From 0a36956261c67d61def90e1aefeb6c46568ff167 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Wed, 9 Jan 2019 14:50:27 +0000 Subject: sim-se: Refactor clone to avoid most ifdefs Some parts of clone are architecture dependent. In some cases, we are able to use architecture-specific helper functions or register aliases. However, there is still some architecture-specific that is protected by ifdefs in the common clone implementation. Move these architecture-specific bits to the architecture-specific OS class instead to avoid these ifdefs and make the code a bit more readable. Change-Id: Ia0903d738d0ba890863bddfa77e3b717db7f45de Signed-off-by: Andreas Sandberg Cc: Giacomo Travaglini Cc: Javier Setoain Cc: Brandon Potter Reviewed-on: https://gem5-review.googlesource.com/c/15435 Reviewed-by: Jason Lowe-Power Maintainer: Brandon Potter --- src/arch/arm/linux/linux.hh | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'src/arch/arm') diff --git a/src/arch/arm/linux/linux.hh b/src/arch/arm/linux/linux.hh index 73f0fa699..9e9ca1f80 100644 --- a/src/arch/arm/linux/linux.hh +++ b/src/arch/arm/linux/linux.hh @@ -45,9 +45,26 @@ #ifndef __ARCH_ARM_LINUX_LINUX_HH__ #define __ARCH_ARM_LINUX_LINUX_HH__ +#include "arch/arm/utility.hh" #include "kern/linux/linux.hh" -class ArmLinux32 : public Linux +class ArmLinux : public Linux +{ + public: + static void + archClone(uint64_t flags, + Process *pp, Process *cp, + ThreadContext *ptc, ThreadContext *ctc, + uint64_t stack, uint64_t tls) + { + ArmISA::copyRegs(ptc, ctc); + + if (stack) + ctc->setIntReg(TheISA::StackPointerReg, stack); + } +}; + +class ArmLinux32 : public ArmLinux { public: @@ -256,7 +273,7 @@ class ArmLinux32 : public Linux }; }; -class ArmLinux64 : public Linux +class ArmLinux64 : public ArmLinux { public: -- cgit v1.2.3