Commit 296eccfa authored by Martin Ruckert's avatar Martin Ruckert

removing rw_break

parent c092c559
...@@ -35,13 +35,12 @@ extern int rzz; ...@@ -35,13 +35,12 @@ extern int rzz;
extern int round_mode; extern int round_mode;
extern bool resuming; extern bool resuming;
extern bool halted; extern bool halted;
extern bool breakpoint; extern int breakpoint;
extern bool tracing; extern bool tracing;
extern bool trace_once; extern bool trace_once;
extern bool stack_tracing; extern bool stack_tracing;
extern bool interacting; extern bool interacting;
extern bool show_operating_system; extern bool show_operating_system;
extern bool rw_break;
extern octa rOlimit; extern octa rOlimit;
extern bool interact_after_break; extern bool interact_after_break;
extern bool tripping; extern bool tripping;
......
...@@ -582,17 +582,17 @@ In all other cases, we set the |trace_bit|. ...@@ -582,17 +582,17 @@ In all other cases, we set the |trace_bit|.
@x @x
bool breakpoint; /* should we pause after the current instruction? */ bool breakpoint; /* should we pause after the current instruction? */
@y @y
int breakpoint; /* what caused the pause after the current instruction? */ int breakpoint=0; /* what caused the pause after the current instruction? */
@z @z
@x @x
bool interacting; /* are we in interactive mode? */ bool interacting; /* are we in interactive mode? */
@y @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 show_operating_system = false; /* do we show negative addresses */
bool trace_once=false; bool trace_once=false;
bool rw_break=false;
octa rOlimit={-1,-1}; /* tracing and break only if g[rO]<=rOlimit */ octa rOlimit={-1,-1}; /* tracing and break only if g[rO]<=rOlimit */
bool interact_after_resume = false; bool interact_after_resume = false;
@z @z
...@@ -741,7 +741,7 @@ cur_round=ROUND_NEAR; ...@@ -741,7 +741,7 @@ cur_round=ROUND_NEAR;
@x @x
@d test_store_bkpt(ll) if ((ll)->bkpt&write_bit) breakpoint=tracing=true @d test_store_bkpt(ll) if ((ll)->bkpt&write_bit) breakpoint=tracing=true
@y @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 @z
...@@ -809,7 +809,7 @@ void stack_store(x) ...@@ -809,7 +809,7 @@ void stack_store(x)
@x @x
@d test_load_bkpt(ll) if ((ll)->bkpt&read_bit) breakpoint=tracing=true @d test_load_bkpt(ll) if ((ll)->bkpt&read_bit) breakpoint=tracing=true
@y @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 @z
Same with stack load. Same with stack load.
...@@ -1973,6 +1973,8 @@ char switchable_string[300] ={0}; /* holds |rhs|; position 0 is ignored */ ...@@ -1973,6 +1973,8 @@ char switchable_string[300] ={0}; /* holds |rhs|; position 0 is ignored */
@x @x
@ @<Sub...@>= @ @<Sub...@>=
void show_stats @,@,@[ARGS((bool))@];@+@t}\6{@> void show_stats @,@,@[ARGS((bool))@];@+@t}\6{@>
void show_stats(verbose)
bool verbose;
@y @y
@ @(libstats.c@>= @ @(libstats.c@>=
#include <stdio.h> #include <stdio.h>
...@@ -1985,7 +1987,9 @@ void show_stats @,@,@[ARGS((bool))@];@+@t}\6{@> ...@@ -1985,7 +1987,9 @@ void show_stats @,@,@[ARGS((bool))@];@+@t}\6{@>
#include "libarith.h" #include "libarith.h"
#include "libimport.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 @z
......
...@@ -197,7 +197,7 @@ void mmix_stack_trace(char *format,...); ...@@ -197,7 +197,7 @@ void mmix_stack_trace(char *format,...);
/* function to do the stack trace */ /* function to do the stack trace */
extern bool halted; extern bool halted;
extern bool breakpoint; extern int breakpoint;
extern bool interrupt; extern bool interrupt;
extern bool interacting; extern bool interacting;
extern octa rOlimit; extern octa rOlimit;
...@@ -208,7 +208,6 @@ extern bool stack_tracing; ...@@ -208,7 +208,6 @@ extern bool stack_tracing;
extern octa loc; extern octa loc;
extern octa inst_ptr; extern octa inst_ptr;
extern tetra inst; extern tetra inst;
extern bool rw_break;
extern bool show_operating_system; extern bool show_operating_system;
extern bool trace_once; extern bool trace_once;
extern bool resuming; extern bool resuming;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment