system.cc (3138:6d4c1cc3af0b) system.cc (3527:0485338dc5e1)
1/*
2 * Copyright (c) 2002-2006 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 63 unchanged lines hidden (view full) ---

72 // Load reset binary into memory
73 reset->loadSections(&functionalPort, SparcISA::LoadAddrMask);
74 // Load the openboot binary
75 openboot->loadSections(&functionalPort, SparcISA::LoadAddrMask);
76 // Load the hypervisor binary
77 hypervisor->loadSections(&functionalPort, SparcISA::LoadAddrMask);
78
79 // load symbols
1/*
2 * Copyright (c) 2002-2006 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 63 unchanged lines hidden (view full) ---

72 // Load reset binary into memory
73 reset->loadSections(&functionalPort, SparcISA::LoadAddrMask);
74 // Load the openboot binary
75 openboot->loadSections(&functionalPort, SparcISA::LoadAddrMask);
76 // Load the hypervisor binary
77 hypervisor->loadSections(&functionalPort, SparcISA::LoadAddrMask);
78
79 // load symbols
80 if (!reset->loadGlobalSymbols(reset))
80 if (!reset->loadGlobalSymbols(resetSymtab))
81 panic("could not load reset symbols\n");
82
83 if (!openboot->loadGlobalSymbols(openbootSymtab))
84 panic("could not load openboot symbols\n");
85
86 if (!hypervisor->loadLocalSymbols(hypervisorSymtab))
87 panic("could not load hypervisor symbols\n");
88

--- 54 unchanged lines hidden (view full) ---

143 SimObjectParam<PhysicalMemory *> physmem;
144 SimpleEnumParam<System::MemoryMode> mem_mode;
145
146 Param<std::string> kernel;
147 Param<std::string> reset_bin;
148 Param<std::string> hypervisor_bin;
149 Param<std::string> openboot_bin;
150
81 panic("could not load reset symbols\n");
82
83 if (!openboot->loadGlobalSymbols(openbootSymtab))
84 panic("could not load openboot symbols\n");
85
86 if (!hypervisor->loadLocalSymbols(hypervisorSymtab))
87 panic("could not load hypervisor symbols\n");
88

--- 54 unchanged lines hidden (view full) ---

143 SimObjectParam<PhysicalMemory *> physmem;
144 SimpleEnumParam<System::MemoryMode> mem_mode;
145
146 Param<std::string> kernel;
147 Param<std::string> reset_bin;
148 Param<std::string> hypervisor_bin;
149 Param<std::string> openboot_bin;
150
151 Param<Tick> boot_cpu_frequency;
151 Param<std::string> boot_osflags;
152 Param<std::string> boot_osflags;
153 Param<uint64_t> system_type;
154 Param<uint64_t> system_rev;
152 Param<std::string> readfile;
153 Param<unsigned int> init_param;
154
155END_DECLARE_SIM_OBJECT_PARAMS(SparcSystem)
156
157BEGIN_INIT_SIM_OBJECT_PARAMS(SparcSystem)
158
155 Param<std::string> readfile;
156 Param<unsigned int> init_param;
157
158END_DECLARE_SIM_OBJECT_PARAMS(SparcSystem)
159
160BEGIN_INIT_SIM_OBJECT_PARAMS(SparcSystem)
161
159 INIT_PARAM(boot_cpu_frequency, "Frequency of the boot CPU"),
160 INIT_PARAM(physmem, "phsyical memory"),
161 INIT_ENUM_PARAM(mem_mode, "Memory Mode, (1=atomic, 2=timing)",
162 System::MemoryModeStrings),
163 INIT_PARAM(kernel, "file that contains the kernel code"),
164 INIT_PARAM(reset_bin, "file that contains the reset code"),
165 INIT_PARAM(hypervisor_bin, "file that contains the hypervisor code"),
166 INIT_PARAM(openboot_bin, "file that contains the openboot code"),
162 INIT_PARAM(physmem, "phsyical memory"),
163 INIT_ENUM_PARAM(mem_mode, "Memory Mode, (1=atomic, 2=timing)",
164 System::MemoryModeStrings),
165 INIT_PARAM(kernel, "file that contains the kernel code"),
166 INIT_PARAM(reset_bin, "file that contains the reset code"),
167 INIT_PARAM(hypervisor_bin, "file that contains the hypervisor code"),
168 INIT_PARAM(openboot_bin, "file that contains the openboot code"),
169 INIT_PARAM(boot_cpu_frequency, "Frequency of the boot CPU"),
167 INIT_PARAM_DFLT(boot_osflags, "flags to pass to the kernel during boot",
168 "a"),
170 INIT_PARAM_DFLT(boot_osflags, "flags to pass to the kernel during boot",
171 "a"),
169 INIT_PARAM_DFLT(readfile, "file to read startup script from", ""),
170 INIT_PARAM_DFLT(init_param, "numerical value to pass into simulator", 0),
171 INIT_PARAM_DFLT(system_type, "Type of system we are emulating", 34),
172 INIT_PARAM_DFLT(system_type, "Type of system we are emulating", 34),
172 INIT_PARAM_DFLT(system_rev, "Revision of system we are emulating", 1<<10)
173 INIT_PARAM_DFLT(system_rev, "Revision of system we are emulating", 1<<10),
174 INIT_PARAM_DFLT(readfile, "file to read startup script from", ""),
175 INIT_PARAM_DFLT(init_param, "numerical value to pass into simulator", 0)
173
174END_INIT_SIM_OBJECT_PARAMS(SparcSystem)
175
176CREATE_SIM_OBJECT(SparcSystem)
177{
178 SparcSystem::Params *p = new SparcSystem::Params;
179 p->name = getInstanceName();
180 p->boot_cpu_frequency = boot_cpu_frequency;

--- 17 unchanged lines hidden --- 		176
177END_INIT_SIM_OBJECT_PARAMS(SparcSystem)
178
179CREATE_SIM_OBJECT(SparcSystem)
180{
181 SparcSystem::Params *p = new SparcSystem::Params;
182 p->name = getInstanceName();
183 p->boot_cpu_frequency = boot_cpu_frequency;

--- 17 unchanged lines hidden ---