mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

added assertion to ensure that mPC is always valid before fetching the next instruction.

This commit is contained in:
beard%netscape.com 2000-06-23 06:10:14 +00:00
Родитель 53e07e5f63
Коммит 0b87b860eb
2 изменённых файлов: 14 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
js/js2/interpreter.cpp
Просмотреть файл

@ -467,6 +467,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
JSValues* registers = &mActivation->mRegisters;
mPC = mActivation->mICode->its_iCode->begin();
InstructionIterator endPC = mActivation->mICode->its_iCode->end();
// stack of all catch/finally handlers available for the current activation
// to implement jsr/rts for finally code
@ -479,6 +480,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
if (mListeners.size())
broadcast(EV_STEP);
assert(mPC != endPC);
Instruction* instruction = *mPC;
switch (instruction->op()) {
case FUNCTION:
@ -526,6 +528,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
mActivation = new Activation(target->getICode(), mActivation, base, op4(call));
registers = &mActivation->mRegisters;
mPC = mActivation->mICode->its_iCode->begin();
endPC = mActivation->mICode->its_iCode->end();
continue;
}
}
@ -562,6 +565,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
mActivation = new Activation(target->getICode(), mActivation, kNull, op4(call));
registers = &mActivation->mRegisters;
mPC = mActivation->mICode->its_iCode->begin();
endPC = mActivation->mICode->its_iCode->end();
continue;
}
}
@ -581,6 +585,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
registers = &mActivation->mRegisters;
(*registers)[linkage->mResult.first] = result;
mPC = linkage->mReturnPC;
endPC = mActivation->mICode->its_iCode->end();
}
continue;
@ -602,6 +607,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
registers = &mActivation->mRegisters;
(*registers)[linkage->mResult.first] = result;
mPC = linkage->mReturnPC;
endPC = mActivation->mICode->its_iCode->end();
}
continue;
case MOVE:
@ -781,6 +787,7 @@ using JSString throughout.
mActivation = new Activation(target->getICode(), r1, r2);
registers = &mActivation->mRegisters;
mPC = mActivation->mICode->its_iCode->begin();
endPC = mActivation->mICode->its_iCode->end();
continue;
}
}

7
js2/src/interpreter.cpp
Просмотреть файл

@ -467,6 +467,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
JSValues* registers = &mActivation->mRegisters;
mPC = mActivation->mICode->its_iCode->begin();
InstructionIterator endPC = mActivation->mICode->its_iCode->end();
// stack of all catch/finally handlers available for the current activation
// to implement jsr/rts for finally code
@ -479,6 +480,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
if (mListeners.size())
broadcast(EV_STEP);
assert(mPC != endPC);
Instruction* instruction = *mPC;
switch (instruction->op()) {
case FUNCTION:
@ -526,6 +528,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
mActivation = new Activation(target->getICode(), mActivation, base, op4(call));
registers = &mActivation->mRegisters;
mPC = mActivation->mICode->its_iCode->begin();
endPC = mActivation->mICode->its_iCode->end();
continue;
}
}
@ -562,6 +565,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
mActivation = new Activation(target->getICode(), mActivation, kNull, op4(call));
registers = &mActivation->mRegisters;
mPC = mActivation->mICode->its_iCode->begin();
endPC = mActivation->mICode->its_iCode->end();
continue;
}
}
@ -581,6 +585,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
registers = &mActivation->mRegisters;
(*registers)[linkage->mResult.first] = result;
mPC = linkage->mReturnPC;
endPC = mActivation->mICode->its_iCode->end();
}
continue;
@ -602,6 +607,7 @@ JSValue Context::interpret(ICodeModule* iCode, const JSValues& args)
registers = &mActivation->mRegisters;
(*registers)[linkage->mResult.first] = result;
mPC = linkage->mReturnPC;
endPC = mActivation->mICode->its_iCode->end();
}
continue;
case MOVE:
@ -781,6 +787,7 @@ using JSString throughout.
mActivation = new Activation(target->getICode(), r1, r2);
registers = &mActivation->mRegisters;
mPC = mActivation->mICode->its_iCode->begin();
endPC = mActivation->mICode->its_iCode->end();
continue;
}
}