зеркало из https://github.com/mozilla/gecko-dev.git
Bug 511972 - More Fragment cleanups, r=dvander.
--HG-- extra : rebase_source : 186782bd96d8155eb3f0277616012636d6ebe469
This commit is contained in:
Родитель
11d01cf3fc
Коммит
a516931ed9
|
@ -5000,7 +5000,6 @@ AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom, j
|
|||
" LINE=%d ANCHOR=%p OFFS=%d\n",
|
||||
f, c, cx->fp->regs->pc, cx->fp->script->filename,
|
||||
js_FramePCToLineNumber(cx, cx->fp), anchor, FramePCOffset(cx->fp));
|
||||
c->spawnedFrom = anchor;
|
||||
c->parent = f;
|
||||
anchor->target = c;
|
||||
c->root = f;
|
||||
|
|
|
@ -735,7 +735,6 @@ namespace nanojit
|
|||
prev = &vbr;
|
||||
)
|
||||
|
||||
verbose_only(_thisfrag->compileNbr++; )
|
||||
_inExit = false;
|
||||
|
||||
LabelStateMap labels(alloc);
|
||||
|
|
|
@ -53,22 +53,6 @@ namespace nanojit
|
|||
//
|
||||
Fragment::Fragment(const void* _ip)
|
||||
:
|
||||
#ifdef NJ_VERBOSE
|
||||
_called(0),
|
||||
_native(0),
|
||||
_exitNative(0),
|
||||
_lir(0),
|
||||
_lirbytes(0),
|
||||
_token(NULL),
|
||||
traceTicks(0),
|
||||
interpTicks(0),
|
||||
eot_target(NULL),
|
||||
sid(0),
|
||||
compileNbr(0),
|
||||
#endif
|
||||
treeBranches(NULL),
|
||||
branches(NULL),
|
||||
nextbranch(NULL),
|
||||
anchor(NULL),
|
||||
root(NULL),
|
||||
parent(NULL),
|
||||
|
@ -76,11 +60,8 @@ namespace nanojit
|
|||
peer(NULL),
|
||||
lirbuf(NULL),
|
||||
lastIns(NULL),
|
||||
spawnedFrom(NULL),
|
||||
kind(LoopTrace),
|
||||
ip(_ip),
|
||||
guardCount(0),
|
||||
xjumpCount(0),
|
||||
recordAttempts(0),
|
||||
fragEntry(NULL),
|
||||
loopEntry(NULL),
|
||||
|
|
|
@ -65,41 +65,22 @@ namespace nanojit
|
|||
public:
|
||||
Fragment(const void*);
|
||||
|
||||
NIns* code() { return _code; }
|
||||
void setCode(NIns* codee) { _code = codee; }
|
||||
int32_t& hits() { return _hits; }
|
||||
NIns* code() { return _code; }
|
||||
void setCode(NIns* codee) { _code = codee; }
|
||||
int32_t& hits() { return _hits; }
|
||||
bool isAnchor() { return anchor == this; }
|
||||
bool isRoot() { return root == this; }
|
||||
|
||||
verbose_only( uint32_t _called; )
|
||||
verbose_only( uint32_t _native; )
|
||||
verbose_only( uint32_t _exitNative; )
|
||||
verbose_only( uint32_t _lir; )
|
||||
verbose_only( uint32_t _lirbytes; )
|
||||
verbose_only( const char* _token; )
|
||||
verbose_only( uint64_t traceTicks; )
|
||||
verbose_only( uint64_t interpTicks; )
|
||||
verbose_only( DWB(Fragment*) eot_target; )
|
||||
verbose_only( uint32_t sid;)
|
||||
verbose_only( uint32_t compileNbr;)
|
||||
|
||||
DWB(Fragment*) treeBranches;
|
||||
DWB(Fragment*) branches;
|
||||
DWB(Fragment*) nextbranch;
|
||||
DWB(Fragment*) anchor;
|
||||
DWB(Fragment*) root;
|
||||
DWB(Fragment*) parent;
|
||||
DWB(Fragment*) first;
|
||||
DWB(Fragment*) peer;
|
||||
Fragment* anchor;
|
||||
Fragment* root;
|
||||
Fragment* parent;
|
||||
Fragment* first;
|
||||
Fragment* peer;
|
||||
LirBuffer* lirbuf;
|
||||
LIns* lastIns;
|
||||
SideExit* spawnedFrom;
|
||||
GuardRecord* outbound;
|
||||
|
||||
TraceKind kind;
|
||||
const void* ip;
|
||||
uint32_t guardCount;
|
||||
uint32_t xjumpCount;
|
||||
uint32_t recordAttempts;
|
||||
NIns* fragEntry;
|
||||
NIns* loopEntry;
|
||||
|
|
Загрузка…
Ссылка в новой задаче