diff options
Diffstat (limited to 'dev')
-rw-r--r-- | dev/alpha_console.cc | 1 | ||||
-rw-r--r-- | dev/baddev.cc | 1 | ||||
-rw-r--r-- | dev/ide_ctrl.cc | 1 | ||||
-rw-r--r-- | dev/ide_disk.cc | 1 | ||||
-rw-r--r-- | dev/ide_disk.hh | 2 | ||||
-rw-r--r-- | dev/isa_fake.cc | 1 | ||||
-rw-r--r-- | dev/ns_gige.cc | 1 | ||||
-rw-r--r-- | dev/pciconfigall.cc | 1 | ||||
-rw-r--r-- | dev/pcidev.hh | 2 | ||||
-rw-r--r-- | dev/platform.cc | 1 | ||||
-rw-r--r-- | dev/platform.hh | 2 | ||||
-rw-r--r-- | dev/simple_disk.hh | 22 | ||||
-rw-r--r-- | dev/sinic.cc | 1 | ||||
-rw-r--r-- | dev/sinicreg.hh | 4 | ||||
-rw-r--r-- | dev/tsunami.cc | 2 | ||||
-rw-r--r-- | dev/tsunami.hh | 2 | ||||
-rw-r--r-- | dev/tsunami_cchip.cc | 2 | ||||
-rw-r--r-- | dev/tsunami_io.cc | 2 | ||||
-rw-r--r-- | dev/tsunami_pchip.cc | 2 | ||||
-rw-r--r-- | dev/uart8250.cc | 1 |
20 files changed, 40 insertions, 12 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc index 38fbbdef0..a7ef8f641 100644 --- a/dev/alpha_console.cc +++ b/dev/alpha_console.cc @@ -53,6 +53,7 @@ #include "sim/system.hh" using namespace std; +using namespace AlphaISA; AlphaConsole::AlphaConsole(const string &name, SimConsole *cons, SimpleDisk *d, System *s, BaseCPU *c, Platform *p, diff --git a/dev/baddev.cc b/dev/baddev.cc index b6ca919e4..62871e348 100644 --- a/dev/baddev.cc +++ b/dev/baddev.cc @@ -46,6 +46,7 @@ #include "sim/system.hh" using namespace std; +using namespace TheISA; BadDevice::BadDevice(const string &name, Addr a, MemoryController *mmu, HierParams *hier, Bus *pio_bus, const string &devicename) diff --git a/dev/ide_ctrl.cc b/dev/ide_ctrl.cc index a5cb0dfd8..18c988b81 100644 --- a/dev/ide_ctrl.cc +++ b/dev/ide_ctrl.cc @@ -48,6 +48,7 @@ #include "sim/sim_object.hh" using namespace std; +using namespace TheISA; //// // Initialization and destruction diff --git a/dev/ide_disk.cc b/dev/ide_disk.cc index 9d8bb8825..41400c590 100644 --- a/dev/ide_disk.cc +++ b/dev/ide_disk.cc @@ -53,6 +53,7 @@ #include "arch/isa_traits.hh" using namespace std; +using namespace TheISA; IdeDisk::IdeDisk(const string &name, DiskImage *img, PhysicalMemory *phys, int id, Tick delay) diff --git a/dev/ide_disk.hh b/dev/ide_disk.hh index a656ca464..32888c81c 100644 --- a/dev/ide_disk.hh +++ b/dev/ide_disk.hh @@ -188,6 +188,8 @@ class IdeController; class IdeDisk : public SimObject { protected: + typedef TheISA::Addr Addr; + protected: /** The IDE controller for this disk. */ IdeController *ctrl; /** The DMA interface to use for transfers */ diff --git a/dev/isa_fake.cc b/dev/isa_fake.cc index 93c9eedbf..117c9e5ad 100644 --- a/dev/isa_fake.cc +++ b/dev/isa_fake.cc @@ -45,6 +45,7 @@ #include "sim/system.hh" using namespace std; +using namespace TheISA; IsaFake::IsaFake(const string &name, Addr a, MemoryController *mmu, HierParams *hier, Bus *pio_bus, Addr size) diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc index c28615438..07bf178fc 100644 --- a/dev/ns_gige.cc +++ b/dev/ns_gige.cc @@ -84,6 +84,7 @@ const char *NsDmaState[] = using namespace std; using namespace Net; +using namespace TheISA; /////////////////////////////////////////////////////////////////////// // diff --git a/dev/pciconfigall.cc b/dev/pciconfigall.cc index 1175172c4..c581e1561 100644 --- a/dev/pciconfigall.cc +++ b/dev/pciconfigall.cc @@ -47,6 +47,7 @@ #include "sim/system.hh" using namespace std; +using namespace TheISA; PciConfigAll::PciConfigAll(const string &name, Addr a, MemoryController *mmu, diff --git a/dev/pcidev.hh b/dev/pcidev.hh index c8d9685c1..a100bf746 100644 --- a/dev/pcidev.hh +++ b/dev/pcidev.hh @@ -53,6 +53,8 @@ class MemoryController; */ class PciConfigData : public SimObject { + protected: + typedef TheISA::Addr Addr; public: /** * Constructor to initialize the devices config space to 0. diff --git a/dev/platform.cc b/dev/platform.cc index 58f94db7b..5b667b12c 100644 --- a/dev/platform.cc +++ b/dev/platform.cc @@ -31,6 +31,7 @@ #include "sim/sim_exit.hh" using namespace std; +using namespace TheISA; Platform::Platform(const string &name, IntrControl *intctrl, PciConfigAll *pci) : SimObject(name), intrctrl(intctrl), pciconfig(pci) diff --git a/dev/platform.hh b/dev/platform.hh index 1ee645454..87810250a 100644 --- a/dev/platform.hh +++ b/dev/platform.hh @@ -44,6 +44,8 @@ class Uart; class Platform : public SimObject { + protected: + typedef TheISA::Addr Addr; public: /** Pointer to the interrupt controller */ IntrControl *intrctrl; diff --git a/dev/simple_disk.hh b/dev/simple_disk.hh index 6560e15c2..f68d5bfff 100644 --- a/dev/simple_disk.hh +++ b/dev/simple_disk.hh @@ -44,19 +44,21 @@ class PhysicalMemory; */ class SimpleDisk : public SimObject { -public: - typedef uint64_t baddr_t; + protected: + typedef TheISA::Addr Addr; + public: + typedef uint64_t baddr_t; -protected: - PhysicalMemory *physmem; - DiskImage *image; + protected: + PhysicalMemory *physmem; + DiskImage *image; -public: - SimpleDisk(const std::string &name, PhysicalMemory *pmem, DiskImage *img); - ~SimpleDisk(); + public: + SimpleDisk(const std::string &name, PhysicalMemory *pmem, DiskImage *img); + ~SimpleDisk(); - void read(Addr addr, baddr_t block, int count) const; - void write(Addr addr, baddr_t block, int count); + void read(Addr addr, baddr_t block, int count) const; + void write(Addr addr, baddr_t block, int count); }; #endif // __DEV_SIMPLE_DISK_HH__ diff --git a/dev/sinic.cc b/dev/sinic.cc index e79f80678..829d58d32 100644 --- a/dev/sinic.cc +++ b/dev/sinic.cc @@ -50,6 +50,7 @@ #include "targetarch/vtophys.hh" using namespace Net; +using namespace TheISA; namespace Sinic { diff --git a/dev/sinicreg.hh b/dev/sinicreg.hh index b7008b4e1..343db6303 100644 --- a/dev/sinicreg.hh +++ b/dev/sinicreg.hh @@ -165,7 +165,7 @@ struct Info /* namespace Regs */ } inline const Regs::Info& -regInfo(Addr daddr) +regInfo(TheISA::Addr daddr) { static Regs::Info invalid = { 0, false, false, false, false, "invalid" }; static Regs::Info info [] = { @@ -201,7 +201,7 @@ regInfo(Addr daddr) } inline bool -regValid(Addr daddr) +regValid(TheISA::Addr daddr) { if (daddr > Regs::Size) return false; diff --git a/dev/tsunami.cc b/dev/tsunami.cc index 760848a00..58fc7434e 100644 --- a/dev/tsunami.cc +++ b/dev/tsunami.cc @@ -46,6 +46,8 @@ #include "sim/system.hh" using namespace std; +//Should this be AlphaISA? +using namespace TheISA; Tsunami::Tsunami(const string &name, System *s, IntrControl *ic, PciConfigAll *pci) diff --git a/dev/tsunami.hh b/dev/tsunami.hh index 7fd91d5b2..79b561ed7 100644 --- a/dev/tsunami.hh +++ b/dev/tsunami.hh @@ -55,6 +55,8 @@ class System; class Tsunami : public Platform { + protected: + typedef TheISA::Addr Addr; public: /** Max number of CPUs in a Tsunami */ static const int Max_CPUs = 64; diff --git a/dev/tsunami_cchip.cc b/dev/tsunami_cchip.cc index 4cda9ec36..10c08a7a2 100644 --- a/dev/tsunami_cchip.cc +++ b/dev/tsunami_cchip.cc @@ -47,6 +47,8 @@ #include "sim/system.hh" using namespace std; +//Should this be AlphaISA? +using namespace TheISA; TsunamiCChip::TsunamiCChip(const string &name, Tsunami *t, Addr a, MemoryController *mmu, HierParams *hier, diff --git a/dev/tsunami_io.cc b/dev/tsunami_io.cc index 0d0d27570..e90bb5abc 100644 --- a/dev/tsunami_io.cc +++ b/dev/tsunami_io.cc @@ -50,6 +50,8 @@ #include "mem/functional/memory_control.hh" using namespace std; +//Should this be AlphaISA? +using namespace TheISA; TsunamiIO::RTC::RTC(const string &name, Tsunami* t, Tick i) : _name(name), event(t, i), addr(0) diff --git a/dev/tsunami_pchip.cc b/dev/tsunami_pchip.cc index a4c04a79f..706daf9dc 100644 --- a/dev/tsunami_pchip.cc +++ b/dev/tsunami_pchip.cc @@ -47,6 +47,8 @@ #include "sim/system.hh" using namespace std; +//Should this be AlphaISA? +using namespace TheISA; TsunamiPChip::TsunamiPChip(const string &name, Tsunami *t, Addr a, MemoryController *mmu, HierParams *hier, diff --git a/dev/uart8250.cc b/dev/uart8250.cc index a2e782189..99355e28a 100644 --- a/dev/uart8250.cc +++ b/dev/uart8250.cc @@ -46,6 +46,7 @@ #include "sim/builder.hh" using namespace std; +using namespace TheISA; Uart8250::IntrEvent::IntrEvent(Uart8250 *u, int bit) : Event(&mainEventQueue), uart(u) |