diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-24 18:45:28 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-24 18:45:28 -0500 |
commit | e66f521d5be35683fc9460b2c4d6b7fb35fad940 (patch) | |
tree | e290f340b7c1d5d999ee61ca3a4db008ecdc7517 /dev/alpha_access.h | |
parent | 802fd04f640b34d713f7ef75142e51d3d82559b9 (diff) | |
parent | 7a37037358ae5800d0f6a40130929669d836fe70 (diff) | |
download | gem5-e66f521d5be35683fc9460b2c4d6b7fb35fad940.tar.xz |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
SConscript:
arch/alpha/ev5.cc:
dev/alpha_console.cc:
Hand merged
--HG--
extra : convert_revision : 318a671e6803400d3ed086a90e70d6790e4f6b19
Diffstat (limited to 'dev/alpha_access.h')
-rw-r--r-- | dev/alpha_access.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dev/alpha_access.h b/dev/alpha_access.h index a20a05535..5a1df6f39 100644 --- a/dev/alpha_access.h +++ b/dev/alpha_access.h @@ -33,7 +33,7 @@ * System Console Memory Mapped Register Definition */ -#define ALPHA_ACCESS_VERSION (1303) +#define ALPHA_ACCESS_VERSION (1305) #ifdef CONSOLE typedef unsigned uint32_t; @@ -67,9 +67,7 @@ struct AlphaAccess uint64_t inputChar; // 68: Placeholder for input // MP boot - uint64_t bootStrapImpure; // 70: - uint32_t bootStrapCPU; // 78: - uint32_t align2; // 7C: Dummy placeholder for alignment + uint64_t cpuStack[64]; // 70: }; #endif // __ALPHA_ACCESS_H__ |