hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more use of macros for the slot field access

Browse Source
This commit is contained in:
hyunghwan.chung 2018-12-20 16:58:32 +00:00
parent 866913e199
commit bbcf85d2b6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
moo/lib/exec.c
View File

@ -2161,7 +2161,7 @@ static moo_pfrc_t __block_value (moo_t* moo, moo_oop_context_t rcv_blkctx, moo_o
/* shallow-copy the named part including home, origin, etc. */ /* shallow-copy the named part including home, origin, etc. */
for (i = 0; i < MOO_CONTEXT_NAMED_INSTVARS; i++) for (i = 0; i < MOO_CONTEXT_NAMED_INSTVARS; i++)
{ {
MOO_STORE_OOP (moo, &((moo_oop_oop_t)blkctx)->slot[i], ((moo_oop_oop_t)rcv_blkctx)->slot[i]); MOO_STORE_OOP (moo, MOO_OBJ_GET_OOP_PTR(blkctx, i), MOO_OBJ_GET_OOP_VAL(rcv_blkctx, i));
} }
#else #else
blkctx->ip = rcv_blkctx->ip; blkctx->ip = rcv_blkctx->ip;
@ -2184,7 +2184,7 @@ static moo_pfrc_t __block_value (moo_t* moo, moo_oop_context_t rcv_blkctx, moo_o
MOO_ASSERT (moo, MOO_OBJ_GET_SIZE(xarg) == num_first_arg_elems); MOO_ASSERT (moo, MOO_OBJ_GET_SIZE(xarg) == num_first_arg_elems);
for (i = 0; i < num_first_arg_elems; i++) for (i = 0; i < num_first_arg_elems; i++)
{ {
MOO_STORE_OOP (moo, &blkctx->stack[i], xarg->slot[i]); MOO_STORE_OOP (moo, &blkctx->stack[i], MOO_OBJ_GET_OOP_VAL(xarg, i));
} }
} }
else else
@ -3765,6 +3765,7 @@ static int start_method (moo_t* moo, moo_oop_method_t method, moo_oow_t nargs)
case MOO_METHOD_PREAMBLE_RETURN_INSTVAR: case MOO_METHOD_PREAMBLE_RETURN_INSTVAR:
{ {
moo_oop_oop_t rcv; moo_oop_oop_t rcv;
moo_ooi_t index;
MOO_STACK_POPS (moo, nargs); /* pop arguments only */ MOO_STACK_POPS (moo, nargs); /* pop arguments only */
@ -3791,7 +3792,8 @@ static int start_method (moo_t* moo, moo_oop_method_t method, moo_oow_t nargs)
} }
/* this accesses the instance variable of the receiver */ /* this accesses the instance variable of the receiver */
MOO_STACK_SET (moo, moo->sp, rcv->slot[MOO_METHOD_GET_PREAMBLE_INDEX(preamble)]); index = MOO_METHOD_GET_PREAMBLE_INDEX(preamble);
MOO_STACK_SET (moo, moo->sp, MOO_OBJ_GET_OOP_VAL(rcv, index));
break; break;
} }
@ -4716,7 +4718,7 @@ static int __execute (moo_t* moo)
push_instvar: push_instvar:
LOG_INST1 (moo, "push_instvar %zu", b1); LOG_INST1 (moo, "push_instvar %zu", b1);
MOO_ASSERT (moo, MOO_OBJ_GET_FLAGS_TYPE(moo->active_context->origin->receiver_or_source) == MOO_OBJ_TYPE_OOP); MOO_ASSERT (moo, MOO_OBJ_GET_FLAGS_TYPE(moo->active_context->origin->receiver_or_source) == MOO_OBJ_TYPE_OOP);
MOO_STACK_PUSH (moo, ((moo_oop_oop_t)moo->active_context->origin->receiver_or_source)->slot[b1]); MOO_STACK_PUSH (moo, MOO_OBJ_GET_OOP_VAL(moo->active_context->origin->receiver_or_source, b1));
NEXT_INST(); NEXT_INST();
/* ------------------------------------------------- */ /* ------------------------------------------------- */
@ -4736,7 +4738,7 @@ static int __execute (moo_t* moo)
store_instvar: store_instvar:
LOG_INST1 (moo, "store_into_instvar %zu", b1); LOG_INST1 (moo, "store_into_instvar %zu", b1);
MOO_ASSERT (moo, MOO_OBJ_GET_FLAGS_TYPE(moo->active_context->receiver_or_source) == MOO_OBJ_TYPE_OOP); MOO_ASSERT (moo, MOO_OBJ_GET_FLAGS_TYPE(moo->active_context->receiver_or_source) == MOO_OBJ_TYPE_OOP);
MOO_STORE_OOP (moo, &((moo_oop_oop_t)moo->active_context->origin->receiver_or_source)->slot[b1], MOO_STACK_GETTOP(moo)); MOO_STORE_OOP (moo, MOO_OBJ_GET_OOP_PTR(moo->active_context->origin->receiver_or_source, b1), MOO_STACK_GETTOP(moo));
NEXT_INST(); NEXT_INST();
/* ------------------------------------------------- */ /* ------------------------------------------------- */
@ -4755,7 +4757,7 @@ static int __execute (moo_t* moo)
pop_into_instvar: pop_into_instvar:
LOG_INST1 (moo, "pop_into_instvar %zu", b1); LOG_INST1 (moo, "pop_into_instvar %zu", b1);
MOO_ASSERT (moo, MOO_OBJ_GET_FLAGS_TYPE(moo->active_context->receiver_or_source) == MOO_OBJ_TYPE_OOP); MOO_ASSERT (moo, MOO_OBJ_GET_FLAGS_TYPE(moo->active_context->receiver_or_source) == MOO_OBJ_TYPE_OOP);
MOO_STORE_OOP (moo, &((moo_oop_oop_t)moo->active_context->origin->receiver_or_source)->slot[b1], MOO_STACK_GETTOP(moo)); MOO_STORE_OOP (moo, MOO_OBJ_GET_OOP_PTR(moo->active_context->origin->receiver_or_source, b1), MOO_STACK_GETTOP(moo));
MOO_STACK_POP (moo); MOO_STACK_POP (moo);
NEXT_INST(); NEXT_INST();
@ -5187,7 +5189,7 @@ static int __execute (moo_t* moo)
if ((bcode >> 3) & 1) if ((bcode >> 3) & 1)
{ {
/* store or pop */ /* store or pop */
MOO_STORE_OOP (moo, &t->slot[b1], MOO_STACK_GETTOP(moo)); MOO_STORE_OOP (moo, MOO_OBJ_GET_OOP_PTR(t, b1), MOO_STACK_GETTOP(moo));
if ((bcode >> 2) & 1) if ((bcode >> 2) & 1)
{ {
@ -5204,7 +5206,7 @@ static int __execute (moo_t* moo)
{ {
/* push */ /* push */
LOG_INST2 (moo, "push_objvar %zu %zu", b1, b2); LOG_INST2 (moo, "push_objvar %zu %zu", b1, b2);
MOO_STACK_PUSH (moo, t->slot[b1]); MOO_STACK_PUSH (moo, MOO_OBJ_GET_OOP_VAL(t, b1));
} }
NEXT_INST(); NEXT_INST();
} }
@ -5381,7 +5383,7 @@ static int __execute (moo_t* moo)
t1 = MOO_STACK_GETTOP(moo); t1 = MOO_STACK_GETTOP(moo);
MOO_STACK_POP (moo); MOO_STACK_POP (moo);
t2 = MOO_STACK_GETTOP(moo); t2 = MOO_STACK_GETTOP(moo);
MOO_STORE_OOP (moo, &((moo_oop_oop_t)t2)->slot[b1], t1); MOO_STORE_OOP (moo, MOO_OBJ_GET_OOP_PTR(t2, b1), t1);
NEXT_INST(); NEXT_INST();
} }