diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-06 18:04:57 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-06 18:04:57 -0400 |
| commit | 62ebe251dac998202403bea45ba69345dc5bf42d (patch) | |
| tree | 779632e0062c10fc0b6c825cf827a69fca5ed6b0 /dev/alpha_console.cc | |
| parent | 832311a17094501a6883100ac9dba8c781211782 (diff) | |
| parent | 61b2bd9d28fa288628d8ef3eb3fd4ab3cef9902f (diff) | |
| download | gem5-62ebe251dac998202403bea45ba69345dc5bf42d.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : a0bfc7495ba0f2916214d6712f67c5c239a210a0
Diffstat (limited to 'dev/alpha_console.cc')
| -rw-r--r-- | dev/alpha_console.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc index 8c097fdd0..88219fcbc 100644 --- a/dev/alpha_console.cc +++ b/dev/alpha_console.cc @@ -120,8 +120,7 @@ AlphaConsole::read(Packet &pkt) if (!pkt.data) { data32 = new uint32_t; pkt.data = (uint8_t*)data32; - } - else + } else data32 = (uint32_t*)pkt.data; switch (daddr) @@ -150,8 +149,7 @@ AlphaConsole::read(Packet &pkt) if (!pkt.data) { data64 = new uint64_t; pkt.data = (uint8_t*)data64; - } - else + } else data64 = (uint64_t*)pkt.data; switch (daddr) { |