From nobody Wed May 8 01:50:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516788930257498.47814206180533; Wed, 24 Jan 2018 02:15:30 -0800 (PST) Received: from localhost ([::1]:39046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeI5Y-0003kw-Pb for importer@patchew.org; Wed, 24 Jan 2018 05:15:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeI4F-0002wU-NK for qemu-devel@nongnu.org; Wed, 24 Jan 2018 05:14:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeI4E-0003Zc-O3 for qemu-devel@nongnu.org; Wed, 24 Jan 2018 05:14:07 -0500 Received: from honk.sigxcpu.org ([24.134.29.49]:46900) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eeI49-0003UX-Bv; Wed, 24 Jan 2018 05:14:01 -0500 Received: from localhost (localhost [127.0.0.1]) by honk.sigxcpu.org (Postfix) with ESMTP id 55B38FB03; Wed, 24 Jan 2018 11:13:59 +0100 (CET) Received: from honk.sigxcpu.org ([127.0.0.1]) by localhost (honk.sigxcpu.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jS_DxjBQ_6ik; Wed, 24 Jan 2018 11:13:58 +0100 (CET) Received: by bogon.sigxcpu.org (Postfix, from userid 1000) id 123F345ED5; Wed, 24 Jan 2018 11:13:58 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at honk.sigxcpu.org Date: Wed, 24 Jan 2018 11:13:58 +0100 From: Guido =?iso-8859-1?Q?G=FCnther?= To: Laurent Vivier Message-ID: <20180124101358.GA5028@bogon.m.sigxcpu.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.2 (2017-12-15) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 24.134.29.49 Subject: [Qemu-devel] [PATCH] 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: Riku Voipio , Richard Henderson , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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=C3=BCnther Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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/a= arch64/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 =3D=3D syscall number - * x0 ... x7 =3D=3D syscall arguments + * x0 ... x6 =3D=3D 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] =20 /* This next sequence of code works in conjunction with the * rewind_if_safe_syscall_function(). If a signal is taken --=20 2.15.1