summaryrefslogtreecommitdiff
path: root/dev/alpha_console.hh
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-02-23 15:06:06 -0500
committerAli Saidi <saidi@eecs.umich.edu>2006-02-23 15:06:06 -0500
commite1c3acd91c65ae7d51a7d0b3c0f7be764b2c8f79 (patch)
tree490fb46c6254fea699d419d58035a1e0b67eebdd /dev/alpha_console.hh
parent99484cfae81f3f01ccdfcd273ddc2bdb41e6456b (diff)
parent1166d4f0bfe67a9dc178be3454b4f0eac38663ad (diff)
downloadgem5-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_console.hh')
-rw-r--r--dev/alpha_console.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh
index 74ad795f0..2d1c1e634 100644
--- a/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@ -96,7 +96,7 @@ class AlphaConsole : public PioDevice
BaseCPU *cpu;
Addr addr;
- static const Addr size = 0x80; // equal to sizeof(alpha_access);
+ static const Addr size = sizeof(struct AlphaAccess);
public:
/** Standard Constructor */