derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-arm, sim-se: Fix incorrect SP handling in clone

Browse Source 
The clone syscall is currently broken on aarch64 since the aarch64
code uses an incorrect SP register. Fix this by storing the new stack
pointer in SP_EL0 instead of R13.

Change-Id: Ie17990b4f359608e3b53e5bf625eca53769a6653
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/15436
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Brandon Potter <Brandon.Potter@amd.com>
This commit is contained in:
Andreas Sandberg
2019-01-09 15:52:51 +00:00
parent 0a36956261
commit 46d6137f01
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/arch/arm/linux/linux.hh
View File

@@ -58,9 +58,6 @@ class ArmLinux : public Linux
uint64_t stack, uint64_t tls)
{
ArmISA::copyRegs(ptc, ctc);
if (stack)
ctc->setIntReg(TheISA::StackPointerReg, stack);
}
};
@@ -271,6 +268,18 @@ class ArmLinux32 : public ArmLinux
int32_t tms_cutime; //!< user time of children
int32_t tms_cstime; //!< system time of children
};
static void
archClone(uint64_t flags,
Process *pp, Process *cp,
ThreadContext *ptc, ThreadContext *ctc,
uint64_t stack, uint64_t tls)
{
ArmLinux::archClone(flags, pp, cp, ptc, ctc, stack, tls);
if (stack)
ctc->setIntReg(ArmISA::INTREG_SP, stack);
}
};
class ArmLinux64 : public ArmLinux
@@ -516,6 +525,17 @@ class ArmLinux64 : public ArmLinux
int64_t tms_cutime; //!< user time of children
int64_t tms_cstime; //!< system time of children
};
static void archClone(uint64_t flags,
Process *pp, Process *cp,
ThreadContext *ptc, ThreadContext *ctc,
uint64_t stack, uint64_t tls)
{
ArmLinux::archClone(flags, pp, cp, ptc, ctc, stack, tls);
if (stack)
ctc->setIntReg(ArmISA::INTREG_SP0, stack);
}
};
#endif