From cf8f5c2c67bfe56f271135d6e3de9fde36d2cbe7 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 27 Aug 2008 16:32:11 -0700 Subject: [PATCH] Removed INS_CONSTPTR use with JSVAL_TAG to discourage future 64-bit problems. Fixed 32-bit build. --- js/src/jstracer.cpp | 10 +++++----- js/src/nanojit/LIR.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp index 80274dfe9d..def5e8cb2d 100644 --- a/js/src/jstracer.cpp +++ b/js/src/jstracer.cpp @@ -3081,10 +3081,10 @@ TraceRecorder::unbox_jsval(jsval v, LIns*& v_ins) // JSVAL_IS_NUMBER(v) guard(false, lir->ins_eq0(lir->ins2(LIR_pior, - lir->ins2(LIR_piand, v_ins, INS_CONSTPTR(JSVAL_INT)), + lir->ins2(LIR_piand, v_ins, INS_CONST(JSVAL_INT)), lir->ins2i(LIR_eq, lir->ins2(LIR_piand, v_ins, - INS_CONSTPTR(JSVAL_TAGMASK)), + INS_CONST(JSVAL_TAGMASK)), JSVAL_DOUBLE))), MISMATCH_EXIT); v_ins = lir->insCall(F_UnboxDouble, &v_ins); @@ -3094,7 +3094,7 @@ TraceRecorder::unbox_jsval(jsval v, LIns*& v_ins) case JSVAL_BOOLEAN: guard(true, lir->ins2i(LIR_eq, - lir->ins2(LIR_piand, v_ins, INS_CONSTPTR(JSVAL_TAGMASK)), + lir->ins2(LIR_piand, v_ins, INS_CONST(JSVAL_TAGMASK)), JSVAL_BOOLEAN), MISMATCH_EXIT); v_ins = lir->ins2i(LIR_ush, v_ins, JSVAL_TAGBITS); @@ -3102,14 +3102,14 @@ TraceRecorder::unbox_jsval(jsval v, LIns*& v_ins) case JSVAL_OBJECT: guard(true, lir->ins2i(LIR_eq, - lir->ins2(LIR_piand, v_ins, INS_CONSTPTR(JSVAL_TAGMASK)), + lir->ins2(LIR_piand, v_ins, INS_CONST(JSVAL_TAGMASK)), JSVAL_OBJECT), MISMATCH_EXIT); return true; case JSVAL_STRING: guard(true, lir->ins2i(LIR_eq, - lir->ins2(LIR_piand, v_ins, INS_CONSTPTR(JSVAL_TAGMASK)), + lir->ins2(LIR_piand, v_ins, INS_CONST(JSVAL_TAGMASK)), JSVAL_STRING), MISMATCH_EXIT); v_ins = lir->ins2(LIR_piand, v_ins, INS_CONST(~JSVAL_TAGMASK)); diff --git a/js/src/nanojit/LIR.h b/js/src/nanojit/LIR.h index 6eb7d5c0f5..a4fe4d2f59 100644 --- a/js/src/nanojit/LIR.h +++ b/js/src/nanojit/LIR.h @@ -150,7 +150,7 @@ namespace nanojit #define LIR_piand LIR_and #define LIR_pilsh LIR_lsh #define LIR_pcmov LIR_cmov - #define LIR_pior LIR_ior + #define LIR_pior LIR_or #endif inline uint32_t argwords(uint32_t argc) { -- 2.11.4.GIT