move some gpu status handling to core

[pcsx_rearmed.git] / libpcsxcore / misc.c

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 3236945..034e5e0 100644 (file)
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -24,6 +24,7 @@
 #include "misc.h"
 #include "cdrom.h"
 #include "mdec.h"
+#include "gpu.h"
 #include "ppf.h"
 
 char CdromId[10] = "";
@@ -209,8 +210,10 @@ int LoadCdrom() {
        tmpHead.t_size = SWAP32(tmpHead.t_size);
        tmpHead.t_addr = SWAP32(tmpHead.t_addr);
 
+       psxCpu->Clear(tmpHead.t_addr, tmpHead.t_size / 4);
+
        // Read the rest of the main executable
-       while (tmpHead.t_size) {
+       while (tmpHead.t_size & ~2047) {
                void *ptr = (void *)PSXM(tmpHead.t_addr);
 
                incTime();
@@ -252,7 +255,9 @@ int LoadCdromFile(const char *filename, EXE_HEADER *head) {
        size = head->t_size;
        addr = head->t_addr;
 
-       while (size) {
+       psxCpu->Clear(addr, size / 4);
+
+       while (size & ~2047) {
                incTime();
                READTRACK();
 
@@ -333,7 +338,7 @@ int CheckCdrom() {
        }
 
        if (Config.PsxAuto) { // autodetect system (pal or ntsc)
-               if (strstr(exename, "ES") != NULL)
+               if (CdromId[2] == 'e' || CdromId[2] == 'E')
                        Config.PsxType = PSX_TYPE_PAL; // pal
                else Config.PsxType = PSX_TYPE_NTSC; // ntsc
        }
@@ -381,6 +386,7 @@ int Load(const char *ExePath) {
        int retval = 0;
        u8 opcode;
        u32 section_address, section_size;
+       void *mem;
 
        strncpy(CdromId, "SLUS99999", 9);
        strncpy(CdromLabel, "SLUS_999.99", 11);
@@ -394,8 +400,14 @@ int Load(const char *ExePath) {
                switch (type) {
                        case PSX_EXE:
                                fread(&tmpHead,sizeof(EXE_HEADER),1,tmpFile);
-                               fseek(tmpFile, 0x800, SEEK_SET);                
-                               fread((void *)PSXM(SWAP32(tmpHead.t_addr)), SWAP32(tmpHead.t_size),1,tmpFile);
+                               section_address = SWAP32(tmpHead.t_addr);
+                               section_size = SWAP32(tmpHead.t_size);
+                               mem = PSXM(section_address);
+                               if (mem != NULL) {
+                                       fseek(tmpFile, 0x800, SEEK_SET);                
+                                       fread(mem, section_size, 1, tmpFile);
+                                       psxCpu->Clear(section_address, section_size / 4);
+                               }
                                fclose(tmpFile);
                                psxRegs.pc = SWAP32(tmpHead.pc0);
                                psxRegs.GPR.n.gp = SWAP32(tmpHead.gp0);
@@ -417,7 +429,11 @@ int Load(const char *ExePath) {
 #ifdef EMU_LOG
                                                        EMU_LOG("Loading %08X bytes from %08X to %08X\n", section_size, ftell(tmpFile), section_address);
 #endif
-                                                       fread(PSXM(section_address), section_size, 1, tmpFile);
+                                                       mem = PSXM(section_address);
+                                                       if (mem != NULL) {
+                                                               fread(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 */
@@ -458,7 +474,7 @@ static const char PcsxHeader[32] = "STv4 PCSX v" PACKAGE_VERSION;
 
 // Savestate Versioning!
 // If you make changes to the savestate version, please increment the value below.
-static const u32 SaveVersion = 0x8b410005;
+static const u32 SaveVersion = 0x8b410006;
 
 int SaveState(const char *file) {
        gzFile f;
@@ -470,6 +486,8 @@ int SaveState(const char *file) {
        f = gzopen(file, "wb");
        if (f == NULL) return -1;
 
+       new_dyna_save();
+
        gzwrite(f, (void *)PcsxHeader, 32);
        gzwrite(f, (void *)&SaveVersion, sizeof(u32));
        gzwrite(f, (void *)&Config.HLE, sizeof(boolean));
@@ -513,6 +531,8 @@ int SaveState(const char *file) {
 
        gzclose(f);
 
+       new_dyna_after_save();
+
        return 0;
 }
 
@@ -532,10 +552,14 @@ int LoadState(const char *file) {
        gzread(f, &version, sizeof(u32));
        gzread(f, &hle, sizeof(boolean));
 
-       if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion || hle != Config.HLE) {
+       if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion) {
                gzclose(f);
                return -1;
        }
+       Config.HLE = hle;
+
+       if (Config.HLE)
+               psxBiosInit();
 
        psxCpu->Reset();
        gzseek(f, 128 * 96 * 3, SEEK_CUR);
@@ -553,6 +577,8 @@ int LoadState(const char *file) {
        gzread(f, gpufP, sizeof(GPUFreeze_t));
        GPU_freeze(0, gpufP);
        free(gpufP);
+       if (HW_GPU_STATUS == 0)
+               HW_GPU_STATUS = GPU_readStatus();
 
        // spu
        gzread(f, &Size, 4);
@@ -568,6 +594,7 @@ int LoadState(const char *file) {
        mdecFreeze(f, 0);
 
        gzclose(f);
+       new_dyna_restore();
 
        return 0;
 }
@@ -587,7 +614,7 @@ int CheckState(const char *file) {
 
        gzclose(f);
 
-       if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion || hle != Config.HLE)
+       if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion)
                return -1;
 
        return 0;