yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-07 13:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

unicorn/mips: Lessen the amount of MIPS_CPU macro usage

Browse source 
Syntaxically reduces line noise
This commit is contained in:
Lioncash 2018-03-07 10:50:07 -05:00
parent be260c43b6
commit 9e14a824ed
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
qemu/target/mips/unicorn.c
View file

@ -39,17 +39,19 @@ static uint64_t mips_mem_redirect(uint64_t address)
static void mips_set_pc(struct uc_struct *uc, uint64_t address) static void mips_set_pc(struct uc_struct *uc, uint64_t address)
{ {
((CPUMIPSState *)uc->current_cpu->env_ptr)->active_tc.PC = address; CPUMIPSState *state = uc->cpu->env_ptr;
state->active_tc.PC = address;
} }
void mips_release(void *ctx); void mips_release(void *ctx);
void mips_release(void *ctx) void mips_release(void *ctx)
{ {
MIPSCPU* cpu;
TCGContext *tcg_ctx = (TCGContext *) ctx; TCGContext *tcg_ctx = (TCGContext *) ctx;
MIPSCPU *cpu = MIPS_CPU(tcg_ctx->uc, tcg_ctx->uc->cpu);
release_common(ctx); release_common(ctx);
cpu = MIPS_CPU(tcg_ctx->uc, tcg_ctx->uc->cpu);
g_free(cpu->env.tlb); g_free(cpu->env.tlb);
g_free(cpu->env.mvp); g_free(cpu->env.mvp);
g_free(tcg_ctx->tb_ctx.tbs); g_free(tcg_ctx->tb_ctx.tbs);
@ -57,9 +59,8 @@ void mips_release(void *ctx)
void mips_reg_reset(struct uc_struct *uc) void mips_reg_reset(struct uc_struct *uc)
{ {
CPUArchState *env; CPUArchState *env = uc->cpu->env_ptr;
(void)uc;
env = uc->cpu->env_ptr;
memset(env->active_tc.gpr, 0, sizeof(env->active_tc.gpr)); memset(env->active_tc.gpr, 0, sizeof(env->active_tc.gpr));
env->active_tc.PC = 0; env->active_tc.PC = 0;
@ -68,18 +69,19 @@ void mips_reg_reset(struct uc_struct *uc)
int mips_reg_read(struct uc_struct *uc, unsigned int *regs, void **vals, int count) int mips_reg_read(struct uc_struct *uc, unsigned int *regs, void **vals, int count)
{ {
CPUState *mycpu = uc->cpu; CPUState *mycpu = uc->cpu;
CPUMIPSState *state = &MIPS_CPU(uc, mycpu)->env;
int i; int i;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
unsigned int regid = regs[i]; unsigned int regid = regs[i];
void *value = vals[i]; void *value = vals[i];
if (regid >= UC_MIPS_REG_0 && regid <= UC_MIPS_REG_31) if (regid >= UC_MIPS_REG_0 && regid <= UC_MIPS_REG_31) {
*(mipsreg_t *)value = MIPS_CPU(uc, mycpu)->env.active_tc.gpr[regid - UC_MIPS_REG_0]; *(mipsreg_t *)value = state->active_tc.gpr[regid - UC_MIPS_REG_0];
else { } else {
switch(regid) { switch(regid) {
default: break; default: break;
case UC_MIPS_REG_PC: case UC_MIPS_REG_PC:
*(mipsreg_t *)value = MIPS_CPU(uc, mycpu)->env.active_tc.PC; *(mipsreg_t *)value = state->active_tc.PC;
break; break;
} }
} }
@ -91,18 +93,19 @@ int mips_reg_read(struct uc_struct *uc, unsigned int *regs, void **vals, int cou
int mips_reg_write(struct uc_struct *uc, unsigned int *regs, void *const *vals, int count) int mips_reg_write(struct uc_struct *uc, unsigned int *regs, void *const *vals, int count)
{ {
CPUState *mycpu = uc->cpu; CPUState *mycpu = uc->cpu;
CPUMIPSState *state = &MIPS_CPU(uc, mycpu)->env;
int i; int i;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
unsigned int regid = regs[i]; unsigned int regid = regs[i];
const void *value = vals[i]; const void *value = vals[i];
if (regid >= UC_MIPS_REG_0 && regid <= UC_MIPS_REG_31) if (regid >= UC_MIPS_REG_0 && regid <= UC_MIPS_REG_31) {
MIPS_CPU(uc, mycpu)->env.active_tc.gpr[regid - UC_MIPS_REG_0] = *(mipsreg_t *)value; state->active_tc.gpr[regid - UC_MIPS_REG_0] = *(mipsreg_t *)value;
else { } else {
switch(regid) { switch(regid) {
default: break; default: break;
case UC_MIPS_REG_PC: case UC_MIPS_REG_PC:
MIPS_CPU(uc, mycpu)->env.active_tc.PC = *(mipsreg_t *)value; state->active_tc.PC = *(mipsreg_t *)value;
// force to quit execution and flush TB // force to quit execution and flush TB
uc->quit_request = true; uc->quit_request = true;
uc_emu_stop(uc); uc_emu_stop(uc);