Bug 522363 - remove debug-break, unused parameters on displacement check, r=dvander.

--HG--
extra : rebase_source : 13ef7b6d16e5b66bb70816cfdd417ab4f9bcd758
This commit is contained in:
Graydon Hoare 2009-10-14 15:30:00 -07:00
parent 1664bfe0fe
commit bb3cb0015c
7 changed files with 6 additions and 19 deletions

View File

@ -8983,15 +8983,10 @@ TraceRecorder::guardShape(LIns* obj_ins, JSObject* obj, uint32 shape, const char
return RECORD_ERROR;
}
// If already guarded, emit an assertion that the shape matches.
// If already guarded, check that the shape matches.
if (entry->key) {
JS_ASSERT(entry->key == obj_ins);
JS_ASSERT(entry->obj == obj);
debug_only_stmt(
lir->insAssert(lir->ins2i(LIR_eq,
lir->insLoad(LIR_ld, map_ins, offsetof(JSScope, shape)),
shape));
)
return RECORD_CONTINUE;
}

View File

@ -1119,7 +1119,6 @@ const CallInfo ci_N_IQF = CI(f_N_IQF, argMask(I32, 1, 3) |
// sufficiently big that it's spread across multiple chunks.
//
// The following instructions aren't generated yet:
// - dbreak (hard to test, and not implemented in NJ)
// - iparam/qparam (hard to test beyond what is auto-generated in fragment
// prologues)
// - ialloc/qalloc (except for the load/store scratch space; hard to do so

View File

@ -1076,13 +1076,6 @@ namespace nanojit
virtual LInsp insSkip(size_t size) {
return out->insSkip(size);
}
void insAssert(LIns* expr) {
#if defined DEBUG
LIns* branch = insBranch(LIR_jt, expr, NULL);
ins0(LIR_dbreak);
branch->setTarget(ins0(LIR_label));
#endif
}
// convenience functions
@ -1453,7 +1446,7 @@ namespace nanojit
class Assembler;
void compile(Assembler *assm, Fragment *frag verbose_only(, Allocator& alloc, LabelMap*));
verbose_only(void live(Allocator& alloc, Fragment *frag, LirBuffer *lirbuf);)
verbose_only(void live(Allocator& alloc, Fragment* frag, LogControl*);)
class StackFilter: public LirFilter
{

View File

@ -74,7 +74,7 @@
OPDEF(start, 0, 0, Op0) // start of a fragment
OPDEF(regfence, 1, 0, Op0) // register fence, no register allocation is allowed across this meta instruction
OPDEF(skip, 2, 1, Sk) // holds blobs ("payloads") of data; also links pages
OPDEF(dbreak, 3, 0, Op0)
OPDEF(unused3, 3,-1, None)
OPDEF(unused4, 4,-1, None)
OPDEF(unused5, 5,-1, None)
OPDEF(unused6, 6,-1, None)

View File

@ -254,7 +254,7 @@ namespace nanojit
static const int NumSavedRegs = 18; // R13-R30
#endif
static inline bool isValidDisplacement(int32_t d) {
static inline bool isValidDisplacement(int32_t) {
return true;
}
static inline bool IsFpReg(Register r) {

View File

@ -181,7 +181,7 @@ namespace nanojit
1<<F22;
static const RegisterMask AllowableFlagRegs = GpRegs;
static inline bool isValidDisplacement(int32_t d) {
static inline bool isValidDisplacement(int32_t) {
return true;
}

View File

@ -320,7 +320,7 @@ namespace nanojit
static const int NumArgRegs = 6;
#endif
static inline bool isValidDisplacement(int32_t d) {
static inline bool isValidDisplacement(int32_t) {
return true;
}
static inline bool IsFpReg(Register r) {