diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2004-01-02 19:23:29 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2004-01-02 19:23:29 +0000 |
| commit | 0c7aecb88dc696f66f49f3bed54a037361a26b8d (patch) | |
| tree | 32bde8a45b8881d3d121fd39cc1270980f596096 /byterun/interp.c | |
| parent | 7ba8c1ca1d044232ed6d81d04a8c46800cf15097 (diff) | |
depollution suite (et fin?) (PR#1914 et PR#1956)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6047 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/interp.c')
| -rw-r--r-- | byterun/interp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/byterun/interp.c b/byterun/interp.c index 59a1a0720..146baa774 100644 --- a/byterun/interp.c +++ b/byterun/interp.c @@ -100,10 +100,10 @@ sp is a local copy of the global variable caml_extern_sp. */ #ifdef THREADED_CODE #define Restart_curr_instr \ - goto *(jumptable[saved_code[pc - 1 - start_code]]) + goto *(jumptable[caml_saved_code[pc - 1 - caml_start_code]]) #else #define Restart_curr_instr \ - curr_instr = saved_code[pc - 1 - start_code]; \ + curr_instr = caml_saved_code[pc - 1 - caml_start_code]; \ goto dispatch_instr #endif @@ -225,8 +225,8 @@ value caml_interprete(code_t prog, asize_t prog_size) if (prog == NULL) { /* Interpreter is initializing */ #ifdef THREADED_CODE - instr_table = (char **) jumptable; - instr_base = Jumptbl_base; + caml_instr_table = (char **) jumptable; + caml_instr_base = Jumptbl_base; #endif return Val_unit; } @@ -258,7 +258,7 @@ value caml_interprete(code_t prog, asize_t prog_size) #ifdef THREADED_CODE #ifdef DEBUG next_instr: - if (icount-- == 0) stop_here (); + if (caml_icount-- == 0) caml_stop_here (); Assert(sp >= caml_stack_low); Assert(sp <= caml_stack_high); #endif @@ -266,8 +266,8 @@ value caml_interprete(code_t prog, asize_t prog_size) #else while(1) { #ifdef DEBUG - if (icount-- == 0) stop_here (); - if (trace_flag) disasm_instr(pc); + if (caml_icount-- == 0) caml_stop_here (); + if (caml_trace_flag) caml_disasm_instr(pc); Assert(sp >= caml_stack_low); Assert(sp <= caml_stack_high); #endif |