Merge fixes to make full system compile and run.
src/arch/alpha/linux/system.cc: src/cpu/o3/alpha_cpu_impl.hh: src/sim/system.cc: Merge fixes. --HG-- extra : convert_revision : aa3326c0ebf54da9ab1dbd2d9877da41ca487082
This commit is contained in:
parent
3e1537cf8b
commit
841d0b9d40
3 changed files with 1 additions and 5 deletions
|
@ -150,9 +150,6 @@ LinuxAlphaSystem::~LinuxAlphaSystem()
|
||||||
delete debugPrintkEvent;
|
delete debugPrintkEvent;
|
||||||
delete idleStartEvent;
|
delete idleStartEvent;
|
||||||
delete printThreadEvent;
|
delete printThreadEvent;
|
||||||
delete intStartEvent;
|
|
||||||
delete intEndEvent;
|
|
||||||
delete intEndEvent2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
#include "arch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
#include "cpu/quiesce_event.hh"
|
#include "cpu/quiesce_event.hh"
|
||||||
#include "kern/kernel_stats.hh"
|
#include "kern/kernel_stats.hh"
|
||||||
|
#include "sim/sim_exit.hh"
|
||||||
#include "sim/system.hh"
|
#include "sim/system.hh"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -119,8 +119,6 @@ System::System(Params *p)
|
||||||
DPRINTF(Loader, "Kernel end = %#x\n", kernelEnd);
|
DPRINTF(Loader, "Kernel end = %#x\n", kernelEnd);
|
||||||
DPRINTF(Loader, "Kernel entry = %#x\n", kernelEntry);
|
DPRINTF(Loader, "Kernel entry = %#x\n", kernelEntry);
|
||||||
DPRINTF(Loader, "Kernel loaded...\n");
|
DPRINTF(Loader, "Kernel loaded...\n");
|
||||||
|
|
||||||
kernelBinning = new Kernel::Binning(this);
|
|
||||||
#endif // FULL_SYSTEM
|
#endif // FULL_SYSTEM
|
||||||
|
|
||||||
// increment the number of running systms
|
// increment the number of running systms
|
||||||
|
|
Loading…
Reference in a new issue