From 1f43e244bda0c78844720609455fd77f6f275e51 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Thu, 11 Jul 2013 21:57:04 -0500 Subject: 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 --- src/dev/sparc/dtod.cc | 4 +--- src/dev/sparc/mm_disk.cc | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/dev/sparc') diff --git a/src/dev/sparc/dtod.cc b/src/dev/sparc/dtod.cc index c7243cfb8..abbab2dee 100644 --- a/src/dev/sparc/dtod.cc +++ b/src/dev/sparc/dtod.cc @@ -50,13 +50,11 @@ using namespace std; using namespace TheISA; DumbTOD::DumbTOD(const Params *p) - : BasicPioDevice(p) + : BasicPioDevice(p, 0x08) { struct tm tm = p->time; char *tz; - pioSize = 0x08; - tz = getenv("TZ"); setenv("TZ", "", 1); tzset(); diff --git a/src/dev/sparc/mm_disk.cc b/src/dev/sparc/mm_disk.cc index 0095d9f1d..0a6d14445 100644 --- a/src/dev/sparc/mm_disk.cc +++ b/src/dev/sparc/mm_disk.cc @@ -45,10 +45,10 @@ #include "sim/system.hh" MmDisk::MmDisk(const Params *p) - : BasicPioDevice(p), image(p->image), curSector((off_t)-1), dirty(false) + : BasicPioDevice(p, p->image->size() * SectorSize), + image(p->image), curSector((off_t)-1), dirty(false) { std::memset(&diskData, 0, SectorSize); - pioSize = image->size() * SectorSize; } Tick -- cgit v1.2.3