From patchwork Thu Jul 14 09:41:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsuneo Saito X-Patchwork-Id: 104648 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 352B4B6F68 for ; Thu, 14 Jul 2011 19:47:55 +1000 (EST) Received: from localhost ([::1]:37011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhIWO-0001jG-1X for incoming@patchwork.ozlabs.org; Thu, 14 Jul 2011 05:47:52 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhIR6-0001Dv-4F for qemu-devel@nongnu.org; Thu, 14 Jul 2011 05:42:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QhIR2-0002w7-6N for qemu-devel@nongnu.org; Thu, 14 Jul 2011 05:42:23 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:47869) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QhIR1-0002vm-Sk for qemu-devel@nongnu.org; Thu, 14 Jul 2011 05:42:20 -0400 Received: by iwn3 with SMTP id 3so42896iwn.4 for ; Thu, 14 Jul 2011 02:42:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=VwlPbAptoCybmut2FONKm/OXLblfXY5lFNfpLSVtyuE=; b=V5gVgrAu4GJCjVaAXKiieoQbzrmG37UpN6lEnrAmhOygdzDj9+ZUIBWaT+1Z6HDJ1A y4gZU9MR0qBLDLSfBOSqT2S/fuX7ClEJHGRvYsmE514V3CU6f+50hMCagoRakI84sZNj qy9KP3CXiWXdsBQkqwRB8GuPZtKkGFfONAXvE= Received: by 10.43.47.1 with SMTP id uq1mr2329308icb.134.1310636538881; Thu, 14 Jul 2011 02:42:18 -0700 (PDT) Received: from localhost.localdomain (tetkyo149119.tkyo.te.ftth2.ppp.infoweb.ne.jp [202.219.195.119]) by mx.google.com with ESMTPS id hq1sm92469icc.2.2011.07.14.02.42.17 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jul 2011 02:42:18 -0700 (PDT) From: Tsuneo Saito To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2011 18:41:40 +0900 Message-Id: <1310636503-8956-6-git-send-email-tsnsaito@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1310636503-8956-1-git-send-email-tsnsaito@gmail.com> References: <1310636503-8956-1-git-send-email-tsnsaito@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.173 Cc: Tsuneo Saito Subject: [Qemu-devel] [PATCH v2 5/8] SPARC64: Add UA2007 ASI_BLK_AIU[PS]L? ASIs for ldfa 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 Support UA2007 block load ASIs for ldfa instructions. Signed-off-by: Tsuneo Saito --- target-sparc/op_helper.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index fe71829..b76ffb6 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -3353,6 +3353,10 @@ void helper_ldf_asi(target_ulong addr, int asi, int size, int rd) } return; + case 0x16: /* UA2007 Block load primary, user privilege */ + case 0x17: /* UA2007 Block load secondary, user privilege */ + case 0x1e: /* UA2007 Block load primary LE, user privilege */ + case 0x1f: /* UA2007 Block load secondary LE, user privilege */ case 0x70: // Block load primary, user privilege case 0x71: // Block load secondary, user privilege if (rd & 7) { @@ -3361,7 +3365,7 @@ void helper_ldf_asi(target_ulong addr, int asi, int size, int rd) } helper_check_align(addr, 0x3f); for (i = 0; i < 16; i++) { - *(uint32_t *)&env->fpr[rd++] = helper_ld_asi(addr, asi & 0x1f, 4, + *(uint32_t *)&env->fpr[rd++] = helper_ld_asi(addr, asi & 0x19, 4, 0); addr += 4; }