diff options
| author | Gabe Black <gabeblack@google.com> | 2020-01-29 15:41:59 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2020-02-01 12:31:40 +0000 |
| commit | 6a7a5b30050d10a7d9cc9cd5614988871253298d (patch) | |
| tree | 49f7d86b99e81b02e472e3c356366bce101415de /src/arch/x86 | |
| parent | dc328d00ebe798f0b0ee8903aca4256bb128dc6f (diff) | |
| download | gem5-6a7a5b30050d10a7d9cc9cd5614988871253298d.tar.xz | |
arch,sim: Merge initCPU and startupCPU.
These two functions were called in exactly one place one right after
the other, and served similar purposes.
This change merges them together, and cleans them up slightly. It also
removes checks for FullSystem, since those functions are only called
in full system to begin with.
Change-Id: I214f7d2d3f88960dccb5895c1241f61cd78716a8
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24904
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/utility.cc | 5 | ||||
| -rw-r--r-- | src/arch/x86/utility.hh | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc index 75f242d83..21765ceae 100644 --- a/src/arch/x86/utility.cc +++ b/src/arch/x86/utility.cc @@ -75,11 +75,8 @@ void initCPU(ThreadContext *tc, int cpuId) { InitInterrupt(0).invoke(tc); -} -void startupCPU(ThreadContext *tc, int cpuId) -{ - if (cpuId == 0 || !FullSystem) { + if (cpuId == 0) { tc->activate(); } else { // This is an application processor (AP). It should be initialized to diff --git a/src/arch/x86/utility.hh b/src/arch/x86/utility.hh index c88a4c777..88c7a17e4 100644 --- a/src/arch/x86/utility.hh +++ b/src/arch/x86/utility.hh @@ -71,8 +71,6 @@ namespace X86ISA void initCPU(ThreadContext *tc, int cpuId); - void startupCPU(ThreadContext *tc, int cpuId); - void copyRegs(ThreadContext *src, ThreadContext *dest); void copyMiscRegs(ThreadContext *src, ThreadContext *dest); |