For s390 use symbolic register names.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14818 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index 450a8b0..e56c715 100644
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -106,9 +106,9 @@
    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 a8e8604..6363e2d 100644
--- a/coregrind/m_syswrap/syswrap-s390x-linux.c
+++ b/coregrind/m_syswrap/syswrap-s390x-linux.c
@@ -250,7 +250,7 @@
    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;