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

enhanced make_bloated_bigint_with_ooi() to handle MOO_TYPE_MIN(moo_ooi_t)

Browse Source
This commit is contained in:
hyunghwan.chung 2019-08-12 01:43:11 +00:00
parent 32341c1773
commit bd614c504b
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
moo/lib/bigint.c
View File

@ -528,50 +528,39 @@ static MOO_INLINE moo_oop_t make_bigint_with_oow (moo_t* moo, moo_oow_t w)
static MOO_INLINE moo_oop_t make_bigint_with_ooi (moo_t* moo, moo_ooi_t i) static MOO_INLINE moo_oop_t make_bigint_with_ooi (moo_t* moo, moo_ooi_t i)
{ {
#if (MOO_LIW_BITS == MOO_OOW_BITS) #if (MOO_LIW_BITS == MOO_OOW_BITS)
moo_oow_t w;
MOO_STATIC_ASSERT (MOO_SIZEOF(moo_oow_t) == MOO_SIZEOF(moo_liw_t)); MOO_STATIC_ASSERT (MOO_SIZEOF(moo_oow_t) == MOO_SIZEOF(moo_liw_t));
if (i >= 0) if (i >= 0)
{ {
moo_oow_t w = i; w = i;
return moo_instantiate(moo, moo->_large_positive_integer, &w, 1); return moo_instantiate(moo, moo->_large_positive_integer, &w, 1);
} }
else if (i > MOO_TYPE_MIN(moo_ooi_t))
{
moo_oow_t w = -i;
return moo_instantiate(moo, moo->_large_negative_integer, &w, 1);
}
else else
{ {
/* MOO_TYPE_MIN(moo_ooi_t) */ w = (i == MOO_TYPE_MIN(moo_ooi_t))? ((moo_oow_t)MOO_TYPE_MAX(moo_ooi_t) + 1): -i;
moo_oow_t w = (moo_oow_t)MOO_TYPE_MAX(moo_ooi_t) + 1;
return moo_instantiate(moo, moo->_large_negative_integer, &w, 1); return moo_instantiate(moo, moo->_large_negative_integer, &w, 1);
} }
#elif (MOO_LIW_BITS == MOO_OOHW_BITS) #elif (MOO_LIW_BITS == MOO_OOHW_BITS)
moo_liw_t hw[2];
moo_oow_t w;
MOO_STATIC_ASSERT (MOO_SIZEOF(moo_oohw_t) == MOO_SIZEOF(moo_liw_t)); MOO_STATIC_ASSERT (MOO_SIZEOF(moo_oohw_t) == MOO_SIZEOF(moo_liw_t));
if (i >= 0) if (i >= 0)
{ {
moo_liw_t hw[2]; w = i;
moo_oow_t w = i;
hw[0] = w /*& MOO_LBMASK(moo_oow_t,MOO_LIW_BITS)*/; hw[0] = w /*& MOO_LBMASK(moo_oow_t,MOO_LIW_BITS)*/;
hw[1] = w >> MOO_LIW_BITS; hw[1] = w >> MOO_LIW_BITS;
return moo_instantiate(moo, moo->_large_positive_integer, hw, (hw[1] > 0? 2: 1)); return moo_instantiate(moo, moo->_large_positive_integer, hw, (hw[1] > 0? 2: 1));
} }
else if (i > MOO_TYPE_MIN(moo_ooi_t)) else
{ {
moo_liw_t hw[2]; w = (i == MOO_TYPE_MIN(moo_ooi_t))? ((moo_oow_t)MOO_TYPE_MAX(moo_ooi_t) + 1): -i;
moo_oow_t w = -i;
hw[0] = w /*& MOO_LBMASK(moo_oow_t,MOO_LIW_BITS)*/; hw[0] = w /*& MOO_LBMASK(moo_oow_t,MOO_LIW_BITS)*/;
hw[1] = w >> MOO_LIW_BITS; hw[1] = w >> MOO_LIW_BITS;
return moo_instantiate(moo, moo->_large_negative_integer, hw, (hw[1] > 0? 2: 1)); return moo_instantiate(moo, moo->_large_negative_integer, hw, (hw[1] > 0? 2: 1));
} }
else
{
/* MOO_TYPE_MIN(moo_ooi_t) */
moo_liw_t hw[2] = { 0, (MOO_TYPE_MAX(moo_liw_t) >> 1) + 1 };
return moo_instantiate(moo, moo->_large_negative_integer, hw, 2);
}
#else #else
# error UNSUPPORTED LIW BIT SIZE # error UNSUPPORTED LIW BIT SIZE
#endif #endif
@ -579,7 +568,6 @@ static MOO_INLINE moo_oop_t make_bigint_with_ooi (moo_t* moo, moo_ooi_t i)
static MOO_INLINE moo_oop_t make_bloated_bigint_with_ooi (moo_t* moo, moo_ooi_t i, moo_oow_t extra) static MOO_INLINE moo_oop_t make_bloated_bigint_with_ooi (moo_t* moo, moo_ooi_t i, moo_oow_t extra)
{ {
/*TODO: enhance this like make_bitint_with_ooi */
#if (MOO_LIW_BITS == MOO_OOW_BITS) #if (MOO_LIW_BITS == MOO_OOW_BITS)
moo_oow_t w; moo_oow_t w;
moo_oop_t z; moo_oop_t z;
@ -591,10 +579,10 @@ static MOO_INLINE moo_oop_t make_bloated_bigint_with_ooi (moo_t* moo, moo_ooi_t
w = i; w = i;
z = moo_instantiate(moo, moo->_large_positive_integer, MOO_NULL, 1 + extra); z = moo_instantiate(moo, moo->_large_positive_integer, MOO_NULL, 1 + extra);
} }
else else
{ {
MOO_ASSERT (moo, i > MOO_TYPE_MIN(moo_ooi_t)); w = (i == MOO_TYPE_MIN(moo_ooi_t))? ((moo_oow_t)MOO_TYPE_MAX(moo_ooi_t) + 1): -i;
w = -i;
z = moo_instantiate(moo, moo->_large_negative_integer, MOO_NULL, 1 + extra); z = moo_instantiate(moo, moo->_large_negative_integer, MOO_NULL, 1 + extra);
} }
@ -617,8 +605,7 @@ static MOO_INLINE moo_oop_t make_bloated_bigint_with_ooi (moo_t* moo, moo_ooi_t
} }
else else
{ {
MOO_ASSERT (moo, i > MOO_TYPE_MIN(moo_ooi_t)); w = (i == MOO_TYPE_MIN(moo_ooi_t))? ((moo_oow_t)MOO_TYPE_MAX(moo_ooi_t) + 1): -i;
w = -i;
hw[0] = w /*& MOO_LBMASK(moo_oow_t,MOO_LIW_BITS)*/; hw[0] = w /*& MOO_LBMASK(moo_oow_t,MOO_LIW_BITS)*/;
hw[1] = w >> MOO_LIW_BITS; hw[1] = w >> MOO_LIW_BITS;
z = moo_instantiate(moo, moo->_large_negative_integer, MOO_NULL, (hw[1] > 0? 2: 1) + extra); z = moo_instantiate(moo, moo->_large_negative_integer, MOO_NULL, (hw[1] > 0? 2: 1) + extra);