regression-test fixes: use new register access syntax
The golden-run image of the regression test needs to be updated in order to cope with the bugfix for breakpoint events in rep-instructions. git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@2011 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
@ -51,7 +51,7 @@ bool RegressionTest::run()
|
|||||||
//Save state
|
//Save state
|
||||||
file << "Saving state." << endl;
|
file << "Saving state." << endl;
|
||||||
simulator.save("regression-save");
|
simulator.save("regression-save");
|
||||||
instrAddr_at_save = simulator.getRegisterManager().getInstructionPointer();
|
instrAddr_at_save = simulator.getCPU(0).getInstructionPointer();
|
||||||
|
|
||||||
//Start Plugins
|
//Start Plugins
|
||||||
TracingPlugin tp;
|
TracingPlugin tp;
|
||||||
@ -187,14 +187,14 @@ bool RegressionTest::run()
|
|||||||
|
|
||||||
simulator.restore("regression-save");
|
simulator.restore("regression-save");
|
||||||
|
|
||||||
if (simulator.getRegisterManager().getInstructionPointer() == instrAddr_at_save) {
|
if (simulator.getCPU(0).getInstructionPointer() == instrAddr_at_save) {
|
||||||
file << "Save-/Restore-Test SUCCESSFUL." << endl;
|
file << "Save-/Restore-Test SUCCESSFUL." << endl;
|
||||||
} else {
|
} else {
|
||||||
file << "Save-/Restore-Test FAILED. The instructionpointer after restore is \
|
file << "Save-/Restore-Test FAILED. The instructionpointer after restore is \
|
||||||
different to the ionstructionpointer after save! " << endl;
|
different to the ionstructionpointer after save! " << endl;
|
||||||
file << "Instructionpointer after save: " << instrAddr_at_save << endl;
|
file << "Instructionpointer after save: " << instrAddr_at_save << endl;
|
||||||
file << "Instructionpointer after restore: " << \
|
file << "Instructionpointer after restore: " << \
|
||||||
simulator.getRegisterManager().getInstructionPointer() << endl;
|
simulator.getCPU(0).getInstructionPointer() << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reboot test
|
// Reboot test
|
||||||
@ -242,7 +242,7 @@ bool RegressionTest::run()
|
|||||||
|
|
||||||
file << "Jump-Instruction found: " << jump.getOpcode() << endl;
|
file << "Jump-Instruction found: " << jump.getOpcode() << endl;
|
||||||
file << "current Instruction-Pointer: 0x" << hex <<\
|
file << "current Instruction-Pointer: 0x" << hex <<\
|
||||||
simulator.getRegisterManager().getInstructionPointer() << dec << endl;
|
simulator.getCPU(0).getInstructionPointer() << dec << endl;
|
||||||
|
|
||||||
file << "Jump-Test end" << endl;
|
file << "Jump-Test end" << endl;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user