X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcarthw%2Fsvp%2Fcompiler.c;h=911da17956a1bfa7e251824a8f6484aba6724ed0;hb=2d2247c26080ed9009b3d8c650cfc647fd1fb162;hp=dc053d4438326e1c288c5698ef8c4cca149834e8;hpb=2385f27374569bbe04313f80f51fba1e235c88fb;p=picodrive.git

diff --git a/Pico/carthw/svp/compiler.c b/Pico/carthw/svp/compiler.c
index dc053d4..911da17 100644
--- a/Pico/carthw/svp/compiler.c
+++ b/Pico/carthw/svp/compiler.c
@@ -4,8 +4,6 @@
 
 #define u32 unsigned int
 
-static u32 *block_table[0x5090/2];
-static u32 *block_table_iram[15][0x800/2];
 static u32 *tcache_ptr = NULL;
 
 static int nblocks = 0;
@@ -21,7 +19,9 @@ extern ssp1601_t *ssp;
 
 #ifndef ARM
 #define DUMP_BLOCK 0x0c9a
-unsigned int tcache[512*1024];
+u32 *ssp_block_table[0x5090/2];
+u32 *ssp_block_table_iram[15][0x800/2];
+u32 tcache[SSP_TCACHE_SIZE/4];
 void ssp_drc_next(void){}
 void ssp_drc_next_patch(void){}
 void ssp_drc_end(void){}
@@ -151,11 +151,10 @@ int ssp_get_iram_context(void)
 	val1 = iram_context_map[(val>>1)&0x3f];
 
 	if (val1 == 0) {
-		printf("val: %02x PC=%04x\n", (val>>1)&0x3f, rPC);
+		elprintf(EL_ANOMALY, "svp: iram ctx val: %02x PC=%04x\n", (val>>1)&0x3f, rPC);
 		//debug_dump2file(name, svp->iram_rom, 0x800);
-		exit(1);
+		//exit(1);
 	}
-//	elprintf(EL_ANOMALY, "iram_context: %02i", val1);
 	return val1;
 }
 
@@ -233,11 +232,11 @@ static void hostreg_sspreg_changed(int sspreg)
 
 void tr_unhandled(void)
 {
-	FILE *f = fopen("tcache.bin", "wb");
-	fwrite(tcache, 1, (tcache_ptr - tcache)*4, f);
-	fclose(f);
-	printf("unhandled @ %04x\n", known_regs.gr[SSP_PC].h<<1);
-	exit(1);
+	//FILE *f = fopen("tcache.bin", "wb");
+	//fwrite(tcache, 1, (tcache_ptr - tcache)*4, f);
+	//fclose(f);
+	elprintf(EL_ANOMALY, "unhandled @ %04x\n", known_regs.gr[SSP_PC].h<<1);
+	//exit(1);
 }
 
 /* update P, if needed. Trashes r0 */
@@ -364,7 +363,7 @@ static void tr_flush_dirty_pmcrs(void)
 		EOP_STR_IMM(1,7,0x400+SSP_PMC*4);
 
 		if (known_regs.emu_status & (SSP_PMC_SET|SSP_PMC_HAVE_ADDR)) {
-			printf("!! SSP_PMC_SET|SSP_PMC_HAVE_ADDR set on flush\n");
+			elprintf(EL_ANOMALY, "!! SSP_PMC_SET|SSP_PMC_HAVE_ADDR set on flush\n");
 			tr_unhandled();
 		}
 	}
@@ -644,7 +643,7 @@ static int tr_cond_check(int op)
 			EOP_TST_IMM(6, 0, 8);
 			return f ? A_COND_NE : A_COND_EQ;
 		default:
-			printf("unimplemented cond?\n");
+			elprintf(EL_ANOMALY, "unimplemented cond?\n");
 			tr_unhandled();
 			return 0;
 	}
@@ -653,12 +652,12 @@ static int tr_cond_check(int op)
 static int tr_neg_cond(int cond)
 {
 	switch (cond) {
-		case A_COND_AL: printf("neg for AL?\n"); exit(1);
+		case A_COND_AL: elprintf(EL_ANOMALY, "neg for AL?\n"); exit(1);
 		case A_COND_EQ: return A_COND_NE;
 		case A_COND_NE: return A_COND_EQ;
 		case A_COND_MI: return A_COND_PL;
 		case A_COND_PL: return A_COND_MI;
-		default:        printf("bad cond for neg\n"); exit(1);
+		default:        elprintf(EL_ANOMALY, "bad cond for neg\n"); exit(1);
 	}
 	return 0;
 }
@@ -1668,7 +1667,7 @@ static void emit_block_prologue(void)
  */
 static void emit_block_epilogue(int cycles, int cond, int pc, int end_pc)
 {
-	if (cycles > 0xff) { printf("large cycle count: %i\n", cycles); cycles = 0xff; }
+	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)) {
@@ -1676,7 +1675,7 @@ static void emit_block_epilogue(int cycles, int cond, int pc, int end_pc)
 		emit_jump(A_COND_AL, ssp_drc_next);
 	}
 	else if (cond == A_COND_AL) {
-		u32 *target = (pc < 0x400) ? block_table_iram[ssp->drc.iram_context][pc] : block_table[pc];
+		u32 *target = (pc < 0x400) ? ssp_block_table_iram[ssp->drc.iram_context][pc] : ssp_block_table[pc];
 		if (target != NULL)
 			emit_jump(A_COND_AL, target);
 		else {
@@ -1686,8 +1685,8 @@ static void emit_block_epilogue(int cycles, int cond, int pc, int end_pc)
 		}
 	}
 	else {
-		u32 *target1 = (pc < 0x400) ? block_table_iram[ssp->drc.iram_context][pc] : block_table[pc];
-		u32 *target2 = (end_pc < 0x400) ? block_table_iram[ssp->drc.iram_context][end_pc] : block_table[end_pc];
+		u32 *target1 = (pc < 0x400) ? ssp_block_table_iram[ssp->drc.iram_context][pc] : ssp_block_table[pc];
+		u32 *target2 = (end_pc < 0x400) ? ssp_block_table_iram[ssp->drc.iram_context][end_pc] : ssp_block_table[end_pc];
 		if (target1 != NULL)
 		     emit_jump(cond, target1);
 		else emit_call(cond, ssp_drc_next_patch);
@@ -1703,7 +1702,7 @@ void *ssp_translate_block(int pc)
 	unsigned int *block_start;
 	int ret, end_cond = A_COND_AL, jump_pc = -1;
 
-	printf("translate %04x -> %04x\n", pc<<1, (tcache_ptr-tcache)<<2);
+	//printf("translate %04x -> %04x\n", pc<<1, (tcache_ptr-tcache)<<2);
 	block_start = tcache_ptr;
 	known_regb = 0;
 	dirty_regb = KRREG_P;
@@ -1724,8 +1723,8 @@ void *ssp_translate_block(int pc)
 		ret = translate_op(op, &pc, imm, &end_cond, &jump_pc);
 		if (ret <= 0)
 		{
-			printf("NULL func! op=%08x (%02x)\n", op, op1);
-			exit(1);
+			elprintf(EL_ANOMALY, "NULL func! op=%08x (%02x)\n", op, op1);
+			//exit(1);
 		}
 
 		ccount += ret & 0xffff;
@@ -1743,16 +1742,16 @@ void *ssp_translate_block(int pc)
 	tr_flush_dirty_pmcrs();
 	emit_block_epilogue(ccount, end_cond, jump_pc, pc);
 
-	if (tcache_ptr - tcache > TCACHE_SIZE/4) {
-		printf("tcache overflow!\n");
+	if (tcache_ptr - tcache > SSP_TCACHE_SIZE/4) {
+		elprintf(EL_ANOMALY, "tcache overflow!\n");
 		fflush(stdout);
 		exit(1);
 	}
 
 	// stats
 	nblocks++;
-	printf("%i blocks, %i bytes, k=%.3f\n", nblocks, (tcache_ptr - tcache)*4,
-		(double)(tcache_ptr - tcache) / (double)n_in_ops);
+	//printf("%i blocks, %i bytes, k=%.3f\n", nblocks, (tcache_ptr - tcache)*4,
+	//	(double)(tcache_ptr - tcache) / (double)n_in_ops);
 
 #ifdef DUMP_BLOCK
 	{
@@ -1780,9 +1779,9 @@ static void ssp1601_state_load(void)
 
 int ssp1601_dyn_startup(void)
 {
-	memset(tcache, 0, TCACHE_SIZE);
-	memset(block_table, 0, sizeof(block_table));
-	memset(block_table_iram, 0, sizeof(block_table_iram));
+	memset(tcache, 0, SSP_TCACHE_SIZE);
+	memset(ssp_block_table, 0, sizeof(ssp_block_table));
+	memset(ssp_block_table_iram, 0, sizeof(ssp_block_table_iram));
 	tcache_ptr = tcache;
 
 	PicoLoadStateHook = ssp1601_state_load;
@@ -1790,14 +1789,14 @@ int ssp1601_dyn_startup(void)
 	n_in_ops = 0;
 #ifdef ARM
 	// hle'd blocks
-	block_table[0x800/2] = (void *) ssp_hle_800;
-	block_table[0x902/2] = (void *) ssp_hle_902;
-	block_table_iram[ 7][0x030/2] = (void *) ssp_hle_07_030;
-	block_table_iram[ 7][0x036/2] = (void *) ssp_hle_07_036;
-	block_table_iram[ 7][0x6d6/2] = (void *) ssp_hle_07_6d6;
-	block_table_iram[11][0x12c/2] = (void *) ssp_hle_11_12c;
-	block_table_iram[11][0x384/2] = (void *) ssp_hle_11_384;
-	block_table_iram[11][0x38a/2] = (void *) ssp_hle_11_38a;
+	ssp_block_table[0x800/2] = (void *) ssp_hle_800;
+	ssp_block_table[0x902/2] = (void *) ssp_hle_902;
+	ssp_block_table_iram[ 7][0x030/2] = (void *) ssp_hle_07_030;
+	ssp_block_table_iram[ 7][0x036/2] = (void *) ssp_hle_07_036;
+	ssp_block_table_iram[ 7][0x6d6/2] = (void *) ssp_hle_07_6d6;
+	ssp_block_table_iram[11][0x12c/2] = (void *) ssp_hle_11_12c;
+	ssp_block_table_iram[11][0x384/2] = (void *) ssp_hle_11_384;
+	ssp_block_table_iram[11][0x38a/2] = (void *) ssp_hle_11_38a;
 #endif
 
 	return 0;
@@ -1806,22 +1805,6 @@ int ssp1601_dyn_startup(void)
 
 void ssp1601_dyn_reset(ssp1601_t *ssp)
 {
-	// debug
-	{
-		int i, u;
-		FILE *f = fopen("tcache.bin", "wb");
-		fwrite(tcache, 1, (tcache_ptr - tcache)*4, f);
-		fclose(f);
-
-		for (i = 0; i < 0x5090/2; i++)
-			if (block_table[i])
-				printf("%06x -> __:%04x\n", (block_table[i] - tcache)*4, i<<1);
-		for (u = 1; u < 15; u++)
-			for (i = 0; i < 0x800/2; i++)
-				if (block_table_iram[u][i])
-					printf("%06x -> %02i:%04x\n", (block_table_iram[u][i] - tcache)*4, u, i<<1);
-	}
-
 	ssp1601_reset(ssp);
 	ssp->drc.iram_dirty = 1;
 	ssp->drc.iram_context = 0;
@@ -1829,8 +1812,8 @@ void ssp1601_dyn_reset(ssp1601_t *ssp)
 	ssp->drc.ptr_rom = (u32) Pico.rom;
 	ssp->drc.ptr_iram_rom = (u32) svp->iram_rom;
 	ssp->drc.ptr_dram = (u32) svp->dram;
-	ssp->drc.ptr_btable = (u32) block_table;
-	ssp->drc.ptr_btable_iram = (u32) block_table_iram;
+	ssp->drc.ptr_btable = (u32) ssp_block_table;
+	ssp->drc.ptr_btable_iram = (u32) ssp_block_table_iram;
 
 	// prevent new versions of IRAM from appearing
 	memset(svp->iram_rom, 0, 0x800);