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 518477 - NJ merge: LIR.{cpp,h} changes from TR. r=graydon.

Browse Source
This commit is contained in:
Nicholas Nethercote 2009-09-24 10:42:25 +10:00
parent 232e0c7e37
commit 9598899fc8
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsregexp.cpp
View File

@ -3196,7 +3196,7 @@ class RegExpNativeCompiler {
if (outOfMemory())
goto fail;
::compile(assm, fragment, tempAlloc verbose_only(, tm->labels));
::compile(assm, fragment verbose_only(, tempAlloc, tm->labels));
if (assm->error() != nanojit::None)
goto fail;

2
js/src/jstracer.cpp
View File

@ -4145,7 +4145,7 @@ TraceRecorder::compile(JSTraceMonitor* tm)
return;
Assembler *assm = tm->assembler;
::compile(assm, fragment, tempAlloc verbose_only(, tm->labels));
::compile(assm, fragment verbose_only(, tempAlloc, tm->labels));
if (outOfMemory())
return;

10
js/src/nanojit/LIR.cpp
View File

@ -107,7 +107,7 @@ namespace nanojit
names(NULL),
#endif
abi(ABI_FASTCALL), state(NULL), param1(NULL), sp(NULL), rp(NULL),
_allocator(alloc), _bytesAllocated(0)
_allocator(alloc)
{
clear();
}
@ -249,7 +249,7 @@ namespace nanojit
LInsp LirBufWriter::insGuard(LOpcode op, LInsp c, GuardRecord *gr)
{
debug_only( if (LIR_x == op || LIR_xbarrier == op) NanoAssert(!c); )
return ins2(op, c, (LIns*)gr);
return ins2(op, c, (LIns*)gr);
}
LInsp LirBufWriter::insBranch(LOpcode op, LInsp condition, LInsp toLabel)
@ -1152,7 +1152,6 @@ namespace nanojit
NanoAssert(i->isLInsOp3());
return hash3(op, i->oprnd1(), i->oprnd2(), i->oprnd3());
}
NanoAssert(0);
}
inline bool LInsHashSet::equals(LInsp a, LInsp b)
@ -1194,7 +1193,6 @@ namespace nanojit
NanoAssert(a->isLInsOp3());
return a->oprnd1() == b->oprnd1() && a->oprnd2() == b->oprnd2() && a->oprnd3() == b->oprnd3();
}
NanoAssert(0);
}
void LInsHashSet::grow()
@ -1450,7 +1448,7 @@ namespace nanojit
total++;
// first handle side-effect instructions
if (!i->isCse())
if (i->isStmt())
{
live.add(i,0);
if (i->isGuard())
@ -1922,7 +1920,7 @@ namespace nanojit
return out->insCall(ci, args);
}
void compile(Assembler* assm, Fragment* frag, Allocator& alloc verbose_only(, LabelMap* labels))
void compile(Assembler* assm, Fragment* frag verbose_only(, Allocator& alloc, LabelMap* labels))
{
verbose_only(
LogControl *logc = assm->_logc;

2
js/src/nanojit/LIR.h
View File

@ -1446,7 +1446,7 @@ namespace nanojit
class Assembler;
void compile(Assembler *assm, Fragment *frag, Allocator& alloc verbose_only(, LabelMap*));
void compile(Assembler *assm, Fragment *frag verbose_only(, Allocator& alloc, LabelMap*));
verbose_only(void live(Allocator& alloc, Fragment *frag, LirBuffer *lirbuf);)
class StackFilter: public LirFilter