From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49884 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OI6kZ-00079U-Mf for qemu-devel@nongnu.org; Fri, 28 May 2010 17:05:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OI6kY-0003DI-Fj for qemu-devel@nongnu.org; Fri, 28 May 2010 17:05:51 -0400 Received: from mail-fx0-f45.google.com ([209.85.161.45]:63859) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OI6kY-0003Cx-B5 for qemu-devel@nongnu.org; Fri, 28 May 2010 17:05:50 -0400 Received: by fxm17 with SMTP id 17so1343399fxm.4 for ; Fri, 28 May 2010 14:05:49 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=[192.168.1.2]) by skyserv with esmtp (Exim 4.71) (envelope-from ) id 1OI6kV-0006B3-B9 for qemu-devel@nongnu.org; Sat, 29 May 2010 01:05:47 +0400 From: "Igor V. Kovalenko" Date: Sat, 29 May 2010 01:05:46 +0400 Message-ID: <20100528210546.23726.83653.stgit@skyserv> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] sparc64: fix 128-bit atomic load from nucleus context v1 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Igor V. Kovalenko - change 128-bit atomic loads to reference nucleus context v0->v1: dropped disassembler change Signed-off-by: Igor V. Kovalenko --- target-sparc/op_helper.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index edeeb44..f468e7b 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -3060,19 +3060,19 @@ void helper_ldda_asi(target_ulong addr, int asi, int rd) case 0x2c: // Nucleus quad LDD 128 bit atomic LE helper_check_align(addr, 0xf); if (rd == 0) { - env->gregs[1] = ldq_kernel(addr + 8); + env->gregs[1] = ldq_nucleus(addr + 8); if (asi == 0x2c) bswap64s(&env->gregs[1]); } else if (rd < 8) { - env->gregs[rd] = ldq_kernel(addr); - env->gregs[rd + 1] = ldq_kernel(addr + 8); + env->gregs[rd] = ldq_nucleus(addr); + env->gregs[rd + 1] = ldq_nucleus(addr + 8); if (asi == 0x2c) { bswap64s(&env->gregs[rd]); bswap64s(&env->gregs[rd + 1]); } } else { - env->regwptr[rd] = ldq_kernel(addr); - env->regwptr[rd + 1] = ldq_kernel(addr + 8); + env->regwptr[rd] = ldq_nucleus(addr); + env->regwptr[rd + 1] = ldq_nucleus(addr + 8); if (asi == 0x2c) { bswap64s(&env->regwptr[rd]); bswap64s(&env->regwptr[rd + 1]);