mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 01:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

gen-icount: Use tcg_set_insn_param

Browse source 
Use tcg_set_insn_param() instead of directly accessing internal
tcg data structures to update an insn param.

Backports commit 25caa94c4a26daaab1e65c6d887e2972aeb5749e from qemu
This commit is contained in:
Edgar E. Iglesias 2018-02-23 20:01:15 -05:00 committed by Lioncash
parent a30a478538
commit bfc74c4da2
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
qemu/include/exec/gen-icount.h
View file

@ -5,7 +5,7 @@
/* Helpers for instruction counting code generation. */ /* Helpers for instruction counting code generation. */
//static TCGArg *icount_arg; //static int icount_start_insn_idx
//static TCGLabel *icount_label; //static TCGLabel *icount_label;
//static TCGLabel *exitreq_label; //static TCGLabel *exitreq_label;
@ -13,7 +13,6 @@ static inline void gen_tb_start(TCGContext *tcg_ctx)
{ {
//TCGv_i32 count, flag, imm; //TCGv_i32 count, flag, imm;
TCGv_i32 flag; TCGv_i32 flag;
//int i;
tcg_ctx->exitreq_label = gen_new_label(tcg_ctx); tcg_ctx->exitreq_label = gen_new_label(tcg_ctx);
flag = tcg_temp_new_i32(tcg_ctx); flag = tcg_temp_new_i32(tcg_ctx);
@ -32,18 +31,15 @@ static inline void gen_tb_start(TCGContext *tcg_ctx)
tcg_gen_ld_i32(tcg_ctx, count, cpu_env, tcg_gen_ld_i32(tcg_ctx, count, cpu_env,
-ENV_OFFSET + offsetof(CPUState, icount_decr.u32)); -ENV_OFFSET + offsetof(CPUState, icount_decr.u32));
imm = tcg_temp_new_i32(tcg_ctx); imm = tcg_temp_new_i32(tcg_ctx);
/* We emit a movi with a dummy immediate argument. Keep the insn index
* of the movi so that we later (when we know the actual insn count)
* can update the immediate argument with the actual insn count. */
icount_start_insn_idx = tcg_op_buf_count(tcg_ctx);
tcg_gen_movi_i32(tcg_ctx, imm, 0xdeadbeef); tcg_gen_movi_i32(tcg_ctx, imm, 0xdeadbeef);
/* This is a horrid hack to allow fixing up the value later. */
i = *tcg_ctx->gen_last_op_idx;
i = *tcg_ctx->gen_op_buf[i].args;
icount_arg = &tcg_ctx->gen_opparam_buf[i + 1];
tcg_gen_sub_i32(tcg_ctx, count, count, imm); tcg_gen_sub_i32(tcg_ctx, count, count, imm);
tcg_temp_free_i32(tcg_ctx, imm); tcg_temp_free_i32(tcg_ctx, imm);
tcg_gen_brcondi_i32(tcg_ctx, TCG_COND_LT, count, 0, icount_label); tcg_gen_brcondi_i32(tcg_ctx, TCG_COND_LT, count, 0, icount_label);
tcg_gen_st16_i32(tcg_ctx, count, cpu_env, tcg_gen_st16_i32(tcg_ctx, count, cpu_env,
-ENV_OFFSET + offsetof(CPUState, icount_decr.u16.low)); -ENV_OFFSET + offsetof(CPUState, icount_decr.u16.low));
@ -58,7 +54,9 @@ static inline void gen_tb_end(TCGContext *tcg_ctx, TranslationBlock *tb, int num
#if 0 #if 0
if (use_icount) { if (use_icount) {
*icount_arg = num_insns; /* Update the num_insn immediate parameter now that we know
* the actual insn count. */
tcg_set_insn_param(tcg_ctx, icount_start_insn_idx, 1, num_insns);
gen_set_label(icount_label); gen_set_label(icount_label);
tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_ICOUNT_EXPIRED); tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_ICOUNT_EXPIRED);
} }