Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed missing pop after var initialization. Added instruction trace.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@133508 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rogerl%netscape.com
2002-11-09 22:53:51 +00:00
parent 27f04d79cc
commit 4c49733aff
4 changed files with 98 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
mozilla/js2/src/js2engine.cpp
View File

@@ -77,7 +77,7 @@ namespace MetaData {
rts();
throw jsx;
}
activationStackTop = f; // when execution falls 'off the bottom' an rts hasn't occurred
activationStackTop = f - 1; // when execution falls 'off the bottom' an rts hasn't occurred
// so the activation stack is off by 1.
return result;
}
@@ -92,6 +92,10 @@ namespace MetaData {
try {
a = JS2VAL_VOID;
b = JS2VAL_VOID;
#ifdef DEBUG
if (traceInstructions)
printInstruction(pc, bCon->getCodeStart(), bCon, this);
#endif
JS2Op op = (JS2Op)*pc++;
switch (op) {
#include "js2op_arithmetic.cpp"
@@ -366,7 +370,8 @@ namespace MetaData {
Dollar_StringAtom(&world.identifiers["$"]),
INIT_STRINGATOM(prototype),
INIT_STRINGATOM(length),
INIT_STRINGATOM(toString)
INIT_STRINGATOM(toString),
traceInstructions(false)
{
for (int i = 0; i < 256; i++)
float64Table[i] = NULL;
@@ -483,69 +488,78 @@ namespace MetaData {
};
uint8 *printInstruction(uint8 *pc, uint8 *start, BytecodeContainer *bCon, JS2Engine *engine)
{
if (engine)
printFormat(stdOut, "%.4d %.4d ", pc - start, (int32)(engine->sp - engine->execStack));
else
printFormat(stdOut, "%.4d ", pc - start);
stdOut << opcodeData[*pc].name;
switch (opcodeData[*pc++].flags) {
case BRANCH_OFFSET:
{
int32 offset = BytecodeContainer::getOffset(pc);
stdOut << " " << offset << " --> " << (pc - start) + offset;
pc += sizeof(int32);
}
break;
case STR_PTR:
{
uint16 index = BytecodeContainer::getShort(pc);
stdOut << "\"" << bCon->mStringList[index] << "\"";
pc += sizeof(short);
}
break;
case NAME_INDEX:
{
Multiname *mn = bCon->mMultinameList[BytecodeContainer::getShort(pc)];
stdOut << " " << *mn->name;
pc += sizeof(short);
}
break;
case FRAME_INDEX:
{
pc += sizeof(short);
}
break;
case BRANCH_PAIR:
{
int32 offset1 = BytecodeContainer::getOffset(pc);
pc += sizeof(int32);
int32 offset2 = BytecodeContainer::getOffset(pc);
pc += sizeof(int32);
if (offset1 == (int32)NotALabel)
stdOut << "no finally; ";
else
stdOut << "(finally) " << offset1 << " --> " << (pc - start) + offset1 << "; ";
if (offset2 == (int32)NotALabel)
stdOut << "no catch;";
else
stdOut << "(catch) " << offset2 << " --> " << (pc - start) + offset2;
}
break;
case FLOAT64:
{
stdOut << " " << BytecodeContainer::getFloat64(pc);
pc += sizeof(float64);
}
break;
}
stdOut << "\n";
return pc;
}
void dumpBytecode(BytecodeContainer *bCon)
{
uint8 *start = bCon->getCodeStart();
uint8 *end = bCon->getCodeEnd();
uint8 *pc = start;
while (pc < end) {
printFormat(stdOut, "%.4d ", pc - start);
stdOut << opcodeData[*pc].name;
switch (opcodeData[*pc++].flags) {
case BRANCH_OFFSET:
{
int32 offset = BytecodeContainer::getOffset(pc);
stdOut << " " << offset << " --> " << (pc - start) + offset;
pc += sizeof(int32);
}
break;
case STR_PTR:
{
uint16 index = BytecodeContainer::getShort(pc);
stdOut << "\"" << bCon->mStringList[index] << "\"";
pc += sizeof(short);
}
break;
case NAME_INDEX:
{
Multiname *mn = bCon->mMultinameList[BytecodeContainer::getShort(pc)];
stdOut << " " << *mn->name;
pc += sizeof(short);
}
break;
case FRAME_INDEX:
{
pc += sizeof(short);
}
break;
case BRANCH_PAIR:
{
int32 offset1 = BytecodeContainer::getOffset(pc);
pc += sizeof(int32);
int32 offset2 = BytecodeContainer::getOffset(pc);
pc += sizeof(int32);
if (offset1 == (int32)NotALabel)
stdOut << "no finally; ";
else
stdOut << "(finally) " << offset1 << " --> " << (pc - start) + offset1 << "; ";
if (offset2 == (int32)NotALabel)
stdOut << "no catch;";
else
stdOut << "(catch) " << offset2 << " --> " << (pc - start) + offset2;
}
break;
case FLOAT64:
{
stdOut << " " << BytecodeContainer::getFloat64(pc);
pc += sizeof(float64);
}
break;
}
stdOut << "\n";
pc = printInstruction(pc, start, bCon, NULL);
}
}
#endif
#endif // DEBUG
// Return the effect of an opcode on the execution stack.
// Some ops (e.g. eCall) have a variable effect, those are handled separately