yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-10-19 12:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

tcg: Make cpu_cond a TCGv

Browse Source 
Commit 5d4e1a1081d3f1ec2908ff0eaebe312389971ab4
allows making the type concrete
This commit is contained in:
Lioncash 2018-02-21 01:11:11 -05:00
parent 2f785b11d2
commit 4da2fd6407
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qemu/target-sparc/translate.c
View File

@ -1020,7 +1020,7 @@ static void gen_branch_a(DisasContext *dc, target_ulong pc1)
TCGLabel *l1 = gen_new_label(tcg_ctx);
target_ulong npc = dc->npc;
tcg_gen_brcondi_tl(tcg_ctx, TCG_COND_EQ, *(TCGv *)tcg_ctx->cpu_cond, 0, l1);
tcg_gen_brcondi_tl(tcg_ctx, TCG_COND_EQ, tcg_ctx->cpu_cond, 0, l1);
gen_goto_tb(dc, 0, npc, pc1);
@ -1048,7 +1048,7 @@ static void gen_branch_n(DisasContext *dc, target_ulong pc1)
tcg_gen_addi_tl(tcg_ctx, *(TCGv *)tcg_ctx->cpu_npc, *(TCGv *)tcg_ctx->cpu_npc, 4);
t = tcg_const_tl(tcg_ctx, pc1);
z = tcg_const_tl(tcg_ctx, 0);
tcg_gen_movcond_tl(tcg_ctx, TCG_COND_NE, *(TCGv *)tcg_ctx->cpu_npc, *(TCGv *)tcg_ctx->cpu_cond, z, t, *(TCGv *)tcg_ctx->cpu_npc);
tcg_gen_movcond_tl(tcg_ctx, TCG_COND_NE, *(TCGv *)tcg_ctx->cpu_npc, tcg_ctx->cpu_cond, z, t, *(TCGv *)tcg_ctx->cpu_npc);
tcg_temp_free(tcg_ctx, t);
tcg_temp_free(tcg_ctx, z);
@ -1064,7 +1064,7 @@ static inline void gen_generic_branch(DisasContext *dc)
TCGv npc1 = tcg_const_tl(tcg_ctx, dc->jump_pc[1]);
TCGv zero = tcg_const_tl(tcg_ctx, 0);
tcg_gen_movcond_tl(tcg_ctx, TCG_COND_NE, *(TCGv *)tcg_ctx->cpu_npc, *(TCGv *)tcg_ctx->cpu_cond, zero, npc0, npc1);
tcg_gen_movcond_tl(tcg_ctx, TCG_COND_NE, *(TCGv *)tcg_ctx->cpu_npc, tcg_ctx->cpu_cond, zero, npc0, npc1);
tcg_temp_free(tcg_ctx, npc0);
tcg_temp_free(tcg_ctx, npc1);
@ -1496,7 +1496,7 @@ static void do_branch(DisasContext *dc, int32_t offset, uint32_t insn, int cc)
}
} else {
flush_cond(dc);
gen_cond(dc, *(TCGv *)tcg_ctx->cpu_cond, cc, cond);
gen_cond(dc, tcg_ctx->cpu_cond, cc, cond);
if (a) {
gen_branch_a(dc, target);
} else {
@ -1537,7 +1537,7 @@ static void do_fbranch(DisasContext *dc, int32_t offset, uint32_t insn, int cc)
}
} else {
flush_cond(dc);
gen_fcond(dc, *(TCGv *)tcg_ctx->cpu_cond, cc, cond);
gen_fcond(dc, tcg_ctx->cpu_cond, cc, cond);
if (a) {
gen_branch_a(dc, target);
} else {
@ -1558,7 +1558,7 @@ static void do_branch_reg(DisasContext *dc, int32_t offset, uint32_t insn,
target &= 0xffffffffULL;
}
flush_cond(dc);
gen_cond_reg(dc, *(TCGv *)tcg_ctx->cpu_cond, cond, r_reg);
gen_cond_reg(dc, tcg_ctx->cpu_cond, cond, r_reg);
if (a) {
gen_branch_a(dc, target);
} else {
@ -5269,7 +5269,7 @@ static void disas_sparc_insn(DisasContext * dc, unsigned int insn, bool hook_ins
gen_op_next_insn(dc);
} else if (dc->npc == JUMP_PC) {
/* we can do a static jump */
gen_branch2(dc, dc->jump_pc[0], dc->jump_pc[1], *(TCGv *)tcg_ctx->cpu_cond);
gen_branch2(dc, dc->jump_pc[0], dc->jump_pc[1], tcg_ctx->cpu_cond);
dc->is_br = 1;
} else {
dc->pc = dc->npc;
@ -5580,8 +5580,7 @@ void gen_intermediate_code_init(CPUSPARCState *env)
*(TCGv *)tcg_ctx->cpu_wim = tcg_global_mem_new(tcg_ctx, tcg_ctx->cpu_env, offsetof(CPUSPARCState, wim),
"wim");
#endif
tcg_ctx->cpu_cond = g_malloc0(sizeof(TCGv));
*(TCGv *)tcg_ctx->cpu_cond = tcg_global_mem_new(tcg_ctx, tcg_ctx->cpu_env, offsetof(CPUSPARCState, cond),
tcg_ctx->cpu_cond = tcg_global_mem_new(tcg_ctx, tcg_ctx->cpu_env, offsetof(CPUSPARCState, cond),
"cond");
tcg_ctx->cpu_cc_src = g_malloc0(sizeof(TCGv));

1
qemu/target-sparc/unicorn.c
View File

@ -35,7 +35,6 @@ void sparc_release(void *ctx)
TCGContext *tcg_ctx = (TCGContext *) ctx;
release_common(ctx);
g_free(tcg_ctx->cpu_wim);
g_free(tcg_ctx->cpu_cond);
g_free(tcg_ctx->cpu_cc_src);
g_free(tcg_ctx->cpu_cc_src2);
g_free(tcg_ctx->cpu_cc_dst);

2
qemu/tcg/tcg.h
View File

@ -837,7 +837,7 @@ struct TCGContext {
void *cpu_regs_sparc[32];
TCGv cpu_y;
TCGv cpu_tbr;
void *cpu_cond;
TCGv cpu_cond;
void *cpu_gsr;
void *cpu_tick_cmpr, *cpu_stick_cmpr, *cpu_hstick_cmpr;
void *cpu_hintp, *cpu_htba, *cpu_hver, *cpu_ssr, *cpu_ver;