wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Andreas Gal 2008-08-28 22:33:45 -07:00
commit c263b7a218
4 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/src/jstracer.cpp
View File

@ -2540,7 +2540,7 @@ TraceRecorder::ifop()
jsval& v = stackval(-1);
if (JSVAL_TAG(v) == JSVAL_BOOLEAN) {
guard(JSVAL_TO_BOOLEAN(v) != 1,
lir->ins_eq0(lir->ins2(LIR_eq, get(&v), lir->insImm(1))),
lir->ins_eq0(lir->ins2i(LIR_eq, get(&v), 1)),
BRANCH_EXIT);
} else if (JSVAL_IS_OBJECT(v)) {
guard(JSVAL_IS_NULL(v), lir->ins_eq0(get(&v)), BRANCH_EXIT);
@ -2770,7 +2770,7 @@ TraceRecorder::cmp(LOpcode op, bool negate)
/* We update the stack after the guard. This is safe since
the guard bails out at the comparison and the interpreter
will this re-execute the comparison. This way the
will therefore re-execute the comparison. This way the
value of the condition doesn't have to be calculated and
saved on the stack in most cases. */
set(&l, x);
@ -2946,8 +2946,12 @@ TraceRecorder::test_property_cache(JSObject* obj, LIns* obj_ins, JSObject*& obj2
MISMATCH_EXIT);
}
} else {
JS_ASSERT(entry->kpc == (jsbytecode*) atoms[GET_INDEX(cx->fp->regs->pc)]);
#ifdef DEBUG
ptrdiff_t pcoff = (mode == JOF_VARPROP) ? SLOTNO_LEN : 0;
jsatomid index = js_GetIndexFromBytecode(cx, cx->fp->script, cx->fp->regs->pc, pcoff);
JS_ASSERT(entry->kpc == (jsbytecode*) atoms[index]);
JS_ASSERT(entry->kshape == jsuword(aobj));
#endif
if (aobj != globalObj) {
guard(true, addName(lir->ins2i(LIR_eq, obj_ins, entry->kshape), "guard(kobj)"),
MISMATCH_EXIT);
@ -3087,7 +3091,7 @@ TraceRecorder::box_jsval(jsval v, LIns*& v_ins)
if (isNumber(v)) {
LIns* args[] = { v_ins, cx_ins };
v_ins = lir->insCall(F_BoxDouble, args);
guard(false, lir->ins2(LIR_eq, v_ins, INS_CONSTPTR(JSVAL_ERROR_COOKIE)),
guard(false, lir->ins2(LIR_eq, v_ins, INS_CONST(JSVAL_ERROR_COOKIE)),
OOM_EXIT);
return true;
}
@ -3402,7 +3406,7 @@ TraceRecorder::record_JSOP_EQ()
/* We update the stack after the guard. This is safe since
the guard bails out at the comparison and the interpreter
will this re-execute the comparison. This way the
will therefore re-execute the comparison. This way the
value of the condition doesn't have to be calculated and
saved on the stack in most cases. */
set(&l, x);
@ -3418,7 +3422,7 @@ TraceRecorder::record_JSOP_EQ()
/* We update the stack after the guard. This is safe since
the guard bails out at the comparison and the interpreter
will this re-execute the comparison. This way the
will therefore re-execute the comparison. This way the
value of the condition doesn't have to be calculated and
saved on the stack in most cases. */
set(&l, x);
@ -3444,7 +3448,7 @@ TraceRecorder::record_JSOP_NE()
/* We update the stack after the guard. This is safe since
the guard bails out at the comparison and the interpreter
will this re-execute the comparison. This way the
will therefore re-execute the comparison. This way the
value of the condition doesn't have to be calculated and
saved on the stack in most cases. */
set(&l, x);
@ -3460,7 +3464,7 @@ TraceRecorder::record_JSOP_NE()
/* We update the stack after the guard. This is safe since
the guard bails out at the comparison and the interpreter
will this re-execute the comparison. This way the
will therefore re-execute the comparison. This way the
value of the condition doesn't have to be calculated and
saved on the stack in most cases. */
set(&l, x);
@ -3777,7 +3781,7 @@ TraceRecorder::record_JSOP_NEW()
break;
}
case FAIL_VOID:
guard(false, lir->ins2i(LIR_eq, res_ins, 2), OOM_EXIT);
guard(false, lir->ins2i(LIR_eq, res_ins, JSVAL_TO_BOOLEAN(JSVAL_VOID)), OOM_EXIT);
break;
default:;
}
@ -4023,7 +4027,7 @@ TraceRecorder::record_JSOP_GETELEM()
LIns* args[] = { get(&r), get(&l), cx_ins };
LIns* v_ins = lir->insCall(F_Any_getelem, args);
guard(false, lir->ins2(LIR_eq, v_ins, INS_CONSTPTR(JSVAL_ERROR_COOKIE)),
guard(false, lir->ins2(LIR_eq, v_ins, INS_CONST(JSVAL_ERROR_COOKIE)),
MISMATCH_EXIT);
if (!unbox_jsval(v, v_ins))
ABORT_TRACE("JSOP_GETELEM");
@ -4410,7 +4414,7 @@ TraceRecorder::record_JSOP_CALL()
break;
}
case FAIL_VOID:
guard(false, lir->ins2i(LIR_eq, res_ins, 2), OOM_EXIT);
guard(false, lir->ins2i(LIR_eq, res_ins, JSVAL_TO_BOOLEAN(JSVAL_VOID)), OOM_EXIT);
break;
default:;
}
@ -4926,13 +4930,15 @@ TraceRecorder::record_JSOP_ITER()
bool
TraceRecorder::forInLoop(jsval* vp)
{
if (!JSVAL_IS_STRING(*vp))
ABORT_TRACE("for-in loop variable changed type from string");
jsval& iterobj_val = stackval(-1);
if (!JSVAL_IS_PRIMITIVE(iterobj_val)) {
LIns* args[] = { get(&iterobj_val), cx_ins };
LIns* v_ins = lir->insCall(F_FastCallIteratorNext, args);
guard(false, lir->ins2(LIR_eq, v_ins, INS_CONSTPTR(JSVAL_ERROR_COOKIE)), OOM_EXIT);
guard(false, lir->ins2(LIR_eq, v_ins, INS_CONST(JSVAL_ERROR_COOKIE)), OOM_EXIT);
LIns* flag_ins = lir->ins_eq0(lir->ins2(LIR_eq, v_ins, INS_CONSTPTR(JSVAL_HOLE)));
LIns* flag_ins = lir->ins_eq0(lir->ins2(LIR_eq, v_ins, INS_CONST(JSVAL_HOLE)));
LIns* iter_ins = get(vp);
if (!box_jsval(JSVAL_STRING, iter_ins))
return false;
@ -5113,7 +5119,7 @@ TraceRecorder::record_JSOP_IN()
LIns* args[] = { get(&lval), obj_ins, cx_ins };
x = lir->insCall(F_HasNamedProperty, args);
guard(false, lir->ins2i(LIR_eq, x, 2), OOM_EXIT);
guard(false, lir->ins2i(LIR_eq, x, JSVAL_TO_BOOLEAN(JSVAL_VOID)), OOM_EXIT);
x = lir->ins2i(LIR_eq, x, 1);
} while (0);
@ -5124,7 +5130,7 @@ TraceRecorder::record_JSOP_IN()
/* We update the stack after the guard. This is safe since
the guard bails out at the comparison and the interpreter
will this re-execute the comparison. This way the
will therefore re-execute the comparison. This way the
value of the condition doesn't have to be calculated and
saved on the stack in most cases. */
set(&lval, x);

14
js/src/nanojit/avmplus.cpp
View File

@ -41,3 +41,17 @@ GCHeap GC::heap;
String* AvmCore::k_str[] = { (String*)"" };
bool AvmCore::sse2_available = false;
#ifdef _DEBUG
// NanoAssertFail matches JS_Assert in jsutil.cpp.
void NanoAssertFail()
{
#if defined(WIN32)
DebugBreak();
exit(3);
#elif defined(XP_OS2) || (defined(__GNUC__) && defined(__i386))
asm("int $3");
#endif
abort();
}
#endif

4
js/src/nanojit/avmplus.h
View File

@ -57,6 +57,10 @@
#include <stdarg.h>
#endif
#ifdef _DEBUG
void NanoAssertFail();
#endif
#define AvmAssert(x) assert(x)
#define AvmAssertMsg(x, y)
#define AvmDebugLog(x) printf x

11
js/src/nanojit/nanojit.h
View File

@ -75,19 +75,10 @@ namespace nanojit
#if defined(_DEBUG)
// The NANO_DIE macro matches the JS_Assert function in jsutil.cpp.
#if defined(WIN32)
#define NANO_DIE do { DebugBreak(); exit(3); } while(0)
#elif defined(XP_OS2) || (defined(__GNUC__) && defined(__i386))
#define NANO_DIE do { asm("int $3"); abort(); } while(0)
#else
#define NANO_DIE do { abort(); } while(0)
#endif
#define __NanoAssertMsgf(a, file_, line_, f, ...) \
if (!(a)) { \
fprintf(stderr, "Assertion failed: " f "%s (%s:%d)\n", __VA_ARGS__, #a, file_, line_); \
NANO_DIE; \
NanoAssertFail(); \
}
#define _NanoAssertMsgf(a, file_, line_, f, ...) __NanoAssertMsgf(a, file_, line_, f, __VA_ARGS__)