X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fdrc%2Femit_x86.c;h=9ccc9e2515494dc72b96af451d763361b395993d;hb=553c3eaa3a4bda6ba99d925ecab518fe82530cd6;hp=43eba94983e7664c4f6e69b61eeb2cac5b91ccb1;hpb=679af8a3f466a2a4a20f58e4181a231fb73e9836;p=picodrive.git

diff --git a/cpu/drc/emit_x86.c b/cpu/drc/emit_x86.c
index 43eba94..9ccc9e2 100644
--- a/cpu/drc/emit_x86.c
+++ b/cpu/drc/emit_x86.c
@@ -1,30 +1,27 @@
 #include <stdarg.h>
 
-// TODO: move
-static int reg_map_g2h[] = {
-	-1, -1, -1, -1,
-	-1, -1, -1, -1,
-	-1, -1, -1, -1,
-	-1, -1, -1, -1,
-	-1, -1, -1, -1,
-	-1, -1, -1, -1,
-};
-
 enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
 
+#define CONTEXT_REG xBP
+
 #define EMIT_PTR(ptr, val, type) \
 	*(type *)(ptr) = val
 
 #define EMIT(val, type) { \
 	EMIT_PTR(tcache_ptr, val, type); \
-	tcache_ptr = (char *)tcache_ptr + sizeof(type); \
+	tcache_ptr += sizeof(type); \
+}
+
+#define EMIT_OP(op) { \
+	COUNT_OP; \
+	EMIT(op, u8); \
 }
 
 #define EMIT_MODRM(mod,r,rm) \
 	EMIT(((mod)<<6) | ((r)<<3) | (rm), u8)
 
 #define EMIT_OP_MODRM(op,mod,r,rm) { \
-	EMIT(op, u8); \
+	EMIT_OP(op); \
 	EMIT_MODRM(mod, r, rm); \
 }
 
@@ -32,7 +29,7 @@ enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
 	EMIT_OP_MODRM(0x8b, 3, dst, src)
 
 #define emith_move_r_imm(r, imm) { \
-	EMIT(0xb8 + (r), u8); \
+	EMIT_OP(0xb8 + (r)); \
 	EMIT(imm, u32); \
 }
 
@@ -48,73 +45,69 @@ enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
 
 // XXX: offs is 8bit only
 #define emith_ctx_read(r, offs) { \
-	EMIT_OP_MODRM(0x8b, 1, r, 5); \
+	EMIT_OP_MODRM(0x8b, 1, r, xBP); \
 	EMIT(offs, u8); 	/* mov tmp, [ebp+#offs] */ \
 }
 
 #define emith_ctx_write(r, offs) { \
-	EMIT_OP_MODRM(0x89, 1, r, 5); \
+	EMIT_OP_MODRM(0x89, 1, r, xBP); \
 	EMIT(offs, u8); 	/* mov [ebp+#offs], tmp */ \
 }
 
 #define emith_ctx_sub(val, offs) { \
-	EMIT_OP_MODRM(0x81, 1, 5, 5); \
+	EMIT_OP_MODRM(0x81, 1, 5, xBP); \
 	EMIT(offs, u8); \
 	EMIT(val, u32); 	/* sub [ebp+#offs], dword val */ \
 }
 
-#define emith_test_t() { \
-	if (reg_map_g2h[SHR_SR] == -1) { \
-		EMIT(0xf6, u8); \
-		EMIT_MODRM(1, 0, 5); \
-		EMIT(SHR_SR * 4, u8); \
-		EMIT(0x01, u8); /* test [ebp+SHR_SR], byte 1 */ \
-	} else { \
-		EMIT(0xf7, u8); \
-		EMIT_MODRM(3, 0, reg_map_g2h[SHR_SR]); \
-		EMIT(0x01, u16); /* test <reg>, word 1 */ \
-	} \
-}
-
 #define emith_jump(ptr) { \
 	u32 disp = (u32)ptr - ((u32)tcache_ptr + 5); \
-	EMIT(0xe9, u8); \
+	EMIT_OP(0xe9); \
 	EMIT(disp, u32); \
 }
 
 #define emith_call(ptr) { \
 	u32 disp = (u32)ptr - ((u32)tcache_ptr + 5); \
-	EMIT(0xe8, u8); \
+	EMIT_OP(0xe8); \
 	EMIT(disp, u32); \
 }
 
-#define EMIT_CONDITIONAL(code, is_nonzero) { \
-	char *ptr = tcache_ptr; \
-	tcache_ptr = (char *)tcache_ptr + 2; \
+#define EMITH_CONDITIONAL(code, is_nonzero) { \
+	u8 *ptr = tcache_ptr; \
+	tcache_ptr = tcache_ptr + 2; \
 	code; \
 	EMIT_PTR(ptr, ((is_nonzero) ? 0x75 : 0x74), u8); \
-	EMIT_PTR(ptr + 1, ((char *)tcache_ptr - (ptr + 2)), u8); \
+	EMIT_PTR(ptr + 1, (tcache_ptr - (ptr + 2)), u8); \
 }
 
-static void emith_pass_arg(int count, ...)
-{
-	va_list vl;
-	int i;
-
-	va_start(vl, count);
+#define arg2reg(rd, arg) \
+	switch (arg) { \
+	case 0: rd = xAX; break; \
+	case 1: rd = xDX; break; \
+	case 2: rd = xCX; break; \
+	}
 
-	for (i = 0; i < count; i++) {
-		long av = va_arg(vl, long);
-		int r = 7;
+#define emith_pass_arg_r(arg, reg) { \
+	int rd = 7; \
+	arg2reg(rd, arg); \
+	emith_move_r_r(rd, reg); \
+}
 
-		switch (i) {
-		case 0: r = xAX; break;
-		case 1: r = xDX; break;
-		case 2: r = xCX; break;
-		}
-		emith_move_r_imm(r, av);
-	}
+#define emith_pass_arg_imm(arg, imm) { \
+	int rd = 7; \
+	arg2reg(rd, arg); \
+	emith_move_r_imm(rd, imm); \
+}
 
-	va_end(vl);
+/* SH2 drc specific */
+#define emith_test_t() { \
+	if (reg_map_g2h[SHR_SR] == -1) { \
+		EMIT_OP_MODRM(0xf6, 1, 0, 5); \
+		EMIT(SHR_SR * 4, u8); \
+		EMIT(0x01, u8); /* test [ebp+SHR_SR], byte 1 */ \
+	} else { \
+		EMIT_OP_MODRM(0xf7, 3, 0, reg_map_g2h[SHR_SR]); \
+		EMIT(0x01, u16); /* test <reg>, word 1 */ \
+	} \
 }