[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/24] target-alpha: Copy singlestep_enabled to Disas
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 09/24] target-alpha: Copy singlestep_enabled to DisasContext |
Date: |
Tue, 23 Jul 2013 04:53:41 +0200 |
From: Richard Henderson <address@hidden>
Prepare for removing env from DisasContext.
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-alpha/translate.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 5558b72..6a1aad6 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -46,6 +46,8 @@ struct DisasContext {
int tb_rm;
/* Current flush-to-zero setting for this TB. */
int tb_ftz;
+
+ bool singlestep_enabled;
};
/* Return values from translate_one, indicating the state of the TB.
@@ -380,7 +382,7 @@ static int use_goto_tb(DisasContext *ctx, uint64_t dest)
/* Check for the dest on the same page as the start of the TB. We
also want to suppress goto_tb in the case of single-steping and IO. */
return (((ctx->tb->pc ^ dest) & TARGET_PAGE_MASK) == 0
- && !ctx->env->singlestep_enabled
+ && !ctx->singlestep_enabled
&& !(ctx->tb->cflags & CF_LAST_IO));
}
@@ -3401,6 +3403,7 @@ static inline void
gen_intermediate_code_internal(AlphaCPU *cpu,
ctx.env = env;
ctx.pc = pc_start;
ctx.mem_idx = cpu_mmu_index(env);
+ ctx.singlestep_enabled = env->singlestep_enabled;
/* ??? Every TB begins with unset rounding mode, to be initialized on
the first fp insn of the TB. Alternately we could define a proper
@@ -3457,7 +3460,7 @@ static inline void
gen_intermediate_code_internal(AlphaCPU *cpu,
|| tcg_ctx.gen_opc_ptr >= gen_opc_end
|| num_insns >= max_insns
|| singlestep
- || env->singlestep_enabled)) {
+ || ctx.singlestep_enabled)) {
ret = EXIT_PC_STALE;
}
} while (ret == NO_EXIT);
@@ -3474,7 +3477,7 @@ static inline void
gen_intermediate_code_internal(AlphaCPU *cpu,
tcg_gen_movi_i64(cpu_pc, ctx.pc);
/* FALLTHRU */
case EXIT_PC_UPDATED:
- if (env->singlestep_enabled) {
+ if (ctx.singlestep_enabled) {
gen_excp_1(EXCP_DEBUG, 0);
} else {
tcg_gen_exit_tb(0);
--
1.8.1.4
- [Qemu-devel] [PULL 00/24] QOM CPUState patch queue 2013-07-22, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 05/24] target-m68k: Implement CPUClass::set_pc(), Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 01/24] gdbstub: Change GDBState::query_cpu to CPUState, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 03/24] HACKING: Document vaddr type usage, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 06/24] target-moxie: Implement CPUClass::set_pc(), Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 02/24] cpu: Introduce vaddr type, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 07/24] target-unicore32: Implement CPUClass::set_pc(), Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 04/24] cpu: Introduce CPUClass::set_pc() for gdb_set_cpu_pc(), Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 09/24] target-alpha: Copy singlestep_enabled to DisasContext,
Andreas Färber <=
- [Qemu-devel] [PULL 10/24] target-alpha: Copy implver to DisasContext, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 12/24] gdbstub: Update gdb_handlesig() and gdb_signalled() Coding Style, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 13/24] cpu: Change cpu_single_step() argument to CPUState, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 08/24] cpu: Introduce CPUClass::synchronize_from_tb() for cpu_pc_from_tb(), Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 14/24] kvm: Change kvm_{insert, remove}_breakpoint() argument to CPUState, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 15/24] gdbstub: Change syscall callback argument to CPUState, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 17/24] gdbstub: Change gdb_{read, write}_register() argument to CPUState, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 16/24] gdbstub: Change gdb_handlesig() argument to CPUState, Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 20/24] cpu: Introduce CPUClass::memory_rw_debug() for target_memory_rw_debug(), Andreas Färber, 2013/07/22
- [Qemu-devel] [PULL 11/24] cpu: Move singlestep_enabled field from CPU_COMMON to CPUState, Andreas Färber, 2013/07/22