mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcg: Make DisasContextBase.tb const

Browse Source 
There is nothing within the translators that ought to be
changing the TranslationBlock data, so make it const.

This does not actually use the read-only copy of the
data structure that exists within the rx region.

Reviewed-by: Joelle van Dyne <j@getutm.app>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2020-10-29 09:49:05 -07:00
parent 1acbad0f27
commit d997143533
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accel/tcg/translator.c
View File

@ -133,8 +133,8 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db,
} }
/* The disas_log hook may use these values rather than recompute. */ /* The disas_log hook may use these values rather than recompute. */
db->tb->size = db->pc_next - db->pc_first; tb->size = db->pc_next - db->pc_first;
db->tb->icount = db->num_insns; tb->icount = db->num_insns;
#ifdef DEBUG_DISAS #ifdef DEBUG_DISAS
if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)

4
include/exec/gen-icount.h
View File

@ -32,7 +32,7 @@ static inline void gen_io_end(void)
tcg_temp_free_i32(tmp); tcg_temp_free_i32(tmp);
} }
static inline void gen_tb_start(TranslationBlock *tb) static inline void gen_tb_start(const TranslationBlock *tb)
{ {
TCGv_i32 count, imm; TCGv_i32 count, imm;
@ -71,7 +71,7 @@ static inline void gen_tb_start(TranslationBlock *tb)
tcg_temp_free_i32(count); tcg_temp_free_i32(count);
} }
static inline void gen_tb_end(TranslationBlock *tb, int num_insns) static inline void gen_tb_end(const TranslationBlock *tb, int num_insns)
{ {
if (tb_cflags(tb) & CF_USE_ICOUNT) { if (tb_cflags(tb) & CF_USE_ICOUNT) {
/* Update the num_insn immediate parameter now that we know /* Update the num_insn immediate parameter now that we know

2
include/exec/translator.h
View File

@ -67,7 +67,7 @@ typedef enum DisasJumpType {
* Architecture-agnostic disassembly context. * Architecture-agnostic disassembly context.
*/ */
typedef struct DisasContextBase { typedef struct DisasContextBase {
TranslationBlock *tb; const TranslationBlock *tb;
target_ulong pc_first; target_ulong pc_first;
target_ulong pc_next; target_ulong pc_next;
DisasJumpType is_jmp; DisasJumpType is_jmp;

2
include/tcg/tcg-op.h
View File

@ -805,7 +805,7 @@ static inline void tcg_gen_insn_start(target_ulong pc, target_ulong a1,
* be NULL and @idx should be 0. Otherwise, @tb should be valid and * be NULL and @idx should be 0. Otherwise, @tb should be valid and
* @idx should be one of the TB_EXIT_ values. * @idx should be one of the TB_EXIT_ values.
*/ */
void tcg_gen_exit_tb(TranslationBlock *tb, unsigned idx); void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx);
/** /**
* tcg_gen_goto_tb() - output goto_tb TCG operation * tcg_gen_goto_tb() - output goto_tb TCG operation

2
target/arm/translate-a64.c
View File

@ -410,7 +410,7 @@ static inline bool use_goto_tb(DisasContext *s, int n, uint64_t dest)
static inline void gen_goto_tb(DisasContext *s, int n, uint64_t dest) static inline void gen_goto_tb(DisasContext *s, int n, uint64_t dest)
{ {
TranslationBlock *tb; const TranslationBlock *tb;
tb = s->base.tb; tb = s->base.tb;
if (use_goto_tb(s, n, dest)) { if (use_goto_tb(s, n, dest)) {

2
tcg/tcg-op.c
View File

@ -2664,7 +2664,7 @@ void tcg_gen_extr32_i64(TCGv_i64 lo, TCGv_i64 hi, TCGv_i64 arg)
/* QEMU specific operations. */ /* QEMU specific operations. */
void tcg_gen_exit_tb(TranslationBlock *tb, unsigned idx) void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx)
{ {
uintptr_t val = (uintptr_t)tb + idx; uintptr_t val = (uintptr_t)tb + idx;