Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More long/ulong/float work.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@131298 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rogerl%netscape.com
2002-10-07 06:34:43 +00:00
parent 40a6edb275
commit 6d2621b192
3 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mozilla/js2/src/js2engine.cpp
View File

@@ -121,8 +121,6 @@ namespace MetaData {
*p = x;
return p;
}
}
// if the argument can be stored as an integer value, do so
@@ -158,6 +156,14 @@ namespace MetaData {
return LONG_TO_JS2VAL(p);
}
// Don't store as an int, even if possible, we need to retain 'floatness'
js2val JS2Engine::allocFloat(float32 x)
{
float32 *p = (float32 *)(JS2Object::alloc(sizeof(float32)));
*p = x;
return FLOAT_TO_JS2VAL(p);
}
// Convert an integer to a string
String *numberToString(int32 i)
{
@@ -234,30 +240,35 @@ namespace MetaData {
return toNumber(toPrimitive(x));
}
// x is not a number
// x is not a number, convert it to one
js2val JS2Engine::convertValueToGeneralNumber(js2val x)
{
// XXX Assuming convert to float64, rather than long/ulong
return allocNumber(toNumber(x));
}
// x is a Number
// x is a Number, validate that it has no fractional component
int64 JS2Engine::checkInteger(js2val x)
{
int64 i;
if (JS2VAL_IS_FLOAT(x)) {
float64 f = *JS2VAL_TO_FLOAT(x);
if (!JSDOUBLE_IS_FINITE(f, i))
if (!JSDOUBLE_IS_FINITE(f))
meta->reportError(Exception::rangeError, "Non integer", errorPos());
int64 i;
JSLL_D2L(i, f);
JSLL_L2D(f, i);
if (!=) rangeError...
if (f != *JS2VAL_TO_FLOAT(x))
meta->reportError(Exception::rangeError, "Non integer", errorPos());
return i;
}
else
if (JS2VAL_IS_DOUBLE(x)) {
float64 d = *JS2VAL_TO_DOUBLE(x);
if (!JSDOUBLE_IS_INT(d, i))
if (!JSDOUBLE_IS_FINITE(d))
meta->reportError(Exception::rangeError, "Non integer", errorPos());
JSLL_D2L(i, d);
JSLL_L2D(d, i);
if (d != *JS2VAL_TO_DOUBLE(x))
meta->reportError(Exception::rangeError, "Non integer", errorPos());
return i;
}
@@ -267,9 +278,8 @@ namespace MetaData {
return i;
}
ASSERT(JS2VAL_IS_ULONG(x));
JSLL_UL2I(i, *JS2VAL_TO_ULONG(x));
return i;
}
JSLL_UL2I(i, *JS2VAL_TO_ULONG(x));
return i;
}
// x is any js2val

5
mozilla/js2/src/js2engine.h
View File

@@ -168,7 +168,7 @@ public:
js2val assignmentConversion(js2val val, JS2Class *type) { return val; } // XXX s'more code, please
int32 checkInteger(js2val x);
int64 checkInteger(js2val x);
JS2Metadata *meta;
@@ -182,6 +182,9 @@ public:
js2val posInfValue;
js2val negInfValue;
js2val allocFloat(float32 x);
js2val pushFloat(float32 x) { js2val retval = allocFloat(x); push(retval); return retval; }
js2val allocNumber(float64 x);
js2val pushNumber(float64 x) { js2val retval = allocNumber(x); push(retval); return retval; }

29
mozilla/js2/src/js2op_arithmetic.cpp
View File

@@ -191,9 +191,32 @@
{
b = pop();
a = pop();
float64 anum = toNumber(a);
float64 bnum = toNumber(b);
pushNumber(anum * bnum);
a = toGeneralNumber(a);
b = toGeneralNumber(b);
if (JS2VAL_IS_LONG(a) || JS2VAL_IS_ULONG(a) || JS2VAL_IS_LONG(b) || JS2VAL_IS_ULONG(b)) {
int64 x = checkInteger(a);
int64 y = checkInteger(b);
int64 z;
JSLL_MUL(z, x, y);
// XXX need to check that z didn't overflow
if (JS2VAL_IS_ULONG(a) || JS2VAL_IS_ULONG(b)) {
pushULong(z);
}
else {
pushLong(z);
}
}
else {
float64 x = toNumber(a);
float64 y = toNumber(b);
float64 z = x * y;
if (JS2VAL_IS_FLOAT(a) || JS2VAL_IS_FLOAT(b)) {
pushFloat(z);
}
else {
pushNumber(z);
}
}
}
break;