From 6a7a5b30050d10a7d9cc9cd5614988871253298d Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 29 Jan 2020 15:41:59 -0800 Subject: 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 Maintainer: Gabe Black Tested-by: kokoro --- src/arch/mips/utility.cc | 6 +----- src/arch/mips/utility.hh | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'src/arch/mips') diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc index 24c451d3e..a98b58e31 100644 --- a/src/arch/mips/utility.cc +++ b/src/arch/mips/utility.cc @@ -218,15 +218,11 @@ isSnan(void *val_ptr, int size) } void -startupCPU(ThreadContext *tc, int cpuId) +initCPU(ThreadContext *tc, int cpuId) { tc->activate(); } -void -initCPU(ThreadContext *tc, int cpuId) -{} - void copyRegs(ThreadContext *src, ThreadContext *dest) { diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh index 0cd066f3e..67fe3a45b 100644 --- a/src/arch/mips/utility.hh +++ b/src/arch/mips/utility.hh @@ -103,7 +103,6 @@ RoundPage(Addr addr) // // CPU Utility // -void startupCPU(ThreadContext *tc, int cpuId); void initCPU(ThreadContext *tc, int cpuId); void copyRegs(ThreadContext *src, ThreadContext *dest); -- cgit v1.2.3