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

added 'preamble' to the compiled method.

Browse Source 
improved some special case handling
This commit is contained in:
hyunghwan.chung 2015-06-09 12:14:18 +00:00
parent 5f6500aa7c
commit a8a44a1519
4 changed files with 265 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
stix/lib/comp.c
View File

@ -1,4 +1,3 @@
/*
/* /*
* $Id$ * $Id$
* *
@ -1662,7 +1661,7 @@ static int compile_method_primitive (stix_t* stix)
while (ptr < end && is_digitchar(*ptr)) while (ptr < end && is_digitchar(*ptr))
{ {
prim_no = prim_no * 10 + (*ptr - '0'); prim_no = prim_no * 10 + (*ptr - '0');
if (prim_no > 0xFF) if (prim_no > 0xFFFF) /* TODO: replace 0xFFFF by a macro name */
{ {
set_syntax_error (stix, STIX_SYNERR_PRIMITIVENO, &stix->c->tok.loc, &stix->c->tok.name); set_syntax_error (stix, STIX_SYNERR_PRIMITIVENO, &stix->c->tok.loc, &stix->c->tok.name);
return -1; return -1;
@ -1671,8 +1670,7 @@ static int compile_method_primitive (stix_t* stix)
ptr++; ptr++;
} }
if (emit_byte_instruction(stix, CODE_EXEC_PRIMITIVE) <= -1 || stix->c->mth.prim_no = prim_no;
emit_byte_instruction(stix, prim_no) <= -1) return -1;
GET_TOKEN (stix); GET_TOKEN (stix);
if (!is_token_binsel(stix, VOCA_GT)) if (!is_token_binsel(stix, VOCA_GT))
@ -1685,8 +1683,6 @@ static int compile_method_primitive (stix_t* stix)
return 0; return 0;
} }
static int get_variable_info (stix_t* stix, const stix_ucs_t* name, const stix_ioloc_t* name_loc, var_info_t* var) static int get_variable_info (stix_t* stix, const stix_ucs_t* name, const stix_ioloc_t* name_loc, var_info_t* var)
{ {
stix_ssize_t index; stix_ssize_t index;
@ -1972,7 +1968,7 @@ printf ("push false...\n");
break; break;
case STIX_IOTOK_THIS_CONTEXT: case STIX_IOTOK_THIS_CONTEXT:
/* TODO */ if (emit_byte_instruction(stix, CODE_PUSH_CONTEXT) <= -1) return -1;
GET_TOKEN (stix); GET_TOKEN (stix);
break; break;
@ -2367,6 +2363,7 @@ static int add_compiled_method (stix_t* stix)
stix_oop_byte_t code; stix_oop_byte_t code;
stix_size_t tmp_count = 0; stix_size_t tmp_count = 0;
stix_size_t i; stix_size_t i;
stix_ooi_t preamble_code, preamble_index;
name = stix_makesymbol (stix, stix->c->mth.name.ptr, stix->c->mth.name.len); name = stix_makesymbol (stix, stix->c->mth.name.ptr, stix->c->mth.name.len);
if (!name) return -1; if (!name) return -1;
@ -2386,7 +2383,71 @@ static int add_compiled_method (stix_t* stix)
if (!code) goto oops; if (!code) goto oops;
stix_pushtmp (stix, (stix_oop_t*)&code); tmp_count++; stix_pushtmp (stix, (stix_oop_t*)&code); tmp_count++;
preamble_code = STIX_METHOD_PREAMBLE_NONE;
preamble_index = 0;
if (stix->c->mth.prim_no < 0)
{
if (stix->c->mth.code.len <= 0)
{
preamble_code = STIX_METHOD_PREAMBLE_RETURN_RECEIVER;
}
else
{
if (stix->c->mth.code.ptr[0] == CODE_RETURN_MESSAGE_RECEIVER)
{
preamble_code = STIX_METHOD_PREAMBLE_RETURN_RECEIVER;
}
else if (stix->c->mth.code.len >= 2 &&
stix->c->mth.code.ptr[0] == CODE_PUSH_RECEIVER &&
stix->c->mth.code.ptr[1] == CODE_RETURN_MESSAGE_STACKTOP)
{
preamble_code = STIX_METHOD_PREAMBLE_RETURN_RECEIVER;
}
else
{
/* check if the method begins with 'return instavar' instruction */
int index_size;
stix_byte_t cmd;
cmd = stix->c->mth.code.ptr[0] >> 4;
if (cmd == CMD_EXTEND)
{
cmd = stix->c->mth.code.ptr[0] & 0xF;
index_size = 1;
}
else if (cmd == CMD_EXTEND_DOUBLE)
{
cmd = stix->c->mth.code.ptr[0] & 0xF;
index_size = 2;
}
else
{
index_size = 0;
}
if (cmd == CMD_PUSH_INSTVAR &&
stix->c->mth.code.ptr[index_size + 1] == CODE_RETURN_MESSAGE_STACKTOP)
{
preamble_code = STIX_METHOD_PREAMBLE_RETURN_INSTVAR;
if (index_size == 1) preamble_index = stix->c->mth.code.ptr[1];
else if (index_size == 2) preamble_index = ((stix_ooi_t)stix->c->mth.code.ptr[1] << 8) | stix->c->mth.code.ptr[2];
else preamble_index = stix->c->mth.code.ptr[0] & 0xF;
}
}
}
}
else
{
preamble_code = STIX_METHOD_PREAMBLE_PRIMITIVE;
preamble_index = stix->c->mth.prim_no;
}
STIX_ASSERT (preamble_index >= 0 && preamble_index <= 0xFFFF); /* TODO: replace 0xFFFF by a proper macro name */
mth->owner = stix->c->cls.self_oop; mth->owner = stix->c->cls.self_oop;
mth->preamble = STIX_OOP_FROM_SMINT(STIX_METHOD_MAKE_PREAMBLE(preamble_code, preamble_index));
mth->tmpr_count = STIX_OOP_FROM_SMINT(stix->c->mth.tmpr_count); mth->tmpr_count = STIX_OOP_FROM_SMINT(stix->c->mth.tmpr_count);
mth->tmpr_nargs = STIX_OOP_FROM_SMINT(stix->c->mth.tmpr_nargs); mth->tmpr_nargs = STIX_OOP_FROM_SMINT(stix->c->mth.tmpr_nargs);
mth->code = code; mth->code = code;
@ -2421,6 +2482,7 @@ static int compile_method_definition (stix_t* stix)
stix->c->mth.tmpr_nargs = 0; stix->c->mth.tmpr_nargs = 0;
stix->c->mth.literal_count = 0; stix->c->mth.literal_count = 0;
stix->c->mth.code.len = 0; stix->c->mth.code.len = 0;
stix->c->mth.prim_no = -1;
if (stix->c->tok.type == STIX_IOTOK_LPAREN) if (stix->c->tok.type == STIX_IOTOK_LPAREN)
{ {

270
stix/lib/exec.c
View File

@ -26,12 +26,26 @@
#include "stix-prv.h" #include "stix-prv.h"
#define LOAD_IP_AND_SP(v_ctx, v_ip, v_sp) \
do \
{ \
v_ip = STIX_OOP_TO_SMINT((v_ctx)->ip); \
v_sp = STIX_OOP_TO_SMINT((v_ctx)->sp); \
} while(0)
#define STORE_IP_AND_SP(v_ctx, v_ip, v_sp) \
do \
{ \
(v_ctx)->ip = STIX_OOP_FROM_SMINT(v_ip); \
(v_ctx)->sp = STIX_OOP_FROM_SMINT(v_sp); \
} while(0)
static int activate_new_method (stix_t* stix, stix_oop_method_t mth, stix_ooi_t* xip, stix_ooi_t* xsp) static int activate_new_method (stix_t* stix, stix_oop_method_t mth, stix_ooi_t* xip, stix_ooi_t* xsp)
{ {
stix_oow_t stack_size; stix_oow_t stack_size;
stix_oop_context_t ctx; stix_oop_context_t ctx;
stix_ooi_t i, j; stix_ooi_t i;
stix_ooi_t sp, ntmprs, nargs; stix_ooi_t sp, ntmprs, nargs;
stack_size = 256; /* TODO: make the stack size configurable or let the compiler choose the rightr value and store it in the compiled method. if it's stored in the compiled method, the code here can take it*/ stack_size = 256; /* TODO: make the stack size configurable or let the compiler choose the rightr value and store it in the compiled method. if it's stored in the compiled method, the code here can take it*/
@ -65,7 +79,6 @@ static int activate_new_method (stix_t* stix, stix_oop_method_t mth, stix_ooi_t*
*/ */
/*sp = STIX_OOP_TO_SMINT (stix->active_context->sp);*/ /*sp = STIX_OOP_TO_SMINT (stix->active_context->sp);*/
sp = *xsp; sp = *xsp;
printf ("@@@@@@@@@@@@@ %d %d\n", (int)*xsp, (int)STIX_OOP_TO_SMINT(stix->active_context->sp));
ntmprs = STIX_OOP_TO_SMINT (mth->tmpr_count); ntmprs = STIX_OOP_TO_SMINT (mth->tmpr_count);
nargs = STIX_OOP_TO_SMINT (mth->tmpr_nargs); nargs = STIX_OOP_TO_SMINT (mth->tmpr_nargs);
@ -123,32 +136,30 @@ printf ("@@@@@@@@@@@@@ %d %d\n", (int)*xsp, (int)STIX_OOP_TO_SMINT(stix->active_
* Since the number of arguments is 3, stack[sp - 3] points to * Since the number of arguments is 3, stack[sp - 3] points to
* the receiver. When the stack is empty, sp is -1. * the receiver. When the stack is empty, sp is -1.
*/ */
j = sp - nargs; for (i = nargs; i > 0; )
ctx->receiver = stix->active_context->slot[j];
printf ("SETTING RECEIVER %p FROM SLOT %d SP %d NARGS %d\n", ctx->receiver, (int)j, (int)sp, (int)nargs);
for (i = 0; i < nargs; i++)
{ {
/* copy an argument*/ /* copy argument */
ctx->slot[i] = stix->active_context->slot[++j]; ctx->slot[--i] = stix->active_context->slot[sp--];
} }
printf ("j = %d, sp = %d\n", (int)j, (int)sp); /* copy receiver */
STIX_ASSERT (j == sp); ctx->receiver = stix->active_context->slot[sp--];
STIX_ASSERT (sp >= -1);
/* TODO: store the contennts of internal registers to stix->active_context */ /* store an instruction pointer and a stack pointer to the active context
sp -= nargs + 1; * before switching it to a new context */
stix->active_context->ip = STIX_OOP_FROM_SMINT(*xip); STORE_IP_AND_SP (stix->active_context, *xip, sp);
stix->active_context->sp = STIX_OOP_FROM_SMINT(sp);
/* swtich the active context */
stix->active_context = ctx; stix->active_context = ctx;
/* TODO: copy the contens of ctx to internal registers */ /* load an instruction pointer and a stack pointer from the new active
*xip = STIX_OOP_TO_SMINT(stix->active_context->ip); * context */
*xsp = STIX_OOP_TO_SMINT(stix->active_context->sp); LOAD_IP_AND_SP (stix->active_context, *xip, *xsp);
return 0; return 0;
} }
static stix_oop_method_t find_method (stix_t* stix, stix_oop_t receiver, const stix_ucs_t* message) static stix_oop_method_t find_method (stix_t* stix, stix_oop_t receiver, const stix_ucs_t* message, int super)
{ {
stix_oop_class_t cls; stix_oop_class_t cls;
stix_oop_association_t ass; stix_oop_association_t ass;
@ -175,21 +186,33 @@ printf ("going to lookup class method dictioanry...\n");
printf ("going to lookup instance method dictioanry...\n"); printf ("going to lookup instance method dictioanry...\n");
} }
while (c != stix->_nil)
{
mthdic = ((stix_oop_class_t)c)->mthdic[dic_no];
STIX_ASSERT (STIX_CLASSOF(stix, mthdic) == stix->_method_dictionary);
dump_dictionary (stix, mthdic, "Method dictionary"); if (c != stix->_nil)
ass = (stix_oop_association_t)stix_lookupdic (stix, mthdic, message); {
if (ass) if (super)
{ {
STIX_ASSERT (STIX_CLASSOF(stix, ass->value) == stix->_method); c = ((stix_oop_class_t)c)->superclass;
return (stix_oop_method_t)ass->value; if (c == stix->_nil) goto not_found;
} }
c = ((stix_oop_class_t)c)->superclass;
do
{
mthdic = ((stix_oop_class_t)c)->mthdic[dic_no];
STIX_ASSERT (STIX_CLASSOF(stix, mthdic) == stix->_method_dictionary);
dump_dictionary (stix, mthdic, "Method dictionary");
ass = (stix_oop_association_t)stix_lookupdic (stix, mthdic, message);
if (ass)
{
STIX_ASSERT (STIX_CLASSOF(stix, ass->value) == stix->_method);
return (stix_oop_method_t)ass->value;
}
c = ((stix_oop_class_t)c)->superclass;
}
while (c != stix->_nil);
} }
not_found:
stix->errnum = STIX_ENOENT; stix->errnum = STIX_ENOENT;
return STIX_NULL; return STIX_NULL;
} }
@ -217,7 +240,7 @@ static int activate_initial_context (stix_t* stix, const stix_ucs_t* objname, co
if (!ass) return -1; if (!ass) return -1;
printf ("found object...\n"); printf ("found object...\n");
mth = find_method (stix, ass->value, mthname); mth = find_method (stix, ass->value, mthname, 0);
if (!mth) return -1; if (!mth) return -1;
printf ("found method...\n"); printf ("found method...\n");
@ -239,20 +262,34 @@ TODO: overcome this problem
sp = -1; sp = -1;
ctx->slot[++sp] = ass->value; /* push receiver */ ctx->slot[++sp] = ass->value; /* push receiver */
ctx->sp = STIX_OOP_FROM_SMINT(sp); STORE_IP_AND_SP (ctx, ip, sp);
ctx->ip = STIX_OOP_FROM_SMINT(ip); /* fake */
/* receiver, sender, method are nils */ /* receiver, sender, method are nils */
stix->active_context = ctx; stix->active_context = ctx;
return activate_new_method (stix, mth, &ip, &sp); return activate_new_method (stix, mth, &ip, &sp);
} }
static int execute_primitive (stix_t* stix, int prim_no, stix_ooi_t nargs, stix_ooi_t* sp)
{
switch (prim_no)
{
case 0:
/*dump_object (stix->active_context->slot[sp], nargs);*/
return 1;
default:
return -1;
}
/* TODO: when it returns 1, it should pop up receiver and argumetns....
* when it returns 0, it should not touch the stack */
}
int stix_execute (stix_t* stix) int stix_execute (stix_t* stix)
{ {
stix_oop_method_t mth; stix_oop_method_t mth;
stix_oop_byte_t code; stix_oop_byte_t code;
stix_ooi_t ip, sp; stix_ooi_t ip, sp;
stix_oop_t receiver;
stix_byte_t bc, cmd; stix_byte_t bc, cmd;
stix_oow_t b1; stix_oow_t b1;
@ -263,7 +300,6 @@ int stix_execute (stix_t* stix)
while (1) while (1)
{ {
receiver = stix->active_context->receiver;
mth = stix->active_context->method; mth = stix->active_context->method;
code = mth->code; code = mth->code;
@ -281,14 +317,14 @@ printf ("IP => %d ", (int)ip);
b1 = bc & 0xF; b1 = bc & 0xF;
} }
printf ("CMD => %d, B1 = %d, IP AFTER INC %d\n", (int)cmd, (int)b1, (int)ip); printf ("CMD => %d, B1 = %d, SP = %d, IP AFTER INC %d\n", (int)cmd, (int)b1, (int)sp, (int)ip);
switch (cmd) switch (cmd)
{ {
case CMD_PUSH_INSTVAR: case CMD_PUSH_INSTVAR:
printf ("PUSHING INSTVAR %d\n", (int)b1); printf ("PUSHING INSTVAR %d\n", (int)b1);
STIX_ASSERT (STIX_OBJ_GET_FLAGS_TYPE(receiver) == STIX_OBJ_TYPE_OOP); STIX_ASSERT (STIX_OBJ_GET_FLAGS_TYPE(stix->active_context->receiver) == STIX_OBJ_TYPE_OOP);
stix->active_context->slot[++sp] = ((stix_oop_oop_t)receiver)->slot[b1]; stix->active_context->slot[++sp] = ((stix_oop_oop_t)stix->active_context->receiver)->slot[b1];
break; break;
case CMD_PUSH_TEMPVAR: case CMD_PUSH_TEMPVAR:
@ -297,12 +333,14 @@ printf ("PUSHING TEMPVAR %d\n", (int)b1);
break; break;
case CMD_PUSH_LITERAL: case CMD_PUSH_LITERAL:
printf ("PUSHING LITERAL %d\n", (int)b1);
stix->active_context->slot[++sp] = mth->slot[b1]; stix->active_context->slot[++sp] = mth->slot[b1];
break; break;
case CMD_POP_AND_STORE_INTO_INSTVAR: case CMD_POP_AND_STORE_INTO_INSTVAR:
printf ("STORING INSTVAR %d\n", (int)b1); printf ("STORING INSTVAR %d\n", (int)b1);
((stix_oop_oop_t)receiver)->slot[b1] = stix->active_context->slot[sp--]; STIX_ASSERT (STIX_OBJ_GET_FLAGS_TYPE(stix->active_context->receiver) == STIX_OBJ_TYPE_OOP);
((stix_oop_oop_t)stix->active_context->receiver)->slot[b1] = stix->active_context->slot[sp--];
break; break;
case CMD_POP_AND_STORE_INTO_TEMPVAR: case CMD_POP_AND_STORE_INTO_TEMPVAR:
@ -314,10 +352,12 @@ printf ("STORING TEMPVAR %d\n", (int)b1);
case CMD_POP_AND_STORE_INTO_OBJECT_POINTED_TO_BY_LITERAL??? case CMD_POP_AND_STORE_INTO_OBJECT_POINTED_TO_BY_LITERAL???
*/ */
/* -------------------------------------------------------- */
case CMD_SEND_MESSAGE: case CMD_SEND_MESSAGE:
case CMD_SEND_MESSAGE_TO_SUPER:
{ {
/* b1 -> number of arguments /* b1 -> number of arguments
* b2 -> literal index of the message symbol
TODO: handle double extension TODO: handle double extension
*/ */
stix_ucs_t mthname; stix_ucs_t mthname;
@ -325,8 +365,11 @@ TODO: handle double extension
stix_oop_method_t newmth; stix_oop_method_t newmth;
stix_oop_char_t selector; stix_oop_char_t selector;
stix_ooi_t selector_index; stix_ooi_t selector_index;
stix_ooi_t preamble;
printf ("SENDING MESSAGE \n"); printf ("SENDING MESSAGE \n");
/* the next byte is the message selector index to the
* literal frame. */
selector_index = code->slot[ip++]; selector_index = code->slot[ip++];
/* get the selector from the literal frame */ /* get the selector from the literal frame */
@ -338,7 +381,7 @@ printf ("RECEIVER INDEX %d\n", (int)(sp - b1));
newrcv = stix->active_context->slot[sp - b1]; newrcv = stix->active_context->slot[sp - b1];
mthname.ptr = selector->slot; mthname.ptr = selector->slot;
mthname.len = STIX_OBJ_GET_SIZE(selector); mthname.len = STIX_OBJ_GET_SIZE(selector);
newmth = find_method (stix, newrcv, &mthname); newmth = find_method (stix, newrcv, &mthname, (cmd == CMD_SEND_MESSAGE_TO_SUPER));
if (!newmth) if (!newmth)
{ {
/* TODO: implement doesNotUnderstand: XXXXX instead of returning -1. */ /* TODO: implement doesNotUnderstand: XXXXX instead of returning -1. */
@ -349,24 +392,63 @@ printf ("]\n");
} }
STIX_ASSERT (STIX_OOP_TO_SMINT(newmth->tmpr_nargs) == b1); STIX_ASSERT (STIX_OOP_TO_SMINT(newmth->tmpr_nargs) == b1);
if (activate_new_method (stix, newmth, &ip, &sp) <= -1) return -1;
break; preamble = STIX_OOP_TO_SMINT(newmth->preamble);
switch (STIX_METHOD_GET_PREAMBLE_CODE(preamble))
{
case STIX_METHOD_PREAMBLE_RETURN_RECEIVER:
sp = sp - b1; /* pop arguments */
break;
case STIX_METHOD_PREAMBLE_RETURN_INSTVAR:
{
stix_oop_oop_t receiver;
sp = sp - b1; /* pop arguments */
printf ("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx SIMPLE RETURN INSTVAR VERIFY THIS\n");
/* replace the receiver by an instance variable of the receiver */
receiver = (stix_oop_oop_t)stix->active_context->slot[sp];
STIX_ASSERT (STIX_OBJ_GET_FLAGS_TYPE(receiver) == STIX_OBJ_TYPE_OOP);
STIX_ASSERT (STIX_OBJ_GET_SIZE(receiver) > STIX_METHOD_GET_PREAMBLE_INDEX(preamble));
stix->active_context->slot[sp] = receiver->slot[STIX_METHOD_GET_PREAMBLE_INDEX(preamble)];
break;
}
case STIX_METHOD_PREAMBLE_PRIMITIVE:
{
int n;
printf ("JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ\n");
stix_pushtmp (stix, (stix_oop_t*)&newmth);
n = execute_primitive (stix, STIX_METHOD_GET_PREAMBLE_INDEX(preamble), b1, &sp);
stix_poptmp (stix);
if (n <= -1) return -1;
if (n >= 1) break;
/* primitive failed. fall thru */
}
default:
if (activate_new_method (stix, newmth, &ip, &sp) <= -1) return -1;
break;
}
break; /* CMD_SEND_MESSAGE */
} }
case CMD_SEND_MESSAGE_TO_SUPER: /* -------------------------------------------------------- */
/*b2 = code->slot[ip++];*/
break;
case CMD_PUSH_SPECIAL: case CMD_PUSH_SPECIAL:
switch (b1) switch (b1)
{ {
case SUBCMD_PUSH_RECEIVER: case SUBCMD_PUSH_RECEIVER:
printf ("PUSHING RECEIVER %p TO STACK INDEX %d\n", receiver, (int)sp); printf ("PUSHING RECEIVER %p TO STACK INDEX %d\n", stix->active_context->receiver, (int)sp);
stix->active_context->slot[++sp] = receiver; stix->active_context->slot[++sp] = stix->active_context->receiver;
break; break;
case SUBCMD_PUSH_NIL: case SUBCMD_PUSH_NIL:
printf ("PUSHING NIL\n");
stix->active_context->slot[++sp] = stix->_nil; stix->active_context->slot[++sp] = stix->_nil;
break; break;
@ -376,69 +458,69 @@ printf ("PUSHING TRUE\n");
break; break;
case SUBCMD_PUSH_FALSE: case SUBCMD_PUSH_FALSE:
printf ("PUSHING FALSE\n");
stix->active_context->slot[++sp] = stix->_false; stix->active_context->slot[++sp] = stix->_false;
break; break;
case SUBCMD_PUSH_CONTEXT:
printf ("PUSHING THIS CONTEXT\n");
stix->active_context->slot[++sp] = (stix_oop_t)stix->active_context;
break;
} }
break; break; /* CMD_PUSH_SPECIAL */
/* -------------------------------------------------------- */
case CMD_DO_SPECIAL: case CMD_DO_SPECIAL:
{
stix_oop_t return_value;
switch (b1) switch (b1)
{ {
case SUBCMD_RETURN_MESSAGE_RECEIVER: case SUBCMD_RETURN_MESSAGE_RECEIVER:
{
stix_oop_context_t ctx;
printf ("RETURNING. RECEIVER...........\n"); printf ("RETURNING. RECEIVER...........\n");
ctx = stix->active_context; /* current context */ return_value = stix->active_context->receiver;
ctx->ip = STIX_OOP_FROM_SMINT(ip); goto handle_return;
ctx->sp = STIX_OOP_FROM_SMINT(sp);
stix->active_context = (stix_oop_context_t)ctx->sender; /* return to the sending context */
if (stix->active_context->sender == stix->_nil)
{
printf ("RETURNIGN TO THE INITIAL CONTEXT.......\n");
/* returning to the initial context */
goto done;
}
ip = STIX_OOP_TO_SMINT(stix->active_context->ip);
sp = STIX_OOP_TO_SMINT(stix->active_context->sp);
stix->active_context->slot[++sp] = ctx->receiver;
break;
}
case SUBCMD_RETURN_MESSAGE_STACKTOP: case SUBCMD_RETURN_MESSAGE_STACKTOP:
{
stix_oop_context_t ctx;
stix_oop_t top;
printf ("RETURNING. RECEIVER...........\n"); printf ("RETURNING. RECEIVER...........\n");
ctx = stix->active_context; /* current context */ return_value = stix->active_context->slot[sp--];
top = ctx->slot[sp--]; goto handle_return;
ctx->ip = STIX_OOP_FROM_SMINT(ip);
ctx->sp = STIX_OOP_FROM_SMINT(sp);
stix->active_context = (stix_oop_context_t)ctx->sender; /* return to the sending context */
ip = STIX_OOP_TO_SMINT(stix->active_context->ip);
sp = STIX_OOP_TO_SMINT(stix->active_context->sp);
stix->active_context->slot[++sp] = top;
if (stix->active_context->sender == stix->_nil)
{
printf ("RETURNIGN TO THE INITIAL CONTEXT.......\n");
/* returning to the initial context */
goto done;
}
break;
}
/*case CMD_RETURN_BLOCK_STACKTOP:*/ /*case CMD_RETURN_BLOCK_STACKTOP:*/
default:
stix->errnum = STIX_EINTERN;
break;
handle_return:
/* store the instruction pointer and the stack pointer to the active context */
STORE_IP_AND_SP (stix->active_context, ip, sp);
/* switch the active context to the sending context */
stix->active_context = (stix_oop_context_t)stix->active_context->sender;
/* load the instruction pointer and the stack pointer from the new active context */
LOAD_IP_AND_SP (stix->active_context, ip, sp);
/* push the return value to the stack of the new active context */
stix->active_context->slot[++sp] = return_value;
if (stix->active_context->sender == stix->_nil)
{
/* the sending context of the intial context has been set to nil.
* use this fact to tell an initial context from a normal context. */
printf ("RETURNIGN TO THE INITIAL CONTEXT.......\n");
STIX_ASSERT (sp == 0);
goto done;
}
break;
} }
break; break; /* CMD_DO_SPECIAL */
}
} }
} }

7
stix/lib/stix-prv.h
View File

@ -426,7 +426,7 @@ struct stix_compiler_t
stix_size_t literal_capa; stix_size_t literal_capa;
/* primitive number */ /* primitive number */
stix_oow_t prim_no; stix_ooi_t prim_no;
/* byte code */ /* byte code */
stix_code_t code; stix_code_t code;
@ -475,18 +475,20 @@ struct stix_compiler_t
#define SUBCMD_PUSH_NIL 0x1 #define SUBCMD_PUSH_NIL 0x1
#define SUBCMD_PUSH_TRUE 0x2 #define SUBCMD_PUSH_TRUE 0x2
#define SUBCMD_PUSH_FALSE 0x3 #define SUBCMD_PUSH_FALSE 0x3
#define SUBCMD_PUSH_CONTEXT 0x4
#define SUBCMD_DUP_STACKTOP 0x0 #define SUBCMD_DUP_STACKTOP 0x0
#define SUBCMD_POP_STACKTOP 0x1 #define SUBCMD_POP_STACKTOP 0x1
#define SUBCMD_RETURN_MESSAGE_STACKTOP 0x2 #define SUBCMD_RETURN_MESSAGE_STACKTOP 0x2
#define SUBCMD_RETURN_BLOCK_STACKTOP 0x3 #define SUBCMD_RETURN_BLOCK_STACKTOP 0x3
#define SUBCMD_RETURN_MESSAGE_RECEIVER 0x4 #define SUBCMD_RETURN_MESSAGE_RECEIVER 0x4
#define SUBCMD_EXEC_PRIMITIVE 0xF
/* ---------------------------------- */ /* ---------------------------------- */
#define CODE_PUSH_RECEIVER MAKE_CODE(CMD_PUSH_SPECIAL, SUBCMD_PUSH_RECEIVER) #define CODE_PUSH_RECEIVER MAKE_CODE(CMD_PUSH_SPECIAL, SUBCMD_PUSH_RECEIVER)
#define CODE_PUSH_NIL MAKE_CODE(CMD_PUSH_SPECIAL, SUBCMD_PUSH_NIL) #define CODE_PUSH_NIL MAKE_CODE(CMD_PUSH_SPECIAL, SUBCMD_PUSH_NIL)
#define CODE_PUSH_TRUE MAKE_CODE(CMD_PUSH_SPECIAL, SUBCMD_PUSH_TRUE) #define CODE_PUSH_TRUE MAKE_CODE(CMD_PUSH_SPECIAL, SUBCMD_PUSH_TRUE)
#define CODE_PUSH_FALSE MAKE_CODE(CMD_PUSH_SPECIAL, SUBCMD_PUSH_FALSE) #define CODE_PUSH_FALSE MAKE_CODE(CMD_PUSH_SPECIAL, SUBCMD_PUSH_FALSE)
#define CODE_PUSH_CONTEXT MAKE_CODE(CMD_PUSH_SPECIAL, SUBCMD_PUSH_CONTEXT)
/* special code */ /* special code */
#define CODE_DUP_STACKTOP MAKE_CODE(CMD_DO_SPECIAL, SUBCMD_DUP_STACKTOP) #define CODE_DUP_STACKTOP MAKE_CODE(CMD_DO_SPECIAL, SUBCMD_DUP_STACKTOP)
@ -494,7 +496,6 @@ struct stix_compiler_t
#define CODE_RETURN_MESSAGE_STACKTOP MAKE_CODE(CMD_DO_SPECIAL, SUBCMD_RETURN_MESSAGE_STACKTOP) #define CODE_RETURN_MESSAGE_STACKTOP MAKE_CODE(CMD_DO_SPECIAL, SUBCMD_RETURN_MESSAGE_STACKTOP)
#define CODE_RETURN_BLOCK_STACKTOP MAKE_CODE(CMD_DO_SPECIAL, SUBCMD_RETURN_BLOCK_STACKTOP) #define CODE_RETURN_BLOCK_STACKTOP MAKE_CODE(CMD_DO_SPECIAL, SUBCMD_RETURN_BLOCK_STACKTOP)
#define CODE_RETURN_MESSAGE_RECEIVER MAKE_CODE(CMD_DO_SPECIAL, SUBCMD_RETURN_MESSAGE_RECEIVER) #define CODE_RETURN_MESSAGE_RECEIVER MAKE_CODE(CMD_DO_SPECIAL, SUBCMD_RETURN_MESSAGE_RECEIVER)
#define CODE_EXEC_PRIMITIVE MAKE_CODE(CMD_DO_SPECIAL, SUBCMD_EXEC_PRIMITIVE)
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {

25
stix/lib/stix.h
View File

@ -554,7 +554,7 @@ struct stix_association_t
stix_oop_t value; stix_oop_t value;
}; };
#define STIX_METHOD_NAMED_INSTVARS 5 #define STIX_METHOD_NAMED_INSTVARS 6
typedef struct stix_method_t stix_method_t; typedef struct stix_method_t stix_method_t;
typedef struct stix_method_t* stix_oop_method_t; typedef struct stix_method_t* stix_oop_method_t;
struct stix_method_t struct stix_method_t
@ -563,18 +563,39 @@ struct stix_method_t
stix_oop_class_t owner; /* Class */ stix_oop_class_t owner; /* Class */
/* primitive number */
stix_oop_t preamble; /* SmallInteger */
/* number of temporaries including arguments */ /* number of temporaries including arguments */
stix_oop_t tmpr_count; /* SmallInteger */ stix_oop_t tmpr_count; /* SmallInteger */
/* number of arguments in temporaries */ /* number of arguments in temporaries */
stix_oop_t tmpr_nargs; /* SmallInteger */ stix_oop_t tmpr_nargs; /* SmallInteger */
stix_oop_byte_t code; /* ByteArray */ stix_oop_byte_t code; /* ByteArray */
stix_oop_t source; /* TODO: what should I put? */ stix_oop_t source; /* TODO: what should I put? */
/* variable indexed part */ /* == variable indexed part == */
stix_oop_t slot[1]; /* it stores literals */ stix_oop_t slot[1]; /* it stores literals */
}; };
/* The preamble field is composed of a 8-bit code and a 16-bit
* index.
*
* The code can be one of the following values:
* 0 - no special action
* 1 - return self
* 2 - return instvar[index]
* 3 - do primitive[index]
*/
#define STIX_METHOD_MAKE_PREAMBLE(code,index) ((((stix_ooi_t)index) << 8) | ((stix_ooi_t)code))
#define STIX_METHOD_GET_PREAMBLE_CODE(preamble) (((stix_ooi_t)preamble) & 0xFF)
#define STIX_METHOD_GET_PREAMBLE_INDEX(preamble) (((stix_ooi_t)preamble) >> 8)
#define STIX_METHOD_PREAMBLE_NONE 0
#define STIX_METHOD_PREAMBLE_RETURN_RECEIVER 1
#define STIX_METHOD_PREAMBLE_RETURN_INSTVAR 2
#define STIX_METHOD_PREAMBLE_PRIMITIVE 3
#define STIX_CONTEXT_NAMED_INSTVARS 6 #define STIX_CONTEXT_NAMED_INSTVARS 6
typedef struct stix_context_t stix_context_t; typedef struct stix_context_t stix_context_t;