Merge zizzer:/bk/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release --HG-- extra : convert_revision : 7ac7b9c9288e4940899766cd2dd55ef793d48d4d
This commit is contained in:
@@ -150,9 +150,6 @@ LinuxAlphaSystem::~LinuxAlphaSystem()
|
||||
delete debugPrintkEvent;
|
||||
delete idleStartEvent;
|
||||
delete printThreadEvent;
|
||||
delete intStartEvent;
|
||||
delete intEndEvent;
|
||||
delete intEndEvent2;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -249,7 +249,7 @@ void SparcFault::invoke(ThreadContext * tc)
|
||||
|
||||
void TrapInstruction::invoke(ThreadContext * tc)
|
||||
{
|
||||
tc->syscall(syscall_num);
|
||||
// Should be handled in ISA.
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -245,8 +245,6 @@ class ThreadContext
|
||||
|
||||
virtual void setSyscallReturn(SyscallReturn return_value) = 0;
|
||||
|
||||
virtual void syscall(int64_t callnum) = 0;
|
||||
|
||||
// Same with st cond failures.
|
||||
virtual Counter readFuncExeInst() = 0;
|
||||
#endif
|
||||
@@ -432,8 +430,6 @@ class ProxyThreadContext : public ThreadContext
|
||||
void setSyscallReturn(SyscallReturn return_value)
|
||||
{ actualTC->setSyscallReturn(return_value); }
|
||||
|
||||
void syscall(int64_t callnum) { actualTC->syscall(callnum); }
|
||||
|
||||
Counter readFuncExeInst() { return actualTC->readFuncExeInst(); }
|
||||
#endif
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user