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

fixed CompiledMethod>>preambleCode

Browse Source
This commit is contained in:
hyunghwan.chung 2017-04-26 16:01:56 +00:00
parent be57cffbe6
commit b0a3b4aef7
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moo/kernel/Context.moo
View File

@ -339,7 +339,7 @@ class(#pointer) CompiledMethod(Object)
method preambleCode method preambleCode
{ {
(* TODO: make this a primtive for performance *) (* TODO: make this a primtive for performance *)
^(self.preamble bitAnd: 16rFF) bitShift: -2. ^(self.preamble bitAnd: 16rFF) bitShift: -3.
} }
method owner method owner

2
moo/kernel/Except.moo
View File

@ -271,7 +271,7 @@ extend MethodContext
| excblk retval actpos | | excblk retval actpos |
(* position of the temporary variable 'active' in MethodContext>>on:do. (* position of the temporary variable 'exception_active' in MethodContext>>on:do.
* for this code to work, it must be the last temporary variable in the method. *) * for this code to work, it must be the last temporary variable in the method. *)
actpos := (self basicSize) - 1. actpos := (self basicSize) - 1.

18
moo/lib/exec.c
View File

@ -1466,7 +1466,8 @@ static MOO_INLINE moo_pfrc_t pf_basic_new (moo_t* moo, moo_ooi_t nargs)
{ {
/* the receiver is not a class object */ /* the receiver is not a class object */
MOO_DEBUG0 (moo, "<pf_basic_new> Receiver is not a class\n"); MOO_DEBUG0 (moo, "<pf_basic_new> Receiver is not a class\n");
goto inval; moo->errnum = MOO_EMSGRCV;
return MOO_PF_FAILURE;
} }
if (nargs >= 1) if (nargs >= 1)
@ -1476,7 +1477,8 @@ static MOO_INLINE moo_pfrc_t pf_basic_new (moo_t* moo, moo_ooi_t nargs)
{ {
/* integer out of range or not integer */ /* integer out of range or not integer */
MOO_DEBUG0 (moo, "<pf_basic_new> Size out of range or not integer\n"); MOO_DEBUG0 (moo, "<pf_basic_new> Size out of range or not integer\n");
goto inval; moo->errnum = MOO_EINVAL;
return MOO_PF_FAILURE;
} }
} }
@ -1492,14 +1494,10 @@ static MOO_INLINE moo_pfrc_t pf_basic_new (moo_t* moo, moo_ooi_t nargs)
* moo_instantiate()? */ * moo_instantiate()? */
obj = moo_instantiate (moo, _class, MOO_NULL, size); obj = moo_instantiate (moo, _class, MOO_NULL, size);
} }
if (!obj) return MOO_PF_HARD_FAILURE; if (!obj) return MOO_PF_FAILURE;
MOO_STACK_SETRET (moo, nargs, obj); MOO_STACK_SETRET (moo, nargs, obj);
return MOO_PF_SUCCESS; return MOO_PF_SUCCESS;
inval:
moo->errnum = MOO_EINVAL;
return MOO_PF_FAILURE;
} }
static moo_pfrc_t pf_ngc_new (moo_t* moo, moo_ooi_t nargs) static moo_pfrc_t pf_ngc_new (moo_t* moo, moo_ooi_t nargs)
@ -1533,7 +1531,7 @@ static moo_pfrc_t pf_shallow_copy (moo_t* moo, moo_ooi_t nargs)
rcv = MOO_STACK_GETRCV (moo, nargs); rcv = MOO_STACK_GETRCV (moo, nargs);
obj = moo_shallowcopy (moo, rcv); obj = moo_shallowcopy (moo, rcv);
if (!obj) return MOO_PF_HARD_FAILURE; if (!obj) return MOO_PF_FAILURE;
MOO_STACK_SETRET (moo, nargs, obj); MOO_STACK_SETRET (moo, nargs, obj);
return MOO_PF_SUCCESS; return MOO_PF_SUCCESS;
@ -1556,7 +1554,7 @@ static moo_pfrc_t pf_basic_size (moo_t* moo, moo_ooi_t nargs)
else else
{ {
sz = moo_oowtoint (moo, MOO_OBJ_GET_SIZE(rcv)); sz = moo_oowtoint (moo, MOO_OBJ_GET_SIZE(rcv));
if (!sz) return MOO_PF_HARD_FAILURE; /* hard failure */ if (!sz) return MOO_PF_FAILURE;
} }
MOO_STACK_SETRET(moo, nargs, sz); MOO_STACK_SETRET(moo, nargs, sz);
@ -1609,7 +1607,7 @@ static moo_pfrc_t pf_basic_at (moo_t* moo, moo_ooi_t nargs)
case MOO_OBJ_TYPE_WORD: case MOO_OBJ_TYPE_WORD:
v = moo_oowtoint (moo, ((moo_oop_word_t)rcv)->slot[idx]); v = moo_oowtoint (moo, ((moo_oop_word_t)rcv)->slot[idx]);
if (!v) return MOO_PF_HARD_FAILURE; if (!v) return MOO_PF_FAILURE;
break; break;
case MOO_OBJ_TYPE_OOP: case MOO_OBJ_TYPE_OOP: