notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: implement cycle reload on read
[pcsx_rearmed.git]
/
libpcsxcore
/
misc.c
diff --git
a/libpcsxcore/misc.c
b/libpcsxcore/misc.c
index
d52a931
..
f332f43
100644
(file)
--- a/
libpcsxcore/misc.c
+++ b/
libpcsxcore/misc.c
@@
-22,11
+22,14
@@
*/
#include <stddef.h>
*/
#include <stddef.h>
+#include <errno.h>
+#include <assert.h>
#include "misc.h"
#include "cdrom.h"
#include "mdec.h"
#include "gpu.h"
#include "ppf.h"
#include "misc.h"
#include "cdrom.h"
#include "mdec.h"
#include "gpu.h"
#include "ppf.h"
+#include "psxbios.h"
#include "database.h"
#include <zlib.h>
#include "database.h"
#include <zlib.h>
@@
-111,7
+114,7
@@
int GetCdromFile(u8 *mdir, u8 *time, char *filename) {
int i;
// only try to scan if a filename is given
int i;
// only try to scan if a filename is given
- if (!strlen(filename)) return -1;
+ if (
filename == INVALID_PTR ||
!strlen(filename)) return -1;
i = 0;
while (i < 4096) {
i = 0;
while (i < 4096) {
@@
-143,43
+146,66
@@
int GetCdromFile(u8 *mdir, u8 *time, char *filename) {
return retval;
}
return retval;
}
-static
const unsigned int gpu_ctl_def[] = {
- 0x00000000, 0x01000000, 0x03000000, 0x04000000,
- 0x05000800, 0x06c60260, 0x0703fc10, 0x08000027,
-
}
;
+static
void SetBootRegs(u32 pc, u32 gp, u32 sp)
+{
+ //printf("%s %08x %08x %08x\n", __func__, pc, gp, sp);
+
psxCpu->Notify(R3000ACPU_NOTIFY_BEFORE_SAVE, NULL)
;
-static const unsigned int gpu_data_def[] = {
- 0xe100360b, 0xe2000000, 0xe3000800, 0xe4077e7f,
- 0xe5001000, 0xe6000000,
- 0x02000000, 0x00000000, 0x01ff03ff,
-};
+ psxRegs.pc = pc;
+ psxRegs.GPR.n.gp = gp;
+ psxRegs.GPR.n.sp = sp ? sp : 0x801fff00;
+ psxRegs.GPR.n.fp = psxRegs.GPR.n.sp;
-static void fake_bios_gpu_setup(void)
-{
- int i;
+ psxRegs.GPR.n.t0 = psxRegs.GPR.n.sp; // mimic A(43)
+ psxRegs.GPR.n.t3 = pc;
+
+ psxCpu->Notify(R3000ACPU_NOTIFY_AFTER_LOAD, NULL);
+}
+
+void BiosBootBypass() {
+ assert(psxRegs.pc == 0x80030000);
- for (i = 0; i < sizeof(gpu_ctl_def) / sizeof(gpu_ctl_def[0]); i++)
- GPU_writeStatus(gpu_ctl_def[i]);
+ // skip BIOS logos and region check
+ psxCpu->Notify(R3000ACPU_NOTIFY_BEFORE_SAVE, NULL);
+ psxRegs.pc = psxRegs.GPR.n.ra;
+}
- for (i = 0; i < sizeof(gpu_data_def) / sizeof(gpu_data_def[0]); i++)
- GPU_writeData(gpu_data_def[i]);
+static void getFromCnf(char *buf, const char *key, u32 *val)
+{
+ buf = strstr(buf, key);
+ if (buf)
+ buf = strchr(buf, '=');
+ if (buf) {
+ unsigned long v;
+ errno = 0;
+ v = strtoul(buf + 1, NULL, 16);
+ if (errno == 0)
+ *val = v;
+ }
}
int LoadCdrom() {
}
int LoadCdrom() {
- EXE_HEADER tmpHead;
+ union {
+ EXE_HEADER h;
+ u32 d[sizeof(EXE_HEADER) / sizeof(u32)];
+ } tmpHead;
struct iso_directory_record *dir;
u8 time[4], *buf;
u8 mdir[4096];
char exename[256];
struct iso_directory_record *dir;
u8 time[4], *buf;
u8 mdir[4096];
char exename[256];
-
- // not the best place to do it, but since BIOS boot logo killer
- // is just below, do it here
- fake_bios_gpu_setup();
-
- if (!Config.HLE && !Config.SlowBoot) {
- // skip BIOS logos
- psxRegs.pc = psxRegs.GPR.n.ra;
- return 0;
+ u32 cnf_tcb = 4;
+ u32 cnf_event = 16;
+ u32 cnf_stack = 0;
+ u32 t_addr;
+ u32 t_size;
+ u32 sp = 0;
+ int i, ret;
+
+ if (!Config.HLE) {
+ if (psxRegs.pc != 0x80030000) // BiosBootBypass'ed or custom BIOS?
+ return 0;
+ if (Config.SlowBoot)
+ return 0;
}
time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);
}
time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);
@@
-197,17
+223,19
@@
int LoadCdrom() {
if (GetCdromFile(mdir, time, "SYSTEM.CNF;1") == -1) {
// if SYSTEM.CNF is missing, start an existing PSX.EXE
if (GetCdromFile(mdir, time, "PSX.EXE;1") == -1) return -1;
if (GetCdromFile(mdir, time, "SYSTEM.CNF;1") == -1) {
// if SYSTEM.CNF is missing, start an existing PSX.EXE
if (GetCdromFile(mdir, time, "PSX.EXE;1") == -1) return -1;
+ strcpy(exename, "PSX.EXE;1");
READTRACK();
}
else {
// read the SYSTEM.CNF
READTRACK();
READTRACK();
}
else {
// read the SYSTEM.CNF
READTRACK();
+ buf[1023] = 0;
- sscanf((char *)buf + 12, "BOOT = cdrom:\\%255s", exename);
- if (GetCdromFile(mdir, time, exename) == -1) {
- sscanf((char *)buf + 12, "BOOT = cdrom:%255s", exename);
- if (GetCdromFile(mdir, time, exename) == -1) {
+
ret =
sscanf((char *)buf + 12, "BOOT = cdrom:\\%255s", exename);
+ if (
ret < 1 ||
GetCdromFile(mdir, time, exename) == -1) {
+
ret =
sscanf((char *)buf + 12, "BOOT = cdrom:%255s", exename);
+ if (
ret < 1 ||
GetCdromFile(mdir, time, exename) == -1) {
char *ptr = strstr((char *)buf + 12, "cdrom:");
if (ptr != NULL) {
ptr += 6;
char *ptr = strstr((char *)buf + 12, "cdrom:");
if (ptr != NULL) {
ptr += 6;
@@
-223,37
+251,45
@@
int LoadCdrom() {
return -1;
}
}
return -1;
}
}
+ getFromCnf((char *)buf + 12, "TCB", &cnf_tcb);
+ getFromCnf((char *)buf + 12, "EVENT", &cnf_event);
+ getFromCnf((char *)buf + 12, "STACK", &cnf_stack);
+ if (Config.HLE)
+ psxBiosCnfLoaded(cnf_tcb, cnf_event, cnf_stack);
// Read the EXE-Header
READTRACK();
}
memcpy(&tmpHead, buf + 12, sizeof(EXE_HEADER));
// Read the EXE-Header
READTRACK();
}
memcpy(&tmpHead, buf + 12, sizeof(EXE_HEADER));
+ for (i = 2; i < sizeof(tmpHead.d) / sizeof(tmpHead.d[0]); i++)
+ tmpHead.d[i] = SWAP32(tmpHead.d[i]);
- psxRegs.pc = SWAP32(tmpHead.pc0);
- psxRegs.GPR.n.gp = SWAP32(tmpHead.gp0);
- psxRegs.GPR.n.sp = SWAP32(tmpHead.s_addr);
- if (psxRegs.GPR.n.sp == 0) psxRegs.GPR.n.sp = 0x801fff00;
-
- tmpHead.t_size = SWAP32(tmpHead.t_size);
- tmpHead.t_addr = SWAP32(tmpHead.t_addr);
-
- psxCpu->Clear(tmpHead.t_addr, tmpHead.t_size / 4);
- psxCpu->Reset();
+ SysPrintf("manual booting '%s' pc=%x\n", exename, tmpHead.h.pc0);
+ sp = tmpHead.h.s_addr;
+ if (cnf_stack)
+ sp = cnf_stack;
+ SetBootRegs(tmpHead.h.pc0, tmpHead.h.gp0, sp);
// Read the rest of the main executable
// Read the rest of the main executable
-
while (tmpHead.t_size & ~2047
) {
- void *ptr = (void *)PSXM(t
mpHead.t
_addr);
+
for (t_addr = tmpHead.h.t_addr, t_size = tmpHead.h.t_size; t_size & ~2047;
) {
+ void *ptr = (void *)PSXM(t_addr);
incTime();
READTRACK();
if (ptr != INVALID_PTR) memcpy(ptr, buf+12, 2048);
incTime();
READTRACK();
if (ptr != INVALID_PTR) memcpy(ptr, buf+12, 2048);
- t
mpHead.t_size -
= 2048;
- t
mpHead.t_addr +
= 2048;
+ t
_addr +
= 2048;
+ t
_size -
= 2048;
}
}
+ psxCpu->Clear(tmpHead.h.t_addr, tmpHead.h.t_size / 4);
+ //psxCpu->Reset();
+
+ if (Config.HLE)
+ psxBiosCheckExe(tmpHead.h.t_addr, tmpHead.h.t_size, 0);
+
return 0;
}
return 0;
}
@@
-262,10
+298,19
@@
int LoadCdromFile(const char *filename, EXE_HEADER *head) {
u8 time[4],*buf;
u8 mdir[4096];
char exename[256];
u8 time[4],*buf;
u8 mdir[4096];
char exename[256];
+ const char *p1, *p2;
u32 size, addr;
void *mem;
u32 size, addr;
void *mem;
- sscanf(filename, "cdrom:\\%255s", exename);
+ if (filename == INVALID_PTR)
+ return -1;
+
+ p1 = filename;
+ if ((p2 = strchr(p1, ':')))
+ p1 = p2 + 1;
+ while (*p1 == '\\')
+ p1++;
+ snprintf(exename, sizeof(exename), "%s", p1);
time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);
time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);
@@
-283,11
+328,11
@@
int LoadCdromFile(const char *filename, EXE_HEADER *head) {
READTRACK();
memcpy(head, buf + 12, sizeof(EXE_HEADER));
READTRACK();
memcpy(head, buf + 12, sizeof(EXE_HEADER));
- size =
head->t_size
;
- addr =
head->t_addr
;
+ size =
SWAP32(head->t_size)
;
+ addr =
SWAP32(head->t_addr)
;
psxCpu->Clear(addr, size / 4);
psxCpu->Clear(addr, size / 4);
- psxCpu->Reset();
+
//
psxCpu->Reset();
while (size & ~2047) {
incTime();
while (size & ~2047) {
incTime();
@@
-488,11
+533,8
@@
int Load(const char *ExePath) {
fread_to_ram(mem, section_size, 1, tmpFile);
psxCpu->Clear(section_address, section_size / 4);
}
fread_to_ram(mem, section_size, 1, tmpFile);
psxCpu->Clear(section_address, section_size / 4);
}
- psxRegs.pc = SWAP32(tmpHead.pc0);
- psxRegs.GPR.n.gp = SWAP32(tmpHead.gp0);
- psxRegs.GPR.n.sp = SWAP32(tmpHead.s_addr);
- if (psxRegs.GPR.n.sp == 0)
- psxRegs.GPR.n.sp = 0x801fff00;
+ SetBootRegs(SWAP32(tmpHead.pc0), SWAP32(tmpHead.gp0),
+ SWAP32(tmpHead.s_addr));
retval = 0;
break;
case CPE_EXE:
retval = 0;
break;
case CPE_EXE:
@@
-600,10
+642,12
@@
static const u32 SaveVersion = 0x8b410006;
int SaveState(const char *file) {
void *f;
int SaveState(const char *file) {
void *f;
- GPUFreeze_t *gpufP;
- SPUFreeze_t *spufP;
+ GPUFreeze_t *gpufP = NULL;
+ SPUFreezeHdr_t spufH;
+ SPUFreeze_t *spufP = NULL;
+ unsigned char *pMem = NULL;
+ int result = -1;
int Size;
int Size;
- unsigned char *pMem;
f = SaveFuncs.open(file, "wb");
if (f == NULL) return -1;
f = SaveFuncs.open(file, "wb");
if (f == NULL) return -1;
@@
-615,7
+659,7
@@
int SaveState(const char *file) {
SaveFuncs.write(f, (void *)&Config.HLE, sizeof(boolean));
pMem = (unsigned char *)malloc(128 * 96 * 3);
SaveFuncs.write(f, (void *)&Config.HLE, sizeof(boolean));
pMem = (unsigned char *)malloc(128 * 96 * 3);
- if (pMem == NULL)
return -1
;
+ if (pMem == NULL)
goto cleanup
;
GPU_getScreenPic(pMem);
SaveFuncs.write(f, pMem, 128 * 96 * 3);
free(pMem);
GPU_getScreenPic(pMem);
SaveFuncs.write(f, pMem, 128 * 96 * 3);
free(pMem);
@@
-631,20
+675,20
@@
int SaveState(const char *file) {
// gpu
gpufP = (GPUFreeze_t *)malloc(sizeof(GPUFreeze_t));
// gpu
gpufP = (GPUFreeze_t *)malloc(sizeof(GPUFreeze_t));
+ if (gpufP == NULL) goto cleanup;
gpufP->ulFreezeVersion = 1;
GPU_freeze(1, gpufP);
SaveFuncs.write(f, gpufP, sizeof(GPUFreeze_t));
gpufP->ulFreezeVersion = 1;
GPU_freeze(1, gpufP);
SaveFuncs.write(f, gpufP, sizeof(GPUFreeze_t));
- free(gpufP);
+ free(gpufP);
gpufP = NULL;
// spu
// spu
- spufP = (SPUFreeze_t *) malloc(16);
- SPU_freeze(2, spufP, psxRegs.cycle);
- Size = spufP->Size; SaveFuncs.write(f, &Size, 4);
- free(spufP);
+ SPU_freeze(2, (SPUFreeze_t *)&spufH, psxRegs.cycle);
+ Size = spufH.Size; SaveFuncs.write(f, &Size, 4);
spufP = (SPUFreeze_t *) malloc(Size);
spufP = (SPUFreeze_t *) malloc(Size);
+ if (spufP == NULL) goto cleanup;
SPU_freeze(1, spufP, psxRegs.cycle);
SaveFuncs.write(f, spufP, Size);
SPU_freeze(1, spufP, psxRegs.cycle);
SaveFuncs.write(f, spufP, Size);
- free(spufP);
+ free(spufP);
spufP = NULL;
sioFreeze(f, 1);
cdrFreeze(f, 1);
sioFreeze(f, 1);
cdrFreeze(f, 1);
@@
-652,20
+696,24
@@
int SaveState(const char *file) {
psxRcntFreeze(f, 1);
mdecFreeze(f, 1);
new_dyna_freeze(f, 1);
psxRcntFreeze(f, 1);
mdecFreeze(f, 1);
new_dyna_freeze(f, 1);
+ padFreeze(f, 1);
+ result = 0;
+cleanup:
SaveFuncs.close(f);
SaveFuncs.close(f);
-
- return 0;
+ return result;
}
int LoadState(const char *file) {
}
int LoadState(const char *file) {
+ u32 biosBranchCheckOld = psxRegs.biosBranchCheck;
void *f;
void *f;
- GPUFreeze_t *gpufP;
- SPUFreeze_t *spufP;
+ GPUFreeze_t *gpufP
= NULL
;
+ SPUFreeze_t *spufP
= NULL
;
int Size;
char header[32];
u32 version;
boolean hle;
int Size;
char header[32];
u32 version;
boolean hle;
+ int result = -1;
f = SaveFuncs.open(file, "rb");
if (f == NULL) return -1;
f = SaveFuncs.open(file, "rb");
if (f == NULL) return -1;
@@
-675,8
+723,8
@@
int LoadState(const char *file) {
SaveFuncs.read(f, &hle, sizeof(boolean));
if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion) {
SaveFuncs.read(f, &hle, sizeof(boolean));
if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion) {
- S
aveFuncs.close(f
);
-
return -1
;
+ S
ysPrintf("incompatible savestate version %x\n", version
);
+
goto cleanup
;
}
Config.HLE = hle;
}
Config.HLE = hle;
@@
-689,6
+737,7
@@
int LoadState(const char *file) {
SaveFuncs.read(f, psxH, 0x00010000);
SaveFuncs.read(f, &psxRegs, offsetof(psxRegisters, gteBusyCycle));
psxRegs.gteBusyCycle = psxRegs.cycle;
SaveFuncs.read(f, psxH, 0x00010000);
SaveFuncs.read(f, &psxRegs, offsetof(psxRegisters, gteBusyCycle));
psxRegs.gteBusyCycle = psxRegs.cycle;
+ psxRegs.biosBranchCheck = ~0;
psxCpu->Notify(R3000ACPU_NOTIFY_AFTER_LOAD, NULL);
psxCpu->Notify(R3000ACPU_NOTIFY_AFTER_LOAD, NULL);
@@
-697,6
+746,7
@@
int LoadState(const char *file) {
// gpu
gpufP = (GPUFreeze_t *)malloc(sizeof(GPUFreeze_t));
// gpu
gpufP = (GPUFreeze_t *)malloc(sizeof(GPUFreeze_t));
+ if (gpufP == NULL) goto cleanup;
SaveFuncs.read(f, gpufP, sizeof(GPUFreeze_t));
GPU_freeze(0, gpufP);
free(gpufP);
SaveFuncs.read(f, gpufP, sizeof(GPUFreeze_t));
GPU_freeze(0, gpufP);
free(gpufP);
@@
-706,6
+756,7
@@
int LoadState(const char *file) {
// spu
SaveFuncs.read(f, &Size, 4);
spufP = (SPUFreeze_t *)malloc(Size);
// spu
SaveFuncs.read(f, &Size, 4);
spufP = (SPUFreeze_t *)malloc(Size);
+ if (spufP == NULL) goto cleanup;
SaveFuncs.read(f, spufP, Size);
SPU_freeze(0, spufP, psxRegs.cycle);
free(spufP);
SaveFuncs.read(f, spufP, Size);
SPU_freeze(0, spufP, psxRegs.cycle);
free(spufP);
@@
-716,10
+767,16
@@
int LoadState(const char *file) {
psxRcntFreeze(f, 0);
mdecFreeze(f, 0);
new_dyna_freeze(f, 0);
psxRcntFreeze(f, 0);
mdecFreeze(f, 0);
new_dyna_freeze(f, 0);
+ padFreeze(f, 0);
- SaveFuncs.close(f);
+ events_restore();
+ if (Config.HLE)
+ psxBiosCheckExe(biosBranchCheckOld, 0x60, 1);
- return 0;
+ result = 0;
+cleanup:
+ SaveFuncs.close(f);
+ return result;
}
int CheckState(const char *file) {
}
int CheckState(const char *file) {
@@
-777,8
+834,6
@@
int RecvPcsxInfo() {
NET_recvData(&RCntFix_old, sizeof(RCntFix_old), PSE_NET_BLOCKING);
NET_recvData(&Config.PsxType, sizeof(Config.PsxType), PSE_NET_BLOCKING);
NET_recvData(&RCntFix_old, sizeof(RCntFix_old), PSE_NET_BLOCKING);
NET_recvData(&Config.PsxType, sizeof(Config.PsxType), PSE_NET_BLOCKING);
- SysUpdate();
-
tmp = Config.Cpu;
NET_recvData(&Config.Cpu, sizeof(Config.Cpu), PSE_NET_BLOCKING);
if (tmp != Config.Cpu) {
tmp = Config.Cpu;
NET_recvData(&Config.Cpu, sizeof(Config.Cpu), PSE_NET_BLOCKING);
if (tmp != Config.Cpu) {