summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-11-03 11:03:03 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-11-03 11:03:03 -0500
commit6b701a6d25f16e0e1b146fb2ce9277f53fbdbbc5 (patch)
tree007f72949c1c25f56b983552cf6d5989649176d5 /src
parent70c0ba22c45e57eb2ac6dcd281a2ae2b77a43514 (diff)
downloadgem5-6b701a6d25f16e0e1b146fb2ce9277f53fbdbbc5.tar.xz
Compilation fixes.
--HG-- extra : convert_revision : 44d67a3bb95f875f17586499aa4a04268aa2fd46
Diffstat (limited to 'src')
-rw-r--r--src/arch/sparc/system.cc13
-rw-r--r--src/arch/sparc/system.hh2
2 files changed, 9 insertions, 6 deletions
diff --git a/src/arch/sparc/system.cc b/src/arch/sparc/system.cc
index ef6443d17..952ac2deb 100644
--- a/src/arch/sparc/system.cc
+++ b/src/arch/sparc/system.cc
@@ -77,7 +77,7 @@ SparcSystem::SparcSystem(Params *p)
hypervisor->loadSections(&functionalPort, SparcISA::LoadAddrMask);
// load symbols
- if (!reset->loadGlobalSymbols(reset))
+ if (!reset->loadGlobalSymbols(resetSymtab))
panic("could not load reset symbols\n");
if (!openboot->loadGlobalSymbols(openbootSymtab))
@@ -148,7 +148,10 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(SparcSystem)
Param<std::string> hypervisor_bin;
Param<std::string> openboot_bin;
+ Param<Tick> boot_cpu_frequency;
Param<std::string> boot_osflags;
+ Param<uint64_t> system_type;
+ Param<uint64_t> system_rev;
Param<std::string> readfile;
Param<unsigned int> init_param;
@@ -156,7 +159,6 @@ END_DECLARE_SIM_OBJECT_PARAMS(SparcSystem)
BEGIN_INIT_SIM_OBJECT_PARAMS(SparcSystem)
- INIT_PARAM(boot_cpu_frequency, "Frequency of the boot CPU"),
INIT_PARAM(physmem, "phsyical memory"),
INIT_ENUM_PARAM(mem_mode, "Memory Mode, (1=atomic, 2=timing)",
System::MemoryModeStrings),
@@ -164,12 +166,13 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(SparcSystem)
INIT_PARAM(reset_bin, "file that contains the reset code"),
INIT_PARAM(hypervisor_bin, "file that contains the hypervisor code"),
INIT_PARAM(openboot_bin, "file that contains the openboot code"),
+ INIT_PARAM(boot_cpu_frequency, "Frequency of the boot CPU"),
INIT_PARAM_DFLT(boot_osflags, "flags to pass to the kernel during boot",
"a"),
- INIT_PARAM_DFLT(readfile, "file to read startup script from", ""),
- INIT_PARAM_DFLT(init_param, "numerical value to pass into simulator", 0),
INIT_PARAM_DFLT(system_type, "Type of system we are emulating", 34),
- INIT_PARAM_DFLT(system_rev, "Revision of system we are emulating", 1<<10)
+ INIT_PARAM_DFLT(system_rev, "Revision of system we are emulating", 1<<10),
+ INIT_PARAM_DFLT(readfile, "file to read startup script from", ""),
+ INIT_PARAM_DFLT(init_param, "numerical value to pass into simulator", 0)
END_INIT_SIM_OBJECT_PARAMS(SparcSystem)
diff --git a/src/arch/sparc/system.hh b/src/arch/sparc/system.hh
index 614707f6c..3c8c6327e 100644
--- a/src/arch/sparc/system.hh
+++ b/src/arch/sparc/system.hh
@@ -46,7 +46,7 @@ class SparcSystem : public System
struct Params : public System::Params
{
std::string reset_bin;
- std::string hypervison_bin;
+ std::string hypervisor_bin;
std::string openboot_bin;
std::string boot_osflags;
uint64_t system_type;