[svn:parrot] r40594 - branches/context_pmc2/src/gc

[whiteknight at svn.parrot.org]

Author: whiteknight
Date: Sun Aug 16 14:11:55 2009
New Revision: 40594
URL: https://trac.parrot.org/parrot/changeset/40594

Log:
[context_pmc2] some small fixes to my last commit

Modified:
   branches/context_pmc2/src/gc/alloc_register.c

Modified: branches/context_pmc2/src/gc/alloc_register.c
==============================================================================
--- branches/context_pmc2/src/gc/alloc_register.c	Sun Aug 16 14:06:41 2009	(r40593)
+++ branches/context_pmc2/src/gc/alloc_register.c	Sun Aug 16 14:11:55 2009	(r40594)
@@ -167,10 +167,10 @@
     PMC * const old = interp->ctx;
     PMC * const ctx = Parrot_set_new_context(interp, n_regs_used);
 
-    ctx->caller_ctx  = old;
+    PARROT_CONTEXT(ctx)->caller_ctx  = old;
 
     /* doesn't change */
-    ctx->current_sub = old->current_sub;
+    PARROT_CONTEXT(ctx)->current_sub = PARROT_CONTEXT(old)->current_sub;
 
     return ctx;
 }
@@ -193,7 +193,7 @@
 {
     ASSERT_ARGS(Parrot_pop_context)
     PMC * const ctx = interp->ctx;
-    PMC * const old = ctx->caller_ctx;
+    PMC * const old = PARROT_CONTEXT(ctx)->caller_ctx;
 
     /* restore old, set cached interpreter base pointers */
     interp->ctx       = old;
@@ -218,7 +218,7 @@
 {
     ASSERT_ARGS(Parrot_set_new_context)
     PMC * const old = interp->ctx;
-    PMC * const ctx = Parrot_alloc_context(interp, number_regs_used, old);
+    PMC * const ctx = Parrot_alloc_context(interp, number_regs_used, PARROT_CONTEXT(old));
 
     interp->ctx = ctx;
 
@@ -261,9 +261,6 @@
     pmcctx = pmc_new(interp, enum_class_Context);
     ctx = mem_sys_allocate_typed(Parrot_Context);
 
-        const size_t to_alloc = reg_alloc + ALIGNED_CTX_SIZE;
-        ctx                   = (Parrot_Context *)mem_sys_allocate(to_alloc);
-    }
 
     ctx->n_regs_used[REGNO_INT] = number_regs_used[REGNO_INT];
     ctx->n_regs_used[REGNO_NUM] = number_regs_used[REGNO_NUM];