diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-06-28 14:03:04 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-06-28 14:03:04 -0400 |
| commit | bc76a807af2a2a874be461f0c6be9a6c5ec8bfad (patch) | |
| tree | 423bd4e153fcc425dc9b7266978bd42778e55c32 /dev/alpha_access.h | |
| parent | 8b042182626b94ed6380f0ba6b99c0e862aa710f (diff) | |
| parent | 036a8ceb8da8aff10b819b4aab32584d41282a64 (diff) | |
| download | gem5-bc76a807af2a2a874be461f0c6be9a6c5ec8bfad.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision : 453615c8194ae9ca96330b7493c6b19fc89c3a72
Diffstat (limited to 'dev/alpha_access.h')
| -rw-r--r-- | dev/alpha_access.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/dev/alpha_access.h b/dev/alpha_access.h index c0a571ced..a20a05535 100644 --- a/dev/alpha_access.h +++ b/dev/alpha_access.h @@ -33,12 +33,11 @@ * System Console Memory Mapped Register Definition */ -#define ALPHA_ACCESS_VERSION (1301) +#define ALPHA_ACCESS_VERSION (1303) -#ifndef CONSOLE -#include <iosfwd> -#include <string> -class Checkpoint; +#ifdef CONSOLE +typedef unsigned uint32_t; +typedef unsigned long uint64_t; #endif // This structure hacked up from simos @@ -71,11 +70,6 @@ struct AlphaAccess uint64_t bootStrapImpure; // 70: uint32_t bootStrapCPU; // 78: uint32_t align2; // 7C: Dummy placeholder for alignment - -#ifndef CONSOLE - void serialize(std::ostream &os); - void unserialize(Checkpoint *cp, const std::string §ion); -#endif }; #endif // __ALPHA_ACCESS_H__ |