summaryrefslogtreecommitdiff
path: root/src/arch/null/utility.hh
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2020-01-29 15:41:59 -0800
committerGabe Black <gabeblack@google.com>2020-02-01 12:31:40 +0000
commit6a7a5b30050d10a7d9cc9cd5614988871253298d (patch)
tree49f7d86b99e81b02e472e3c356366bce101415de /src/arch/null/utility.hh
parentdc328d00ebe798f0b0ee8903aca4256bb128dc6f (diff)
downloadgem5-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/null/utility.hh')
-rw-r--r--src/arch/null/utility.hh11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/arch/null/utility.hh b/src/arch/null/utility.hh
index d92e55221..69055c706 100644
--- a/src/arch/null/utility.hh
+++ b/src/arch/null/utility.hh
@@ -43,13 +43,16 @@
#include "base/types.hh"
#include "cpu/thread_context.hh"
-namespace NullISA {
+namespace NullISA
+{
-inline uint64_t getArgument(ThreadContext *tc, int &number, uint16_t size,
- bool fp) { return 0; }
+static inline uint64_t
+getArgument(ThreadContext *tc, int &number, uint16_t size, bool fp)
+{
+ return 0;
+}
inline void initCPU(ThreadContext *tc, int cpuId) {}
-inline void startupCPU(ThreadContext *tc, int cpuId) {}
}