diff options
| author | Gabe Black <gabeblack@google.com> | 2019-10-09 21:04:22 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-10-25 22:42:31 +0000 |
| commit | 2b7d4bd73db443b4ca302213689a673266e856e0 (patch) | |
| tree | 9c111c4416935249eb62b2734336307e94a11a46 /src/cpu | |
| parent | 1ded8d6d9f829774c16c50c56f1538d4b7711f09 (diff) | |
| download | gem5-2b7d4bd73db443b4ca302213689a673266e856e0.tar.xz | |
cpu,sim: Get rid of a bunch of conditional compilation for PCEvents.
These can now be built without referring to anything in ThreadContext
and so can be built even with the NULL ISA. This means the pcEventQueue
can be unconditionally built into the System class. Even though the
pcEventQueue is going away, this still makes it possible for System to
be a PCEventScope unconditionally.
Change-Id: Ia342bb7972b1b5ce95033176d72af4bfa343560f
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22104
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/SConscript | 3 | ||||
| -rw-r--r-- | src/cpu/pc_event.cc | 2 |
2 files changed, 2 insertions, 3 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" |