From patchwork Mon Feb 19 17:10:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 875245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zlVkG6qjxz9ryn for ; Tue, 20 Feb 2018 04:15:18 +1100 (AEDT) Received: from localhost ([::1]:51455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1enp25-00084V-25 for incoming@patchwork.ozlabs.org; Mon, 19 Feb 2018 12:15:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1enoxs-0004u3-Oe for qemu-devel@nongnu.org; Mon, 19 Feb 2018 12:10:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1enoxo-0005Rq-Ql for qemu-devel@nongnu.org; Mon, 19 Feb 2018 12:10:56 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:41507) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1enoxo-0005Qv-Gd for qemu-devel@nongnu.org; Mon, 19 Feb 2018 12:10:52 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Mc5lW-1f62Kt29LS-00JIcE; Mon, 19 Feb 2018 18:10:41 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 19 Feb 2018 18:10:31 +0100 Message-Id: <20180219171037.24539-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180219171037.24539-1-laurent@vivier.eu> References: <20180219171037.24539-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K0:TL1JIVQ3q6EJn6SDr6GzGDGnvIremIiVdS8HvS4xVy8mDTS37X3 rZPlujZek6iMBGOcFqznE/jcZFFnhghORO8vSEviCgAKyk9V6KAu7FJkPovPTOFdG5QIaye 71VTWzDp6to4Fvdf/k7l18Bu45vzc+hildO8eqbGBGcfGnDR3mZ8mWpREDJzUs0Sl32IXxK dZgvYhq2hZu9ynmHkm7jw== X-UI-Out-Filterresults: notjunk:1; V01:K0:jWewu6/QFUA=:KvScR/+08SpWjiQN7fhhcj 0pjcagg6r2Ga3/54ggssjdGzo9xDw9s7Et3wdpwRZoPzXO+5fZSWhYpCdWpU0b37jXuX4Me0P wgXT+hKmwTM/B0xR0nS8z4sCc0SSGvkL197wgYn2wRNFs+Hzga34Mr7ULcYcGNZWLRVGAjilL KnK9yiOtO3G04LEcoaNjK0j6JfptEcj0QlYuhOl+P1bv9WL2OZIckvjnXAtluRuHn5ccP9UQl qgvEorfhQlLL5fWX+kLbmokD9UhQr8klUHF38cuBOP8jr8qIl+4xMC+gd62FMbidnkwy8e+FC nTK9fHqYw3GayoOAuh8eprg8nWkXnYdOMBDXUqS3n17IsHrey0cD4McywtF6xm21nxeqPO5F3 qH601yIG/m4KpJAXL+e3fs9GLqxbiPyzpXTLRvqw3CWILntfR3pXkXQyn5/cIQfDAeosjd72Z E9hfgf1AbuoYjq4RKfbLIehr8Nt7sSWwWZgZZ7U5FkqSZe2M7IJxdTOGULzjf7P6ZXbkvEGok 7eI4MoqIkiS6wsslPsB4tzpUWqzEHeviWQYdyGAIvxDNBmEiRMpJ59BR3AH/i6SH07H4scTnr 4IQ4EbXWyIKgWophJDFtMaNGv/371sMlr5c9U+8KXQr78QtNwaARVI8pzcg7sl3DVFHuit5sV /aW1ORhWHLXZ4ksK1JrYv+eKlbtRFzcX57Uvuz9HRPcrw2ojxfMHwQ47hDYVARqrHRLBywH9n BNE8N4dce48dRanMdsQ7DtmC12+/35iR7araqQgu+1+/xRuh00d/h0GwnSo= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 2/8] linux-user: Fix register used for 6th and 7th syscall argument on aarch64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Guido_G=C3=BCnther?= , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Guido Günther 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 Tested-by: Philippe Mathieu-Daudé Suggested-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <671eaa99f4e0bf3a58f76f9151f7cfa24662227f.1517565566.git.agx@sigxcpu.org> Signed-off-by: Laurent Vivier --- 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