[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/4] linux-user: Fix register used for 6th and 7th sy
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 2/4] linux-user: Fix register used for 6th and 7th syscall argument on aarch64 |
Date: |
Tue, 20 Feb 2018 10:16:38 +0100 |
From: Guido Günther <address@hidden>
This unbreaks the testcase from
http://lists.nongnu.org/archive/html/qemu-arm/2018-01/msg00514.html
Thanks to Laurent Vivier for spotting the 7th one.
Signed-off-by: Guido Günther <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Suggested-by: Laurent Vivier <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/host/aarch64/safe-syscall.inc.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux-user/host/aarch64/safe-syscall.inc.S
b/linux-user/host/aarch64/safe-syscall.inc.S
index 58a2329b37..bc1f5a9792 100644
--- a/linux-user/host/aarch64/safe-syscall.inc.S
+++ b/linux-user/host/aarch64/safe-syscall.inc.S
@@ -36,7 +36,7 @@ safe_syscall_base:
* and return the result in x0
* and the syscall instruction needs
* x8 == syscall number
- * x0 ... x7 == syscall arguments
+ * x0 ... x6 == syscall arguments
* and returns the result in x0
* Shuffle everything around appropriately.
*/
@@ -47,8 +47,8 @@ safe_syscall_base:
mov x2, x4
mov x3, x5
mov x4, x6
- mov x6, x7
- ldr x7, [sp]
+ mov x5, x7
+ ldr x6, [sp]
/* This next sequence of code works in conjunction with the
* rewind_if_safe_syscall_function(). If a signal is taken
--
2.14.3
- [Qemu-devel] [PULL 0/4] Linux user for 2.12 patches, Laurent Vivier, 2018/02/20
- [Qemu-devel] [PULL 0/4] Linux user for 2.12 patches, Laurent Vivier, 2018/02/25
- [Qemu-devel] [PULL 3/4] linux-user, m68k: select CPU according to ELF header values, Laurent Vivier, 2018/02/25
- [Qemu-devel] [PULL 1/4] linux-user: Move CPU type name selection to a function, Laurent Vivier, 2018/02/25
- [Qemu-devel] [PULL 2/4] linux-user: introduce functions to detect CPU type, Laurent Vivier, 2018/02/25
- [Qemu-devel] [PULL 4/4] linux-user: MIPS set cpu to r6 CPU if binary is R6, Laurent Vivier, 2018/02/25
- Re: [Qemu-devel] [PULL 0/4] Linux user for 2.12 patches, no-reply, 2018/02/25