From: Petar Jovanovic <mips32r2@gmail.com>
Date: Fri, 26 Apr 2013 19:01:04 +0000 (+0000)
Subject: mips: fixup blksys_restart address for mips64
X-Git-Tag: svn/VALGRIND_3_9_0~305
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fb2e817bb64fe8f8842fb4b5b36c0dddfa21129;p=thirdparty%2Fvalgrind.git

mips: fixup blksys_restart address for mips64

Restart logic has changed in kernel, this is counterpart in Valgrind.

This change fixes:

none/tests/syscall-restart1
none/tests/syscall-restart2

for mips64.


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

diff --git a/coregrind/m_syswrap/syscall-mips64-linux.S b/coregrind/m_syswrap/syscall-mips64-linux.S
index 4405b54b87..330ab1d17c 100644
--- a/coregrind/m_syswrap/syscall-mips64-linux.S
+++ b/coregrind/m_syswrap/syscall-mips64-linux.S
@@ -100,9 +100,8 @@ ML_(do_syscall_for_client_WRK):
 
    ld      $5, OFFSET_mips64_r5($5)  /* a1 */
    ld      $2, 0($29)                /* syscallno */
-2: nop
 
-   syscall
+2: syscall
 
    /* Saving return values into Guest state  */
 3: ld      $5, 8($29)                /* guest_state */