From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAZsb-0007As-4L for qemu-devel@nongnu.org; Sat, 17 Aug 2013 02:20:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VAZsV-0007mL-1Y for qemu-devel@nongnu.org; Sat, 17 Aug 2013 02:20:52 -0400 Received: from mail-qe0-x232.google.com ([2607:f8b0:400d:c02::232]:43808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAZsU-0007mH-S4 for qemu-devel@nongnu.org; Sat, 17 Aug 2013 02:20:46 -0400 Received: by mail-qe0-f50.google.com with SMTP id q19so1635162qeb.23 for ; Fri, 16 Aug 2013 23:20:46 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Fri, 16 Aug 2013 23:20:09 -0700 Message-Id: <1376720412-2165-2-git-send-email-rth@twiddle.net> In-Reply-To: <1376720412-2165-1-git-send-email-rth@twiddle.net> References: <1376720412-2165-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 1/4] target-alpha: Implement call_pal without an exception List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com The destination of the call_pal, and the cpu state, is very predictable; there's no need for exiting the cpu loop. Signed-off-by: Richard Henderson --- target-alpha/helper.h | 1 + target-alpha/sys_helper.c | 12 ++++++++++++ target-alpha/translate.c | 25 ++++++++++++++++++++++--- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/target-alpha/helper.h b/target-alpha/helper.h index 0e425cf..5529c17 100644 --- a/target-alpha/helper.h +++ b/target-alpha/helper.h @@ -99,6 +99,7 @@ DEF_HELPER_FLAGS_2(ieee_input_cmp, TCG_CALL_NO_WG, void, env, i64) #if !defined (CONFIG_USER_ONLY) DEF_HELPER_2(hw_ret, void, env, i64) +DEF_HELPER_3(call_pal, void, env, i64, i64) DEF_HELPER_1(ldl_phys, i64, i64) DEF_HELPER_1(ldq_phys, i64, i64) diff --git a/target-alpha/sys_helper.c b/target-alpha/sys_helper.c index bd94597..ce51ed6 100644 --- a/target-alpha/sys_helper.c +++ b/target-alpha/sys_helper.c @@ -51,6 +51,17 @@ void helper_hw_ret(CPUAlphaState *env, uint64_t a) } } +void helper_call_pal(CPUAlphaState *env, uint64_t pc, uint64_t entry_ofs) +{ + int pal_mode = env->pal_mode; + env->exc_addr = pc | pal_mode; + env->pc = env->palbr + entry_ofs; + if (!pal_mode) { + env->pal_mode = 1; + swap_shadow_regs(env); + } +} + void helper_tbia(CPUAlphaState *env) { tlb_flush(env, 1); @@ -91,4 +102,5 @@ void helper_set_alarm(CPUAlphaState *env, uint64_t expire) qemu_del_timer(cpu->alarm_timer); } } + #endif /* CONFIG_USER_ONLY */ diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 0efd559..59389a2 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -1521,7 +1521,8 @@ static ExitStatus gen_call_pal(DisasContext *ctx, int palcode) tcg_gen_mov_i64(cpu_unique, cpu_ir[IR_A0]); break; default: - return gen_excp(ctx, EXCP_CALL_PAL, palcode & 0xbf); + palcode &= 0xbf; + goto do_call_pal; } return NO_EXIT; } @@ -1586,13 +1587,31 @@ static ExitStatus gen_call_pal(DisasContext *ctx, int palcode) break; default: - return gen_excp(ctx, EXCP_CALL_PAL, palcode & 0x3f); + palcode &= 0x3f; + goto do_call_pal; } return NO_EXIT; } #endif - return gen_invalid(ctx); + + do_call_pal: +#ifdef CONFIG_USER_ONLY + return gen_excp(ctx, EXCP_CALL_PAL, palcode); +#else + { + TCGv pc = tcg_const_i64(ctx->pc); + TCGv entry = tcg_const_i64(palcode & 0x80 + ? 0x2000 + (palcode - 0x80) * 64 + : 0x1000 + palcode * 64); + + gen_helper_call_pal(cpu_env, pc, entry); + + tcg_temp_free(entry); + tcg_temp_free(pc); + return EXIT_PC_UPDATED; + } +#endif } #ifndef CONFIG_USER_ONLY -- 1.8.1.4