diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-06-12 17:53:57 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-06-12 17:53:57 -0400 |
| commit | 841d0b9d40446160fdc1e073e16f9bd7b6501911 (patch) | |
| tree | 2842605c1b3371ae6aa75f44207936bc59b5f107 | |
| parent | 3e1537cf8b6a9fdbffa3975fde9f3d7f12c719f9 (diff) | |
| download | gem5-841d0b9d40446160fdc1e073e16f9bd7b6501911.tar.xz | |
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
| -rw-r--r-- | src/arch/alpha/linux/system.cc | 3 | ||||
| -rw-r--r-- | src/cpu/o3/alpha_cpu_impl.hh | 1 | ||||
| -rw-r--r-- | src/sim/system.cc | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc index bb35f046d..9fe63c390 100644 --- a/src/arch/alpha/linux/system.cc +++ b/src/arch/alpha/linux/system.cc @@ -150,9 +150,6 @@ LinuxAlphaSystem::~LinuxAlphaSystem() delete debugPrintkEvent; delete idleStartEvent; delete printThreadEvent; - delete intStartEvent; - delete intEndEvent; - delete intEndEvent2; } diff --git a/src/cpu/o3/alpha_cpu_impl.hh b/src/cpu/o3/alpha_cpu_impl.hh index 98290e57f..bfd05d260 100644 --- a/src/cpu/o3/alpha_cpu_impl.hh +++ b/src/cpu/o3/alpha_cpu_impl.hh @@ -46,6 +46,7 @@ #include "arch/isa_traits.hh" #include "cpu/quiesce_event.hh" #include "kern/kernel_stats.hh" +#include "sim/sim_exit.hh" #include "sim/system.hh" #endif diff --git a/src/sim/system.cc b/src/sim/system.cc index b3c7870fd..91bba85fe 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -119,8 +119,6 @@ System::System(Params *p) DPRINTF(Loader, "Kernel end = %#x\n", kernelEnd); DPRINTF(Loader, "Kernel entry = %#x\n", kernelEntry); DPRINTF(Loader, "Kernel loaded...\n"); - - kernelBinning = new Kernel::Binning(this); #endif // FULL_SYSTEM // increment the number of running systms |