[svn:parrot] r40873 - in branches/context_pmc3: include/parrot src/call src/gc

bacek at svn.parrot.org bacek at svn.parrot.org
Sun Aug 30 12:35:19 UTC 2009 

Author: bacek
Date: Sun Aug 30 12:35:17 2009
New Revision: 40873
URL: https://trac.parrot.org/parrot/changeset/40873

Log:
Rename Parrot_pcc_get_context to Parrot_pcc_get_context_struct

Modified:
   branches/context_pmc3/include/parrot/call.h
   branches/context_pmc3/include/parrot/interpreter.h
   branches/context_pmc3/include/parrot/register.h
   branches/context_pmc3/src/call/context.c
   branches/context_pmc3/src/gc/alloc_register.c

Modified: branches/context_pmc3/include/parrot/call.h
==============================================================================
--- branches/context_pmc3/include/parrot/call.h	Sun Aug 30 11:18:07 2009	(r40872)
+++ branches/context_pmc3/include/parrot/call.h	Sun Aug 30 12:35:17 2009	(r40873)
@@ -771,7 +771,7 @@
         __attribute__nonnull__(2);
 
 PARROT_EXPORT
-UINTVAL Parrot_pcc_errors_on(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
+void Parrot_pcc_errors_on(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
@@ -790,7 +790,7 @@
 
 PARROT_EXPORT
 PARROT_CAN_RETURN_NULL
-Parrot_Context* Parrot_pcc_get_context(PARROT_INTERP,
+Parrot_Context* Parrot_pcc_get_context_struct(PARROT_INTERP,
     ARGIN_NULLOK(PMC *ctx))
         __attribute__nonnull__(1);
 
@@ -997,7 +997,7 @@
         __attribute__nonnull__(2);
 
 PARROT_EXPORT
-UINTVAL Parrot_pcc_trace_flags_on(PARROT_INTERP,
+void Parrot_pcc_trace_flags_on(PARROT_INTERP,
     ARGIN(PMC *ctx),
     UINTVAL flags)
         __attribute__nonnull__(1)
@@ -1048,7 +1048,7 @@
 #define ASSERT_ARGS_Parrot_pcc_get_caller_ctx __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(ctx)
-#define ASSERT_ARGS_Parrot_pcc_get_context __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_pcc_get_context_struct __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_pcc_get_continuation __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \

Modified: branches/context_pmc3/include/parrot/interpreter.h
==============================================================================
--- branches/context_pmc3/include/parrot/interpreter.h	Sun Aug 30 11:18:07 2009	(r40872)
+++ branches/context_pmc3/include/parrot/interpreter.h	Sun Aug 30 12:35:17 2009	(r40873)
@@ -205,7 +205,7 @@
  * Not considered as part of public API. Should be replaced with proper accessor
  * functions to manipulate Context.
  */
-#define CONTEXT_FIELD(interp, ctx, name)    ((Parrot_pcc_get_context((interp), (ctx)))->name)
+#define CONTEXT_FIELD(interp, ctx, name)    ((Parrot_pcc_get_context_struct((interp), (ctx)))->name)
 #define CURRENT_CONTEXT_FIELD(interp, name) CONTEXT_FIELD((interp), (interp)->ctx, name)
 
 

Modified: branches/context_pmc3/include/parrot/register.h
==============================================================================
--- branches/context_pmc3/include/parrot/register.h	Sun Aug 30 11:18:07 2009	(r40872)
+++ branches/context_pmc3/include/parrot/register.h	Sun Aug 30 12:35:17 2009	(r40873)
@@ -43,7 +43,7 @@
 #define REGNO_STR 2
 #define REGNO_PMC 3
 
-#define __CTX Parrot_pcc_get_context(interp, interp->ctx)
+#define __CTX Parrot_pcc_get_context_struct(interp, interp->ctx)
 #define _SIZEOF_INTS    (sizeof (INTVAL) * __CTX->n_regs_used[REGNO_INT])
 #define _SIZEOF_NUMS    (sizeof (FLOATVAL) * __CTX->n_regs_used[REGNO_NUM])
 #define _SIZEOF_PMCS    (sizeof (PMC*) * __CTX->n_regs_used[REGNO_PMC])

Modified: branches/context_pmc3/src/call/context.c
==============================================================================
--- branches/context_pmc3/src/call/context.c	Sun Aug 30 11:18:07 2009	(r40872)
+++ branches/context_pmc3/src/call/context.c	Sun Aug 30 12:35:17 2009	(r40873)
@@ -45,7 +45,7 @@
 Parrot_pcc_set_constants(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(struct PackFile_Constant **constants))
 {
     ASSERT_ARGS(Parrot_pcc_set_constants)
-    Parrot_Context * c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context * c = Parrot_pcc_get_context_struct(interp, ctx);
     c->constants = constants;
 }
 
@@ -66,7 +66,7 @@
 Parrot_pcc_get_string_constant(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
 {
     ASSERT_ARGS(Parrot_pcc_get_string_constant)
-    Parrot_Context const * c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const * c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->constants[idx]->u.string;
 }
 
@@ -87,7 +87,7 @@
 Parrot_pcc_get_pmc_constant(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
 {
     ASSERT_ARGS(Parrot_pcc_get_pmc_constant)
-    Parrot_Context const * c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const * c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->constants[idx]->u.key;
 }
 
@@ -115,7 +115,7 @@
 
 /*
 
-=item C<Parrot_Context* Parrot_pcc_get_context(PARROT_INTERP, PMC *ctx)>
+=item C<Parrot_Context* Parrot_pcc_get_context_struct(PARROT_INTERP, PMC *ctx)>
 
 Fetch Parrot_Context from Context PMC.
 
@@ -125,9 +125,9 @@
 PARROT_EXPORT
 PARROT_CAN_RETURN_NULL
 Parrot_Context*
-Parrot_pcc_get_context(PARROT_INTERP, ARGIN_NULLOK(PMC *ctx))
+Parrot_pcc_get_context_struct(PARROT_INTERP, ARGIN_NULLOK(PMC *ctx))
 {
-    ASSERT_ARGS(Parrot_pcc_get_context)
+    ASSERT_ARGS(Parrot_pcc_get_context_struct)
     if (PMC_IS_NULL(ctx))
         return NULL;
 
@@ -149,7 +149,7 @@
 Parrot_pcc_get_recursion_depth(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_recursion_depth)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->recursion_depth;
 }
 
@@ -168,7 +168,7 @@
 Parrot_pcc_inc_recursion_depth(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_inc_recursion_depth)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     return ++c->recursion_depth;
 }
 
@@ -187,7 +187,7 @@
 Parrot_pcc_dec_recursion_depth(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_dec_recursion_depth)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     return --c->recursion_depth;
 }
 
@@ -207,7 +207,7 @@
 Parrot_pcc_get_caller_ctx(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_caller_ctx)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->caller_ctx;
 }
 
@@ -228,7 +228,7 @@
 Parrot_pcc_set_caller_ctx(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN(PMC *caller_ctx))
 {
     ASSERT_ARGS(Parrot_pcc_set_caller_ctx)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->caller_ctx = caller_ctx;
 }
 
@@ -248,7 +248,7 @@
 Parrot_pcc_get_outer_ctx(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_outer_ctx)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->outer_ctx;
 }
 
@@ -268,7 +268,7 @@
 Parrot_pcc_set_outer_ctx(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN(PMC *outer_ctx))
 {
     ASSERT_ARGS(Parrot_pcc_set_outer_ctx)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->outer_ctx = outer_ctx;
 }
 
@@ -288,7 +288,7 @@
 Parrot_pcc_get_lex_pad(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_lex_pad)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->lex_pad;
 }
 
@@ -308,7 +308,7 @@
 Parrot_pcc_set_lex_pad(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN(PMC *lex_pad))
 {
     ASSERT_ARGS(Parrot_pcc_set_lex_pad)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->lex_pad = lex_pad;
 }
 
@@ -328,7 +328,7 @@
 Parrot_pcc_get_namespace(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_namespace)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->current_namespace;
 }
 
@@ -348,7 +348,7 @@
 Parrot_pcc_set_namespace(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(PMC *_namespace))
 {
     ASSERT_ARGS(Parrot_pcc_set_namespace)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->current_namespace = _namespace;
 }
 
@@ -367,7 +367,7 @@
 Parrot_pcc_get_HLL(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_HLL)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->current_HLL;
 }
 
@@ -387,7 +387,7 @@
 Parrot_pcc_set_HLL(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL hll)
 {
     ASSERT_ARGS(Parrot_pcc_set_HLL)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->current_HLL = hll;
 }
 
@@ -407,7 +407,7 @@
 Parrot_pcc_get_handlers(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_handlers)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->handlers;
 }
 
@@ -427,7 +427,7 @@
 Parrot_pcc_set_handers(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN(PMC *handlers))
 {
     ASSERT_ARGS(Parrot_pcc_set_handers)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->handlers = handlers;
 }
 
@@ -447,7 +447,7 @@
 Parrot_pcc_get_continuation(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_continuation)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->current_cont;
 }
 
@@ -468,7 +468,7 @@
 Parrot_pcc_set_continuation(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(PMC *_continuation))
 {
     ASSERT_ARGS(Parrot_pcc_set_continuation)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->current_cont = _continuation;
 }
 
@@ -488,7 +488,7 @@
 Parrot_pcc_get_object(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_object)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->current_object;
 }
 
@@ -508,7 +508,7 @@
 Parrot_pcc_set_object(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(PMC *object))
 {
     ASSERT_ARGS(Parrot_pcc_set_object)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->current_object = object;
 }
 
@@ -528,7 +528,7 @@
 Parrot_pcc_get_sub(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_sub)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->current_sub;
 }
 
@@ -548,7 +548,7 @@
 Parrot_pcc_set_sub(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(PMC *sub))
 {
     ASSERT_ARGS(Parrot_pcc_set_sub)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->current_sub = sub;
 }
 
@@ -568,7 +568,7 @@
 Parrot_pcc_get_pc(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_pc)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->current_pc;
 }
 
@@ -588,7 +588,7 @@
 Parrot_pcc_set_pc(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(opcode_t *pc))
 {
     ASSERT_ARGS(Parrot_pcc_set_pc)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->current_pc = pc;
 }
 
@@ -608,7 +608,7 @@
 Parrot_pcc_get_results(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_results)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->current_results;
 }
 
@@ -628,7 +628,7 @@
 Parrot_pcc_set_results(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(opcode_t *pc))
 {
     ASSERT_ARGS(Parrot_pcc_set_results)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->current_results = pc;
 }
 
@@ -648,7 +648,7 @@
 Parrot_pcc_get_results_signature(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_results_signature)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->results_signature;
 }
 
@@ -669,7 +669,7 @@
 Parrot_pcc_set_results_signature(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(PMC *sig))
 {
     ASSERT_ARGS(Parrot_pcc_set_results_signature)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->results_signature = sig;
 }
 
@@ -689,7 +689,7 @@
 Parrot_pcc_get_pred_offset(PARROT_INTERP, ARGIN(PMC *ctx))
 {
     ASSERT_ARGS(Parrot_pcc_get_pred_offset)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context const *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->pred_offset;
 }
 
@@ -710,7 +710,7 @@
 Parrot_pcc_set_pred_offset(PARROT_INTERP, ARGIN(PMC *ctx), size_t pred_offset)
 {
     ASSERT_ARGS(Parrot_pcc_set_pred_offset)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->pred_offset = pred_offset;
 }
 
@@ -730,7 +730,7 @@
 Parrot_pcc_warnings_on(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
 {
     ASSERT_ARGS(Parrot_pcc_warnings_on)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->warns |= flags;
     return c->warns;
 }
@@ -751,9 +751,8 @@
 Parrot_pcc_warnings_off(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
 {
     ASSERT_ARGS(Parrot_pcc_warnings_off)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->warns &= ~flags;
-    return c->warns;
 }
 
 
@@ -773,13 +772,13 @@
 Parrot_pcc_warnings_test(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
 {
     ASSERT_ARGS(Parrot_pcc_warnings_test)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->warns & flags;
 }
 
 /*
 
-=item C<UINTVAL Parrot_pcc_errors_on(PARROT_INTERP, PMC *ctx, UINTVAL flags)>
+=item C<void Parrot_pcc_errors_on(PARROT_INTERP, PMC *ctx, UINTVAL flags)>
 
 Set errors flags.
 
@@ -788,13 +787,12 @@
 */
 
 PARROT_EXPORT
-UINTVAL
+void
 Parrot_pcc_errors_on(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
 {
     ASSERT_ARGS(Parrot_pcc_errors_on)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->errors |= flags;
-    return c->errors;
 }
 
 
@@ -813,9 +811,8 @@
 Parrot_pcc_errors_off(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
 {
     ASSERT_ARGS(Parrot_pcc_errors_off)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->errors &= ~flags;
-    return c->errors;
 }
 
 
@@ -834,14 +831,13 @@
 Parrot_pcc_errors_test(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
 {
     ASSERT_ARGS(Parrot_pcc_errors_test)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->errors & flags;
 }
 
 /*
 
-=item C<UINTVAL Parrot_pcc_trace_flags_on(PARROT_INTERP, PMC *ctx, UINTVAL
-flags)>
+=item C<void Parrot_pcc_trace_flags_on(PARROT_INTERP, PMC *ctx, UINTVAL flags)>
 
 Set trace flags.
 
@@ -850,13 +846,12 @@
 */
 
 PARROT_EXPORT
-UINTVAL
+void
 Parrot_pcc_trace_flags_on(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
 {
     ASSERT_ARGS(Parrot_pcc_trace_flags_on)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->trace_flags |= flags;
-    return c->trace_flags;
 }
 
 
@@ -875,9 +870,8 @@
 Parrot_pcc_trace_flags_off(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
 {
     ASSERT_ARGS(Parrot_pcc_trace_flags_off)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     c->trace_flags &= ~flags;
-    return c->trace_flags;
 }
 
 
@@ -897,7 +891,7 @@
 Parrot_pcc_trace_flags_test(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL flags)
 {
     ASSERT_ARGS(Parrot_pcc_trace_flags_test)
-    Parrot_Context *c = Parrot_pcc_get_context(interp, ctx);
+    Parrot_Context *c = Parrot_pcc_get_context_struct(interp, ctx);
     return c->trace_flags & flags;
 }
 

Modified: branches/context_pmc3/src/gc/alloc_register.c
==============================================================================
--- branches/context_pmc3/src/gc/alloc_register.c	Sun Aug 30 11:18:07 2009	(r40872)
+++ branches/context_pmc3/src/gc/alloc_register.c	Sun Aug 30 12:35:17 2009	(r40873)
@@ -219,7 +219,7 @@
 {
     ASSERT_ARGS(clear_regs)
     int i;
-    Parrot_Context *ctx = Parrot_pcc_get_context(interp, pmcctx);
+    Parrot_Context *ctx = Parrot_pcc_get_context_struct(interp, pmcctx);
 
     /* NULL out registers - P/S have to be NULL for GC
      *
@@ -261,8 +261,8 @@
         ARGIN_NULLOK(PMC *pmcold))
 {
     ASSERT_ARGS(init_context)
-    Parrot_Context *ctx = Parrot_pcc_get_context(interp, pmcctx);
-    Parrot_Context *old = Parrot_pcc_get_context(interp, pmcold);
+    Parrot_Context *ctx = Parrot_pcc_get_context_struct(interp, pmcctx);
+    Parrot_Context *old = Parrot_pcc_get_context_struct(interp, pmcold);
 
     ctx->current_results   = NULL;
     ctx->results_signature = NULL;
@@ -540,7 +540,7 @@
 Parrot_pcc_get_INTVAL_reg(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
 {
     ASSERT_ARGS(Parrot_pcc_get_INTVAL_reg)
-    return &(Parrot_pcc_get_context(interp, ctx)->bp.regs_i[idx]);
+    return &(Parrot_pcc_get_context_struct(interp, ctx)->bp.regs_i[idx]);
 }
 
 PARROT_EXPORT
@@ -549,7 +549,7 @@
 Parrot_pcc_get_FLOATVAL_reg(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
 {
     ASSERT_ARGS(Parrot_pcc_get_FLOATVAL_reg)
-    return &(Parrot_pcc_get_context(interp, ctx)->bp.regs_n[-1L - idx]);
+    return &(Parrot_pcc_get_context_struct(interp, ctx)->bp.regs_n[-1L - idx]);
 }
 
 PARROT_EXPORT
@@ -558,7 +558,7 @@
 Parrot_pcc_get_STRING_reg(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
 {
     ASSERT_ARGS(Parrot_pcc_get_STRING_reg)
-    return &(Parrot_pcc_get_context(interp, ctx)->bp_ps.regs_s[idx]);
+    return &(Parrot_pcc_get_context_struct(interp, ctx)->bp_ps.regs_s[idx]);
 }
 
 PARROT_EXPORT
@@ -567,7 +567,7 @@
 Parrot_pcc_get_PMC_reg(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
 {
     ASSERT_ARGS(Parrot_pcc_get_PMC_reg)
-    return &(Parrot_pcc_get_context(interp, ctx)->bp_ps.regs_p[-1L - idx]);
+    return &(Parrot_pcc_get_context_struct(interp, ctx)->bp_ps.regs_p[-1L - idx]);
 }

More information about the parrot-commits mailing list