diff options
author | Steve Reinhardt <stever@gmail.com> | 2013-07-11 21:57:04 -0500 |
---|---|---|
committer | Steve Reinhardt <stever@gmail.com> | 2013-07-11 21:57:04 -0500 |
commit | 1f43e244bda0c78844720609455fd77f6f275e51 (patch) | |
tree | 65eb7262e58a61992368dfe10f2152dd85eb6129 /src/dev/mips | |
parent | 502ad1e6757116867e0e0529c0c080320a2b440b (diff) | |
download | gem5-1f43e244bda0c78844720609455fd77f6f275e51.tar.xz |
dev: make BasicPioDevice take size in constructor
Instead of relying on derived classes explicitly assigning
to the BasicPioDevice pioSize field, require them to pass
a size value in to the constructor.
Committed by: Nilay Vaish <nilay@cs.wisc.edu>
Diffstat (limited to 'src/dev/mips')
-rwxr-xr-x | src/dev/mips/malta_cchip.cc | 3 | ||||
-rwxr-xr-x | src/dev/mips/malta_io.cc | 4 | ||||
-rwxr-xr-x | src/dev/mips/malta_pchip.cc | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/dev/mips/malta_cchip.cc b/src/dev/mips/malta_cchip.cc index 25062e422..fe3336435 100755 --- a/src/dev/mips/malta_cchip.cc +++ b/src/dev/mips/malta_cchip.cc @@ -55,11 +55,10 @@ using namespace std; using namespace TheISA; MaltaCChip::MaltaCChip(Params *p) - : BasicPioDevice(p), malta(p->malta) + : BasicPioDevice(p, 0xfffffff), malta(p->malta) { warn("MaltaCCHIP::MaltaCChip() not implemented."); - pioSize = 0xfffffff; //Put back pointer in malta malta->cchip = this; diff --git a/src/dev/mips/malta_io.cc b/src/dev/mips/malta_io.cc index 1ae5442bf..d769b1112 100755 --- a/src/dev/mips/malta_io.cc +++ b/src/dev/mips/malta_io.cc @@ -65,11 +65,9 @@ MaltaIO::RTC::RTC(const string &name, const MaltaIOParams *p) } MaltaIO::MaltaIO(const Params *p) - : BasicPioDevice(p), malta(p->malta), + : BasicPioDevice(p, 0x100), malta(p->malta), pitimer(this, p->name + "pitimer"), rtc(p->name + ".rtc", p) { - pioSize = 0x100; - // set the back pointer from malta to myself malta->io = this; diff --git a/src/dev/mips/malta_pchip.cc b/src/dev/mips/malta_pchip.cc index 076fdfe84..37aaa1b5a 100755 --- a/src/dev/mips/malta_pchip.cc +++ b/src/dev/mips/malta_pchip.cc @@ -51,10 +51,8 @@ using namespace std; using namespace TheISA; MaltaPChip::MaltaPChip(const Params *p) -: BasicPioDevice(p) + : BasicPioDevice(p, 0x1000) { - pioSize = 0x1000; - for (int i = 0; i < 4; i++) { wsba[i] = 0; wsm[i] = 0; |