From patchwork Sat Jul 23 19:17:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 106481 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 82148B6F76 for ; Sun, 24 Jul 2011 05:46:18 +1000 (EST) Received: from localhost ([::1]:50088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qkhis-00065Z-Mn for incoming@patchwork.ozlabs.org; Sat, 23 Jul 2011 15:18:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qkhi0-00036S-Li for qemu-devel@nongnu.org; Sat, 23 Jul 2011 15:17:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qkhhy-0004tW-5S for qemu-devel@nongnu.org; Sat, 23 Jul 2011 15:17:56 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:37275) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qkhhx-0004sf-R6 for qemu-devel@nongnu.org; Sat, 23 Jul 2011 15:17:54 -0400 Received: by mail-vx0-f173.google.com with SMTP id 29so2635039vxi.4 for ; Sat, 23 Jul 2011 12:17:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=TB31XsMzdBrr2lKnAFwuSTronKo2815ohiF3DbjCKcc=; b=UK7fogXMJaRAWufd33Yd3ET1wlS5HTgIW4Z8Ds4kiMjqlERur5ICDvnkzTdA4/v6Ri PqrDiRAAs1At7O+X2roZ+ip67YhqRcmU91CUoVu3NqNrx6fSWZM8sdAvVMadqQ1rigsS NRRe5K57uOYiGN7sEg8vWij2L/yRYmLYHWW2g= Received: by 10.220.0.205 with SMTP id 13mr763937vcc.105.1311448673663; Sat, 23 Jul 2011 12:17:53 -0700 (PDT) Received: from localhost.localdomain (c-71-227-161-214.hsd1.wa.comcast.net [71.227.161.214]) by mx.google.com with ESMTPS id z4sm1361183vcd.11.2011.07.23.12.17.52 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 23 Jul 2011 12:17:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Jul 2011 12:17:37 -0700 Message-Id: <1311448659-17424-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1311448659-17424-1-git-send-email-rth@twiddle.net> References: <1311448659-17424-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.220.173 Subject: [Qemu-devel] [PATCH 5/7] target-alpha: Implement WAIT IPR. 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 --- target-alpha/translate.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/target-alpha/translate.c b/target-alpha/translate.c index c61906a..fddaff8 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -1617,9 +1617,10 @@ static void gen_mfpr(int ra, int regno) } } -static void gen_mtpr(int rb, int regno) +static ExitStatus gen_mtpr(DisasContext *ctx, int rb, int regno) { TCGv tmp; + int data; if (rb == 31) { tmp = tcg_const_i64(0); @@ -1627,19 +1628,27 @@ static void gen_mtpr(int rb, int regno) tmp = cpu_ir[rb]; } - /* These two register numbers perform a TLB cache flush. Thankfully we - can only do this inside PALmode, which means that the current basic - block cannot be affected by the change in mappings. */ - if (regno == 255) { + switch (regno) { + case 255: /* TBIA */ gen_helper_tbia(); - } else if (regno == 254) { + break; + + case 254: /* TBIS */ gen_helper_tbis(tmp); - } else { + break; + + case 253: + /* WAIT */ + tmp = tcg_const_i64(1); + tcg_gen_st32_i64(tmp, cpu_env, offsetof(CPUState, halted)); + return gen_excp(ctx, EXCP_HLT, 0); + + default: /* The basic registers are data only, and unknown registers are read-zero, write-ignore. */ - int data = cpu_pr_data(regno); + data = cpu_pr_data(regno); if (data != 0) { if (data & PR_BYTE) { tcg_gen_st8_i64(tmp, cpu_env, data & ~PR_BYTE); @@ -1649,11 +1658,14 @@ static void gen_mtpr(int rb, int regno) tcg_gen_st_i64(tmp, cpu_env, data); } } + break; } if (rb == 31) { tcg_temp_free(tmp); } + + return NO_EXIT; } #endif /* !USER_ONLY*/ @@ -3053,8 +3065,7 @@ static ExitStatus translate_one(DisasContext *ctx, uint32_t insn) /* HW_MTPR (PALcode) */ #ifndef CONFIG_USER_ONLY if (ctx->tb->flags & TB_FLAGS_PAL_MODE) { - gen_mtpr(rb, insn & 0xffff); - break; + return gen_mtpr(ctx, rb, insn & 0xffff); } #endif goto invalid_opc;