[svn:parrot] r40923 - branches/context_pmc3/src

[bacek at svn.parrot.org]

Author: bacek
Date: Wed Sep  2 11:29:35 2009
New Revision: 40923
URL: https://trac.parrot.org/parrot/changeset/40923

Log:
[cage] Fix CONTEXT vs CURRENT_CONTEXT usage.

Modified:
   branches/context_pmc3/src/jit.c

Modified: branches/context_pmc3/src/jit.c
==============================================================================
--- branches/context_pmc3/src/jit.c	Wed Sep  2 11:29:14 2009	(r40922)
+++ branches/context_pmc3/src/jit.c	Wed Sep  2 11:29:35 2009	(r40923)
@@ -287,7 +287,7 @@
         int arg_type;
         PMC *sig;
         if (argn >= args) {
-            sig = Parrot_pcc_get_pmc_constant(interp, CONTEXT(interp), cur_op[1]);
+            sig = Parrot_pcc_get_pmc_constant(interp, CURRENT_CONTEXT(interp), cur_op[1]);
             arg_type = VTABLE_get_integer_keyed_int(interp,
                     sig, argn - args);
             arg_type &= (PARROT_ARG_TYPE_MASK | PARROT_ARG_CONSTANT);
@@ -397,9 +397,9 @@
     int typ;
 
     cur_section->ru[0].registers_used = Parrot_pcc_get_regs_used(interp,
-                                            CONTEXT(interp), REGNO_INT);
+                                            CURRENT_CONTEXT(interp), REGNO_INT);
     cur_section->ru[3].registers_used = Parrot_pcc_get_regs_used(interp,
-                                            CONTEXT(interp), REGNO_NUM);
+                                            CURRENT_CONTEXT(interp), REGNO_NUM);
     cur_section->ru[1].registers_used = cur_section->ru[2].registers_used = 0;
 
     for (typ = 0; typ < 4; typ++) {
@@ -1306,7 +1306,8 @@
 
             if (offs >= sub->start_offs && offs < sub->end_offs) {
                 for (i = 0; i < 4; i++)
-                    Parrot_pcc_set_regs_used(interp, CONTEXT(interp), i, sub->n_regs_used[i]);
+                    Parrot_pcc_set_regs_used(interp, CURRENT_CONTEXT(interp),
+                            i, sub->n_regs_used[i]);
 
                 return;
             }