From 4ae8d1c0ed18f351b52f421553b28fe109f87665 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 29 Jan 2020 16:49:40 -0800 Subject: 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 Maintainer: Gabe Black Tested-by: kokoro --- src/arch/mips/utility.cc | 6 ------ src/arch/mips/utility.hh | 14 ++++++-------- 2 files changed, 6 insertions(+), 14 deletions(-) (limited to 'src/arch/mips') 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 @@ -217,12 +217,6 @@ isSnan(void *val_ptr, int size) } } -void -initCPU(ThreadContext *tc, int cpuId) -{ - tc->activate(); -} - void copyRegs(ThreadContext *src, ThreadContext *dest) { 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); -- cgit v1.2.3