From patchwork Thu Sep 22 15:30:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 115960 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 376E1B6F84 for ; Fri, 23 Sep 2011 01:32:37 +1000 (EST) Received: from localhost ([::1]:57286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6lGE-0005qc-J8 for incoming@patchwork.ozlabs.org; Thu, 22 Sep 2011 11:32:26 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6lFe-0004ei-TI for qemu-devel@nongnu.org; Thu, 22 Sep 2011 11:32:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6lFZ-0006TF-3a for qemu-devel@nongnu.org; Thu, 22 Sep 2011 11:31:50 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:54880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6lFY-0006RZ-Uk for qemu-devel@nongnu.org; Thu, 22 Sep 2011 11:31:45 -0400 Received: by mail-ww0-f53.google.com with SMTP id 14so2052898wwg.10 for ; Thu, 22 Sep 2011 08:31:44 -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=QTCCUS0JOD/Kj5oVfNcCmbMZJS2bK3BRlKVYGsHnb5k=; b=Z+WTvKb1jSayYAv/yiQynshjRPvuzZY9OM4lhnt/44Fc7r1GnIcH1GBf/mHqnKYf1T j/W85ntfVAyD/2M0ZppX09Ig0vq8sttlvjA9Y2XUtXeK4EJNjJgx1DpF1lh7It8jv2Ps N7a1KMFcphDuz8WBmeP9gNpJITC5sn9gHHjWY= Received: by 10.227.156.72 with SMTP id v8mr2279175wbw.110.1316705504486; Thu, 22 Sep 2011 08:31:44 -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 fa3sm12030729wbb.3.2011.09.22.08.31.42 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Sep 2011 08:31:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 22 Sep 2011 08:30:47 -0700 Message-Id: <1316705449-17187-5-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.6.2 In-Reply-To: <1316705449-17187-1-git-send-email-rth@twiddle.net> References: <1316705449-17187-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Subject: [Qemu-devel] [PATCH 4/6] 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 Signed-off-by: Richard Henderson --- 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 fb2e9e5..c1ef465 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*/ @@ -3061,8 +3073,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;