From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ST8TH-0005xv-78 for qemu-devel@nongnu.org; Sat, 12 May 2012 05:18:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ST8TF-0006fa-Hv for qemu-devel@nongnu.org; Sat, 12 May 2012 05:18:38 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:63527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ST8TF-0006eJ-8m for qemu-devel@nongnu.org; Sat, 12 May 2012 05:18:37 -0400 Received: by mail-bk0-f45.google.com with SMTP id j10so3106760bkw.4 for ; Sat, 12 May 2012 02:18:36 -0700 (PDT) From: Artyom Tarasenko Date: Sat, 12 May 2012 11:15:21 +0200 Message-Id: <576d7f282d704fa7f8828af1f57c86f606a55ef3.1336811825.git.atar4qemu@gmail.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 2/4, master+QEMU 1.1] fix block loads broken in commit 30038fd818 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, Artyom Tarasenko Fix UltraSPARC/JPS1/UA2007 VIS block load instructions broken in 30038fd81808f7c3bca92be2369e74c8ca7b3d69 Conflicts: target-sparc/ldst_helper.c Signed-off-by: Artyom Tarasenko --- target-sparc/ldst_helper.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index 04ffddf..27660dd 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -2098,8 +2098,8 @@ void helper_ldf_asi(CPUSPARCState *env, target_ulong addr, int asi, int size, return; } helper_check_align(env, addr, 0x3f); - for (i = 0; i < 8; i++, rd += 2, addr += 4) { - env->fpr[rd / 2].ll = helper_ld_asi(env, addr, asi & 0x19, 8, 0); + for (i = 0; i < 8; i++, rd += 2, addr += 8) { + env->fpr[rd/2].ll = helper_ld_asi(env, addr, asi & 0x19, 8, 0); } return; -- 1.7.1