X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fsh2%2Fsh2.c;h=23b8fc0aacbbd1537a7c9f5e4499e790066071f1;hb=00468b0a9b651d930c06d565f3ffc7e704f0e57c;hp=fbf0c6d374d8b0da7a83231b87fc00ad55ae8bc4;hpb=6d7979571d08d7b020022fa169a34a29fc20dfdc;p=picodrive.git

diff --git a/cpu/sh2/sh2.c b/cpu/sh2/sh2.c
index fbf0c6d..23b8fc0 100644
--- a/cpu/sh2/sh2.c
+++ b/cpu/sh2/sh2.c
@@ -14,12 +14,18 @@
 
 #define I 0xf0
 
-int sh2_init(SH2 *sh2, int is_slave)
+int sh2_init(SH2 *sh2, int is_slave, SH2 *other_sh2)
 {
 	int ret = 0;
+	unsigned int mult_m68k_to_sh2 = sh2->mult_m68k_to_sh2;
+	unsigned int mult_sh2_to_m68k = sh2->mult_sh2_to_m68k;
 
-	memset(sh2, 0, offsetof(SH2, mult_m68k_to_sh2));
+	memset(sh2, 0, sizeof(*sh2));
 	sh2->is_slave = is_slave;
+	sh2->other_sh2 = other_sh2;
+	sh2->mult_m68k_to_sh2 = mult_m68k_to_sh2;
+	sh2->mult_sh2_to_m68k = mult_sh2_to_m68k;
+
 	pdb_register_cpu(sh2, PDBCT_SH2, is_slave ? "ssh2" : "msh2");
 #ifdef DRC_SH2
 	ret = sh2_drc_init(sh2);
@@ -135,18 +141,6 @@ void sh2_unpack(SH2 *sh2, const unsigned char *buff)
 
 static SH2 sh2ref[2];
 static unsigned int mem_val;
-static FILE *f;
-
-enum ctl_byte {
-	CTL_MASTERSLAVE = 0x80,
-	CTL_EA = 0x82,
-	CTL_EAVAL = 0x83,
-	CTL_M68KPC = 0x84,
-	CTL_CYCLES = 0x85,
-};
-
-#define SH2MAP_ADDR2OFFS_R(a) \
-  ((((a) >> 25) & 3) | (((a) >> 27) & 0x1c))
 
 static unsigned int local_read32(SH2 *sh2, u32 a)
 {
@@ -154,7 +148,7 @@ static unsigned int local_read32(SH2 *sh2, u32 a)
 	u16 *pd;
 	uptr p;
 
-	sh2_map += SH2MAP_ADDR2OFFS_R(a);
+	sh2_map += (a >> 25);
 	p = sh2_map->addr;
 	if (!map_flag_set(p)) {
 		pd = (u16 *)((p << 1) + ((a & sh2_map->mask) & ~1));
@@ -163,8 +157,7 @@ static unsigned int local_read32(SH2 *sh2, u32 a)
 
 	if ((a & 0xfffff000) == 0xc0000000) {
 		// data array
-		pd = (u16 *)Pico32xMem->data_array[sh2->is_slave]
-			+ (a & 0xfff) / 2;
+		pd = (u16 *)sh2->data_array + (a & 0xfff) / 2;
 		return (pd[0] << 16) | pd[1];
 	}
 	if ((a & 0xdfffffc0) == 0x4000) {
@@ -179,12 +172,6 @@ static unsigned int local_read32(SH2 *sh2, u32 a)
 	return 0;
 }
 
-static void write_uint(unsigned char ctl, unsigned int v)
-{
-	fwrite(&ctl, 1, 1, f);
-	fwrite(&v, sizeof(v), 1, f);
-}
-
 void do_sh2_trace(SH2 *current, int cycles)
 {
 	static int current_slave = -1;
@@ -196,39 +183,36 @@ void do_sh2_trace(SH2 *current, int cycles)
 	u32 val;
 	int i;
 
-	if (f == NULL)
-		f = fopen("tracelog", "wb");
-
 	if (SekPc != current_m68k_pc) {
 		current_m68k_pc = SekPc;
-		write_uint(CTL_M68KPC, current_m68k_pc);
+		tl_write_uint(CTL_M68KPC, current_m68k_pc);
 	}
 
 	if (current->is_slave != current_slave) {
 		current_slave = current->is_slave;
 		v = CTL_MASTERSLAVE | current->is_slave;
-		fwrite(&v, 1, 1, f);
+		tl_write(&v, sizeof(v));
 	}
 
 	for (i = 0; i < offsetof(SH2, read8_map) / 4; i++) {
 		if (i == 17) // ppc
 			continue;
 		if (regs_a[i] != regs_o[i]) {
-			write_uint(i, regs_a[i]);
+			tl_write_uint(CTL_SH2_R + i, regs_a[i]);
 			regs_o[i] = regs_a[i];
 		}
 	}
 
 	if (current->ea != sh2o->ea) {
-		write_uint(CTL_EA, current->ea);
+		tl_write_uint(CTL_EA, current->ea);
 		sh2o->ea = current->ea;
 	}
 	val = local_read32(current, current->ea);
 	if (mem_val != val) {
-		write_uint(CTL_EAVAL, val);
+		tl_write_uint(CTL_EAVAL, val);
 		mem_val = val;
 	}
-	write_uint(CTL_CYCLES, cycles);
+	tl_write_uint(CTL_CYCLES, cycles);
 }
 
 static const char *regnames[] = {
@@ -267,17 +251,14 @@ void do_sh2_cmp(SH2 *current)
 	int cycles;
 	int i, ret;
 
-	if (f == NULL) {
-		f = fopen("tracelog", "rb");
-		sh2ref[1].is_slave = 1;
-	}
+	sh2ref[1].is_slave = 1;
 
 	while (1) {
-		ret = fread(&code, 1, 1, f);
+		ret = tl_read(&code, 1);
 		if (ret <= 0)
 			break;
 		if (code == CTL_CYCLES) {
-			fread(&cycles_o, 1, 4, f);
+			tl_read(&cycles_o, 4);
 			break;
 		}
 
@@ -287,23 +268,27 @@ void do_sh2_cmp(SH2 *current)
 			current_slave = code & 1;
 			break;
 		case CTL_EA:
-			fread(&sh2o->ea, 4, 1, f);
+			tl_read_uint(&sh2o->ea);
 			break;
 		case CTL_EAVAL:
-			fread(&current_val, 4, 1, f);
+			tl_read_uint(&current_val);
 			break;
 		case CTL_M68KPC:
-			fread(&val, 4, 1, f);
+			tl_read_uint(&val);
 			if (SekPc != val) {
 				printf("m68k: %08x %08x\n", SekPc, val);
 				bad = 1;
 			}
 			break;
 		default:
-			if (code < offsetof(SH2, read8_map) / 4)
-				fread(regs_o + code, 4, 1, f);
-			else {
-				printf("invalid code: %02x\n", code);
+			if (CTL_SH2_R <= code && code < CTL_SH2_R +
+			    offsetof(SH2, read8_map) / 4)
+			{
+				tl_read_uint(regs_o + code - CTL_SH2_R);
+			}
+			else
+			{
+				printf("wrong code: %02x\n", code);
 				goto end;
 			}
 			break;