X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxbios.c;h=73f277a0c28540e45732a30394af694ad1c0bb61;hb=b34d6a805a50ee4a897b0a53bbc0b89e3eb7f72e;hp=996a242b7ebb6d0d0d6dd0109fb55395978e88af;hpb=8aecce153fe3f821a078cb9db00eac5c1540bb03;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index 996a242b..73f277a0 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -36,12 +36,9 @@
 #include "sio.h"
 #include "psxhle.h"
 #include "psxinterpreter.h"
+#include "new_dynarec/events.h"
 #include <zlib.h>
 
-#if (defined(__GNUC__) && __GNUC__ >= 5) || defined(__clang__)
-#pragma GCC diagnostic ignored "-Wpointer-sign"
-#endif
-
 #ifndef PSXBIOS_LOG
 //#define PSXBIOS_LOG printf
 #define PSXBIOS_LOG(...)
@@ -296,16 +293,29 @@ static u32 floodchk;
 #define A_HEAP_BASE     0x9000
 #define A_HEAP_SIZE     0x9004
 #define A_HEAP_END      0x9008
-#define A_HEAP_FLAG     0x900c
+#define A_HEAP_INIT_FLG 0x900c
 #define A_RND_SEED      0x9010
+#define A_HEAP_FRSTCHNK 0xb060
+#define A_HEAP_CURCHNK  0xb064
 #define A_CONF_TCB      0xb940
 #define A_CONF_EvCB     0xb944
 #define A_CONF_SP       0xb948
 #define A_CD_EVENTS     0xb9b8
 #define A_EXC_GP        0xf450
 
+#define A_A0_DUMMY      0x1010
+#define A_B0_DUMMY      0x2010
+#define A_C0_DUMMY      0x3010
+#define A_B0_5B_DUMMY   0x43d0
+
 #define HLEOP(n) SWAPu32((0x3b << 26) | (n));
 
+static u8 loadRam8(u32 addr)
+{
+	assert(!(addr & 0x5f800000));
+	return psxM[addr & 0x1fffff];
+}
+
 static u32 loadRam32(u32 addr)
 {
 	assert(!(addr & 0x5f800000));
@@ -558,6 +568,11 @@ void psxBios_atoi() { // 0x10
 	s32 n = 0, f = 0;
 	char *p = (char *)Ra0;
 
+	if (p == INVALID_PTR) {
+		mips_return(0);
+		return;
+	}
+
 	for (;;p++) {
 		switch (*p) {
 			case ' ': case '\t': continue;
@@ -573,6 +588,7 @@ void psxBios_atoi() { // 0x10
 
 	v0 = (f ? -n : n);
 	pc0 = ra;
+	PSXBIOS_LOG("psxBios_%s %s (%x) -> 0x%x\n", biosA0n[0x10], Ra0, a0, v0);
 }
 
 void psxBios_atol() { // 0x11
@@ -622,22 +638,24 @@ void psxBios_longjmp() { // 0x14
 }
 
 void psxBios_strcat() { // 0x15
-	char *p1 = (char *)Ra0, *p2 = (char *)Ra1;
+	u8 *p2 = (u8 *)Ra1;
+	u32 p1 = a0;
 
-#ifdef PSXBIOS_LOG
-	PSXBIOS_LOG("psxBios_%s: %s, %s\n", biosA0n[0x15], Ra0, Ra1);
-#endif
-	if (a0 == 0 || a1 == 0)
+	PSXBIOS_LOG("psxBios_%s %s (%x), %s (%x)\n", biosA0n[0x15], Ra0, a0, Ra1, a1);
+	if (a0 == 0 || a1 == 0 || p2 == INVALID_PTR)
 	{
-		v0 = 0;
-		pc0 = ra;
+		mips_return_c(0, 6);
 		return;
 	}
-	while (*p1++);
-	--p1;
-	while ((*p1++ = *p2++) != '\0');
+	while (loadRam8(p1)) {
+		use_cycles(4);
+		p1++;
+	}
+	for (; *p2; p1++, p2++)
+		storeRam8(p1, *p2);
+	storeRam8(p1, 0);
 
-	v0 = a0; pc0 = ra;
+	mips_return_c(a0, 22);
 }
 
 void psxBios_strncat() { // 0x16
@@ -756,6 +774,7 @@ void psxBios_strncmp() { // 0x18
 
 void psxBios_strcpy() { // 0x19
 	char *p1 = (char *)Ra0, *p2 = (char *)Ra1;
+	PSXBIOS_LOG("psxBios_%s %x, %s (%x)\n", biosA0n[0x19], a0, p2, a1);
 	if (a0 == 0 || a1 == 0)
 	{
 		v0 = 0;
@@ -897,6 +916,7 @@ void psxBios_strtok() { // 0x23
 
 void psxBios_strstr() { // 0x24
 	char *p = (char *)Ra0, *p1, *p2;
+	PSXBIOS_LOG("psxBios_%s %s (%x), %s (%x)\n", biosA0n[0x24], p, a0, Ra1, a1);
 
 	while (*p != '\0') {
 		p1 = p;
@@ -909,10 +929,12 @@ void psxBios_strstr() { // 0x24
 		if (*p2 == '\0') {
 			v0 = a0 + (p - (char *)Ra0);
 			pc0 = ra;
+			PSXBIOS_LOG(" -> %x\n", v0);
 			return;
 		}
 
-		p++;
+		// bug: skips the whole matched substring + 1
+		p = p1 + 1;
 	}
 
 	v0 = 0; pc0 = ra;
@@ -1218,114 +1240,98 @@ void psxBios_qsort() { // 0x31
 	pc0 = ra;
 }
 
-// this isn't how the real bios works, but maybe good enough
+static int malloc_heap_grow(u32 size) {
+	u32 heap_addr, heap_end, heap_addr_new;
+
+	heap_addr = loadRam32(A_HEAP_BASE);
+	heap_end = loadRam32(A_HEAP_END);
+	heap_addr_new = heap_addr + 4 + size;
+	if (heap_addr_new >= heap_end)
+		return -1;
+	storeRam32(A_HEAP_BASE, heap_addr_new);
+	storeRam32(heap_addr - 4, size | 1);
+	storeRam32(heap_addr + size, ~1); // terminator
+	return 0;
+}
+
 static void psxBios_malloc() { // 0x33
-	u32 *heap_addr, *heap_end;
-	u32 *chunk, *newchunk = NULL;
-	unsigned int dsize = 0, csize, cstat;
-	int colflag;
-	PSXBIOS_LOG("psxBios_%s %x\n", biosA0n[0x33], a0);
-	heap_addr = loadRam32ptr(A_HEAP_BASE);
-	heap_end = loadRam32ptr(A_HEAP_END);
-	if (heap_addr >= heap_end) {
-		v0 = 0;
-		pc0 = ra;
-		return;
-	}
+	u32 size = (a0 + 3) & ~3;
+	u32 limit = 32*1024;
+	u32 tries = 2, i;
+	u32 ret;
 
-	// scan through heap and combine free chunks of space
-	chunk = heap_addr;
-	colflag = 0;
-	while(chunk < heap_end) {
-		// get size and status of actual chunk
-		csize = ((u32)*chunk) & 0xfffffffc;
-		cstat = ((u32)*chunk) & 1;
-
-		// most probably broken heap descriptor
-		// this fixes Burning Road
-		if (*chunk == 0) {
-			newchunk = chunk;
-			dsize = ((uptr)heap_end - (uptr)chunk) - 4;
-			colflag = 1;
-			break;
+	PSXBIOS_LOG("psxBios_%s %d\n", biosA0n[0x33], a0);
+
+	if (!loadRam32(A_HEAP_INIT_FLG)) {
+		u32 heap_addr = loadRam32(A_HEAP_BASE);
+		storeRam32(heap_addr, ~1);
+		storeRam32(A_HEAP_FRSTCHNK, heap_addr);
+		storeRam32(A_HEAP_CURCHNK, heap_addr);
+		storeRam32(A_HEAP_BASE, heap_addr + 4);
+		if (malloc_heap_grow(size)) {
+			PSXBIOS_LOG("malloc: init OOM\n");
+			mips_return_c(0, 20);
+			return;
 		}
+		storeRam32(A_HEAP_INIT_FLG, 1);
+	}
 
-		// it's a free chunk
-		if(cstat == 1) {
-			if(colflag == 0) {
-				newchunk = chunk;
-				dsize = csize;
-				colflag = 1;			// let's begin a new collection of free memory
+	for (i = 0; tries > 0 && i < limit; i++)
+	{
+		u32 chunk = loadRam32(A_HEAP_CURCHNK);
+		u32 chunk_hdr = loadRam32(chunk);
+		u32 next_chunk = chunk + 4 + (chunk_hdr & ~3);
+		u32 next_chunk_hdr = loadRam32(next_chunk);
+		use_cycles(20);
+		//printf(" c %08x %08x\n", chunk, chunk_hdr);
+		if (chunk_hdr & 1) {
+			// free chunk
+			if (chunk_hdr > (size | 1)) {
+				// split
+				u32 p2size = (chunk_hdr & ~3) - size - 4;
+				storeRam32(chunk + 4 + size, p2size | 1);
+				chunk_hdr = size | 1;
+			}
+			if (chunk_hdr == (size | 1)) {
+				storeRam32(chunk, size);
+				break;
+			}
+			// chunk too small
+			if (next_chunk_hdr & 1) {
+				// merge
+				u32 msize = (chunk_hdr & ~3) + 4 + (next_chunk_hdr & ~3);
+				storeRam32(chunk, msize | 1);
+				continue;
 			}
-			else dsize += (csize+4);	// add the new size including header
 		}
-		// not a free chunk: did we start a collection ?
+		if (chunk_hdr == ~1) {
+			// last chunk
+			if (tries == 2)
+				storeRam32(A_HEAP_CURCHNK, loadRam32(A_HEAP_FRSTCHNK));
+			tries--;
+		}
 		else {
-			if(colflag == 1) {			// collection is over
-				colflag = 0;
-				*newchunk = SWAP32(dsize | 1);
-			}
+			// go to the next chunk
+			storeRam32(A_HEAP_CURCHNK, next_chunk);
 		}
-
-		// next chunk
-		chunk = (u32*)((uptr)chunk + csize + 4);
 	}
-	// if neccessary free memory on end of heap
-	if (colflag == 1)
-		*newchunk = SWAP32(dsize | 1);
-
-	chunk = heap_addr;
-	csize = ((u32)*chunk) & 0xfffffffc;
-	cstat = ((u32)*chunk) & 1;
-	dsize = (a0 + 3) & 0xfffffffc;
 
-	// exit on uninitialized heap
-	if (chunk == NULL) {
-		printf("malloc %x,%x: Uninitialized Heap!\n", v0, a0);
-		v0 = 0;
-		pc0 = ra;
-		return;
-	}
-
-	// search an unused chunk that is big enough until the end of the heap
-	while ((dsize > csize || cstat==0) && chunk < heap_end ) {
-		chunk = (u32*)((uptr)chunk + csize + 4);
-
-			// catch out of memory
-			if(chunk >= heap_end) {
-				printf("malloc %x,%x: Out of memory error!\n",
-					v0, a0);
-				v0 = 0; pc0 = ra;
-				return;
-			}
-
-		csize = ((u32)*chunk) & 0xfffffffc;
-		cstat = ((u32)*chunk) & 1;
+	if (i == limit)
+		ret = 0;
+	else if (tries == 0 && malloc_heap_grow(size))
+		ret = 0;
+	else {
+		u32 chunk = loadRam32(A_HEAP_CURCHNK);
+		storeRam32(chunk, loadRam32(chunk) & ~3);
+		ret = chunk + 4;
 	}
 
-	// allocate memory
-	if(dsize == csize) {
-		// chunk has same size
-		*chunk &= 0xfffffffc;
-	} else if (dsize > csize) {
-		v0 = 0; pc0 = ra;
-		return;
-	} else {
-		// split free chunk
-		*chunk = SWAP32(dsize);
-		newchunk = (u32*)((uptr)chunk + dsize + 4);
-		*newchunk = SWAP32(((csize - dsize - 4) & 0xfffffffc) | 1);
-	}
-
-	// return pointer to allocated memory
-	v0 = ((uptr)chunk - (uptr)psxM) + 4;
-	v0|= 0x80000000;
-	//printf ("malloc %x,%x\n", v0, a0);
-	pc0 = ra;
+	PSXBIOS_LOG(" -> %08x\n", ret);
+	mips_return_c(ret, 40);
 }
 
 static void psxBios_free() { // 0x34
-	PSXBIOS_LOG("psxBios_%s %x (%x bytes)\n", biosA0n[0x34], a0, loadRam32(a0 - 4));
+	PSXBIOS_LOG("psxBios_%s %x (%d bytes)\n", biosA0n[0x34], a0, loadRam32(a0 - 4));
 	storeRam32(a0 - 4, loadRam32(a0 - 4) | 1); // set chunk to free
 	mips_return_void_c(5);
 }
@@ -1380,7 +1386,7 @@ static void psxBios_InitHeap() { // 0x39
 	storeRam32(A_HEAP_BASE, a0);
 	storeRam32(A_HEAP_SIZE, a1);
 	storeRam32(A_HEAP_END, a0 + (a1 & ~3) + 4);
-	storeRam32(A_HEAP_FLAG, 0);
+	storeRam32(A_HEAP_INIT_FLG, 0);
 	storeRam32(a0, 0);
 
 	mips_return_void_c(14);
@@ -1393,7 +1399,7 @@ void psxBios_getchar() { //0x3b
 static void psxBios_printf_psxout() { // 0x3f
 	char tmp[1024];
 	char tmp2[1024];
-	u32 save[4];
+	u32 save[4] = { 0, };
 	char *ptmp = tmp;
 	int n=1, i=0, j;
 	void *psp;
@@ -2596,7 +2602,7 @@ static void bufile(const u8 *mcd_data, u32 dir_) {
 	}
 	for (; nfile <= 15; nfile++, blocks++) {
 		const u8 *data2 = mcd_data + 128 * nfile;
-		const char *name = data2 + 0x0a;
+		const char *name = (const char *)data2 + 0x0a;
 		if ((data2[0] & 0xF0) != 0x50 || name[0])
 			break;
 	}
@@ -2629,11 +2635,11 @@ static void psxBios_firstfile() { // 42
 		if (!strncmp(pa0, "bu00", 4)) {
 			// firstfile() calls _card_read() internally, so deliver it's event
 			DeliverEvent(0xf0000011, 0x0004);
-			bufile(Mcd1Data, a1);
+			bufile((u8 *)Mcd1Data, a1);
 		} else if (!strncmp(pa0, "bu10", 4)) {
 			// firstfile() calls _card_read() internally, so deliver it's event
 			DeliverEvent(0xf0000011, 0x0004);
-			bufile(Mcd2Data, a1);
+			bufile((u8 *)Mcd2Data, a1);
 		}
 	}
 
@@ -2649,9 +2655,9 @@ void psxBios_nextfile() { // 43
 
 	v0 = 0;
 	if (!strncmp(ffile, "bu00", 4))
-		bufile(Mcd1Data, a0);
+		bufile((u8 *)Mcd1Data, a0);
 	else if (!strncmp(ffile, "bu10", 4))
-		bufile(Mcd2Data, a0);
+		bufile((u8 *)Mcd2Data, a0);
 
 	pc0 = ra;
 }
@@ -3312,13 +3318,21 @@ void psxBiosSetupBootState(void)
 		SPU_writeRegister(0x1f801d80 + i*2, spu_config[i], psxRegs.cycle);
 }
 
+static void hleExc0_0_1();
+static void hleExc0_0_2();
+static void hleExc0_1_1();
+static void hleExc0_1_2();
+
 #include "sjisfont.h"
 
 void psxBiosInit() {
 	u32 *ptr, *ram32, *rom32;
+	char *romc;
 	int i;
 	uLongf len;
 
+	psxRegs.biosBranchCheck = ~0;
+
 	memset(psxM, 0, 0x10000);
 	for(i = 0; i < 256; i++) {
 		biosA0[i] = NULL;
@@ -3330,7 +3344,15 @@ void psxBiosInit() {
 	biosA0[0x3e] = biosB0[0x3f] = psxBios_puts_psxout;
 	biosA0[0x3f] = psxBios_printf_psxout;
 
-	if (!Config.HLE) return;
+	if (!Config.HLE) {
+		char verstr[0x24+1];
+		rom32 = (u32 *)psxR;
+		memcpy(verstr, psxR + 0x12c, 0x24);
+		verstr[0x24] = 0;
+		SysPrintf("BIOS: %08x, '%s', '%c'\n", SWAP32(rom32[0x100/4]),
+			verstr, psxR[0x7ff52]);
+		return;
+	}
 
 	for(i = 0; i < 256; i++) {
 		if (biosA0[i] == NULL) biosA0[i] = psxBios_dummy;
@@ -3656,10 +3678,11 @@ void psxBiosInit() {
 	rom32 = (u32 *)psxR;
 	rom32[0x100/4] = SWAP32(0x19951204);
 	rom32[0x104/4] = SWAP32(3);
-	strcpy(psxR + 0x108, "PCSX authors");
-	strcpy(psxR + 0x12c, "CEX-3000 PCSX HLE"); // see psxBios_GetSystemInfo
-	strcpy(psxR + 0x7ff32, "System ROM Version 2.2 12/04/95 A");
-	strcpy(psxR + 0x7ff54, "GPL-2.0-or-later");
+	romc = (char *)psxR;
+	strcpy(romc + 0x108, "PCSX authors");
+	strcpy(romc + 0x12c, "CEX-3000 PCSX HLE"); // see psxBios_GetSystemInfo
+	strcpy(romc + 0x7ff32, "System ROM Version 2.2 12/04/95 A");
+	strcpy(romc + 0x7ff54, "GPL-2.0-or-later");
 
 	// fonts
 	len = 0x80000 - 0x66000;
@@ -3721,16 +3744,16 @@ void psxBiosInit() {
 	// (or rather the funcs listed there)
 	ptr = (u32 *)&psxM[A_A0_TABLE];
 	for (i = 0; i < 256; i++)
-		ptr[i] = SWAP32(0x1000);
+		ptr[i] = SWAP32(A_A0_DUMMY);
 
 	ptr = (u32 *)&psxM[A_B0_TABLE];
 	for (i = 0; i < 256; i++)
-		ptr[i] = SWAP32(0x2000);
+		ptr[i] = SWAP32(A_B0_DUMMY);
 	// B(5b) is special because games patch (sometimes even jump to)
 	// code at fixed offsets from it, nocash lists offsets:
 	//  patch: +3d8, +4dc, +594, +62c, +9c8, +1988
 	//  call:  +7a0=4b70, +884=4c54, +894=4c64
-	ptr[0x5b] = SWAP32(0x43d0);
+	ptr[0x5b] = SWAP32(A_B0_5B_DUMMY);    // 0x43d0
 	ram32[0x4b70/4] = SWAP32(0x03e00008); // jr $ra // setPadOutputBuf
 
 	ram32[0x4c54/4] = SWAP32(0x240e0001); // mov $t6, 1
@@ -3742,13 +3765,14 @@ void psxBiosInit() {
 
 	ptr = (u32 *)&psxM[A_C0_TABLE];
 	for (i = 0; i < 256/2; i++)
-		ptr[i] = SWAP32(0x3000);
+		ptr[i] = SWAP32(A_C0_DUMMY);
 	ptr[6] = SWAP32(A_EXCEPTION);
 
 	// more HLE traps
-	ram32[0x1000/4] = HLEOP(hleop_dummy);
-	ram32[0x2000/4] = HLEOP(hleop_dummy);
-	ram32[0x3000/4] = HLEOP(hleop_dummy);
+	ram32[A_A0_DUMMY/4] = HLEOP(hleop_dummy);
+	ram32[A_B0_DUMMY/4] = HLEOP(hleop_dummy);
+	ram32[A_C0_DUMMY/4] = HLEOP(hleop_dummy);
+	ram32[A_B0_5B_DUMMY/4] = HLEOP(hleop_dummy);
 	ram32[0x8000/4] = HLEOP(hleop_execret);
 
 	ram32[A_EEXIT_PTR/4] = SWAP32(A_EEXIT_DEF);
@@ -3798,13 +3822,13 @@ static void handle_chain_x_x_1(u32 enable, u32 irqbit)
 
 // hleExc0_{0,1}* are usually removed by A(56)/A(72) on the game's startup,
 // so this is only partially implemented
-void hleExc0_0_1() // A(93h) - CdromDmaIrqFunc2
+static void hleExc0_0_1() // A(93h) - CdromDmaIrqFunc2
 {
 	u32 cdrom_dma_ack_enable = 1; // a000b93c
 	handle_chain_x_x_1(cdrom_dma_ack_enable, 3); // IRQ3 DMA
 }
 
-void hleExc0_0_2() // A(91h) - CdromDmaIrqFunc1
+static void hleExc0_0_2() // A(91h) - CdromDmaIrqFunc1
 {
 	u32 ret = 0;
 	//PSXBIOS_LOG("%s\n", __func__);
@@ -3819,13 +3843,13 @@ void hleExc0_0_2() // A(91h) - CdromDmaIrqFunc1
 	mips_return_c(ret, 20);
 }
 
-void hleExc0_1_1() // A(92h) - CdromIoIrqFunc2
+static void hleExc0_1_1() // A(92h) - CdromIoIrqFunc2
 {
 	u32 cdrom_irq_ack_enable = 1; // a000b938
 	handle_chain_x_x_1(cdrom_irq_ack_enable, 2); // IRQ2 cdrom
 }
 
-void hleExc0_1_2() // A(90h) - CdromIoIrqFunc1
+static void hleExc0_1_2() // A(90h) - CdromIoIrqFunc1
 {
 	u32 ret = 0;
 	if (psxHu32(0x1074) & psxHu32(0x1070) & 4) { // IRQ2 cdrom
@@ -3835,7 +3859,7 @@ void hleExc0_1_2() // A(90h) - CdromIoIrqFunc1
 	mips_return_c(ret, 20);
 }
 
-void hleExc0_2_2_syscall() // not in any A/B/C table
+static void hleExc0_2_2_syscall() // not in any A/B/C table
 {
 	u32 tcbPtr = loadRam32(A_TT_PCB);
 	TCB *tcb = loadRam32ptr(tcbPtr);
@@ -3879,7 +3903,7 @@ void hleExc0_2_2_syscall() // not in any A/B/C table
 	psxBios_ReturnFromException();
 }
 
-void hleExc1_0_1(void)
+static void hleExc1_0_1(void)
 {
 	u32 vbl_irq_ack_enable = loadRam32(A_RCNT_VBL_ACK + 0x0c); // 860c
 	handle_chain_x_x_1(vbl_irq_ack_enable, 0); // IRQ0 vblank
@@ -3895,45 +3919,45 @@ static void handle_chain_1_x_2(u32 ev_index, u32 irqbit)
 	mips_return_c(ret, 22);
 }
 
-void hleExc1_0_2(void)
+static void hleExc1_0_2(void)
 {
 	handle_chain_1_x_2(3, 0); // IRQ0 vblank
 }
 
-void hleExc1_1_1(void)
+static void hleExc1_1_1(void)
 {
 	u32 rcnt_irq_ack_enable = loadRam32(A_RCNT_VBL_ACK + 0x08); // 8608
 	handle_chain_x_x_1(rcnt_irq_ack_enable, 6); // IRQ6 rcnt2
 }
 
-void hleExc1_1_2(void)
+static void hleExc1_1_2(void)
 {
 	handle_chain_1_x_2(2, 6); // IRQ6 rcnt2
 }
 
-void hleExc1_2_1(void)
+static void hleExc1_2_1(void)
 {
 	u32 rcnt_irq_ack_enable = loadRam32(A_RCNT_VBL_ACK + 0x04); // 8604
 	handle_chain_x_x_1(rcnt_irq_ack_enable, 5); // IRQ5 rcnt1
 }
 
-void hleExc1_2_2(void)
+static void hleExc1_2_2(void)
 {
 	handle_chain_1_x_2(1, 5); // IRQ5 rcnt1
 }
 
-void hleExc1_3_1(void)
+static void hleExc1_3_1(void)
 {
 	u32 rcnt_irq_ack_enable = loadRam32(A_RCNT_VBL_ACK + 0x00); // 8600
 	handle_chain_x_x_1(rcnt_irq_ack_enable, 4); // IRQ4 rcnt0
 }
 
-void hleExc1_3_2(void)
+static void hleExc1_3_2(void)
 {
 	handle_chain_1_x_2(0, 4); // IRQ4 rcnt0
 }
 
-void hleExc3_0_2_defint(void)
+static void hleExc3_0_2_defint(void)
 {
 	static const struct {
 		u8 ev, irqbit;
@@ -3961,7 +3985,7 @@ void hleExc3_0_2_defint(void)
 	mips_return_c(0, 11 + 7*11 + 7*11 + 12);
 }
 
-void hleExcPadCard1(void)
+static void hleExcPadCard1(void)
 {
 	if (loadRam32(A_PAD_IRQR_ENA)) {
 		u8 *pad_buf1 = loadRam8ptr(A_PAD_INBUF + 0);
@@ -3982,7 +4006,7 @@ void hleExcPadCard1(void)
 	mips_return_c(0, 18);
 }
 
-void hleExcPadCard2(void)
+static void hleExcPadCard2(void)
 {
 	u32 ret = psxHu32(0x1074) & psxHu32(0x1070) & 1;
 	mips_return_c(ret, 15);
@@ -4049,6 +4073,178 @@ void psxBiosException() {
 	psxBios_ReturnFromException();
 }
 
+/* HLE */
+static void hleDummy() {
+	log_unhandled("hleDummy called @%08x ra=%08x\n", psxRegs.pc - 4, ra);
+	psxRegs.pc = ra;
+	psxRegs.cycle += 1000;
+
+	psxBranchTest();
+}
+
+static void hleA0() {
+	u32 call = t1 & 0xff;
+	u32 entry = loadRam32(A_A0_TABLE + call * 4);
+
+	if (call < 192 && entry != A_A0_DUMMY) {
+		PSXBIOS_LOG("custom A%02x %s(0x%x, )  addr=%08x ra=%08x\n",
+			call, biosA0n[call], a0, entry, ra);
+		softCall(entry);
+		pc0 = ra;
+		PSXBIOS_LOG(" -> %08x\n", v0);
+	}
+	else if (biosA0[call])
+		biosA0[call]();
+
+	//printf("A(%02x) -> %x\n", call, v0);
+	psxBranchTest();
+}
+
+static void hleB0() {
+	u32 call = t1 & 0xff;
+	u32 entry = loadRam32(A_B0_TABLE + call * 4);
+	int is_custom = 0;
+
+	if (call == 0x5b)
+		is_custom = entry != A_B0_5B_DUMMY;
+	else
+		is_custom = entry != A_B0_DUMMY;
+	if (is_custom) {
+		PSXBIOS_LOG("custom B%02x %s(0x%x, )  addr=%08x ra=%08x\n",
+			call, biosB0n[call], a0, entry, ra);
+		softCall(entry);
+		pc0 = ra;
+		PSXBIOS_LOG(" -> %08x\n", v0);
+	}
+	else if (biosB0[call])
+		biosB0[call]();
+
+	//printf("B(%02x) -> %x\n", call, v0);
+	psxBranchTest();
+}
+
+static void hleC0() {
+	u32 call = t1 & 0xff;
+	u32 entry = loadRam32(A_C0_TABLE + call * 4);
+
+	if (call < 128 && entry != A_C0_DUMMY) {
+		PSXBIOS_LOG("custom C%02x %s(0x%x, )  addr=%08x ra=%08x\n",
+			call, biosC0n[call], a0, entry, ra);
+		softCall(entry);
+		pc0 = ra;
+		PSXBIOS_LOG(" -> %08x\n", v0);
+	}
+	else if (biosC0[call])
+		biosC0[call]();
+
+	//printf("C(%02x) -> %x\n", call, v0);
+	psxBranchTest();
+}
+
+// currently not used
+static void hleBootstrap() {
+	CheckCdrom();
+	LoadCdrom();
+}
+
+static void hleExecRet() {
+	const EXEC *header = (EXEC *)PSXM(s0);
+
+	PSXBIOS_LOG("ExecRet %x: %x\n", s0, header->ret);
+
+	ra = SWAP32(header->ret);
+	sp = SWAP32(header->_sp);
+	fp = SWAP32(header->_fp);
+	gp = SWAP32(header->_gp);
+	s0 = SWAP32(header->base);
+
+	v0 = 1;
+	psxRegs.pc = ra;
+}
+
+void (* const psxHLEt[24])() = {
+	hleDummy, hleA0, hleB0, hleC0,
+	hleBootstrap, hleExecRet, psxBiosException, hleDummy,
+	hleExc0_0_1, hleExc0_0_2,
+	hleExc0_1_1, hleExc0_1_2, hleExc0_2_2_syscall,
+	hleExc1_0_1, hleExc1_0_2,
+	hleExc1_1_1, hleExc1_1_2,
+	hleExc1_2_1, hleExc1_2_2,
+	hleExc1_3_1, hleExc1_3_2,
+	hleExc3_0_2_defint,
+	hleExcPadCard1, hleExcPadCard2,
+};
+
+void psxBiosCheckExe(u32 t_addr, u32 t_size, int loading_state)
+{
+	// lw      $v0, 0x10($sp)
+	// nop
+	// addiu   $v0, -1
+	// sw      $v0, 0x10($sp)
+	// lw      $v0, 0x10($sp)
+	// nop
+	// bne     $v0, $v1, not_timeout
+	// nop
+	// lui     $a0, ...
+	static const u8 pattern[] = {
+		0x10, 0x00, 0xA2, 0x8F, 0x00, 0x00, 0x00, 0x00,
+		0xFF, 0xFF, 0x42, 0x24, 0x10, 0x00, 0xA2, 0xAF,
+		0x10, 0x00, 0xA2, 0x8F, 0x00, 0x00, 0x00, 0x00,
+		0x0C, 0x00, 0x43, 0x14, 0x00, 0x00, 0x00, 0x00,
+	};
+	u32 start = t_addr & 0x1ffffc;
+	u32 end = (start + t_size) & 0x1ffffc;
+	u32 buf[sizeof(pattern) / sizeof(u32)];
+	const u32 *r32 = (u32 *)(psxM + start);
+	u32 i, j;
+
+	if (end <= start)
+		return;
+	if (!Config.HLE)
+		return;
+
+	memcpy(buf, pattern, sizeof(buf));
+	for (i = 0; i < t_size / 4; i += j + 1) {
+		for (j = 0; j < sizeof(buf) / sizeof(buf[0]); j++)
+			if (r32[i + j] != buf[j])
+				break;
+		if (j != sizeof(buf) / sizeof(buf[0]))
+			continue;
+
+		if ((SWAP32(r32[i + j]) >> 16) != 0x3c04) // lui
+			continue;
+		if (!loading_state)
+			SysPrintf("HLE vsync @%08x\n", start + i * 4);
+		psxRegs.biosBranchCheck = (t_addr & 0xa01ffffc) + i * 4;
+	}
+}
+
+void psxBiosCheckBranch(void)
+{
+#if 1
+	// vsync HLE hack
+	static u32 cycles_prev, v0_prev;
+	u32 cycles_passed, waste_cycles;
+	u32 loops, v0_expect = v0_prev - 1;
+	if (v0 != 1)
+		return;
+	execI(&psxRegs);
+	cycles_passed = psxRegs.cycle - cycles_prev;
+	cycles_prev = psxRegs.cycle;
+	v0_prev = v0;
+	if (cycles_passed < 10 || cycles_passed > 50 || v0 != v0_expect)
+		return;
+
+	waste_cycles = schedule_timeslice() - psxRegs.cycle;
+	loops = waste_cycles / cycles_passed;
+	if (loops > v0)
+		loops = v0;
+	v0 -= loops;
+	psxRegs.cycle += loops * cycles_passed;
+	//printf("c %4u %d\n", loops, cycles_passed);
+#endif
+}
+
 #define bfreeze(ptr, size) { \
 	if (Mode == 1) memcpy(&psxR[base], ptr, size); \
 	if (Mode == 0) memcpy(ptr, &psxR[base], size); \