arch-arm: Add initial support for SVE contiguous loads/stores

[gem5.git] / src / arch / sparc / system.cc

diff --git a/src/arch/sparc/system.cc b/src/arch/sparc/system.cc
index 1ee207844245995538bafbbacb0608b46438fa62..a68b11cad1433a375dffb5c00a74cf73bb6d56be 100644 (file)
--- a/src/arch/sparc/system.cc
+++ b/src/arch/sparc/system.cc
@@ -29,8 +29,8 @@
  */
 
 #include "arch/sparc/system.hh"
+
 #include "arch/vtophys.hh"
-#include "base/remote_gdb.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
@@ -38,14 +38,10 @@
 #include "params/SparcSystem.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace BigEndianGuest;
 
 SparcSystem::SparcSystem(Params *p)
-    : System(p), sysTick(0),funcRomPort(p->name + "-fromport"),
-    funcNvramPort(p->name + "-fnvramport"),
-    funcHypDescPort(p->name + "-fhypdescport"),
-    funcPartDescPort(p->name + "-fpartdescport")
+    : System(p), sysTick(0)
 {
     resetSymtab = new SymbolTable;
     hypervisorSymtab = new SymbolTable;
@@ -54,23 +50,6 @@ SparcSystem::SparcSystem(Params *p)
     hypervisorDescSymtab = new SymbolTable;
     partitionDescSymtab = new SymbolTable;
 
-    Port *rom_port;
-    rom_port = params()->rom->getPort("functional");
-    funcRomPort.setPeer(rom_port);
-    rom_port->setPeer(&funcRomPort);
-
-    rom_port = params()->nvram->getPort("functional");
-    funcNvramPort.setPeer(rom_port);
-    rom_port->setPeer(&funcNvramPort);
-
-    rom_port = params()->hypervisor_desc->getPort("functional");
-    funcHypDescPort.setPeer(rom_port);
-    rom_port->setPeer(&funcHypDescPort);
-
-    rom_port = params()->partition_desc->getPort("functional");
-    funcPartDescPort.setPeer(rom_port);
-    rom_port->setPeer(&funcPartDescPort);
-
     /**
      * Load the boot code, and hypervisor into memory.
      */
@@ -106,26 +85,6 @@ SparcSystem::SparcSystem(Params *p)
         fatal("Could not load partition description image %s",
                 params()->partition_desc_bin);
 
-
-    // Load reset binary into memory
-    reset->setTextBase(params()->reset_addr);
-    reset->loadSections(&funcRomPort);
-    // Load the openboot binary
-    openboot->setTextBase(params()->openboot_addr);
-    openboot->loadSections(&funcRomPort);
-    // Load the hypervisor binary
-    hypervisor->setTextBase(params()->hypervisor_addr);
-    hypervisor->loadSections(&funcRomPort);
-    // Load the nvram image
-    nvram->setTextBase(params()->nvram_addr);
-    nvram->loadSections(&funcNvramPort);
-    // Load the hypervisor description image
-    hypervisor_desc->setTextBase(params()->hypervisor_desc_addr);
-    hypervisor_desc->loadSections(&funcHypDescPort);
-    // Load the partition description image
-    partition_desc->setTextBase(params()->partition_desc_addr);
-    partition_desc->loadSections(&funcPartDescPort);
-
     // load symbols
     if (!reset->loadGlobalSymbols(resetSymtab))
         panic("could not load reset symbols\n");
@@ -157,7 +116,7 @@ SparcSystem::SparcSystem(Params *p)
 
     // Strip off the rom address so when the hypervisor is copied into memory we
     // have symbols still
-    if (!hypervisor->loadLocalSymbols(debugSymbolTable, 0xFFFFFF))
+    if (!hypervisor->loadLocalSymbols(debugSymbolTable, 0, 0, 0xFFFFFF))
         panic("could not load hypervisor symbols\n");
 
     if (!nvram->loadGlobalSymbols(debugSymbolTable))
@@ -169,6 +128,33 @@ SparcSystem::SparcSystem(Params *p)
     if (!partition_desc->loadLocalSymbols(debugSymbolTable))
         panic("could not load partition description symbols\n");
 
+}
+
+void
+SparcSystem::initState()
+{
+    // Call the initialisation of the super class
+    System::initState();
+
+    // Load reset binary into memory
+    reset->setTextBase(params()->reset_addr);
+    reset->loadSections(physProxy);
+    // Load the openboot binary
+    openboot->setTextBase(params()->openboot_addr);
+    openboot->loadSections(physProxy);
+    // Load the hypervisor binary
+    hypervisor->setTextBase(params()->hypervisor_addr);
+    hypervisor->loadSections(physProxy);
+    // Load the nvram image
+    nvram->setTextBase(params()->nvram_addr);
+    nvram->loadSections(physProxy);
+    // Load the hypervisor description image
+    hypervisor_desc->setTextBase(params()->hypervisor_desc_addr);
+    hypervisor_desc->loadSections(physProxy);
+    // Load the partition description image
+    partition_desc->setTextBase(params()->partition_desc_addr);
+    partition_desc->loadSections(physProxy);
+
 
     // @todo any fixup code over writing data in binaries on setting break
     // events on functions should happen here.
@@ -192,28 +178,26 @@ SparcSystem::~SparcSystem()
 }
 
 void
-SparcSystem::serialize(std::ostream &os)
+SparcSystem::serializeSymtab(CheckpointOut &cp) const
 {
-    System::serialize(os);
-    resetSymtab->serialize("reset_symtab", os);
-    hypervisorSymtab->serialize("hypervisor_symtab", os);
-    openbootSymtab->serialize("openboot_symtab", os);
-    nvramSymtab->serialize("nvram_symtab", os);
-    hypervisorDescSymtab->serialize("hypervisor_desc_symtab", os);
-    partitionDescSymtab->serialize("partition_desc_symtab", os);
+    resetSymtab->serialize("reset_symtab", cp);
+    hypervisorSymtab->serialize("hypervisor_symtab", cp);
+    openbootSymtab->serialize("openboot_symtab", cp);
+    nvramSymtab->serialize("nvram_symtab", cp);
+    hypervisorDescSymtab->serialize("hypervisor_desc_symtab", cp);
+    partitionDescSymtab->serialize("partition_desc_symtab", cp);
 }
 
 
 void
-SparcSystem::unserialize(Checkpoint *cp, const std::string &section)
+SparcSystem::unserializeSymtab(CheckpointIn &cp)
 {
-    System::unserialize(cp,section);
-    resetSymtab->unserialize("reset_symtab", cp, section);
-    hypervisorSymtab->unserialize("hypervisor_symtab", cp, section);
-    openbootSymtab->unserialize("openboot_symtab", cp, section);
-    nvramSymtab->unserialize("nvram_symtab", cp, section);
-    hypervisorDescSymtab->unserialize("hypervisor_desc_symtab", cp, section);
-    partitionDescSymtab->unserialize("partition_desc_symtab", cp, section);
+    resetSymtab->unserialize("reset_symtab", cp);
+    hypervisorSymtab->unserialize("hypervisor_symtab", cp);
+    openbootSymtab->unserialize("openboot_symtab", cp);
+    nvramSymtab->unserialize("nvram_symtab", cp);
+    hypervisorDescSymtab->unserialize("hypervisor_desc_symtab", cp);
+    partitionDescSymtab->unserialize("partition_desc_symtab", cp);
 }
 
 SparcSystem *