X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fmisc.c;h=7929dc76fc6b8aa64c4349c6d82beb1cf1a7280b;hb=d0d2939d7a485bbe97017e5ae20b504d225c09d3;hp=b02ac6f2a2bc756c2731165b7079f3b6afe179ed;hpb=6962f77077fe33ba7c650264f9930e1899901659;p=pcsx_rearmed.git

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index b02ac6f2..7929dc76 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -28,6 +28,7 @@
 #include "gpu.h"
 #include "ppf.h"
 #include "database.h"
+#include "lightrec/plugin.h"
 #include <zlib.h>
 
 char CdromId[10] = "";
@@ -55,17 +56,11 @@ struct iso_directory_record {
 	char name			[1];
 };
 
-void mmssdd( char *b, char *p )
+static void mmssdd( char *b, char *p )
 {
 	int m, s, d;
-#if defined(__arm__)
-	unsigned char *u = (void *)b;
-	int block = (u[3] << 24) | (u[2] << 16) | (u[1] << 8) | u[0];
-#elif defined(__BIGENDIAN__)
-	int block = (b[0] & 0xff) | ((b[1] & 0xff) << 8) | ((b[2] & 0xff) << 16) | (b[3] << 24);
-#else
-	int block = *((int*)b);
-#endif
+	unsigned char *ub = (void *)b;
+	int block = (ub[3] << 24) | (ub[2] << 16) | (ub[1] << 8) | ub[0];
 
 	block += 150;
 	m = block / 4500;			// minutes
@@ -96,7 +91,7 @@ void mmssdd( char *b, char *p )
 	time[0] = itob(time[0]); time[1] = itob(time[1]); time[2] = itob(time[2]);
 
 #define READTRACK() \
-	if (CDR_readTrack(time) == -1) return -1; \
+	if (!CDR_readTrack(time)) return -1; \
 	buf = (void *)CDR_getBuffer(); \
 	if (buf == NULL) return -1; \
 	else CheckPPFCache((u8 *)buf, time[0], time[1], time[2]);
@@ -254,7 +249,7 @@ int LoadCdrom() {
 		incTime();
 		READTRACK();
 
-		if (ptr != NULL) memcpy(ptr, buf+12, 2048);
+		if (ptr != INVALID_PTR) memcpy(ptr, buf+12, 2048);
 
 		tmpHead.t_size -= 2048;
 		tmpHead.t_addr += 2048;
@@ -300,7 +295,7 @@ int LoadCdromFile(const char *filename, EXE_HEADER *head) {
 		READTRACK();
 
 		mem = PSXM(addr);
-		if (mem)
+		if (mem != INVALID_PTR)
 			memcpy(mem, buf + 12, 2048);
 
 		size -= 2048;
@@ -423,7 +418,7 @@ static int PSXGetFileType(FILE *f) {
 
 	current = ftell(f);
 	fseek(f, 0L, SEEK_SET);
-	if (fread(&mybuf, sizeof(mybuf), 1, f) != sizeof(mybuf))
+	if (fread(&mybuf, 1, sizeof(mybuf), f) != sizeof(mybuf))
 		goto io_fail;
 	
 	fseek(f, current, SEEK_SET);
@@ -484,12 +479,12 @@ int Load(const char *ExePath) {
 		type = PSXGetFileType(tmpFile);
 		switch (type) {
 			case PSX_EXE:
-				if (fread(&tmpHead, sizeof(EXE_HEADER), 1, tmpFile) != sizeof(EXE_HEADER))
+				if (fread(&tmpHead, 1, sizeof(EXE_HEADER), tmpFile) != sizeof(EXE_HEADER))
 					goto fail_io;
 				section_address = SWAP32(tmpHead.t_addr);
 				section_size = SWAP32(tmpHead.t_size);
 				mem = PSXM(section_address);
-				if (mem != NULL) {
+				if (mem != INVALID_PTR) {
 					fseek(tmpFile, 0x800, SEEK_SET);
 					fread_to_ram(mem, section_size, 1, tmpFile);
 					psxCpu->Clear(section_address, section_size / 4);
@@ -504,13 +499,13 @@ int Load(const char *ExePath) {
 			case CPE_EXE:
 				fseek(tmpFile, 6, SEEK_SET); /* Something tells me we should go to 4 and read the "08 00" here... */
 				do {
-					if (fread(&opcode, sizeof(opcode), 1, tmpFile) != sizeof(opcode))
+					if (fread(&opcode, 1, sizeof(opcode), tmpFile) != sizeof(opcode))
 						goto fail_io;
 					switch (opcode) {
 						case 1: /* Section loading */
-							if (fread(&section_address, sizeof(section_address), 1, tmpFile) != sizeof(section_address))
+							if (fread(&section_address, 1, sizeof(section_address), tmpFile) != sizeof(section_address))
 								goto fail_io;
-							if (fread(&section_size, sizeof(section_size), 1, tmpFile) != sizeof(section_size))
+							if (fread(&section_size, 1, sizeof(section_size), tmpFile) != sizeof(section_size))
 								goto fail_io;
 							section_address = SWAPu32(section_address);
 							section_size = SWAPu32(section_size);
@@ -518,14 +513,14 @@ int Load(const char *ExePath) {
 							EMU_LOG("Loading %08X bytes from %08X to %08X\n", section_size, ftell(tmpFile), section_address);
 #endif
 							mem = PSXM(section_address);
-							if (mem != NULL) {
+							if (mem != INVALID_PTR) {
 								fread_to_ram(mem, section_size, 1, tmpFile);
 								psxCpu->Clear(section_address, section_size / 4);
 							}
 							break;
 						case 3: /* register loading (PC only?) */
 							fseek(tmpFile, 2, SEEK_CUR); /* unknown field */
-							if (fread(&psxRegs.pc, sizeof(psxRegs.pc), 1, tmpFile) != sizeof(psxRegs.pc))
+							if (fread(&psxRegs.pc, 1, sizeof(psxRegs.pc), tmpFile) != sizeof(psxRegs.pc))
 								goto fail_io;
 							psxRegs.pc = SWAPu32(psxRegs.pc);
 							break;
@@ -555,7 +550,8 @@ int Load(const char *ExePath) {
 		CdromLabel[0] = '\0';
 	}
 
-	fclose(tmpFile);
+	if (tmpFile)
+		fclose(tmpFile);
 	return retval;
 
 fail_io:
@@ -603,15 +599,6 @@ static const char PcsxHeader[32] = "STv4 PCSX v" PCSX_VERSION;
 // If you make changes to the savestate version, please increment the value below.
 static const u32 SaveVersion = 0x8b410006;
 
-static int drc_is_lightrec(void)
-{
-#if defined(LIGHTREC)
-	return 1;
-#else
-	return 0;
-#endif
-}
-
 int SaveState(const char *file) {
 	void *f;
 	GPUFreeze_t *gpufP;
@@ -624,8 +611,8 @@ int SaveState(const char *file) {
 
 	new_dyna_before_save();
 
-	if (drc_is_lightrec())
-		lightrec_plugin_prepare_save_state();
+	if (drc_is_lightrec() && Config.Cpu != CPU_INTERPRETER)
+		lightrec_plugin_sync_regs_to_pcsx();
 
 	SaveFuncs.write(f, (void *)PcsxHeader, 32);
 	SaveFuncs.write(f, (void *)&SaveVersion, sizeof(u32));
@@ -713,7 +700,7 @@ int LoadState(const char *file) {
 	psxRegs.gteBusyCycle = psxRegs.cycle;
 
 	if (drc_is_lightrec() && Config.Cpu != CPU_INTERPRETER)
-		lightrec_plugin_prepare_load_state();
+		lightrec_plugin_sync_regs_from_pcsx();
 
 	if (Config.HLE)
 		psxBiosFreeze(0);
@@ -724,7 +711,7 @@ int LoadState(const char *file) {
 	GPU_freeze(0, gpufP);
 	free(gpufP);
 	if (HW_GPU_STATUS == 0)
-		HW_GPU_STATUS = GPU_readStatus();
+		HW_GPU_STATUS = SWAP32(GPU_readStatus());
 
 	// spu
 	SaveFuncs.read(f, &Size, 4);
@@ -772,10 +759,13 @@ int SendPcsxInfo() {
 	if (NET_recvData == NULL || NET_sendData == NULL)
 		return 0;
 
+	boolean Sio_old = 0;
+	boolean SpuIrq_old = 0;
+	boolean RCntFix_old = 0;
 	NET_sendData(&Config.Xa, sizeof(Config.Xa), PSE_NET_BLOCKING);
-	NET_sendData(&Config.Sio, sizeof(Config.Sio), PSE_NET_BLOCKING);
-	NET_sendData(&Config.SpuIrq, sizeof(Config.SpuIrq), PSE_NET_BLOCKING);
-	NET_sendData(&Config.RCntFix, sizeof(Config.RCntFix), PSE_NET_BLOCKING);
+	NET_sendData(&Sio_old, sizeof(Sio_old), PSE_NET_BLOCKING);
+	NET_sendData(&SpuIrq_old, sizeof(SpuIrq_old), PSE_NET_BLOCKING);
+	NET_sendData(&RCntFix_old, sizeof(RCntFix_old), PSE_NET_BLOCKING);
 	NET_sendData(&Config.PsxType, sizeof(Config.PsxType), PSE_NET_BLOCKING);
 	NET_sendData(&Config.Cpu, sizeof(Config.Cpu), PSE_NET_BLOCKING);
 
@@ -788,10 +778,13 @@ int RecvPcsxInfo() {
 	if (NET_recvData == NULL || NET_sendData == NULL)
 		return 0;
 
+	boolean Sio_old = 0;
+	boolean SpuIrq_old = 0;
+	boolean RCntFix_old = 0;
 	NET_recvData(&Config.Xa, sizeof(Config.Xa), PSE_NET_BLOCKING);
-	NET_recvData(&Config.Sio, sizeof(Config.Sio), PSE_NET_BLOCKING);
-	NET_recvData(&Config.SpuIrq, sizeof(Config.SpuIrq), PSE_NET_BLOCKING);
-	NET_recvData(&Config.RCntFix, sizeof(Config.RCntFix), PSE_NET_BLOCKING);
+	NET_recvData(&Sio_old, sizeof(Sio_old), PSE_NET_BLOCKING);
+	NET_recvData(&SpuIrq_old, sizeof(SpuIrq_old), PSE_NET_BLOCKING);
+	NET_recvData(&RCntFix_old, sizeof(RCntFix_old), PSE_NET_BLOCKING);
 	NET_recvData(&Config.PsxType, sizeof(Config.PsxType), PSE_NET_BLOCKING);
 
 	SysUpdate();