diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-29 17:40:09 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-29 17:40:09 -0500 |
| commit | 2177d822ce1eecffb685f13468412c99b1e59ecd (patch) | |
| tree | 4ae56528a80dcffacda85b6e4a1c5602c6f19652 /arch | |
| parent | 1e4e989b8396b9f4f322fb27bbfa1cf9e2007334 (diff) | |
| parent | 3dcb589ea46290ecfe2c2e54ebf2ba8921a932ed (diff) | |
| download | gem5-2177d822ce1eecffb685f13468412c99b1e59ecd.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 7866241cf43416636cbd6a3a4f6eeda561ed2e27
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/isa_traits.hh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh index 5f8b00c40..842eea05a 100644 --- a/arch/alpha/isa_traits.hh +++ b/arch/alpha/isa_traits.hh @@ -75,6 +75,11 @@ class SyscallReturn { #endif +#if FULL_SYSTEM +#include "arch/alpha/isa_fullsys_traits.hh" +#endif + + namespace AlphaISA { @@ -83,12 +88,6 @@ using namespace LittleEndianGuest; // redirected register map, really only used for the full system case. extern const int reg_redir[NumIntRegs]; -#if FULL_SYSTEM - -#include "arch/alpha/isa_fullsys_traits.hh" - -#endif - StaticInstPtr decodeInst(ExtMachInst); #if !FULL_SYSTEM |