Skip to content

Commit

Permalink
tcg: Adjust tcg_register_jit for const
Browse files Browse the repository at this point in the history
We must change all targets at once, since all must match
the declaration in tcg.c.

Reviewed-by: Joelle van Dyne <j@getutm.app>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
rth7680 committed Jan 7, 2021
1 parent 92ab8e7 commit 755bf9e
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion include/tcg/tcg.h
Expand Up @@ -1255,7 +1255,7 @@ typedef uintptr_t tcg_prologue_fn(CPUArchState *env, const void *tb_ptr);
extern tcg_prologue_fn *tcg_qemu_tb_exec;
#endif

void tcg_register_jit(void *buf, size_t buf_size);
void tcg_register_jit(const void *buf, size_t buf_size);

#if TCG_TARGET_MAYBE_vec
/* Return zero if the tuple (opc, type, vece) is unsupportable;
Expand Down
2 changes: 1 addition & 1 deletion tcg/aarch64/tcg-target.c.inc
Expand Up @@ -2964,7 +2964,7 @@ static const DebugFrame debug_frame = {
}
};

void tcg_register_jit(void *buf, size_t buf_size)
void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
2 changes: 1 addition & 1 deletion tcg/arm/tcg-target.c.inc
Expand Up @@ -2353,7 +2353,7 @@ static const DebugFrame debug_frame = {
}
};

void tcg_register_jit(void *buf, size_t buf_size)
void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
2 changes: 1 addition & 1 deletion tcg/i386/tcg-target.c.inc
Expand Up @@ -3976,7 +3976,7 @@ static const DebugFrame debug_frame = {
#endif

#if defined(ELF_HOST_MACHINE)
void tcg_register_jit(void *buf, size_t buf_size)
void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
Expand Down
2 changes: 1 addition & 1 deletion tcg/mips/tcg-target.c.inc
Expand Up @@ -2703,7 +2703,7 @@ static const DebugFrame debug_frame = {
}
};

void tcg_register_jit(void *buf, size_t buf_size)
void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
2 changes: 1 addition & 1 deletion tcg/ppc/tcg-target.c.inc
Expand Up @@ -3847,7 +3847,7 @@ static DebugFrame debug_frame = {
}
};

void tcg_register_jit(void *buf, size_t buf_size)
void tcg_register_jit(const void *buf, size_t buf_size)
{
uint8_t *p = &debug_frame.fde_reg_ofs[3];
int i;
Expand Down
2 changes: 1 addition & 1 deletion tcg/riscv/tcg-target.c.inc
Expand Up @@ -1907,7 +1907,7 @@ static const DebugFrame debug_frame = {
}
};

void tcg_register_jit(void *buf, size_t buf_size)
void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
2 changes: 1 addition & 1 deletion tcg/s390/tcg-target.c.inc
Expand Up @@ -2620,7 +2620,7 @@ static const DebugFrame debug_frame = {
}
};

void tcg_register_jit(void *buf, size_t buf_size)
void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
2 changes: 1 addition & 1 deletion tcg/sparc/tcg-target.c.inc
Expand Up @@ -1816,7 +1816,7 @@ static const DebugFrame debug_frame = {
.fde_ret_save = { 9, 15, 31 }, /* DW_CFA_register o7, i7 */
};

void tcg_register_jit(void *buf, size_t buf_size)
void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
Expand Down
10 changes: 5 additions & 5 deletions tcg/tcg.c
Expand Up @@ -97,7 +97,7 @@ typedef struct QEMU_PACKED {
DebugFrameFDEHeader fde;
} DebugFrameHeader;

static void tcg_register_jit_int(void *buf, size_t size,
static void tcg_register_jit_int(const void *buf, size_t size,
const void *debug_frame,
size_t debug_frame_size)
__attribute__((unused));
Expand Down Expand Up @@ -1137,7 +1137,7 @@ void tcg_prologue_init(TCGContext *s)
total_size -= prologue_size;
s->code_gen_buffer_size = total_size;

tcg_register_jit(s->code_gen_buffer, total_size);
tcg_register_jit(tcg_splitwx_to_rx(s->code_gen_buffer), total_size);

#ifdef DEBUG_DISAS
if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM)) {
Expand Down Expand Up @@ -4511,7 +4511,7 @@ static int find_string(const char *strtab, const char *str)
}
}

static void tcg_register_jit_int(void *buf_ptr, size_t buf_size,
static void tcg_register_jit_int(const void *buf_ptr, size_t buf_size,
const void *debug_frame,
size_t debug_frame_size)
{
Expand Down Expand Up @@ -4713,13 +4713,13 @@ static void tcg_register_jit_int(void *buf_ptr, size_t buf_size,
/* No support for the feature. Provide the entry point expected by exec.c,
and implement the internal function we declared earlier. */

static void tcg_register_jit_int(void *buf, size_t size,
static void tcg_register_jit_int(const void *buf, size_t size,
const void *debug_frame,
size_t debug_frame_size)
{
}

void tcg_register_jit(void *buf, size_t buf_size)
void tcg_register_jit(const void *buf, size_t buf_size)
{
}
#endif /* ELF_HOST_MACHINE */
Expand Down

0 comments on commit 755bf9e

Please sign in to comment.