From 0ea794bcf453093f83c21a56333d78ba1b8dae33 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Mon, 8 Nov 2010 13:58:22 -0600 Subject: sim: Use forward declarations for ports. Virtual ports need TLB data which means anything touching a file in the arch directory rebuilds any file that includes system.hh which in everything. --- src/arch/mips/system.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/arch/mips/system.cc') diff --git a/src/arch/mips/system.cc b/src/arch/mips/system.cc index d11d473e3..6e2ad4d5a 100755 --- a/src/arch/mips/system.cc +++ b/src/arch/mips/system.cc @@ -50,7 +50,7 @@ MipsSystem::MipsSystem(Params *p) : System(p) #if FULL_SYSTEM if (p->bare_iron == true) { hexFile = new HexFile(params()->hex_file_name); - if (!hexFile->loadSections(&functionalPort)) + if (!hexFile->loadSections(functionalPort)) panic("Could not load hex file\n"); } @@ -70,7 +70,7 @@ MipsSystem::MipsSystem(Params *p) : System(p) if (console == NULL) fatal("Could not load console file %s", params()->console); //Load program sections into memory - console->loadSections(&functionalPort, loadAddrMask); + console->loadSections(functionalPort, loadAddrMask); //load symbols if (!console->loadGlobalSymbols(consoleSymtab)) @@ -92,7 +92,7 @@ MipsSystem::MipsSystem(Params *p) : System(p) */ if (consoleSymtab->findAddress("env_booted_osflags", addr)) { warn("writing addr starting from %#x", addr); - virtPort.writeBlob(addr, (uint8_t*)params()->boot_osflags.c_str(), + virtPort->writeBlob(addr, (uint8_t*)params()->boot_osflags.c_str(), strlen(params()->boot_osflags.c_str())); } @@ -103,9 +103,9 @@ MipsSystem::MipsSystem(Params *p) : System(p) if (consoleSymtab->findAddress("m5_rpb", addr)) { uint64_t data; data = htog(params()->system_type); - virtPort.write(addr + 0x50, data); + virtPort->write(addr + 0x50, data); data = htog(params()->system_rev); - virtPort.write(addr + 0x58, data); + virtPort->write(addr + 0x58, data); } else { panic("could not find hwrpb\n"); } -- cgit v1.2.3