From: Petar Jovanovic <mips32r2@gmail.com>
Date: Thu, 26 Sep 2019 15:18:34 +0000 (+0000)
Subject: mips64: fix do_syscall_WRK for N32
X-Git-Tag: VALGRIND_3_16_0~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ad8d78dca1cc553c3cb14622a352ee552431284;p=thirdparty%2Fvalgrind.git

mips64: fix do_syscall_WRK for N32

Load correctly pointer to V1_A3_val on N32.

Patch by Stefan Maksimovic.
---

diff --git a/coregrind/m_syscall.c b/coregrind/m_syscall.c
index a3461e84f6..e4fb70c693 100644
--- a/coregrind/m_syscall.c
+++ b/coregrind/m_syscall.c
@@ -811,7 +811,11 @@ asm (
    "do_syscall_WRK:                        \n\t"
    "   move $2, $11                        \n\t"
    "   syscall                             \n\t"
+#  if defined(_ABI64)
    "   ld $12, 0($29)                      \n\t"
+#  elif defined(_ABIN32)
+   "   lw $12, 0($29)                      \n\t"
+#  endif
    "   sd $3, 0($12)                       \n\t" /* store v1 in V1_A3_val */
    "   jr $31                              \n\t"
    "   sd $7, 8($12)                       \n\t" /* store a3 in V1_A3_val */