X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxbios.c;h=69e531f74242455cd5f0907efab9ae2952015204;hb=c02b90b22d36025085d2382eef641681b4eb01f8;hp=46e1595ea8c7567666b761aa55096f12f4bd1daf;hpb=cd2d587936d9d83af6fd47360103f0e79dcb4341;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index 46e1595e..69e531f7 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -36,6 +36,10 @@
 #include "sio.h"
 #include <zlib.h>
 
+#if (defined(__GNUC__) && __GNUC__ >= 5) || defined(__clang__)
+#pragma GCC diagnostic ignored "-Wpointer-sign"
+#endif
+
 #undef SysPrintf
 #define SysPrintf if (Config.PsxOut) printf
 
@@ -369,7 +373,7 @@ void psxBios_getc(void) // 0x03, 0x35
 #endif
 	v0 = -1;
 
-	if (pa1) {
+	if (pa1 != INVALID_PTR) {
 		switch (a0) {
 			case 2: buread(pa1, 1, 1); break;
 			case 3: buread(pa1, 2, 1); break;
@@ -388,7 +392,7 @@ void psxBios_putc(void) // 0x09, 0x3B
 	PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x09]);
 #endif
 	v0 = -1;
-	if (!pa1) {
+	if (pa1 == INVALID_PTR) {
 		pc0 = ra;
 		return;
 	}
@@ -1062,7 +1066,7 @@ void psxBios_qsort() { // 0x31
 }
 
 void psxBios_malloc() { // 0x33
-	unsigned int *chunk, *newchunk = NULL;
+	u32 *chunk, *newchunk = NULL;
 	unsigned int dsize = 0, csize, cstat;
 	int colflag;
 #ifdef PSXBIOS_LOG
@@ -1248,7 +1252,7 @@ void psxBios_getchar() { //0x3b
 	v0 = getchar(); pc0 = ra;
 }
 
-void psxBios_printf() { // 0x3f
+static void psxBios_printf_psxout() { // 0x3f
 	char tmp[1024];
 	char tmp2[1024];
 	u32 save[4];
@@ -1257,7 +1261,7 @@ void psxBios_printf() { // 0x3f
 	void *psp;
 
 	psp = PSXM(sp);
-	if (psp) {
+	if (psp != INVALID_PTR) {
 		memcpy(save, psp, 4 * 4);
 		psxMu32ref(sp) = SWAP32((u32)a0);
 		psxMu32ref(sp + 4) = SWAP32((u32)a1);
@@ -1313,11 +1317,14 @@ _start:
 	}
 	*ptmp = 0;
 
-	if (psp)
+	if (psp != INVALID_PTR)
 		memcpy(psp, save, 4 * 4);
 
 	SysPrintf("%s", tmp);
+}
 
+void psxBios_printf() { // 0x3f
+	psxBios_printf_psxout();
 	pc0 = ra;
 }
 
@@ -1402,10 +1409,8 @@ void psxBios_FlushCache() { // 44
 #ifdef PSXBIOS_LOG
 	PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x44]);
 #endif
-#ifdef ICACHE_EMULATION
-    psxCpu->Notify(R3000ACPU_NOTIFY_CACHE_ISOLATED, NULL);
-    psxCpu->Notify(R3000ACPU_NOTIFY_CACHE_UNISOLATED, NULL);
-#endif
+	psxCpu->Notify(R3000ACPU_NOTIFY_CACHE_ISOLATED, NULL);
+	psxCpu->Notify(R3000ACPU_NOTIFY_CACHE_UNISOLATED, NULL);
 	pc0 = ra;
 }
 
@@ -2110,7 +2115,7 @@ void psxBios_open() { // 0x32
 
 	v0 = -1;
 
-	if (pa0) {
+	if (pa0 != INVALID_PTR) {
 		if (!strncmp(pa0, "bu00", 4)) {
 			buopen(1, Mcd1Data, Config.Mcd1);
 		}
@@ -2164,7 +2169,7 @@ void psxBios_read() { // 0x34
 
 	v0 = -1;
 
-	if (pa1) {
+	if (pa1 != INVALID_PTR) {
 		switch (a0) {
 			case 2: buread(pa1, 1, a2); break;
 			case 3: buread(pa1, 2, a2); break;
@@ -2187,7 +2192,7 @@ void psxBios_write() { // 0x35/0x03
 #endif
 
 	v0 = -1;
-	if (!pa1) {
+	if (pa1 == INVALID_PTR) {
 		pc0 = ra;
 		return;
 	}
@@ -2210,6 +2215,25 @@ void psxBios_write() { // 0x35/0x03
 	pc0 = ra;
 }
 
+static void psxBios_write_psxout() {
+	if (a0 == 1) { // stdout
+		const char *ptr = Ra1;
+		int len = a2;
+
+		if (ptr != INVALID_PTR)
+			while (len-- > 0)
+				SysPrintf("%c", *ptr++);
+	}
+}
+
+static void psxBios_putchar_psxout() { // 3d
+	SysPrintf("%c", (char)a0);
+}
+
+static void psxBios_puts_psxout() { // 3e/3f
+	SysPrintf("%s", Ra0);
+}
+
 /*
  *	int close(int fd);
  */
@@ -2291,7 +2315,7 @@ void psxBios_firstfile() { // 42
 
 	v0 = 0;
 
-	if (pa0) {
+	if (pa0 != INVALID_PTR) {
 		strcpy(ffile, pa0);
 		pfile = ffile+5;
 		nfile = 0;
@@ -2369,7 +2393,7 @@ void psxBios_rename() { // 44
 
 	v0 = 0;
 
-	if (pa0 && pa1) {
+	if (pa0 != INVALID_PTR && pa1 != INVALID_PTR) {
 		if (!strncmp(pa0, "bu00", 4) && !strncmp(pa1, "bu00", 4)) {
 			burename(1);
 		}
@@ -2411,7 +2435,7 @@ void psxBios_delete() { // 45
 
 	v0 = 0;
 
-	if (pa0) {
+	if (pa0 != INVALID_PTR) {
 		if (!strncmp(pa0, "bu00", 4)) {
 			budelete(1);
 		}
@@ -2474,7 +2498,7 @@ void psxBios__card_write() { // 0x4e
 	card_active_chan = a0;
 	port = a0 >> 4;
 
-	if (pa2) {
+	if (pa2 != INVALID_PTR) {
 		if (port == 0) {
 			memcpy(Mcd1Data + a1 * 128, pa2, 128);
 			SaveMcd(Config.Mcd1, Mcd1Data, a1 * 128, 128);
@@ -2510,7 +2534,7 @@ void psxBios__card_read() { // 0x4f
 	card_active_chan = a0;
 	port = a0 >> 4;
 
-	if (pa2) {
+	if (pa2 != INVALID_PTR) {
 		if (port == 0) {
 			memcpy(pa2, Mcd1Data + a1 * 128, 128);
 		} else {
@@ -2702,11 +2726,10 @@ void psxBiosInit() {
 		biosB0[i] = NULL;
 		biosC0[i] = NULL;
 	}
-	biosA0[0x3e] = psxBios_puts;
-	biosA0[0x3f] = psxBios_printf;
-
-	biosB0[0x3d] = psxBios_putchar;
-	biosB0[0x3f] = psxBios_puts;
+	biosA0[0x03] = biosB0[0x35] = psxBios_write_psxout;
+	biosA0[0x3c] = biosB0[0x3d] = psxBios_putchar_psxout;
+	biosA0[0x3e] = biosB0[0x3f] = psxBios_puts_psxout;
+	biosA0[0x3f] = psxBios_printf_psxout;
 
 	if (!Config.HLE) return;