removing rw_break

mmixlib/libglobals.h

@@ -35,13 +35,12 @@ extern int rzz;
 extern int round_mode;
 extern bool resuming;
 extern bool halted;
-extern bool breakpoint;
+extern int breakpoint;
 extern bool tracing;
 extern bool trace_once;
 extern bool stack_tracing;
 extern bool interacting;
 extern bool show_operating_system;
-extern bool rw_break;
 extern octa rOlimit;
 extern bool interact_after_break;
 extern bool tripping;

mmixlib/mmixlib.ch

@@ -582,17 +582,17 @@ In all other cases, we set the |trace_bit|.
 @x
 bool breakpoint; /* should we pause after the current instruction? */
 @y
-int breakpoint; /* what caused the pause after the current instruction? */
+int breakpoint=0; /* what caused the pause after the current instruction? */
 @z
 
 
 @x
 bool interacting; /* are we in interactive mode? */
 @y
-bool interacting; /* are we in interactive mode? */
+bool interacting=false; /* are we in interactive mode? */
 bool show_operating_system = false; /* do we show negative addresses */
 bool trace_once=false;
-bool rw_break=false;
+
 octa rOlimit={-1,-1}; /* tracing and break only if g[rO]<=rOlimit */
 bool interact_after_resume = false;
 @z
@@ -741,7 +741,7 @@ cur_round=ROUND_NEAR;
 @x
 @d test_store_bkpt(ll) if ((ll)->bkpt&write_bit) breakpoint=tracing=true
 @y
-@d test_store_bkpt(ll) if ((ll)->bkpt&write_bit) rw_break=breakpoint|=write_bit,tracing=true
+@d test_store_bkpt(ll) if ((ll)->bkpt&write_bit) breakpoint|=write_bit,tracing=true
 @z
 
 
@@ -809,7 +809,7 @@ void stack_store(x)
 @x
 @d test_load_bkpt(ll) if ((ll)->bkpt&read_bit) breakpoint=tracing=true
 @y
-@d test_load_bkpt(ll) if ((ll)->bkpt&read_bit) rw_break=breakpoint|=read_bit,tracing=true
+@d test_load_bkpt(ll) if ((ll)->bkpt&read_bit) breakpoint|=read_bit,tracing=true
 @z
 
 Same with stack load.
@@ -1973,6 +1973,8 @@ char switchable_string[300] ={0}; /* holds |rhs|; position 0 is ignored */
 @x
 @ @<Sub...@>=
 void show_stats @,@,@[ARGS((bool))@];@+@t}\6{@>
+void show_stats(verbose)
+  bool verbose;
 @y
 @ @(libstats.c@>=
 #include <stdio.h>
@@ -1985,7 +1987,9 @@ void show_stats @,@,@[ARGS((bool))@];@+@t}\6{@>
 #include "libarith.h"
 #include "libimport.h"
 
-void show_stats @,@,@[ARGS((bool))@];@+@t}\6{@>
+void show_stats @,@,@[ARGS((int))@];@+@t}\6{@>
+void show_stats(verbose)
+  int verbose;
 @z
 
 

mmixlib/mmixlib.h

@@ -197,7 +197,7 @@ void mmix_stack_trace(char *format,...);
 /* function to do the stack trace */
 
 extern bool halted;
-extern bool breakpoint;
+extern int breakpoint;
 extern bool interrupt;
 extern bool interacting;
 extern octa rOlimit;
@@ -208,7 +208,6 @@ extern bool stack_tracing;
 extern octa loc;
 extern octa inst_ptr;
 extern tetra inst;
-extern bool rw_break;
 extern bool show_operating_system;
 extern bool trace_once;
 extern bool resuming;