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

Increase NJ_MAX_STACK_ENTRY on desktop systems, revise search algo in AR (r=nnethercote,r=edwsmith,bug=473769)

Browse Source 
--HG--
extra : convert_revision : 0a12bb3f8436feac1814bfdd25dde1afcd050c0a
This commit is contained in:
Steven Johnson 2009-12-21 12:03:59 -08:00
parent c44c200044
commit 4015262424
6 changed files with 83 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,11 +87,29 @@ namespace nanojit
reset();
}
#ifdef _DEBUG
/*static*/ LIns* const AR::BAD_ENTRY = (LIns*)0xdeadbeef;
void AR::validate()
{
NanoAssert(_highWaterMark < NJ_MAX_STACK_ENTRY);
NanoAssert(_entries[0] == BAD_ENTRY);
for (uint32_t i = 1; i <= _highWaterMark; ++i)
NanoAssert(_entries[i] != BAD_ENTRY);
for (uint32_t i = _highWaterMark+1; i < NJ_MAX_STACK_ENTRY; ++i)
NanoAssert(_entries[i] == BAD_ENTRY);
}
#endif
inline void AR::clear()
{
_highWaterMark = 0;
for(uint32_t i=0; i<NJ_MAX_STACK_ENTRY; i++)
_entries[i] = 0;
#ifdef _DEBUG
for (uint32_t i = 0; i < NJ_MAX_STACK_ENTRY; ++i)
_entries[i] = BAD_ENTRY;
#endif
}
bool AR::Iter::next(LIns*& ins, uint32_t& nStackSlots, int32_t& arIndex)
@ -266,7 +284,7 @@ namespace nanojit
i = n-1;
}
else if (ins->isQuad()) {
NanoAssert(_entries[i - stack_direction(1)]==ins);
NanoAssert(_entries[i + 1]==ins);
i += 1; // skip high word
}
else {
@ -1641,12 +1659,16 @@ namespace nanojit
void AR::freeEntryAt(uint32_t idx)
{
NanoAssert(idx > 0 && idx <= _highWaterMark);
LIns *i = _entries[idx];
NanoAssert(i != 0);
do {
_entries[idx] = 0;
idx--;
} while (_entries[idx] == i);
debug_only(validate();)
}
#ifdef NJ_VERBOSE
@ -1719,61 +1741,73 @@ namespace nanojit
uint32_t AR::reserveEntry(LIns* ins)
{
uint32_t const nStackSlots = nStackSlotsFor(ins);
uint32_t start = 1;
uint32_t found = 0;
if (nStackSlots == 1) {
// easy most common case -- find a hole, or make the frame bigger
for (uint32_t i=start; i < NJ_MAX_STACK_ENTRY; i++) {
if (_entries[i] == 0) {
// found a hole
if (nStackSlots == 1)
{
for (uint32_t i = 1; i <= _highWaterMark; i++)
{
if (_entries[i] == NULL)
{
_entries[i] = ins;
found = i;
break;
return i;
}
}
uint32_t const spaceLeft = NJ_MAX_STACK_ENTRY - _highWaterMark - 1;
if (spaceLeft >= 1)
{
NanoAssert(_entries[_highWaterMark+1] == BAD_ENTRY);
_entries[++_highWaterMark] = ins;
return _highWaterMark;
}
}
else if (nStackSlots == 2) {
if ( (start&1)==1 ) start++; // even 8 boundary
for (uint32_t i=start; i < NJ_MAX_STACK_ENTRY; i+=2) {
if ( (_entries[i+stack_direction(1)] == 0) && (i>_highWaterMark || (_entries[i] == 0)) ) {
// found 2 adjacent aligned slots
NanoAssert(_entries[i] == 0);
NanoAssert(_entries[i+stack_direction(1)] == 0);
_entries[i] = ins;
_entries[i+stack_direction(1)] = ins;
found = i;
break;
}
}
}
else {
else
{
// alloc larger block on 8byte boundary.
if (start < nStackSlots) start = nStackSlots;
if ((start&1)==1) start++;
for (uint32_t i=start; i < NJ_MAX_STACK_ENTRY; i+=2) {
if (isEmptyRange(i, nStackSlots)) {
uint32_t const start = nStackSlots + (nStackSlots & 1);
for (uint32_t i = start; i <= _highWaterMark; i += 2)
{
if (isEmptyRange(i, nStackSlots))
{
// place the entry in the table and mark the instruction with it
for (uint32_t j=0; j < nStackSlots; j++) {
NanoAssert(_entries[i-j] == 0);
for (uint32_t j=0; j < nStackSlots; j++)
{
NanoAssert(i-j <= _highWaterMark);
NanoAssert(_entries[i-j] == NULL);
_entries[i-j] = ins;
}
found = i;
break;
return i;
}
}
// Be sure to account for any 8-byte-round-up when calculating spaceNeeded.
uint32_t const spaceLeft = NJ_MAX_STACK_ENTRY - _highWaterMark - 1;
uint32_t const spaceNeeded = nStackSlots + (_highWaterMark & 1);
if (spaceLeft >= spaceNeeded)
{
if (_highWaterMark & 1)
{
NanoAssert(_entries[_highWaterMark+1] == BAD_ENTRY);
_entries[_highWaterMark+1] = NULL;
}
_highWaterMark += spaceNeeded;
for (uint32_t j = 0; j < nStackSlots; j++)
{
NanoAssert(_highWaterMark-j < NJ_MAX_STACK_ENTRY);
NanoAssert(_entries[_highWaterMark-j] == BAD_ENTRY);
_entries[_highWaterMark-j] = ins;
}
return _highWaterMark;
}
}
if (_highWaterMark < found) {
_highWaterMark = found;
}
return found;
// no space. oh well.
return 0;
}
#ifdef _DEBUG
void AR::checkForResourceLeaks() const
{
for (uint32_t i = 1; i <= _highWaterMark; i++) {
NanoAssertMsgf(_entries[i] == 0, "frame entry %d wasn't freed\n",-4*i);
NanoAssertMsgf(_entries[i] == NULL, "frame entry %d wasn't freed\n",-4*i);
}
}
#endif
@ -1781,6 +1815,7 @@ 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

@ -106,6 +106,9 @@ namespace nanojit
uint32_t _highWaterMark; /* index of highest entry used since last clear() */
LIns* _entries[ NJ_MAX_STACK_ENTRY ]; /* maps to 4B contiguous locations relative to the frame pointer.
NB: _entries[0] is always unused */
#ifdef _DEBUG
static LIns* const BAD_ENTRY;
#endif
bool isEmptyRange(uint32_t start, uint32_t nStackSlots) const;
static uint32_t nStackSlotsFor(LIns* ins);
@ -119,6 +122,7 @@ namespace nanojit
uint32_t reserveEntry(LIns* ins); /* return 0 if unable to reserve the entry */
#ifdef _DEBUG
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 checkForResourceLeaks() const;
@ -446,7 +450,7 @@ namespace nanojit
inline int32_t disp(LIns* ins)
{
// even on 64bit cpu's, we allocate stack area in 4byte chunks
return stack_direction(4 * int32_t(ins->getArIndex()));
return -4 * int32_t(ins->getArIndex());
}
}
#endif // __nanojit_Assembler__

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

@ -119,12 +119,6 @@ namespace nanojit {
};
}
#ifdef NJ_STACK_GROWTH_UP
#define stack_direction(n) n
#else
#define stack_direction(n) -n
#endif
#define isSPorFP(r) ( (r)==SP || (r)==FP )
#ifdef NJ_NO_VARIADIC_MACROS

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

@ -54,7 +54,7 @@
namespace nanojit
{
#define NJ_MAX_STACK_ENTRY 256
#define NJ_MAX_STACK_ENTRY 16384
#define NJ_ALIGN_STACK 16
#define NJ_JTBL_SUPPORTED 1
#define NJ_EXPANDED_LOADSTORE_SUPPORTED 0

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

@ -58,7 +58,7 @@
namespace nanojit
{
#define NJ_MAX_STACK_ENTRY 256
#define NJ_MAX_STACK_ENTRY 16384
#define NJ_ALIGN_STACK 16
#define NJ_JTBL_SUPPORTED 1
#define NJ_EXPANDED_LOADSTORE_SUPPORTED 1

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

@ -93,7 +93,7 @@ namespace nanojit
{
const int NJ_MAX_REGISTERS = 24; // gpregs, x87 regs, xmm regs
#define NJ_MAX_STACK_ENTRY 256
#define NJ_MAX_STACK_ENTRY 16384
#define NJ_MAX_PARAMETERS 1
#define NJ_JTBL_SUPPORTED 1
#define NJ_EXPANDED_LOADSTORE_SUPPORTED 1