diff options
| -rw-r--r-- | src/cpu/SConscript | 3 | ||||
| -rw-r--r-- | src/cpu/pc_event.cc | 2 | ||||
| -rw-r--r-- | src/sim/system.cc | 2 | ||||
| -rw-r--r-- | src/sim/system.hh | 22 |
4 files changed, 4 insertions, 25 deletions
diff --git a/src/cpu/SConscript b/src/cpu/SConscript index a8585a797..bd6639061 100644 --- a/src/cpu/SConscript +++ b/src/cpu/SConscript @@ -72,6 +72,8 @@ CompoundFlag('ExecNoTicks', [ 'ExecEnable', 'ExecOpClass', 'ExecThread', 'ExecEffAddr', 'ExecResult', 'ExecMicro', 'ExecMacro', 'ExecFaulting', 'ExecUser', 'ExecKernel' ]) +Source('pc_event.cc') + if env['TARGET_ISA'] == 'null': SimObject('IntrControl.py') Source('intr_control_noisa.cc') @@ -99,7 +101,6 @@ Source('func_unit.cc') Source('inteltrace.cc') Source('intr_control.cc') Source('nativetrace.cc') -Source('pc_event.cc') Source('profile.cc') Source('quiesce_event.cc') Source('reg_class.cc') diff --git a/src/cpu/pc_event.cc b/src/cpu/pc_event.cc index b4017de7a..0bb8a4175 100644 --- a/src/cpu/pc_event.cc +++ b/src/cpu/pc_event.cc @@ -37,8 +37,6 @@ #include "base/debug.hh" #include "base/trace.hh" -#include "cpu/base.hh" -#include "cpu/thread_context.hh" #include "debug/PCEvent.hh" #include "sim/core.hh" #include "sim/system.hh" diff --git a/src/sim/system.cc b/src/sim/system.cc index 7b8ca87e3..e993a738f 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -292,7 +292,6 @@ System::registerThreadContext(ThreadContext *tc, ContextID assigned) return id; } -#if THE_ISA != NULL_ISA bool System::schedule(PCEvent *event) { @@ -304,7 +303,6 @@ System::remove(PCEvent *event) { return pcEventQueue.remove(event); } -#endif int System::numRunningContexts() diff --git a/src/sim/system.hh b/src/sim/system.hh index c2b841107..8c0660376 100644 --- a/src/sim/system.hh +++ b/src/sim/system.hh @@ -57,6 +57,7 @@ #include "base/loader/symtab.hh" #include "base/statistics.hh" #include "config/the_isa.hh" +#include "cpu/pc_event.hh" #include "enums/MemoryMode.hh" #include "mem/mem_master.hh" #include "mem/physical.hh" @@ -68,25 +69,12 @@ #include "sim/se_signal.hh" #include "sim/sim_object.hh" -/** - * To avoid linking errors with LTO, only include the header if we - * actually have the definition. - */ -#if THE_ISA != NULL_ISA -#include "cpu/pc_event.hh" -#else -class PCEvent; -#endif - class BaseRemoteGDB; class KvmVM; class ObjectFile; class ThreadContext; -class System : public SimObject -#if THE_ISA != NULL_ISA - , public PCEventScope -#endif +class System : public SimObject, public PCEventScope { private: @@ -198,19 +186,15 @@ class System : public SimObject */ unsigned int cacheLineSize() const { return _cacheLineSize; } -#if THE_ISA != NULL_ISA PCEventQueue pcEventQueue; -#endif std::vector<ThreadContext *> threadContexts; const bool multiThread; using SimObject::schedule; -#if THE_ISA != NULL_ISA bool schedule(PCEvent *event) override; bool remove(PCEvent *event) override; -#endif ThreadContext *getThreadContext(ContextID tid) const { @@ -502,13 +486,11 @@ class System : public SimObject { Addr addr M5_VAR_USED = 0; // initialize only to avoid compiler warning -#if THE_ISA != NULL_ISA if (symtab->findAddress(lbl, addr)) { T *ev = new T(this, desc, fixFuncEventAddr(addr), std::forward<Args>(args)...); return ev; } -#endif return NULL; } |