[svn:parrot] r40872 - in branches/context_pmc3: lib/Parrot/Pmc2c src/pmc

[bacek at svn.parrot.org]

Author: bacek
Date: Sun Aug 30 11:18:07 2009
New Revision: 40872
URL: https://trac.parrot.org/parrot/changeset/40872

Log:
Use more Context accessors functions

Modified:
   branches/context_pmc3/lib/Parrot/Pmc2c/PCCMETHOD.pm
   branches/context_pmc3/src/pmc/coroutine.pmc

Modified: branches/context_pmc3/lib/Parrot/Pmc2c/PCCMETHOD.pm
==============================================================================
--- branches/context_pmc3/lib/Parrot/Pmc2c/PCCMETHOD.pm	Sun Aug 30 11:17:37 2009	(r40871)
+++ branches/context_pmc3/lib/Parrot/Pmc2c/PCCMETHOD.pm	Sun Aug 30 11:18:07 2009	(r40872)
@@ -430,7 +430,7 @@
     if (PObj_get_FLAGS(_ccont) & SUB_FLAG_TAILCALL) {
         PObj_get_FLAGS(_ccont) &= ~SUB_FLAG_TAILCALL;
         Parrot_pcc_dec_recursion_depth(interp, _ctx);
-        CONTEXT_FIELD(interp, _ctx, caller_ctx) = CONTEXT_FIELD(interp, _caller_ctx, caller_ctx);
+        Parrot_pcc_set_caller_ctx(interp, _ctx, Parrot_pcc_get_caller_ctx(interp, _caller_ctx));
         interp->current_args = NULL;
     }
     /* BEGIN PARMS SCOPE */
@@ -465,7 +465,7 @@
 
     interp->returns_signature = _return_sig;
     parrot_pass_args(interp, _ctx, _caller_ctx, _return_indexes,
-        CONTEXT_FIELD(interp, _caller_ctx, current_results), PARROT_PASS_RESULTS);
+        Parrot_pcc_get_results(interp, _caller_ctx), PARROT_PASS_RESULTS);
 END
     }
     $e_post->emit( <<"END", __FILE__, __LINE__ + 1 );

Modified: branches/context_pmc3/src/pmc/coroutine.pmc
==============================================================================
--- branches/context_pmc3/src/pmc/coroutine.pmc	Sun Aug 30 11:17:37 2009	(r40871)
+++ branches/context_pmc3/src/pmc/coroutine.pmc	Sun Aug 30 11:18:07 2009	(r40872)
@@ -148,7 +148,7 @@
 
             co->ctx                   = ctx;
 
-            CONTEXT_FIELD(INTERP, ctx, caller_ctx)          = caller_ctx;
+            Parrot_pcc_set_caller_ctx(INTERP, ctx, caller_ctx);
             PMC_cont(ccont)->from_ctx                       = ctx;
             Parrot_pcc_set_sub(INTERP, ctx, SELF);
             Parrot_pcc_set_HLL(interp, ctx, co->HLL_id);