diff options
| author | Gabe Black <gabeblack@google.com> | 2020-01-29 16:49:40 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2020-02-01 12:31:56 +0000 |
| commit | 4ae8d1c0ed18f351b52f421553b28fe109f87665 (patch) | |
| tree | 08f688eed7d45f41f4c3af946bc0afdbf199aebf /src/arch/mips | |
| parent | 6a7a5b30050d10a7d9cc9cd5614988871253298d (diff) | |
| download | gem5-4ae8d1c0ed18f351b52f421553b28fe109f87665.tar.xz | |
arch,sim: Merge initCPU into the ISA System classes.
Those classes are already ISA specific, so we can just move initCPU's
contents there and take it out of utility.hh, utility.cc, and the base
System's initState.
Change-Id: I28f0d0b50d83efe5116b0b24d20f8182a02823e7
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24905
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/mips')
| -rw-r--r-- | src/arch/mips/utility.cc | 6 | ||||
| -rw-r--r-- | src/arch/mips/utility.hh | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc index a98b58e31..fe06ca17c 100644 --- a/src/arch/mips/utility.cc +++ b/src/arch/mips/utility.cc @@ -218,12 +218,6 @@ isSnan(void *val_ptr, int size) } void -initCPU(ThreadContext *tc, int cpuId) -{ - tc->activate(); -} - -void copyRegs(ThreadContext *src, ThreadContext *dest) { // First loop through the integer registers. diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh index 67fe3a45b..3338550cc 100644 --- a/src/arch/mips/utility.hh +++ b/src/arch/mips/utility.hh @@ -93,17 +93,15 @@ inUserMode(ThreadContext *tc) // inline Addr TruncPage(Addr addr) -{ return addr & ~(PageBytes - 1); } +{ + return addr & ~(PageBytes - 1); +} inline Addr RoundPage(Addr addr) -{ return (addr + PageBytes - 1) & ~(PageBytes - 1); } - -//////////////////////////////////////////////////////////////////////// -// -// CPU Utility -// -void initCPU(ThreadContext *tc, int cpuId); +{ + return (addr + PageBytes - 1) & ~(PageBytes - 1); +} void copyRegs(ThreadContext *src, ThreadContext *dest); void copyMiscRegs(ThreadContext *src, ThreadContext *dest); |