changeset 45331a355c38 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=45331a355c38
description:
ARM: Fix checkpoint restoration into O3 CPU and the way O3 switchCpu
works.
This change fixes a small bug in the arm copyRegs() code where some
registers
wouldn't be copied if the processor was in a mode other than MODE_USER.
Additionally, this change simplifies the way the O3 switchCpu code
works by
utilizing TheISA::copyRegs() to copy the required context information
rather than the adhoc copying that goes on in the CPU model. The
current code
makes assumptions about the visibility of int and float registers that
aren't
true for all architectures in FS mode.
diffstat:
src/arch/arm/isa.cc | 9 ++++++++-
src/arch/arm/miscregs.hh | 2 ++
src/arch/arm/utility.cc | 13 +++++++++++++
src/cpu/o3/thread_context_impl.hh | 33 ++++-----------------------------
4 files changed, 27 insertions(+), 30 deletions(-)
diffs (114 lines):
diff -r cad97f04eb91 -r 45331a355c38 src/arch/arm/isa.cc
--- a/src/arch/arm/isa.cc Mon Apr 04 11:42:28 2011 -0500
+++ b/src/arch/arm/isa.cc Mon Apr 04 11:42:28 2011 -0500
@@ -447,6 +447,7 @@
default:
panic("Security Extensions not implemented!");
}
+ warn("Translating via MISCREG in atomic mode! Fix Me!\n");
req->setVirt(0, val, 1, flags, tc->pcState().pc());
fault = tc->getDTBPtr()->translateAtomic(req, tc, mode);
if (fault == NoFault) {
@@ -475,7 +476,13 @@
tc->getITBPtr()->invalidateMiscReg();
tc->getDTBPtr()->invalidateMiscReg();
break;
-
+ case MISCREG_CPSR_MODE:
+ // This miscreg is used by copy*Regs to set the CPSR mode
+ // without updating other CPSR variables. It's used to
+ // make sure the register map is in such a state that we can
+ // see all of the registers for the copy.
+ updateRegMap(val);
+ return;
}
}
setMiscRegNoEffect(misc_reg, newVal);
diff -r cad97f04eb91 -r 45331a355c38 src/arch/arm/miscregs.hh
--- a/src/arch/arm/miscregs.hh Mon Apr 04 11:42:28 2011 -0500
+++ b/src/arch/arm/miscregs.hh Mon Apr 04 11:42:28 2011 -0500
@@ -170,6 +170,7 @@
MISCREG_ID_ISAR3,
MISCREG_ID_ISAR4,
MISCREG_ID_ISAR5,
+ MISCREG_CPSR_MODE,
MISCREG_CP15_UNIMP_START,
MISCREG_TCMTR = MISCREG_CP15_UNIMP_START,
MISCREG_ID_PFR1,
@@ -233,6 +234,7 @@
"pmceid1", "pmc_other", "pmxevcntr",
"pmuserenr", "pmintenset", "pmintenclr",
"id_isar0", "id_isar1", "id_isar2", "id_isar3", "id_isar4", "id_isar5",
+ "cpsr_mode",
// Unimplemented below
"tcmtr",
"id_pfr1", "id_dfr0", "id_afr0",
diff -r cad97f04eb91 -r 45331a355c38 src/arch/arm/utility.cc
--- a/src/arch/arm/utility.cc Mon Apr 04 11:42:28 2011 -0500
+++ b/src/arch/arm/utility.cc Mon Apr 04 11:42:28 2011 -0500
@@ -124,8 +124,21 @@
copyRegs(ThreadContext *src, ThreadContext *dest)
{
int i;
+
+ int saved_mode = ((CPSR)src->readMiscReg(MISCREG_CPSR)).mode;
+
+ // Make sure we're in user mode, so we can easily see all the registers
+ // in the copy loop
+ src->setMiscReg(MISCREG_CPSR_MODE, MODE_USER);
+ dest->setMiscReg(MISCREG_CPSR_MODE, MODE_USER);
+
for(i = 0; i < TheISA::NumIntRegs; i++)
dest->setIntReg(i, src->readIntReg(i));
+
+ // Restore us back to the old mode
+ src->setMiscReg(MISCREG_CPSR_MODE, saved_mode);
+ dest->setMiscReg(MISCREG_CPSR_MODE, saved_mode);
+
for(i = 0; i < TheISA::NumFloatRegs; i++)
dest->setFloatReg(i, src->readFloatReg(i));
for(i = 0; i < TheISA::NumMiscRegs; i++)
diff -r cad97f04eb91 -r 45331a355c38 src/cpu/o3/thread_context_impl.hh
--- a/src/cpu/o3/thread_context_impl.hh Mon Apr 04 11:42:28 2011 -0500
+++ b/src/cpu/o3/thread_context_impl.hh Mon Apr 04 11:42:28 2011 -0500
@@ -231,36 +231,11 @@
void
O3ThreadContext<Impl>::copyArchRegs(ThreadContext *tc)
{
- // This function will mess things up unless the ROB is empty and
- // there are no instructions in the pipeline.
- ThreadID tid = thread->threadId();
- PhysRegIndex renamed_reg;
+ // Prevent squashing
+ thread->inSyscall = true;
+ TheISA::copyRegs(tc, this);
+ thread->inSyscall = false;
- // First loop through the integer registers.
- for (int i = 0; i < TheISA::NumIntRegs; ++i) {
- renamed_reg = cpu->renameMap[tid].lookup(i);
-
- DPRINTF(O3CPU, "Copying over register %i, had data %lli, "
- "now has data %lli.\n",
- renamed_reg, cpu->readIntReg(renamed_reg),
- tc->readIntReg(i));
-
- cpu->setIntReg(renamed_reg, tc->readIntReg(i));
- }
-
- // Then loop through the floating point registers.
- for (int i = 0; i < TheISA::NumFloatRegs; ++i) {
- renamed_reg = cpu->renameMap[tid].lookup(i + TheISA::FP_Base_DepTag);
- cpu->setFloatRegBits(renamed_reg,
- tc->readFloatRegBits(i));
- }
-
- // Copy the misc regs.
- TheISA::copyMiscRegs(tc, this);
-
- // Then finally set the PC, the next PC, the nextNPC, the micropc, and the
- // next micropc.
- cpu->pcState(tc->pcState(), tid);
#if !FULL_SYSTEM
this->thread->funcExeInst = tc->readFuncExeInst();
#endif
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
