[svn:parrot] r40921 - branches/context_pmc3/src/jit/i386

[bacek at svn.parrot.org]

Author: bacek
Date: Wed Sep  2 11:28:52 2009
New Revision: 40921
URL: https://trac.parrot.org/parrot/changeset/40921

Log:
[cage] Remove last references to CURRENT_CONTEXT_FIELD macros. mikehh++

Modified:
   branches/context_pmc3/src/jit/i386/core.jit

Modified: branches/context_pmc3/src/jit/i386/core.jit
==============================================================================
--- branches/context_pmc3/src/jit/i386/core.jit	Wed Sep  2 10:45:10 2009	(r40920)
+++ branches/context_pmc3/src/jit/i386/core.jit	Wed Sep  2 11:28:52 2009	(r40921)
@@ -1453,21 +1453,18 @@
 
 Parrot_pic_callr___pc {
     int offset, here, op_i;
-    PackFile_Constant ** constants;
     PMC *sig_params, *sig_result;
     opcode_t *params;
     int skip;
 
-    constants = CURRENT_CONTEXT_FIELD(interp, constants);
     params = jit_info->optimizer->sections->begin;
-    sig_params = constants[params[1]]->u.key;
+    sig_params = Parrot_pcc_get_pmc_constant(interp, CURRENT_CONTEXT(interp), params[1]);
     op_i = 2 + VTABLE_elements(interp, sig_params);
 
     offset = jit_info->arena.op_map[op_i].offset;
     /* TODO preserve necessary regs */
     assert(*CUR_OPCODE == PARROT_OP_get_results_pc);
-    constants = CURRENT_CONTEXT_FIELD(interp, constants);
-    sig_result = constants[CUR_OPCODE[1]]->u.key;
+    sig_result = Parrot_pcc_get_pmc_constant(interp, CURRENT_CONTEXT(interp), CUR_OPCODE[1]);
     if (!VTABLE_elements(interp, sig_result))
         skip = -1;
     else
@@ -1497,11 +1494,9 @@
                 offsetof(Parrot_Context, current_results));
     }
     else {
-        PackFile_Constant ** constants;
-        PMC *sig_result;
+        PMC *sig_result = Parrot_pcc_get_pmc_constant(interp,
+                                CURRENT_CONTEXT(interp), CUR_OPCODE[1]);
 
-        constants = CURRENT_CONTEXT_FIELD(interp, constants);
-        sig_result = constants[CUR_OPCODE[1]]->u.key;
         if (!VTABLE_elements(interp, sig_result))
             return;
         if (VTABLE_get_integer_keyed_int(interp, sig_result, 0) ==