diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-03-29 17:37:41 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-03-29 17:37:41 -0500 |
| commit | 35faf09bcce4eaac5d6899d7e371b2506d1b256f (patch) | |
| tree | ad93a7953130d4be1e911a469452b7f8e3f5ee6a /arch | |
| parent | d46d3d6811822d218c137cd6d991e6b4981811d6 (diff) | |
| parent | 62f5d7dd3ffbbb33e8371af589eaa69280bd017a (diff) | |
| download | gem5-35faf09bcce4eaac5d6899d7e371b2506d1b256f.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 5ab4ce9f6ec7af326d8906060ae3558cfd67ca08
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 |