diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2005-06-27 17:04:43 -0400 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2005-06-27 17:04:43 -0400 |
| commit | 10a906be528df1e7495a68f415833a27e8279840 (patch) | |
| tree | da3ad6069de6be7c9782480252d848a90613d1d6 | |
| parent | c4029ecb306e95a188edf0b8d20a87f1e03e32fe (diff) | |
| download | gem5-10a906be528df1e7495a68f415833a27e8279840.tar.xz | |
Update for console code reorganization
dev/alpha_access.h:
Update the ALPHA_ACCESS_VERSION
move typedefs to this file since they're only used here.
dev/alpha_console.cc:
formatting
sim/system.cc:
xxm -> m5
--HG--
extra : convert_revision : 3aeca50d1385034f5a1e20dd8b0abd03bd6f26f0
| -rw-r--r-- | dev/alpha_access.h | 5 | ||||
| -rw-r--r-- | dev/alpha_console.cc | 6 | ||||
| -rw-r--r-- | sim/system.cc | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/dev/alpha_access.h b/dev/alpha_access.h index c0a571ced..07350d622 100644 --- a/dev/alpha_access.h +++ b/dev/alpha_access.h @@ -33,12 +33,15 @@ * System Console Memory Mapped Register Definition */ -#define ALPHA_ACCESS_VERSION (1301) +#define ALPHA_ACCESS_VERSION (1302) #ifndef CONSOLE #include <iosfwd> #include <string> class Checkpoint; +#else +typedef unsigned uint32_t; +typedef unsigned long uint64_t; #endif // This structure hacked up from simos diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc index 3ae1aede5..2cbe60f47 100644 --- a/dev/alpha_console.cc +++ b/dev/alpha_console.cc @@ -108,7 +108,8 @@ AlphaConsole::read(MemReqPtr &req, uint8_t *data) switch (req->size) { case sizeof(uint32_t): - DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, *(uint32_t*)data); + DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, + *(uint32_t*)data); switch (daddr) { case offsetof(AlphaAccess, last_offset): @@ -133,7 +134,8 @@ AlphaConsole::read(MemReqPtr &req, uint8_t *data) } break; case sizeof(uint64_t): - DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, *(uint64_t*)data); + DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, + *(uint64_t*)data); switch (daddr) { case offsetof(AlphaAccess, inputChar): diff --git a/sim/system.cc b/sim/system.cc index a51cc03bf..3ac0fdce1 100644 --- a/sim/system.cc +++ b/sim/system.cc @@ -147,7 +147,7 @@ System::System(Params *p) * Set the hardware reset parameter block system type and revision * information to Tsunami. */ - if (consoleSymtab->findAddress("xxm_rpb", addr)) { + if (consoleSymtab->findAddress("m5_rpb", addr)) { Addr paddr = vtophys(physmem, addr); char *hwrpb = (char *)physmem->dma_addr(paddr, sizeof(uint64_t)); |