From patchwork Fri May 28 21:05:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Igor V. Kovalenko" X-Patchwork-Id: 53960 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E602EB7D24 for ; Sat, 29 May 2010 07:12:06 +1000 (EST) Received: from localhost ([127.0.0.1]:34875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OI6qA-0003FH-FF for incoming@patchwork.ozlabs.org; Fri, 28 May 2010 17:11:38 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:subject:to:from:date :message-id:user-agent:mime-version:content-type :content-transfer-encoding; bh=uKFXZuIefJ7f9N+KJaKZ32YwMvJBm17d9Z0A98jio8k=; b=GpmG3eWZw6xDb63wOPCHxw6jgnV7k02uowzTtu0G1tiMB/A8q0eGLfz8os+grYHaTw vOHwhFdObP6E1N0R3Xz4eV3CfUlqobiNV7mibyPT4elUF6RaEi31fkm7AbbLpotnFI6K xZmbZ45eJ11ocWeqVZmS4KtJglQnUkTDNCpH4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:to:from:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; b=FTYC85eCJ5c+VcNothF2w4icMb3h6E7itN+6KNBmdaQ3BlMxU/ShtNR2yFv09NSKtm vGLNAWcBZCw15hf3B1y7uT1DYwjgjPYDcSLUgIthkA8GH5pi+bLo0au2yEdtUy+QBoIR VV1f6R9ouFME6Nds7Md6c2CfY6WuIf8qJOxbo= Received: by 10.223.19.18 with SMTP id y18mr1010399faa.6.1275080748872; Fri, 28 May 2010 14:05:48 -0700 (PDT) Received: from skyserv ([87.255.14.75]) by mx.google.com with ESMTPS id r25sm13813305fai.23.2010.05.28.14.05.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 28 May 2010 14:05:48 -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 To: qemu-devel@nongnu.org From: "Igor V. Kovalenko" Date: Sat, 29 May 2010 01:05:46 +0400 Message-ID: <20100528210546.23726.83653.stgit@skyserv> User-Agent: StGit/0.15 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] sparc64: fix 128-bit atomic load from nucleus context v1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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]);