fix some warnings

[picodrive.git] / pico / carthw / svp / compiler.c

diff --git a/pico/carthw/svp/compiler.c b/pico/carthw/svp/compiler.c
index 758d926..b31197c 100644 (file)
--- a/pico/carthw/svp/compiler.c
+++ b/pico/carthw/svp/compiler.c
@@ -689,6 +689,18 @@ static int tr_aop_ssp2arm(int op)
        return 0;
 }
 
+#ifdef __MACH__
+/* spacial version of call for calling C needed on ios, since we use r9.. */
+static void emith_call_c_func(void *target)
+{
+       EOP_STMFD_SP(A_R7M|A_R9M);
+       emith_call(target);
+       EOP_LDMFD_SP(A_R7M|A_R9M);
+}
+#else
+#define emith_call_c_func emith_call
+#endif
+
 // -----------------------------------------------------
 
 //@ r4:  XXYY
@@ -839,7 +851,7 @@ static void tr_PMX_to_r0(int reg)
        tr_flush_dirty_ST();
        //tr_flush_dirty_pmcrs();
        tr_mov16(0, reg);
-       emith_call(ssp_pm_read);
+       emith_call_c_func(ssp_pm_read);
        hostreg_clear();
 }
 
@@ -1080,7 +1092,7 @@ static void tr_r0_to_PMX(int reg)
        tr_flush_dirty_ST();
        //tr_flush_dirty_pmcrs();
        tr_mov16(1, reg);
-       emith_call(ssp_pm_write);
+       emith_call_c_func(ssp_pm_write);
        hostreg_clear();
 }
 
@@ -1680,9 +1692,14 @@ static void emit_block_prologue(void)
  * >0: direct (un)conditional jump
  * <0: indirect jump
  */
-static void emit_block_epilogue(int cycles, int cond, int pc, int end_pc)
+static void *emit_block_epilogue(int cycles, int cond, int pc, int end_pc)
 {
-       if (cycles > 0xff) { elprintf(EL_ANOMALY, "large cycle count: %i\n", cycles); cycles = 0xff; }
+       void *end_ptr = NULL;
+
+       if (cycles > 0xff) {
+               elprintf(EL_ANOMALY, "large cycle count: %i\n", cycles);
+               cycles = 0xff;
+       }
        EOP_SUB_IMM(11,11,0,cycles);            // sub r11, r11, #cycles
 
        if (cond < 0 || (end_pc >= 0x400 && pc < 0x400)) {
@@ -1697,6 +1714,7 @@ static void emit_block_epilogue(int cycles, int cond, int pc, int end_pc)
                        emith_jump(target);
                else {
                        int ops = emith_jump(ssp_drc_next);
+                       end_ptr = tcache_ptr;
                        // cause the next block to be emitted over jump instruction
                        tcache_ptr -= ops;
                }
@@ -1724,12 +1742,17 @@ static void emit_block_epilogue(int cycles, int cond, int pc, int end_pc)
                        emith_jump(ssp_drc_next);
 #endif
        }
+
+       if (end_ptr == NULL)
+               end_ptr = tcache_ptr;
+
+       return end_ptr;
 }
 
 void *ssp_translate_block(int pc)
 {
        unsigned int op, op1, imm, ccount = 0;
-       unsigned int *block_start;
+       unsigned int *block_start, *block_end;
        int ret, end_cond = A_COND_AL, jump_pc = -1;
 
        //printf("translate %04x -> %04x\n", pc<<1, (tcache_ptr-tcache)<<2);
@@ -1771,7 +1794,7 @@ void *ssp_translate_block(int pc)
        tr_flush_dirty_prs();
        tr_flush_dirty_ST();
        tr_flush_dirty_pmcrs();
-       emit_block_epilogue(ccount, end_cond, jump_pc, pc);
+       block_end = emit_block_epilogue(ccount, end_cond, jump_pc, pc);
 
        if (tcache_ptr - (u32 *)tcache > DRC_TCACHE_SIZE/4) {
                elprintf(EL_ANOMALY|EL_STATUS|EL_SVP, "tcache overflow!\n");
@@ -1795,7 +1818,7 @@ void *ssp_translate_block(int pc)
 #endif
 
 #ifdef __arm__
-       cache_flush_d_inval_i(tcache, tcache_ptr);
+       cache_flush_d_inval_i(block_start, block_end);
 #endif
 
        return block_start;
@@ -1880,7 +1903,7 @@ void ssp1601_dyn_run(int cycles)
        ssp_translate_block(DUMP_BLOCK >> 1);
 #endif
 #ifdef __arm__
-       ssp_drc_entry(cycles);
+       ssp_drc_entry(ssp, cycles);
 #endif
 }