From patchwork Tue Feb 20 09:16:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10229625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BA345602DC for ; Tue, 20 Feb 2018 09:21:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D98E285D8 for ; Tue, 20 Feb 2018 09:21:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91EFF285D5; Tue, 20 Feb 2018 09:21:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BFB64285D3 for ; Tue, 20 Feb 2018 09:21:05 +0000 (UTC) Received: from localhost ([::1]:54279 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eo46i-0006uT-Bd for patchwork-qemu-devel@patchwork.kernel.org; Tue, 20 Feb 2018 04:21:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eo42k-0003rq-53 for qemu-devel@nongnu.org; Tue, 20 Feb 2018 04:16:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eo42h-0005hK-1R for qemu-devel@nongnu.org; Tue, 20 Feb 2018 04:16:58 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:34365) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eo42g-0005ff-OF for qemu-devel@nongnu.org; Tue, 20 Feb 2018 04:16:54 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LjJi3-1eCo0f0EDn-00dT2B; Tue, 20 Feb 2018 10:16:46 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 20 Feb 2018 10:16:38 +0100 Message-Id: <20180220091640.10875-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180220091640.10875-1-laurent@vivier.eu> References: <20180220091640.10875-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K0:bNjBS5llXgGgcGQ4dGBYLQ/4qGkwwmgL3nocEN1hX8tIsD6mAGP f5tEzp36Wi8NAHUUMLuqumcC38cqpdilNQY2CAow6XUCA2tMGLrQRrXzthgOEMBIqyYV4Dj PlYvb+ryGt07zYORSGOD8zDoJMYwbB1NcRvOz9Yuh/JxlgUM+Ev3FH2MIgCAG2nf2alU9Bo qgnYlxDR4RE5j/3//bIGw== X-UI-Out-Filterresults: notjunk:1; V01:K0:C/a9KUQwqt0=:I4ooGTir6VTClGyXp6zIVF ormtOUdqMONzdxgAb2dglS5DNrn+VlV9Gdvg3SDpjV9nd3mudyIyuQFypLcdr9jaqGuMwLQtM J1nZt+p40mpr1YB79VQaaOqlMpxceS41pOjqoKIsfbN73B5QaV15gxGuNFFVhIK2jBW+HE6Om 3um7NjLe/5qHMFbdjgD6fGnTc3GhTs2RpyU7W0HUCq5+1y6TrKYD+aYO+UExW2h/Y3A7IjWg3 RQ9mKWnI/wE+74buDliDx+/2mnp2xifEam7083X8n+TmISwbxZeQTEbW5sPlXZb/1LJbu5aij yRmoLg/GX2KIQRxVYXfn0eCpPXKNPbykywV6dcLt88AMkbqOP6Z2KtMl3JR5osswOkBJnlfQr rCRPElH2BaasJSGzbXroN0sIbFh055RPMuxVs1fpAjNPSEy6GkXdnkNImxtiL3KB/9MKKT/J+ qpmvmBkNSlSmwGbQ8+B4bIXzKG9lyklwFZvlflKuCnWv8wmoOmYv8cmzTuA/nqNOWwfADPHnZ FB1TT0DrEs/mASPI3E8pWhLaqAekbfS+p3KGDmmCJkNDtU7H/RgToIHCpJlF8O1sfkDMVvyFW 6qPFQel0ET0tvc6I+dzx5ekNr7FWxc8ivc5WXh1Rce9RVUmYsUpCVkKY2HZm7vQNpD0uo4myB DV78+AElm0FAuinJH5n/3i7JMXOs/Ib0QIe4ywsCN1u4b8jND7ofXuDcnFJpSTLFwJGXbiyVM aBERlYA/R4hif0ZQBzLcq1hZlLGBo6XTRlF6zDIL+Qdvl85Z5vmq8710pUY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 2/4] 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=20G=C3=BCnther?= , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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