Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 12:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

speed up AR::validate (r=nnethercote,bug=473769)

Browse Source 
--HG--
extra : convert_revision : 0ff411e99654f590121e90a93345257b14442721
This commit is contained in:
Steven Johnson 2009-12-22 17:32:49 -08:00
parent 80ff17b398
commit a8f7b1a0a0
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
js/src/nanojit/Assembler.cpp
View File

@ -91,7 +91,21 @@ namespace nanojit
/*static*/ LIns* const AR::BAD_ENTRY = (LIns*)0xdeadbeef;
void AR::validate()
void AR::validateQuick()
{
NanoAssert(_highWaterMark < NJ_MAX_STACK_ENTRY);
NanoAssert(_entries[0] == NULL);
// Only check a few entries around _highWaterMark.
uint32_t const RADIUS = 4;
uint32_t const lo = (_highWaterMark > 1 + RADIUS ? _highWaterMark - RADIUS : 1);
uint32_t const hi = (_highWaterMark + 1 + RADIUS < NJ_MAX_STACK_ENTRY ? _highWaterMark + 1 + RADIUS : NJ_MAX_STACK_ENTRY);
for (uint32_t i = lo; i <= _highWaterMark; ++i)
NanoAssert(_entries[i] != BAD_ENTRY);
for (uint32_t i = _highWaterMark+1; i < hi; ++i)
NanoAssert(_entries[i] == BAD_ENTRY);
}
void AR::validateFull()
{
NanoAssert(_highWaterMark < NJ_MAX_STACK_ENTRY);
NanoAssert(_entries[0] == NULL);
@ -101,6 +115,20 @@ namespace nanojit
NanoAssert(_entries[i] == BAD_ENTRY);
}
void AR::validate()
{
static uint32_t validateCounter = 0;
if (++validateCounter >= 100)
{
validateFull();
validateCounter = 0;
}
else
{
validateQuick();
}
}
#endif
inline void AR::clear()
@ -266,8 +294,9 @@ namespace nanojit
return idx > 0 && idx <= _highWaterMark && _entries[idx] == ins;
}
void AR::checkForResourceConsistency(const RegAlloc& regs) const
void AR::checkForResourceConsistency(const RegAlloc& regs)
{
validate();
for (uint32_t i = 1; i <= _highWaterMark; ++i)
{
LIns* ins = _entries[i];
@ -1662,14 +1691,12 @@ namespace nanojit
// NB: this loop relies on using entry[0] being NULL,
// so that we are guaranteed to terminate
// without access negative entries.
LIns *i = _entries[idx];
NanoAssert(i != 0);
LIns* i = _entries[idx];
NanoAssert(i != NULL);
do {
_entries[idx] = 0;
_entries[idx] = NULL;
idx--;
} while (_entries[idx] == i);
debug_only(validate();)
}
#ifdef NJ_VERBOSE
@ -1816,7 +1843,6 @@ namespace nanojit
uint32_t Assembler::arReserve(LIns* ins)
{
uint32_t i = _activation.reserveEntry(ins);
debug_only( _activation.validate(); )
if (!i)
setError(StackFull);
return i;

6
js/src/nanojit/Assembler.h
View File

@ -124,9 +124,11 @@ namespace nanojit
uint32_t reserveEntry(LIns* ins); /* return 0 if unable to reserve the entry */
#ifdef _DEBUG
void validateQuick();
void validateFull();
void validate();
bool isValidEntry(uint32_t idx, LIns* ins) const; /* return true iff idx and ins are matched */
void checkForResourceConsistency(const RegAlloc& regs) const;
void checkForResourceConsistency(const RegAlloc& regs);
void checkForResourceLeaks() const;
#endif
@ -143,7 +145,7 @@ namespace nanojit
inline AR::AR()
{
_entries[0] = 0;
_entries[0] = NULL;
clear();
}