X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcarthw%2Fsvp%2Fgen_arm.c;h=46be2db5da5fe3d764e786c208a393013b719482;hb=84100c0fd5a5abb6b1e712aa1feb33388362695d;hp=909433a231f03028216b30206dca28bb915c8ee8;hpb=fad248933b6676d30ccf419858b4ee10cc123fc5;p=picodrive.git

diff --git a/Pico/carthw/svp/gen_arm.c b/Pico/carthw/svp/gen_arm.c
index 909433a..46be2db 100644
--- a/Pico/carthw/svp/gen_arm.c
+++ b/Pico/carthw/svp/gen_arm.c
@@ -1,3 +1,8 @@
+// Basic macros to emit ARM instructions and some utils
+
+// (c) Copyright 2008, Grazvydas "notaz" Ignotas
+// Free for non-commercial use.
+
 #define EMIT(x) *tcache_ptr++ = x
 
 #define A_R4M  (1 << 4)
@@ -15,6 +20,7 @@
 #define A_COND_NE 0x1
 #define A_COND_MI 0x4
 #define A_COND_PL 0x5
+#define A_COND_LE 0xd
 
 /* addressing mode 1 */
 #define A_AM1_LSL 0
@@ -52,6 +58,7 @@
 #define EOP_AND_IMM(rd,rn,ror2,imm8) EOP_C_DOP_IMM(A_COND_AL,A_OP_AND,0,rn,rd,ror2,imm8)
 #define EOP_SUB_IMM(rd,rn,ror2,imm8) EOP_C_DOP_IMM(A_COND_AL,A_OP_SUB,0,rn,rd,ror2,imm8)
 #define EOP_TST_IMM(   rn,ror2,imm8) EOP_C_DOP_IMM(A_COND_AL,A_OP_TST,1,rn, 0,ror2,imm8)
+#define EOP_CMP_IMM(   rn,ror2,imm8) EOP_C_DOP_IMM(A_COND_AL,A_OP_CMP,1,rn, 0,ror2,imm8)
 #define EOP_RSB_IMM(rd,rn,ror2,imm8) EOP_C_DOP_IMM(A_COND_AL,A_OP_RSB,0,rn,rd,ror2,imm8)
 
 #define EOP_MOV_REG(s,   rd,shift_imm,shift_op,rm) EOP_C_DOP_REG_XIMM(A_COND_AL,A_OP_MOV,s, 0,rd,shift_imm,shift_op,rm)
@@ -171,15 +178,6 @@ static void emit_mov_const(int cond, int d, unsigned int val)
 		EOP_C_DOP_IMM(cond, need_or ? A_OP_ORR : A_OP_MOV, 0, need_or ? d : 0, d, 0, val&0xff);
 }
 
-/*
-static void check_offset_12(unsigned int val)
-{
-	if (!(val & ~0xfff)) return;
-	printf("offset_12 overflow %04x\n", val);
-	exit(1);
-}
-*/
-
 static void check_offset_24(int val)
 {
 	if (val >= (int)0xff000000 && val <= 0x00ffffff) return;
@@ -187,39 +185,27 @@ static void check_offset_24(int val)
 	exit(1);
 }
 
-static void emit_call(void *target)
+static void emit_call(int cond, void *target)
 {
 	int val = (unsigned int *)target - tcache_ptr - 2;
 	check_offset_24(val);
 
-	EOP_BL(val & 0xffffff);			// bl target
+	EOP_C_B(cond,1,val & 0xffffff);			// bl target
 }
 
-static void emit_block_prologue(void)
+static void emit_jump(int cond, void *target)
 {
-	// nothing
-}
-
-static void emit_block_epilogue(int cycles)
-{
-	if (cycles > 0xff) { printf("large cycle count: %i\n", cycles); cycles = 0xff; }
-	EOP_SUB_IMM(11,11,0,cycles);		// sub r11, r11, #cycles
-#ifdef ARM
-	emit_call(ssp_drc_next);
-#endif
-}
+	int val = (unsigned int *)target - tcache_ptr - 2;
+	check_offset_24(val);
 
-static void emit_pc_dump(int pc)
-{
-	emit_mov_const(A_COND_AL, 3, pc<<16);
-	EOP_STR_IMM(3,7,0x400+6*4);		// str r3, [r7, #(0x400+6*8)]
+	EOP_C_B(cond,0,val & 0xffffff);			// b target
 }
 
-static void handle_caches()
+static void handle_caches(void)
 {
 #ifdef ARM
-	extern void flush_inval_caches(const void *start_addr, const void *end_addr);
-	flush_inval_caches(tcache, tcache_ptr);
+	extern void cache_flush_d_inval_i(const void *start_addr, const void *end_addr);
+	cache_flush_d_inval_i(tcache, tcache_ptr);
 #endif
 }