[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 119/147] target-s390: Tidy s->op_cc handling
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 119/147] target-s390: Tidy s->op_cc handling |
Date: |
Thu, 27 Sep 2012 17:55:03 -0700 |
There's no need to force computation of the true cc_op when taking an
exception or single stepping. In either case we'll enter the next TB
with s->cc_op = DYNAMIC and recompute anyway. Just make sure that
s->cc_op is stored back to env->cc_op as needed.
Delete some dead functions, avoid allocating unused TCG temps, drop
the old s->is_jmp setting.
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/translate.c | 95 ++++++++++++++++++++++++++++--------------------
1 file changed, 55 insertions(+), 40 deletions(-)
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 74f14bc..fdb31cd 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -55,7 +55,6 @@ struct DisasContext {
uint64_t pc, next_pc;
enum cc_op cc_op;
bool singlestep_enabled;
- int is_jmp;
};
/* Information carried about a condition to be evaluated. */
@@ -72,8 +71,6 @@ typedef struct {
#define DISAS_EXCP 4
-static void gen_op_calc_cc(DisasContext *s);
-
#ifdef DEBUG_INLINE_BRANCHES
static uint64_t inline_branch_hit[CC_OP_MAX];
static uint64_t inline_branch_miss[CC_OP_MAX];
@@ -246,12 +243,17 @@ static void update_psw_addr(DisasContext *s)
tcg_gen_movi_i64(psw_addr, s->pc);
}
+static void update_cc_op(DisasContext *s)
+{
+ if (s->cc_op != CC_OP_DYNAMIC && s->cc_op != CC_OP_STATIC) {
+ tcg_gen_movi_i32(cc_op, s->cc_op);
+ }
+}
+
static void potential_page_fault(DisasContext *s)
{
-#ifndef CONFIG_USER_ONLY
update_psw_addr(s);
- gen_op_calc_cc(s);
-#endif
+ update_cc_op(s);
}
static inline uint64_t ld_code2(CPUS390XState *env, uint64_t pc)
@@ -309,13 +311,10 @@ static void gen_program_exception(DisasContext *s, int
code)
update_psw_addr(s);
/* Save off cc. */
- gen_op_calc_cc(s);
+ update_cc_op(s);
/* Trigger exception. */
gen_exception(EXCP_PGM);
-
- /* End TB here. */
- s->is_jmp = DISAS_EXCP;
}
static inline void gen_illegal_opcode(DisasContext *s)
@@ -428,23 +427,40 @@ static void set_cc_static(DisasContext *s)
s->cc_op = CC_OP_STATIC;
}
-static void gen_op_set_cc_op(DisasContext *s)
-{
- if (s->cc_op != CC_OP_DYNAMIC && s->cc_op != CC_OP_STATIC) {
- tcg_gen_movi_i32(cc_op, s->cc_op);
- }
-}
-
-static void gen_update_cc_op(DisasContext *s)
-{
- gen_op_set_cc_op(s);
-}
-
/* calculates cc into cc_op */
static void gen_op_calc_cc(DisasContext *s)
{
- TCGv_i32 local_cc_op = tcg_const_i32(s->cc_op);
- TCGv_i64 dummy = tcg_const_i64(0);
+ TCGv_i32 local_cc_op;
+ TCGv_i64 dummy;
+
+ TCGV_UNUSED_I32(local_cc_op);
+ TCGV_UNUSED_I64(dummy);
+ switch (s->cc_op) {
+ default:
+ dummy = tcg_const_i64(0);
+ /* FALLTHRU */
+ case CC_OP_ADD_64:
+ case CC_OP_ADDU_64:
+ case CC_OP_ADDC_64:
+ case CC_OP_SUB_64:
+ case CC_OP_SUBU_64:
+ case CC_OP_SUBB_64:
+ case CC_OP_ADD_32:
+ case CC_OP_ADDU_32:
+ case CC_OP_ADDC_32:
+ case CC_OP_SUB_32:
+ case CC_OP_SUBU_32:
+ case CC_OP_SUBB_32:
+ local_cc_op = tcg_const_i32(s->cc_op);
+ break;
+ case CC_OP_CONST0:
+ case CC_OP_CONST1:
+ case CC_OP_CONST2:
+ case CC_OP_CONST3:
+ case CC_OP_STATIC:
+ case CC_OP_DYNAMIC:
+ break;
+ }
switch (s->cc_op) {
case CC_OP_CONST0:
@@ -508,8 +524,12 @@ static void gen_op_calc_cc(DisasContext *s)
tcg_abort();
}
- tcg_temp_free_i32(local_cc_op);
- tcg_temp_free_i64(dummy);
+ if (!TCGV_IS_UNUSED_I32(local_cc_op)) {
+ tcg_temp_free_i32(local_cc_op);
+ }
+ if (!TCGV_IS_UNUSED_I64(dummy)) {
+ tcg_temp_free_i64(dummy);
+ }
/* We now have cc in cc_op as constant */
set_cc_static(s);
@@ -1054,7 +1074,7 @@ static ExitStatus help_goto_direct(DisasContext *s,
uint64_t dest)
return NO_EXIT;
}
if (use_goto_tb(s, dest)) {
- gen_update_cc_op(s);
+ update_cc_op(s);
tcg_gen_goto_tb(0);
tcg_gen_movi_i64(psw_addr, dest);
tcg_gen_exit_tb((tcg_target_long)s->tb);
@@ -1103,7 +1123,7 @@ static ExitStatus help_branch(DisasContext *s,
DisasCompare *c,
if (use_goto_tb(s, s->next_pc)) {
if (is_imm && use_goto_tb(s, dest)) {
/* Both exits can use goto_tb. */
- gen_update_cc_op(s);
+ update_cc_op(s);
lab = gen_new_label();
if (c->is_64) {
@@ -1141,7 +1161,7 @@ static ExitStatus help_branch(DisasContext *s,
DisasCompare *c,
}
/* Branch not taken. */
- gen_update_cc_op(s);
+ update_cc_op(s);
tcg_gen_goto_tb(0);
tcg_gen_movi_i64(psw_addr, s->next_pc);
tcg_gen_exit_tb((tcg_target_long)s->tb + 0);
@@ -1749,7 +1769,7 @@ static ExitStatus op_ex(DisasContext *s, DisasOps *o)
TCGv_i64 tmp;
update_psw_addr(s);
- gen_op_calc_cc(s);
+ update_cc_op(s);
tmp = tcg_const_i64(s->next_pc);
gen_helper_ex(cc_op, cpu_env, cc_op, o->in1, o->in2, tmp);
@@ -2913,7 +2933,7 @@ static ExitStatus op_svc(DisasContext *s, DisasOps *o)
TCGv_i32 t;
update_psw_addr(s);
- gen_op_calc_cc(s);
+ update_cc_op(s);
t = tcg_const_i32(get_field(s->fields, i1) & 0xff);
tcg_gen_st_i32(t, cpu_env, offsetof(CPUS390XState, int_svc_code));
@@ -3999,7 +4019,6 @@ static inline void
gen_intermediate_code_internal(CPUS390XState *env,
dc.pc = pc_start;
dc.cc_op = CC_OP_DYNAMIC;
do_debug = dc.singlestep_enabled = env->singlestep_enabled;
- dc.is_jmp = DISAS_NEXT;
gen_opc_end = gen_opc_buf + OPC_MAX_SIZE;
@@ -4073,17 +4092,13 @@ static inline void
gen_intermediate_code_internal(CPUS390XState *env,
update_psw_addr(&dc);
/* FALLTHRU */
case EXIT_PC_UPDATED:
- if (singlestep && dc.cc_op != CC_OP_DYNAMIC) {
- gen_op_calc_cc(&dc);
- } else {
- /* Next TB starts off with CC_OP_DYNAMIC,
- so make sure the cc op type is in env */
- gen_op_set_cc_op(&dc);
- }
+ /* Next TB starts off with CC_OP_DYNAMIC, so make sure the
+ cc op type is in env */
+ update_cc_op(&dc);
+ /* Exit the TB, either by raising a debug exception or by return. */
if (do_debug) {
gen_exception(EXCP_DEBUG);
} else {
- /* Generate the return instruction */
tcg_gen_exit_tb(0);
}
break;
--
1.7.11.4
- [Qemu-devel] [PATCH 109/147] target-s390: Convert STURA, (continued)
- [Qemu-devel] [PATCH 109/147] target-s390: Convert STURA, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 110/147] target-s390: Convert CSP, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 111/147] target-s390: Convert STCKE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 112/147] target-s390: Convert SACF, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 113/147] target-s390: Convert STSI, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 114/147] target-s390: Convert STFL, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 115/147] target-s390: Convert LPSWE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 116/147] target-s390: Convert SERVC, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 117/147] target-s390: Delete dead code from old translator, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 118/147] target-s390: Implement BRANCH ON INDEX, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 119/147] target-s390: Tidy s->op_cc handling,
Richard Henderson <=
- [Qemu-devel] [PATCH 120/147] target-s390: Implement COMPARE AND BRANCH, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 121/147] target-s390: Implement RISBG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 122/147] target-s390: Implement LDGR, LGDR, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 123/147] target-s390: Implement R[NOX]SBG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 124/147] target-s390: Implement PREFETCH, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 125/147] target-s390: Implement COMPARE RELATIVE LONG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 126/147] target-s390: Implement COMPARE AND TRAP, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 127/147] target-s390: Implement LOAD ON CONDITION, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 128/147] target-s390: Implement STORE ON CONDITION, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 129/147] target-s390: Implement CONVERT TO LOGICAL, Richard Henderson, 2012/09/27