From patchwork Tue Apr 19 15:04:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 92004 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 2B791B6FE8 for ; Wed, 20 Apr 2011 01:44:07 +1000 (EST) Received: from localhost ([::1]:57941 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCD5w-0006YT-Et for incoming@patchwork.ozlabs.org; Tue, 19 Apr 2011 11:44:04 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCD3j-0002gj-Is for qemu-devel@nongnu.org; Tue, 19 Apr 2011 11:41:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QCD3c-0005FH-Ve for qemu-devel@nongnu.org; Tue, 19 Apr 2011 11:41:47 -0400 Received: from a.mail.sonic.net ([64.142.16.245]:56235) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCD3c-0005Ei-OE for qemu-devel@nongnu.org; Tue, 19 Apr 2011 11:41:40 -0400 Received: from are.twiddle.net (are.twiddle.net [75.101.38.216]) by a.mail.sonic.net (8.13.8.Beta0-Sonic/8.13.7) with ESMTP id p3JF56sj030826 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 19 Apr 2011 08:05:06 -0700 Received: from are.twiddle.net (localhost [127.0.0.1]) by are.twiddle.net (8.14.4/8.14.4) with ESMTP id p3JF56lp012856 for ; Tue, 19 Apr 2011 08:05:06 -0700 Received: (from rth@localhost) by are.twiddle.net (8.14.4/8.14.4/Submit) id p3JF56TN012855 for qemu-devel@nongnu.org; Tue, 19 Apr 2011 08:05:06 -0700 From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Apr 2011 08:04:48 -0700 Message-Id: <1303225501-12778-12-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1303225501-12778-1-git-send-email-rth@twiddle.net> References: <1303225501-12778-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 64.142.16.245 Subject: [Qemu-devel] [PATCH 11/24] target-alpha: Merge HW_REI and HW_RET implementations. 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 | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 7c90ad9..c8ef31d 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -2939,14 +2939,24 @@ static ExitStatus translate_one(DisasContext *ctx, uint32_t insn) break; #endif case 0x1E: - /* HW_REI (PALcode) */ + /* HW_RET (PALcode) */ #if defined (CONFIG_USER_ONLY) goto invalid_opc; #else if (!ctx->pal_mode) goto invalid_opc; - gen_helper_hw_ret(cpu_ir[rb]); - break; + if (rb == 31) { + /* Pre-EV6 CPUs interpreted this as HW_REI, loading the return + address from EXC_ADDR. This turns out to be useful for our + emulation PALcode, so continue to accept it. */ + TCGv tmp = tcg_temp_new(); + tcg_gen_ld_i64(tmp, cpu_env, offsetof(CPUState, exc_addr)); + gen_helper_hw_ret(tmp); + tcg_temp_free(tmp); + } else { + gen_helper_hw_ret(cpu_ir[rb]); + } + return EXIT_PC_UPDATED; #endif case 0x1F: /* HW_ST (PALcode) */