diff options
author | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-01-09 14:50:27 +0000 |
---|---|---|
committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-01-10 17:55:42 +0000 |
commit | 0a36956261c67d61def90e1aefeb6c46568ff167 (patch) | |
tree | 5f6d72f83185698d45e1f4b3eba1537f1c370167 /src/arch | |
parent | 13daa2e0620e71a1c11f94d1f8a864f73a52b94d (diff) | |
download | gem5-0a36956261c67d61def90e1aefeb6c46568ff167.tar.xz |
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 <andreas.sandberg@arm.com>
Cc: Giacomo Travaglini <giacomo.travaglini@arm.com>
Cc: Javier Setoain <javier.setoain@arm.com>
Cc: Brandon Potter <Brandon.Potter@amd.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15435
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Brandon Potter <Brandon.Potter@amd.com>
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/alpha/linux/linux.hh | 12 | ||||
-rw-r--r-- | src/arch/arm/linux/linux.hh | 21 | ||||
-rw-r--r-- | src/arch/riscv/linux/linux.hh | 12 | ||||
-rw-r--r-- | src/arch/sparc/linux/linux.hh | 23 | ||||
-rw-r--r-- | src/arch/x86/linux/linux.hh | 26 |
5 files changed, 90 insertions, 4 deletions
diff --git a/src/arch/alpha/linux/linux.hh b/src/arch/alpha/linux/linux.hh index cacb96bd3..3fd65679d 100644 --- a/src/arch/alpha/linux/linux.hh +++ b/src/arch/alpha/linux/linux.hh @@ -31,6 +31,7 @@ #ifndef __ALPHA_ALPHA_LINUX_LINUX_HH__ #define __ALPHA_ALPHA_LINUX_LINUX_HH__ +#include "arch/alpha/utility.hh" #include "kern/linux/linux.hh" /* AlphaLinux class contains static constants/definitions/misc. @@ -196,6 +197,17 @@ class AlphaLinux : public Linux // For futex system call static const unsigned TGT_EAGAIN = 35; static const unsigned TGT_EWOULDBLOCK = TGT_EAGAIN; + + static void + archClone(uint64_t flags, + Process *pp, Process *cp, + ThreadContext *ptc, ThreadContext *ctc, + uint64_t stack, uint64_t tls) + { + AlphaISA::copyMiscRegs(ptc, ctc); + if (stack) + ctc->setIntReg(AlphaISA::StackPointerReg, stack); + } }; #endif // __ALPHA_ALPHA_LINUX_LINUX_HH__ 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: diff --git a/src/arch/riscv/linux/linux.hh b/src/arch/riscv/linux/linux.hh index cfc1d4fd7..2dac1fe32 100644 --- a/src/arch/riscv/linux/linux.hh +++ b/src/arch/riscv/linux/linux.hh @@ -31,6 +31,7 @@ #ifndef __ARCH_RISCV_LINUX_LINUX_HH__ #define __ARCH_RISCV_LINUX_LINUX_HH__ +#include "arch/riscv/utility.hh" #include "kern/linux/linux.hh" class RiscvLinux : public Linux @@ -187,6 +188,17 @@ class RiscvLinux : public Linux uint64_t freehigh; uint32_t mem_unit; } tgt_sysinfo; + + static void + archClone(uint64_t flags, + Process *pp, Process *cp, + ThreadContext *ptc, ThreadContext *ctc, + uint64_t stack, uint64_t tls) + { + RiscvISA::copyRegs(ptc, ctc); + if (stack) + ctc->setIntReg(RiscvISA::StackPointerReg, stack); + } }; #endif diff --git a/src/arch/sparc/linux/linux.hh b/src/arch/sparc/linux/linux.hh index 69d373b67..1de949d10 100644 --- a/src/arch/sparc/linux/linux.hh +++ b/src/arch/sparc/linux/linux.hh @@ -31,6 +31,7 @@ #ifndef __ARCH_SPARC_LINUX_LINUX_HH__ #define __ARCH_SPARC_LINUX_LINUX_HH__ +#include "arch/sparc/utility.hh" #include "kern/linux/linux.hh" class SparcLinux : public Linux @@ -182,6 +183,28 @@ class SparcLinux : public Linux return false; } } + + static void + archClone(uint64_t flags, + Process *pp, Process *cp, + ThreadContext *ptc, ThreadContext *ctc, + uint64_t stack, uint64_t tls) + { + SparcISA::copyRegs(ptc, ctc); + ctc->setIntReg(SparcISA::NumIntArchRegs + 6, 0); + ctc->setIntReg(SparcISA::NumIntArchRegs + 4, 0); + ctc->setIntReg(SparcISA::NumIntArchRegs + 3, SparcISA::NWindows - 2); + ctc->setIntReg(SparcISA::NumIntArchRegs + 5, SparcISA::NWindows); + ctc->setMiscReg(SparcISA::MISCREG_CWP, 0); + ctc->setIntReg(SparcISA::NumIntArchRegs + 7, 0); + ctc->setMiscRegNoEffect(SparcISA::MISCREG_TL, 0); + ctc->setMiscReg(SparcISA::MISCREG_ASI, SparcISA::ASI_PRIMARY); + for (int y = 8; y < 32; y++) + ctc->setIntReg(y, ptc->readIntReg(y)); + + if (stack) + ctc->setIntReg(SparcISA::StackPointerReg, stack); + } }; class Sparc32Linux : public SparcLinux diff --git a/src/arch/x86/linux/linux.hh b/src/arch/x86/linux/linux.hh index ef0715fd6..91498043c 100644 --- a/src/arch/x86/linux/linux.hh +++ b/src/arch/x86/linux/linux.hh @@ -40,9 +40,31 @@ #ifndef __ARCH_X86_LINUX_LINUX_HH__ #define __ARCH_X86_LINUX_LINUX_HH__ +#include "arch/x86/utility.hh" #include "kern/linux/linux.hh" -class X86Linux64 : public Linux +class X86Linux : public Linux +{ + public: + static void + archClone(uint64_t flags, + Process *pp, Process *cp, + ThreadContext *ptc, ThreadContext *ctc, + uint64_t stack, uint64_t tls) + { + X86ISA::copyRegs(ptc, ctc); + + if (flags & TGT_CLONE_SETTLS) { + ctc->setMiscRegNoEffect(X86ISA::MISCREG_FS_BASE, tls); + ctc->setMiscRegNoEffect(X86ISA::MISCREG_FS_EFF_BASE, tls); + } + + if (stack) + ctc->setIntReg(X86ISA::StackPointerReg, stack); + } +}; + +class X86Linux64 : public X86Linux { public: @@ -185,7 +207,7 @@ class X86Linux64 : public Linux }; -class X86Linux32 : public Linux +class X86Linux32 : public X86Linux { public: |