From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV6tM-0003wu-1Z for qemu-devel@nongnu.org; Thu, 27 Aug 2015 19:47:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZV6tI-0005xW-QA for qemu-devel@nongnu.org; Thu, 27 Aug 2015 19:47:35 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 27 Aug 2015 17:47:34 -0600 Message-Id: <1440719254-12349-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] tcg/aarch64: Fix tcg_out_qemu_{ld, st} for linux-user List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Claudio Fontana , "v2.4.0" , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno , Richard Henderson The argument order for the !CONFIG_SOFTMMU case was jumbled up since ffc6372851d8631a9f9fa56ec613b3244dc635b9 ("tcg/aarch64: use 32-bit offset for 32-bit user-mode emulation"), regressing from -rc2 to v2.4.0. Fix their order to avoid segfaults, e.g., in openSUSE's GNU coreutils 8.2= 4. Cc: Paolo Bonzini Cc: Aurelien Jarno Cc: Richard Henderson Cc: qemu-stable@nongnu.org (v2.4.0) Signed-off-by: Andreas F=C3=A4rber --- tcg/aarch64/tcg-target.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c index 01ae610..6f7dd4e 100644 --- a/tcg/aarch64/tcg-target.c +++ b/tcg/aarch64/tcg-target.c @@ -1224,9 +1224,8 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg d= ata_reg, TCGReg addr_reg, add_qemu_ldst_label(s, true, oi, ext, data_reg, addr_reg, s->code_ptr, label_ptr); #else /* !CONFIG_SOFTMMU */ - tcg_out_qemu_ld_direct(s, memop, ext, data_reg, - guest_base ? TCG_REG_GUEST_BASE : TCG_REG_XZR= , - otype, addr_reg); + tcg_out_qemu_ld_direct(s, memop, ext, data_reg, addr_reg, otype, + guest_base ? TCG_REG_GUEST_BASE : TCG_REG_XZR= ); #endif /* CONFIG_SOFTMMU */ } =20 @@ -1245,9 +1244,8 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg d= ata_reg, TCGReg addr_reg, add_qemu_ldst_label(s, false, oi, (memop & MO_SIZE)=3D=3D MO_64, data_reg, addr_reg, s->code_ptr, label_ptr); #else /* !CONFIG_SOFTMMU */ - tcg_out_qemu_st_direct(s, memop, data_reg, - guest_base ? TCG_REG_GUEST_BASE : TCG_REG_XZR= , - otype, addr_reg); + tcg_out_qemu_st_direct(s, memop, data_reg, addr_reg, otype, + guest_base ? TCG_REG_GUEST_BASE : TCG_REG_XZR= ); #endif /* CONFIG_SOFTMMU */ } =20 --=20 2.1.4