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

Bug 484291 - INS_CONSTPTR should not cast to void*; callers should do their own casting if they want to interpret numbers as pointers. r=gal

Browse Source
This commit is contained in:
Jeff Walden 2009-03-19 16:58:23 -07:00
parent 270aed708f
commit 23b0894344
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/jstracer.cpp
View File

@ -221,7 +221,7 @@ js_InitJITStatsClass(JSContext *cx, JSObject *glob)
#endif /* JS_JIT_SPEW */ #endif /* JS_JIT_SPEW */
#define INS_CONST(c) addName(lir->insImm(c), #c) #define INS_CONST(c) addName(lir->insImm(c), #c)
#define INS_CONSTPTR(p) addName(lir->insImmPtr((void*) (p)), #p) #define INS_CONSTPTR(p) addName(lir->insImmPtr(p), #p)
#define INS_CONSTFUNPTR(p) addName(lir->insImmPtr(JS_FUNC_TO_DATA_PTR(void*, p)), #p) #define INS_CONSTFUNPTR(p) addName(lir->insImmPtr(JS_FUNC_TO_DATA_PTR(void*, p)), #p)
using namespace avmplus; using namespace avmplus;
@ -5011,7 +5011,7 @@ TraceRecorder::ifop()
lir->insLoad(LIR_ldp, lir->insLoad(LIR_ldp,
v_ins, v_ins,
(int)offsetof(JSString, length)), (int)offsetof(JSString, length)),
INS_CONSTPTR(JSSTRING_LENGTH_MASK)); INS_CONSTPTR(reinterpret_cast<void *>(JSSTRING_LENGTH_MASK)));
} else { } else {
JS_NOT_REACHED("ifop"); JS_NOT_REACHED("ifop");
return false; return false;
@ -6424,7 +6424,7 @@ TraceRecorder::record_JSOP_NOT()
JS_ASSERT(JSVAL_IS_STRING(v)); JS_ASSERT(JSVAL_IS_STRING(v));
set(&v, lir->ins_eq0(lir->ins2(LIR_piand, set(&v, lir->ins_eq0(lir->ins2(LIR_piand,
lir->insLoad(LIR_ldp, get(&v), (int)offsetof(JSString, length)), lir->insLoad(LIR_ldp, get(&v), (int)offsetof(JSString, length)),
INS_CONSTPTR(JSSTRING_LENGTH_MASK)))); INS_CONSTPTR(reinterpret_cast<void *>(JSSTRING_LENGTH_MASK)))));
return true; return true;
} }
@ -9356,19 +9356,19 @@ TraceRecorder::record_JSOP_LENGTH()
LIns* masked_len_ins = lir->ins2(LIR_piand, LIns* masked_len_ins = lir->ins2(LIR_piand,
len_ins, len_ins,
INS_CONSTPTR(JSSTRING_LENGTH_MASK)); INS_CONSTPTR(reinterpret_cast<void *>(JSSTRING_LENGTH_MASK)));
LIns *choose_len_ins = LIns* choose_len_ins =
lir->ins_choose(lir->ins_eq0(lir->ins2(LIR_piand, lir->ins_choose(lir->ins_eq0(lir->ins2(LIR_piand,
len_ins, len_ins,
INS_CONSTPTR(JSSTRFLAG_DEPENDENT))), INS_CONSTPTR(reinterpret_cast<void *>(JSSTRFLAG_DEPENDENT)))),
masked_len_ins, masked_len_ins,
lir->ins_choose(lir->ins_eq0(lir->ins2(LIR_piand, lir->ins_choose(lir->ins_eq0(lir->ins2(LIR_piand,
len_ins, len_ins,
INS_CONSTPTR(JSSTRFLAG_PREFIX))), INS_CONSTPTR(reinterpret_cast<void *>(JSSTRFLAG_PREFIX)))),
lir->ins2(LIR_piand, lir->ins2(LIR_piand,
len_ins, len_ins,
INS_CONSTPTR(JSSTRDEP_LENGTH_MASK)), INS_CONSTPTR(reinterpret_cast<void *>(JSSTRDEP_LENGTH_MASK))),
masked_len_ins)); masked_len_ins));
set(&l, lir->ins1(LIR_i2f, choose_len_ins)); set(&l, lir->ins1(LIR_i2f, choose_len_ins));