From 2788ea59bf8a74fc5689f4f22bc4773e33209ecd Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 12 Jul 2020 20:14:25 +0200 Subject: [PATCH] Hopefully fixed compilation of the new recompiler. --- src/codegen_new/codegen.c | 8 ++++---- src/codegen_new/codegen_accumulate.c | 2 +- src/codegen_new/codegen_accumulate.h | 2 +- src/codegen_new/codegen_block.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/codegen_new/codegen.c b/src/codegen_new/codegen.c index f385fb448..441bb4aa2 100644 --- a/src/codegen_new/codegen.c +++ b/src/codegen_new/codegen.c @@ -599,8 +599,8 @@ generate_call: codegen_timing_opcode(opcode, fetchdat, op_32, op_pc); - codegen_accumulate(ACCREG_ins, 1); - codegen_accumulate(ACCREG_cycles, -codegen_block_cycles); + codegen_accumulate(ir, ACCREG_ins, 1); + codegen_accumulate(ir, ACCREG_cycles, -codegen_block_cycles); codegen_block_cycles = 0; if ((op_table == x86_dynarec_opcodes && @@ -620,10 +620,10 @@ generate_call: codegen_timing_jump_cycles(); if (jump_cycles) - codegen_accumulate(ACCREG_cycles, -jump_cycles); + codegen_accumulate(ir, ACCREG_cycles, -jump_cycles); codegen_accumulate_flush(ir); if (jump_cycles) - codegen_accumulate(ACCREG_cycles, jump_cycles); + codegen_accumulate(ir, ACCREG_cycles, jump_cycles); } if (op_table == x86_dynarec_opcodes_0f && opcode == 0x0f) diff --git a/src/codegen_new/codegen_accumulate.c b/src/codegen_new/codegen_accumulate.c index 02a4890ec..88ab1c0f7 100644 --- a/src/codegen_new/codegen_accumulate.c +++ b/src/codegen_new/codegen_accumulate.c @@ -17,7 +17,7 @@ static struct [ACCREG_cycles] = {0, IREG_cycles}, }; -void codegen_accumulate(int acc_reg, int delta) +void codegen_accumulate(r_data_t *ir, int acc_reg, int delta) { acc_regs[acc_reg].count += delta; diff --git a/src/codegen_new/codegen_accumulate.h b/src/codegen_new/codegen_accumulate.h index 55d7c8eba..9e6ee3a59 100644 --- a/src/codegen_new/codegen_accumulate.h +++ b/src/codegen_new/codegen_accumulate.h @@ -8,6 +8,6 @@ enum struct ir_data_t; -void codegen_accumulate(int acc_reg, int delta); +void codegen_accumulate(struct ir_data_t *ir, int acc_reg, int delta); void codegen_accumulate_flush(struct ir_data_t *ir); void codegen_accumulate_reset(); diff --git a/src/codegen_new/codegen_block.c b/src/codegen_new/codegen_block.c index a6584c03a..9396fb1f0 100644 --- a/src/codegen_new/codegen_block.c +++ b/src/codegen_new/codegen_block.c @@ -782,7 +782,7 @@ void codegen_block_end() void codegen_block_end_recompile(codeblock_t *block) { codegen_timing_block_end(); - codegen_accumulate(ACCREG_cycles, -codegen_block_cycles); + codegen_accumulate(ir_data, ACCREG_cycles, -codegen_block_cycles); if (block->flags & CODEBLOCK_IN_DIRTY_LIST) block_dirty_list_remove(block);