diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-03-12 05:58:28 -0500 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-03-12 05:58:28 -0500 |
| commit | 57d53f8a9d738b43e0de41a70813e3a6de8d4dfb (patch) | |
| tree | 2bd45bf1d4a23ca8696b76fbffff3754dd244d4a /cpu/cpu_exec_context.cc | |
| parent | 18ba0f85486f0dd919064ba2b0ed8c53a7861298 (diff) | |
| parent | 4d19bbeeebd026b0aab52e381ee77e4141ed9dd1 (diff) | |
| download | gem5-57d53f8a9d738b43e0de41a70813e3a6de8d4dfb.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem
--HG--
extra : convert_revision : b101fa550567d5a9f5de6c2d8c3f67829ae050c1
Diffstat (limited to 'cpu/cpu_exec_context.cc')
| -rw-r--r-- | cpu/cpu_exec_context.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpu/cpu_exec_context.cc b/cpu/cpu_exec_context.cc index f840c38dc..2ad9571ce 100644 --- a/cpu/cpu_exec_context.cc +++ b/cpu/cpu_exec_context.cc @@ -270,12 +270,12 @@ void CPUExecContext::copyArchRegs(ExecContext *xc) { // First loop through the integer registers. - for (int i = 0; i < AlphaISA::NumIntRegs; ++i) { + for (int i = 0; i < TheISA::NumIntRegs; ++i) { setIntReg(i, xc->readIntReg(i)); } // Then loop through the floating point registers. - for (int i = 0; i < AlphaISA::NumFloatRegs; ++i) { + for (int i = 0; i < TheISA::NumFloatRegs; ++i) { setFloatRegDouble(i, xc->readFloatRegDouble(i)); setFloatRegInt(i, xc->readFloatRegInt(i)); } @@ -286,5 +286,6 @@ CPUExecContext::copyArchRegs(ExecContext *xc) // Lastly copy PC/NPC setPC(xc->readPC()); setNextPC(xc->readNextPC()); + setNextNPC(xc->readNextNPC()); } |