From patchwork Sat May 12 09:15:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 158725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C0C23B7015 for ; Sat, 12 May 2012 19:18:53 +1000 (EST) Received: from localhost ([::1]:51166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ST8TT-000666-HY for incoming@patchwork.ozlabs.org; Sat, 12 May 2012 05:18:51 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=r1xW3nqzF8ZVuN2iQmmej8GnKeYATUz4gCkaubMnvUQ=; b=ISdN+oky59b/1IrbJyCPglRJYNZ0sIrcygupEo/DnCFM0iRiJWj2G5XNh1yeGr8L2j igZXxlvP4Mysab25OcSGYQp+49ALtEJ00oJl4OOreCRAg1LMFhyKtyUzLBnhaEdZoYiz lMOubwfsuR+F+fjBfkt9ClxHLR0IUGVo+k3UM5EITpOt+8993+LAB/22ymj8iiQrRGK5 s6+oyb5QZna1X8f5HJF4JONe5XhUbr8z5tdSeUcN+O3D//ZarS/6A7ctmTHzks878KNo qQJsydjHYJtREWnxDnrL7nVGgTdYpXEUuEthZ8u0X5uxaK6ZVnHTNjzL+Yy3RL6EWp/J 74YQ== Received: by 10.204.156.220 with SMTP id y28mr434908bkw.37.1336814316402; Sat, 12 May 2012 02:18:36 -0700 (PDT) Received: from localhost (e180217031.adsl.alicedsl.de. [85.180.217.31]) by mx.google.com with ESMTPS id u8sm22975032bks.0.2012.05.12.02.18.34 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 12 May 2012 02:18:35 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Sat, 12 May 2012 11:15:21 +0200 Message-Id: <576d7f282d704fa7f8828af1f57c86f606a55ef3.1336811825.git.atar4qemu@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.45 Cc: blauwirbel@gmail.com, Artyom Tarasenko Subject: [Qemu-devel] [PATCH 2/4, master+QEMU 1.1] fix block loads broken in commit 30038fd818 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;