diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-02-23 15:06:06 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-02-23 15:06:06 -0500 |
| commit | e1c3acd91c65ae7d51a7d0b3c0f7be764b2c8f79 (patch) | |
| tree | 490fb46c6254fea699d419d58035a1e0b67eebdd /dev/alpha_access.h | |
| parent | 99484cfae81f3f01ccdfcd273ddc2bdb41e6456b (diff) | |
| parent | 1166d4f0bfe67a9dc178be3454b4f0eac38663ad (diff) | |
| download | gem5-e1c3acd91c65ae7d51a7d0b3c0f7be764b2c8f79.tar.xz | |
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5.head
cpu/simple/cpu.cc:
remove initCPU from constructor
dev/alpha_console.cc:
we are panicing, so no need to return a fault
--HG--
extra : convert_revision : 72389ea0c96e91a55f35b884200325224bfb6ed9
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__ |