arm64: rename guest_SP to guest_XSP so as to avoid a name clash with

guest_SP from s390 world.

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

diff --git a/coregrind/m_debugger.c b/coregrind/m_debugger.c
index 7cd5ec17147ab2810cdec0b3a21121d25d0aa0a9..3a6136171ed78245f1be1c406ebed7df635b40e2 100644 (file)
--- a/coregrind/m_debugger.c
+++ b/coregrind/m_debugger.c
@@ -268,7 +268,7 @@ static Int ptrace_setregs(Int pid, VexGuestArchState* vex)
    uregs.regs[28] = vex->guest_X28;
    uregs.regs[29] = vex->guest_X29;
    uregs.regs[30] = vex->guest_X30;
-   uregs.sp       = vex->guest_SP;
+   uregs.sp       = vex->guest_XSP;
    uregs.pc       = vex->guest_PC;
    uregs.pstate   = LibVEX_GuestARM64_get_nzcv(vex); /* is this correct? */
    return VG_(ptrace)(VKI_PTRACE_SETREGS, pid, NULL, &uregs);

diff --git a/coregrind/m_initimg/initimg-linux.c b/coregrind/m_initimg/initimg-linux.c
index 9e6530dc4bd436e06ea714adb1ac0af2296ed992..a1e8b3f24e354763d236c6e8520a9ae5d37669ac 100644 (file)
--- a/coregrind/m_initimg/initimg-linux.c
+++ b/coregrind/m_initimg/initimg-linux.c
@@ -1064,8 +1064,8 @@ void VG_(ii_finalise_image)( IIFinaliseImageInfo iifii )
    VG_(memset)(&arch->vex_shadow1, 0, sizeof(VexGuestARM64State));
    VG_(memset)(&arch->vex_shadow2, 0, sizeof(VexGuestARM64State));
 
-   arch->vex.guest_SP = iifii.initial_client_SP;
-   arch->vex.guest_PC = iifii.initial_client_IP;
+   arch->vex.guest_XSP = iifii.initial_client_SP;
+   arch->vex.guest_PC  = iifii.initial_client_IP;
 
 #  elif defined(VGP_s390x_linux)
    vg_assert(0 == sizeof(VexGuestS390XState) % 16);

diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index ee5c78ec3905e586725e49bd26cff64ba03811d8..992722b4a11aa5a9f8d9d0a3c6bea890fee45844 100644 (file)
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -99,7 +99,7 @@ void VG_(get_UnwindStartRegs) ( /*OUT*/UnwindStartRegs* regs,
       = VG_(threads)[tid].arch.vex.guest_R7;
 #  elif defined(VGA_arm64)
    regs->r_pc = VG_(threads)[tid].arch.vex.guest_PC;
-   regs->r_sp = VG_(threads)[tid].arch.vex.guest_SP;
+   regs->r_sp = VG_(threads)[tid].arch.vex.guest_XSP;
    regs->misc.ARM64.x29 = VG_(threads)[tid].arch.vex.guest_X29;
    regs->misc.ARM64.x30 = VG_(threads)[tid].arch.vex.guest_X30;
 #  elif defined(VGA_s390x)

diff --git a/coregrind/m_sigframe/sigframe-arm64-linux.c b/coregrind/m_sigframe/sigframe-arm64-linux.c
index 876fef4470f6150fd4db836bcad72cf55a1cfb57..a09025766f838113599a2b4e58ce0e6b2a619c74 100644 (file)
--- a/coregrind/m_sigframe/sigframe-arm64-linux.c
+++ b/coregrind/m_sigframe/sigframe-arm64-linux.c
@@ -143,7 +143,7 @@ static void synth_ucontext( ThreadId tid, const vki_siginfo_t *si,
    SC2(24);  SC2(25);  SC2(26);  SC2(27);
    SC2(28);  SC2(29);  SC2(30);
 #  undef SC2
-   sc->sp = tst->arch.vex.guest_SP;
+   sc->sp = tst->arch.vex.guest_XSP;
    sc->pc = tst->arch.vex.guest_PC;
    sc->pstate = 0; /* slack .. could do better */
 
@@ -268,7 +268,7 @@ void VG_(sigframe_destroy)( ThreadId tid, Bool isRT )
 
    vg_assert(VG_(is_valid_tid)(tid));
    tst = VG_(get_ThreadState)(tid);
-   sp = tst->arch.vex.guest_SP;
+   sp = tst->arch.vex.guest_XSP;
 
 //ZZ    if (has_siginfo) {
       struct rt_sigframe *frame = (struct rt_sigframe *)sp;

diff --git a/coregrind/pub_core_machine.h b/coregrind/pub_core_machine.h
index 3443061c6eb2528cf7542ebd634c9e63eb0b287a..0cd5cf853e84f731f7357773c0ea7e6ef54bc4f3 100644 (file)
--- a/coregrind/pub_core_machine.h
+++ b/coregrind/pub_core_machine.h
@@ -129,8 +129,8 @@
 #  define VG_FRAME_PTR        guest_R11
 #elif defined(VGA_arm64)
 #  define VG_INSTR_PTR        guest_PC
-#  define VG_STACK_PTR        guest_SP
-#  define VG_FRAME_PTR        guest_SP   // FIXME: is this right?
+#  define VG_STACK_PTR        guest_XSP
+#  define VG_FRAME_PTR        guest_X29   // FIXME: is this right?
 #elif defined(VGA_s390x)
 #  define VG_INSTR_PTR        guest_IA
 #  define VG_STACK_PTR        guest_SP

diff --git a/drd/drd_load_store.c b/drd/drd_load_store.c
index 005f72845b499cd601de32cbab90b0ab3ea1b738..59c2e36af5423baeb9c18d8e761c40059593d908 100644 (file)
--- a/drd/drd_load_store.c
+++ b/drd/drd_load_store.c
@@ -48,7 +48,7 @@
 #elif defined(VGA_arm)
 #define STACK_POINTER_OFFSET OFFSET_arm_R13
 #elif defined(VGA_arm64)
-#define STACK_POINTER_OFFSET OFFSET_arm64_SP
+#define STACK_POINTER_OFFSET OFFSET_arm64_XSP
 #elif defined(VGA_s390x)
 #define STACK_POINTER_OFFSET OFFSET_s390x_r15
 #elif defined(VGA_mips32)