From patchwork Mon Apr 12 23:14:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 50009 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 52955B7C48 for ; Tue, 13 Apr 2010 09:48:07 +1000 (EST) Received: from localhost ([127.0.0.1]:53271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1TLR-00084y-6B for incoming@patchwork.ozlabs.org; Mon, 12 Apr 2010 19:47:09 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O1T1w-0000uK-Ae for qemu-devel@nongnu.org; Mon, 12 Apr 2010 19:27:01 -0400 Received: from [140.186.70.92] (port=54780 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1T1j-0000n3-OM for qemu-devel@nongnu.org; Mon, 12 Apr 2010 19:26:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O1T1e-0007EX-Q3 for qemu-devel@nongnu.org; Mon, 12 Apr 2010 19:26:47 -0400 Received: from are.twiddle.net ([75.149.56.221]:42303) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O1T1e-0007Dh-D1 for qemu-devel@nongnu.org; Mon, 12 Apr 2010 19:26:42 -0400 Received: by are.twiddle.net (Postfix, from userid 5000) id 44EA8D66; Mon, 12 Apr 2010 16:26:40 -0700 (PDT) Message-Id: In-Reply-To: References: From: Richard Henderson Date: Mon, 12 Apr 2010 16:14:54 -0700 To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 02/10] target-alpha: Implement rs/rc properly. 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 This is a per-cpu flag; there's no need for a spinlock of any kind. We were also failing to manipulate the flag with $31 as a target reg and failing to clear the flag on execution of a return-from-interrupt instruction. Signed-off-by: Richard Henderson --- linux-user/main.c | 7 ++++++- target-alpha/helper.h | 2 -- target-alpha/op_helper.c | 28 ++-------------------------- target-alpha/translate.c | 19 +++++++++++++++---- 4 files changed, 23 insertions(+), 33 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index b394c00..c0cc261 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2357,6 +2357,11 @@ void cpu_loop (CPUState *env) while (1) { trapnr = cpu_alpha_exec (env); + /* All of the traps imply a transition through PALcode, which + implies an REI instruction has been executed. Which means + that the intr_flag should be cleared. */ + env->intr_flag = 0; + switch (trapnr) { case EXCP_RESET: fprintf(stderr, "Reset requested. Exit\n"); @@ -2443,7 +2448,7 @@ void cpu_loop (CPUState *env) env->ir[IR_A0], env->ir[IR_A1], env->ir[IR_A2], env->ir[IR_A3], env->ir[IR_A4], env->ir[IR_A5]); - if (trapnr != TARGET_NR_sigreturn + if (trapnr != TARGET_NR_sigreturn && trapnr != TARGET_NR_rt_sigreturn) { env->ir[IR_V0] = (sysret < 0 ? -sysret : sysret); env->ir[IR_A3] = (sysret < 0); diff --git a/target-alpha/helper.h b/target-alpha/helper.h index 73413f2..10c78d0 100644 --- a/target-alpha/helper.h +++ b/target-alpha/helper.h @@ -2,8 +2,6 @@ DEF_HELPER_2(excp, void, int, int) DEF_HELPER_FLAGS_0(load_pcc, TCG_CALL_CONST | TCG_CALL_PURE, i64) -DEF_HELPER_FLAGS_0(rc, TCG_CALL_CONST, i64) -DEF_HELPER_FLAGS_0(rs, TCG_CALL_CONST, i64) DEF_HELPER_2(addqv, i64, i64, i64) DEF_HELPER_2(addlv, i64, i64, i64) diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index ded71f6..f9cd07a 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -47,32 +47,6 @@ void helper_store_fpcr (uint64_t val) cpu_alpha_store_fpcr (env, val); } -static spinlock_t intr_cpu_lock = SPIN_LOCK_UNLOCKED; - -uint64_t helper_rs(void) -{ - uint64_t tmp; - - spin_lock(&intr_cpu_lock); - tmp = env->intr_flag; - env->intr_flag = 1; - spin_unlock(&intr_cpu_lock); - - return tmp; -} - -uint64_t helper_rc(void) -{ - uint64_t tmp; - - spin_lock(&intr_cpu_lock); - tmp = env->intr_flag; - env->intr_flag = 0; - spin_unlock(&intr_cpu_lock); - - return tmp; -} - uint64_t helper_addqv (uint64_t op1, uint64_t op2) { uint64_t tmp = op1; @@ -1191,6 +1165,7 @@ void helper_hw_rei (void) { env->pc = env->ipr[IPR_EXC_ADDR] & ~3; env->ipr[IPR_EXC_ADDR] = env->ipr[IPR_EXC_ADDR] & 1; + env->intr_flag = 0; /* XXX: re-enable interrupts and memory mapping */ } @@ -1198,6 +1173,7 @@ void helper_hw_ret (uint64_t a) { env->pc = a & ~3; env->ipr[IPR_EXC_ADDR] = a & 1; + env->intr_flag = 0; /* XXX: re-enable interrupts and memory mapping */ } diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 817194e..939496c 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -1301,6 +1301,19 @@ static void gen_cmp(TCGCond cond, int ra, int rb, int rc, } } +static void gen_rx(int ra, int set) +{ + TCGv_i32 tmp; + + if (ra != 31) { + tcg_gen_ld8u_i64(cpu_ir[ra], cpu_env, offsetof(CPUState, intr_flag)); + } + + tmp = tcg_const_i32(set); + tcg_gen_st8_i32(tmp, cpu_env, offsetof(CPUState, intr_flag)); + tcg_temp_free_i32(tmp); +} + static inline int translate_one(DisasContext *ctx, uint32_t insn) { uint32_t palcode; @@ -2395,16 +2408,14 @@ static inline int translate_one(DisasContext *ctx, uint32_t insn) break; case 0xE000: /* RC */ - if (ra != 31) - gen_helper_rc(cpu_ir[ra]); + gen_rx(ra, 0); break; case 0xE800: /* ECB */ break; case 0xF000: /* RS */ - if (ra != 31) - gen_helper_rs(cpu_ir[ra]); + gen_rx(ra, 1); break; case 0xF800: /* WH64 */