[svn:parrot] r43024 - branches/context_unify3/src/ops

[bacek at svn.parrot.org]

Author: bacek
Date: Sat Dec 12 20:20:44 2009
New Revision: 43024
URL: https://trac.parrot.org/parrot/changeset/43024

Log:
Update passing of args/results to use current context

Modified:
   branches/context_unify3/src/ops/core.ops

Modified: branches/context_unify3/src/ops/core.ops
==============================================================================
--- branches/context_unify3/src/ops/core.ops	Sat Dec 12 20:20:25 2009	(r43023)
+++ branches/context_unify3/src/ops/core.ops	Sat Dec 12 20:20:44 2009	(r43024)
@@ -559,9 +559,8 @@
     ccont   = Parrot_pcc_get_continuation(interp, ctx);
 
     caller_ctx  = Parrot_pcc_get_caller_ctx(interp, ctx);
-    call_object = Parrot_pcc_get_signature(interp, caller_ctx);
 
-    Parrot_pcc_fill_params_from_op(interp, call_object, signature, raw_params);
+    Parrot_pcc_fill_params_from_op(interp, ctx, signature, raw_params);
 
     /* TODO Factor out with Sub.invoke */
     if (PObj_get_FLAGS(ccont) & SUB_FLAG_TAILCALL) {
@@ -577,11 +576,9 @@
     opcode_t * const raw_returns = CUR_OPCODE;
     PMC      *signature          = $1;
     PMC      *ctx                = CURRENT_CONTEXT(interp);
-    PMC      *caller_ctx         = Parrot_pcc_get_caller_ctx(interp, ctx);
-    PMC      *call_object        = Parrot_pcc_get_signature(interp, caller_ctx);
     INTVAL    argc               = VTABLE_elements(interp, signature);
 
-    Parrot_pcc_fill_returns_from_op(interp, call_object, signature, raw_returns);
+    Parrot_pcc_fill_returns_from_op(interp, ctx, signature, raw_returns);
 
     Parrot_pcc_set_signature(interp, ctx, NULL);