sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update for console code reorganization

Browse source 
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
This commit is contained in:
Nathan Binkert 2005-06-27 17:04:43 -04:00
parent c4029ecb30
commit 10a906be52
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dev/alpha_access.h
View file

@ -33,12 +33,15 @@
* System Console Memory Mapped Register Definition * System Console Memory Mapped Register Definition
*/ */
#define ALPHA_ACCESS_VERSION (1301) #define ALPHA_ACCESS_VERSION (1302)
#ifndef CONSOLE #ifndef CONSOLE
#include <iosfwd> #include <iosfwd>
#include <string> #include <string>
class Checkpoint; class Checkpoint;
#else
typedef unsigned uint32_t;
typedef unsigned long uint64_t;
#endif #endif
// This structure hacked up from simos // This structure hacked up from simos

6
dev/alpha_console.cc
View file

@ -108,7 +108,8 @@ AlphaConsole::read(MemReqPtr &req, uint8_t *data)
switch (req->size) switch (req->size)
{ {
case sizeof(uint32_t): 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) switch (daddr)
{ {
case offsetof(AlphaAccess, last_offset): case offsetof(AlphaAccess, last_offset):
@ -133,7 +134,8 @@ AlphaConsole::read(MemReqPtr &req, uint8_t *data)
} }
break; break;
case sizeof(uint64_t): 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) switch (daddr)
{ {
case offsetof(AlphaAccess, inputChar): case offsetof(AlphaAccess, inputChar):

2
sim/system.cc
View file

@ -147,7 +147,7 @@ System::System(Params *p)
* Set the hardware reset parameter block system type and revision * Set the hardware reset parameter block system type and revision
* information to Tsunami. * information to Tsunami.
*/ */
if (consoleSymtab->findAddress("xxm_rpb", addr)) { if (consoleSymtab->findAddress("m5_rpb", addr)) {
Addr paddr = vtophys(physmem, addr); Addr paddr = vtophys(physmem, addr);
char *hwrpb = (char *)physmem->dma_addr(paddr, sizeof(uint64_t)); char *hwrpb = (char *)physmem->dma_addr(paddr, sizeof(uint64_t));