diff options
| author | Miguel Serrano <mserrano@umich.edu> | 2005-07-01 15:12:09 -0400 |
|---|---|---|
| committer | Miguel Serrano <mserrano@umich.edu> | 2005-07-01 15:12:09 -0400 |
| commit | 4f2480a18bdf98792e2ebf3471ce7cd3109ef824 (patch) | |
| tree | b2d8d27e41eae3d659dbe6e6665436d02bcea429 /dev/alpha_access.h | |
| parent | 16a2357e8637fed706a94ab0da6226df8a2e7f07 (diff) | |
| parent | efd0c5d4b04f630f1b591af509458224b6d98655 (diff) | |
| download | gem5-4f2480a18bdf98792e2ebf3471ce7cd3109ef824.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5
--HG--
extra : convert_revision : bb3e977e79599c459fb32f309ce5b486f1639afa
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__ |