diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-03-15 02:52:51 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-03-15 02:52:51 +0000 |
| commit | 32368a2bd62409b303b0fcbe796fc94e4902657d (patch) | |
| tree | af146159b4488dc9bf1c581162452a8de06a3d16 /src/arch/mips/utility.hh | |
| parent | ff90b8c1aa99711eeb55c5eba29519f77cbc041c (diff) | |
| parent | a2b56088fb4d12aee73ecfeaba88cfa46f98567e (diff) | |
| download | gem5-32368a2bd62409b303b0fcbe796fc94e4902657d.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
src/arch/mips/utility.hh:
src/arch/x86/SConscript:
Hand merge
--HG--
extra : convert_revision : 0ba457aab52bf6ffc9191fd1fe1006ca7704b5b0
Diffstat (limited to 'src/arch/mips/utility.hh')
| -rw-r--r-- | src/arch/mips/utility.hh | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh index b5c1e31e1..12db1de57 100644 --- a/src/arch/mips/utility.hh +++ b/src/arch/mips/utility.hh @@ -88,19 +88,6 @@ namespace MipsISA { return 0; } - static inline ExtMachInst - makeExtMI(MachInst inst, ThreadContext * xc) { -#if FULL_SYSTEM - ExtMachInst ext_inst = inst; - if (xc->readPC() && 0x1) - return ext_inst|=(static_cast<ExtMachInst>(xc->readPC() & 0x1) << 32); - else - return ext_inst; -#else - return ExtMachInst(inst); -#endif - } - inline void startupCPU(ThreadContext *tc, int cpuId) { tc->activate(0); |