For s390 use symbolic register names.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14818

diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index 450a8b08d17042b675175c54851e7d014ecff673..e56c715f3ba97a73f941ea2555bbe43d318932a3 100644 (file)
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -106,9 +106,9 @@ void VG_(get_UnwindStartRegs) ( /*OUT*/UnwindStartRegs* regs,
    regs->r_pc = (ULong)VG_(threads)[tid].arch.vex.guest_IA;
    regs->r_sp = (ULong)VG_(threads)[tid].arch.vex.guest_SP;
    regs->misc.S390X.r_fp
-      = VG_(threads)[tid].arch.vex.guest_r11;
+      = VG_(threads)[tid].arch.vex.guest_FP;
    regs->misc.S390X.r_lr
-      = VG_(threads)[tid].arch.vex.guest_r14;
+      = VG_(threads)[tid].arch.vex.guest_LR;
 #  elif defined(VGA_mips32)
    regs->r_pc = VG_(threads)[tid].arch.vex.guest_PC;
    regs->r_sp = VG_(threads)[tid].arch.vex.guest_r29;

diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c
index a8e860474d3fa0513c43f1b682518257198e87a5..6363e2de79243890fea36654f15fa162412104a5 100644 (file)
--- a/coregrind/m_syswrap/syswrap-s390x-linux.c
+++ b/coregrind/m_syswrap/syswrap-s390x-linux.c
@@ -250,7 +250,7 @@ static SysRes do_clone ( ThreadId ptid,
    ctst->arch.vex.guest_r2 = 0;
 
    if (sp != 0)
-      ctst->arch.vex.guest_r15 = sp;
+      ctst->arch.vex.guest_SP = sp;
 
    ctst->os_state.parent = ptid;