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

completed Apex>>basicAt:test:put.

Browse Source 
changed BlockContext>>ensure: and Context>>unwindTo:return: to use basicAt:test:put to make the test-and-set operation uninterruptible
This commit is contained in:
hyunghwan.chung 2019-08-17 06:30:34 +00:00
parent f3953c4754
commit a65b64a0d9
3 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
moo/kernel/Apex.moo
View File

@ -121,8 +121,13 @@ extend Apex
method(#dual,#primitive) basicSize. method(#dual,#primitive) basicSize.
method(#dual,#primitive) basicAt: index. method(#dual,#primitive) basicAt: index.
method(#dual,#primitive) basicAt: index put: value.
method(#dual,#primitive) basicAt: index test: test oldvalue put: newvalue. // set the slot at the given index to the new value and return the new value.
method(#dual,#primitive) basicAt: index put: newvalue.
// set the slot at the give index to the new value if the existing value is identical to the old value.
// return true if the existing value is identical to the old value and false otherwise.
method(#dual,#primitive) basicAt: index test: oldvalue put: newvalue.
method(#dual,#primitive) basicFillFrom: sindex with: value count: count. method(#dual,#primitive) basicFillFrom: sindex with: value count: count.
method(#dual,#primitive) basicShiftFrom: sindex to: dindex count: count. method(#dual,#primitive) basicShiftFrom: sindex to: dindex count: count.

7
moo/kernel/Except.moo
View File

@ -177,11 +177,13 @@ extend Context
* if the block has been evaluated. see the method BlockContext>>ensure:. * if the block has been evaluated. see the method BlockContext>>ensure:.
* it is the position of the last temporary variable of the method */ * it is the position of the last temporary variable of the method */
pending_pos := ctx basicSize - 1. pending_pos := ctx basicSize - 1.
/*
if (ctx basicAt: pending_pos) if (ctx basicAt: pending_pos)
{ {
ctx basicAt: pending_pos put: false. ctx basicAt: pending_pos put: false.
eb value. eb value.
} }*/
if (ctx basicAt: pending_pos test: true put: false) { eb value }.
}. }.
stop := (ctx == context). stop := (ctx == context).
ctx := ctx sender. ctx := ctx sender.
@ -392,7 +394,8 @@ thisContext isExceptionContext dump.
/* the temporary variable 'pending' may get changed /* the temporary variable 'pending' may get changed
* during evaluation for exception handling. * during evaluation for exception handling.
* it gets chagned in Context>>unwindTo:return: */ * it gets chagned in Context>>unwindTo:return: */
if (pending) { pending := false. aBlock value }. /*if (pending) { pending := false. aBlock value }.*/
if (thisContext basicAt: (thisContext basicSize - 1) test: true put: false) { aBlock value }.
^retval ^retval
} }

61
moo/lib/pf-basic.c
View File

@ -454,7 +454,7 @@ moo_pfrc_t moo_pf_basic_at_put (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
moo_pfrc_t moo_pf_basic_at_test_put (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs) moo_pfrc_t moo_pf_basic_at_test_put (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
{ {
moo_oop_t rcv, pos, oldval, newval; moo_oop_t rcv, pos, oldval, newval, retval;
moo_oow_t idx; moo_oow_t idx;
MOO_ASSERT (moo, nargs == 3); MOO_ASSERT (moo, nargs == 3);
@ -490,55 +490,76 @@ moo_pfrc_t moo_pf_basic_at_test_put (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs
return MOO_PF_FAILURE; return MOO_PF_FAILURE;
} }
retval = moo->_false;
switch (MOO_OBJ_GET_FLAGS_TYPE(rcv)) switch (MOO_OBJ_GET_FLAGS_TYPE(rcv))
{ {
case MOO_OBJ_TYPE_BYTE: case MOO_OBJ_TYPE_BYTE:
if (!MOO_OOP_IS_SMOOI(val)) if (!MOO_OOP_IS_SMOOI(newval))
{ {
moo_seterrbfmt (moo, MOO_EINVAL, "value not a byte - %O", val); moo_seterrbfmt (moo, MOO_EINVAL, "new value not a byte - %O", newval);
return MOO_PF_FAILURE; return MOO_PF_FAILURE;
} }
/* TOOD: must I check the range of the value? */
MOO_OBJ_SET_BYTE_VAL (rcv, idx, MOO_OOP_TO_SMOOI(val)); /* TOOD: must I check the range of the new value? */
if (oldval == MOO_OBJ_GET_BYTE_VAL(rcv, idx))
{
MOO_OBJ_SET_BYTE_VAL (rcv, idx, MOO_OOP_TO_SMOOI(newval));
retval = moo->_true;
}
break; break;
case MOO_OBJ_TYPE_CHAR: case MOO_OBJ_TYPE_CHAR:
if (!MOO_OOP_IS_CHAR(val)) if (!MOO_OOP_IS_CHAR(newval))
{ {
moo_seterrbfmt (moo, MOO_EINVAL, "value not a character - %O", val); moo_seterrbfmt (moo, MOO_EINVAL, "new value not a character - %O", newval);
return MOO_PF_FAILURE; return MOO_PF_FAILURE;
} }
MOO_OBJ_SET_CHAR_VAL (rcv, idx, MOO_OOP_TO_CHAR(val)); if (oldval == MOO_OBJ_GET_CHAR_VAL(rcv, idx))
{
MOO_OBJ_SET_CHAR_VAL (rcv, idx, MOO_OOP_TO_CHAR(newval));
retval = moo->_true;
}
break; break;
case MOO_OBJ_TYPE_HALFWORD: case MOO_OBJ_TYPE_HALFWORD:
if (!MOO_OOP_IS_SMOOI(val)) if (!MOO_OOP_IS_SMOOI(newval))
{ {
/* the value is not a number */ /* the new value is not a number */
moo_seterrbfmt (moo, MOO_EINVAL, "value not a half-word integer - %O", val); moo_seterrbfmt (moo, MOO_EINVAL, "new value not a half-word integer - %O", newval);
return MOO_PF_FAILURE; return MOO_PF_FAILURE;
} }
/* if the small integer is too large, it will get truncated */ /* if the small integer is too large, it will get truncated */
MOO_OBJ_SET_HALFWORD_VAL (rcv, idx, MOO_OOP_TO_SMOOI(val)); if (oldval == MOO_OBJ_GET_HALFWORD_VAL(rcv, idx))
{
MOO_OBJ_SET_HALFWORD_VAL (rcv, idx, MOO_OOP_TO_SMOOI(newval));
retval = moo->_true;
}
break; break;
case MOO_OBJ_TYPE_WORD: case MOO_OBJ_TYPE_WORD:
{ {
moo_oow_t w; moo_oow_t w;
if (moo_inttooow(moo, val, &w) <= 0) if (moo_inttooow(moo, newval, &w) <= 0)
{ {
/* the value is not a number, out of range, or negative */ /* the new value is not a number, out of range, or negative */
moo_seterrbfmt (moo, MOO_EINVAL, "value not a word integer - %O", val); moo_seterrbfmt (moo, MOO_EINVAL, "new value not a word integer - %O", newval);
return MOO_PF_FAILURE; return MOO_PF_FAILURE;
} }
MOO_OBJ_SET_WORD_VAL (rcv, idx, MOO_OOP_TO_SMOOI(val)); if (oldval == MOO_OBJ_GET_WORD_VAL(rcv, idx))
{
MOO_OBJ_SET_WORD_VAL (rcv, idx, MOO_OOP_TO_SMOOI(newval));
retval = moo->_true;
}
break; break;
} }
case MOO_OBJ_TYPE_OOP: case MOO_OBJ_TYPE_OOP:
MOO_STORE_OOP (moo, MOO_OBJ_GET_OOP_PTR(rcv, idx), val); if (oldval == MOO_OBJ_GET_OOP_VAL(rcv, idx))
{
MOO_STORE_OOP (moo, MOO_OBJ_GET_OOP_PTR(rcv, idx), newval);
retval = moo->_true;
}
break; break;
default: default:
@ -546,8 +567,8 @@ moo_pfrc_t moo_pf_basic_at_test_put (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs
return MOO_PF_HARD_FAILURE; return MOO_PF_HARD_FAILURE;
} }
/* TODO: return receiver or value? */ /* return the old value */
MOO_STACK_SETRET (moo, nargs, val); MOO_STACK_SETRET (moo, nargs, retval);
return MOO_PF_SUCCESS; return MOO_PF_SUCCESS;
} }