changeset 5b5a9f4203d1 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=5b5a9f4203d1
description:
Get rid of old RegContext code.
diffstat:
17 files changed, 46 deletions(-)
src/arch/alpha/regfile.hh | 3 ---
src/arch/alpha/types.hh | 3 ---
src/arch/mips/regfile.cc | 3 ---
src/arch/mips/regfile/regfile.hh | 2 --
src/arch/mips/types.hh | 1 -
src/arch/sparc/miscregfile.cc | 2 --
src/arch/sparc/regfile.cc | 7 -------
src/arch/sparc/regfile.hh | 1 -
src/arch/sparc/types.hh | 4 ----
src/arch/x86/regfile.cc | 2 --
src/arch/x86/regfile.hh | 1 -
src/arch/x86/types.hh | 5 -----
src/cpu/checker/thread_context.hh | 3 ---
src/cpu/o3/thread_context.hh | 4 ----
src/cpu/ozone/cpu.hh | 1 -
src/cpu/simple_thread.hh | 3 ---
src/cpu/thread_context.hh | 1 -
diffs (285 lines):
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/alpha/regfile.hh
--- a/src/arch/alpha/regfile.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/alpha/regfile.hh Sun Oct 12 17:57:46 2008 -0700
@@ -206,13 +206,6 @@
void serialize(EventManager *em, std::ostream &os);
void unserialize(EventManager *em, Checkpoint *cp,
const std::string §ion);
-
- void
- changeContext(RegContextParam param, RegContextVal val)
- {
- //This would be an alternative place to call/implement
- //the swapPALShadow function
- }
};
static inline int
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/alpha/types.hh
--- a/src/arch/alpha/types.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/alpha/types.hh Sun Oct 12 17:57:46 2008 -0700
@@ -57,13 +57,6 @@
MiscReg ctrlreg;
};
-enum RegContextParam
-{
- CONTEXT_PALMODE
-};
-
-typedef bool RegContextVal;
-
enum annotes
{
ANNOTE_NONE = 0,
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/mips/regfile.cc
--- a/src/arch/mips/regfile.cc Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/mips/regfile.cc Sun Oct 12 17:57:46 2008 -0700
@@ -188,12 +188,6 @@
}
-
-void RegFile::changeContext(RegContextParam param, RegContextVal val)
-{
- panic("Change Context Not Implemented for MipsISA");
-}
-
static inline int flattenIntIndex(ThreadContext * tc, int reg)
{
return reg;
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/mips/regfile/regfile.hh
--- a/src/arch/mips/regfile/regfile.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/mips/regfile/regfile.hh Sun Oct 12 17:57:46 2008 -0700
@@ -104,10 +104,6 @@
void unserialize(EventManager *em, Checkpoint *cp,
const std::string §ion);
- void changeContext(RegContextParam param, RegContextVal val)
- {
- }
-
};
} // namespace MipsISA
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/mips/types.hh
--- a/src/arch/mips/types.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/mips/types.hh Sun Oct 12 17:57:46 2008 -0700
@@ -59,9 +59,6 @@
FloatReg fpreg;
MiscReg ctrlreg;
} AnyReg;
-
- typedef int RegContextParam;
- typedef int RegContextVal;
//used in FP convert & round function
enum ConvertType{
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/sparc/miscregfile.cc
--- a/src/arch/sparc/miscregfile.cc Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/sparc/miscregfile.cc Sun Oct 12 17:57:46 2008 -0700
@@ -551,11 +551,8 @@
new_val = val >= NWindows ? NWindows - 1 : val;
if (val >= NWindows)
new_val = NWindows - 1;
-
- tc->changeRegFileContext(CONTEXT_CWP, new_val);
break;
case MISCREG_GL:
- tc->changeRegFileContext(CONTEXT_GLOBALS, val);
break;
case MISCREG_PIL:
case MISCREG_SOFTINT:
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/sparc/regfile.cc
--- a/src/arch/sparc/regfile.cc Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/sparc/regfile.cc Sun Oct 12 17:57:46 2008 -0700
@@ -241,21 +241,6 @@
UNSERIALIZE_SCALAR(nnpc);
}
-void RegFile::changeContext(RegContextParam param, RegContextVal val)
-{
- switch(param)
- {
- case CONTEXT_CWP:
- intRegFile.setCWP(val);
- break;
- case CONTEXT_GLOBALS:
- intRegFile.setGlobals(val);
- break;
- default:
- panic("Tried to set illegal context parameter in the SPARC
regfile.\n");
- }
-}
-
void SparcISA::copyMiscRegs(ThreadContext *src, ThreadContext *dest)
{
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/sparc/regfile.hh
--- a/src/arch/sparc/regfile.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/sparc/regfile.hh Sun Oct 12 17:57:46 2008 -0700
@@ -117,8 +117,6 @@
const std::string §ion);
public:
-
- void changeContext(RegContextParam param, RegContextVal val);
};
int flattenIntIndex(ThreadContext * tc, int reg);
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/sparc/types.hh
--- a/src/arch/sparc/types.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/sparc/types.hh Sun Oct 12 17:57:46 2008 -0700
@@ -51,14 +51,6 @@
MiscReg ctrlreg;
} AnyReg;
- enum RegContextParam
- {
- CONTEXT_CWP,
- CONTEXT_GLOBALS
- };
-
- typedef int RegContextVal;
-
typedef uint16_t RegIndex;
struct CoreSpecific {
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/x86/regfile.cc
--- a/src/arch/x86/regfile.cc Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/x86/regfile.cc Sun Oct 12 17:57:46 2008 -0700
@@ -248,11 +248,6 @@
UNSERIALIZE_SCALAR(nextRip);
}
-void RegFile::changeContext(RegContextParam param, RegContextVal val)
-{
- panic("changeContext not implemented for x86!\n");
-}
-
void X86ISA::copyMiscRegs(ThreadContext *src, ThreadContext *dest)
{
panic("copyMiscRegs not implemented for x86!\n");
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/x86/regfile.hh
--- a/src/arch/x86/regfile.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/x86/regfile.hh Sun Oct 12 17:57:46 2008 -0700
@@ -145,8 +145,6 @@
const std::string §ion);
public:
-
- void changeContext(RegContextParam param, RegContextVal val);
};
int flattenIntIndex(ThreadContext * tc, int reg);
diff -r 78b94954f66a -r 5b5a9f4203d1 src/arch/x86/types.hh
--- a/src/arch/x86/types.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/arch/x86/types.hh Sun Oct 12 17:57:46 2008 -0700
@@ -246,17 +246,6 @@
MiscReg ctrlReg;
} AnyReg;
- //XXX This is very hypothetical. X87 instructions would need to
- //change their "context" constantly. It's also not clear how
- //this would be handled as far as out of order execution.
- //Maybe x87 instructions are in order?
- enum RegContextParam
- {
- CONTEXT_X87_TOP
- };
-
- typedef int RegContextVal;
-
typedef uint16_t RegIndex;
struct CoreSpecific {
diff -r 78b94954f66a -r 5b5a9f4203d1 src/cpu/checker/thread_context.hh
--- a/src/cpu/checker/thread_context.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/cpu/checker/thread_context.hh Sun Oct 12 17:57:46 2008 -0700
@@ -294,12 +294,6 @@
Counter readFuncExeInst() { return actualTC->readFuncExeInst(); }
#endif
- void changeRegFileContext(TheISA::RegContextParam param,
- TheISA::RegContextVal val)
- {
- actualTC->changeRegFileContext(param, val);
- checkerTC->changeRegFileContext(param, val);
- }
};
#endif // __CPU_CHECKER_EXEC_CONTEXT_HH__
diff -r 78b94954f66a -r 5b5a9f4203d1 src/cpu/o3/thread_context.hh
--- a/src/cpu/o3/thread_context.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/cpu/o3/thread_context.hh Sun Oct 12 17:57:46 2008 -0700
@@ -281,15 +281,6 @@
this->cpu->setNextNPC(val, this->thread->readTid());
}
- virtual void changeRegFileContext(TheISA::RegContextParam param,
- TheISA::RegContextVal val)
- {
-#if THE_ISA != SPARC_ISA
- panic("changeRegFileContext not implemented.");
-#endif
- }
-
-
/** This function exits the thread context in the CPU and returns
* 1 if the CPU has no more active threads (meaning it's OK to exit);
* Used in syscall-emulation mode when a thread executes the 'exit'
diff -r 78b94954f66a -r 5b5a9f4203d1 src/cpu/ozone/cpu.hh
--- a/src/cpu/ozone/cpu.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/cpu/ozone/cpu.hh Sun Oct 12 17:57:46 2008 -0700
@@ -271,9 +271,6 @@
void setFuncExeInst(Counter new_val)
{ thread->funcExeInst = new_val; }
#endif
- void changeRegFileContext(TheISA::RegContextParam param,
- TheISA::RegContextVal val)
- { panic("Not supported on Alpha!"); }
};
// Ozone specific thread context
diff -r 78b94954f66a -r 5b5a9f4203d1 src/cpu/simple_thread.hh
--- a/src/cpu/simple_thread.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/cpu/simple_thread.hh Sun Oct 12 17:57:46 2008 -0700
@@ -405,12 +405,6 @@
process->syscall(callnum, tc);
}
#endif
-
- void changeRegFileContext(TheISA::RegContextParam param,
- TheISA::RegContextVal val)
- {
- regs.changeContext(param, val);
- }
};
diff -r 78b94954f66a -r 5b5a9f4203d1 src/cpu/thread_context.hh
--- a/src/cpu/thread_context.hh Sun Oct 12 17:52:51 2008 -0700
+++ b/src/cpu/thread_context.hh Sun Oct 12 17:57:46 2008 -0700
@@ -272,9 +272,6 @@
virtual int exit() { return 1; };
#endif
- virtual void changeRegFileContext(TheISA::RegContextParam param,
- TheISA::RegContextVal val) = 0;
-
/** function to compare two thread contexts (for debugging) */
static void compare(ThreadContext *one, ThreadContext *two);
};
@@ -467,12 +464,6 @@
Counter readFuncExeInst() { return actualTC->readFuncExeInst(); }
#endif
-
- void changeRegFileContext(TheISA::RegContextParam param,
- TheISA::RegContextVal val)
- {
- actualTC->changeRegFileContext(param, val);
- }
};
#endif
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
