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
improve field status after enable
[pcsx_rearmed.git]
/
libpcsxcore
/
misc.c
diff --git
a/libpcsxcore/misc.c
b/libpcsxcore/misc.c
index
702f690
..
9486d23
100644
(file)
--- a/
libpcsxcore/misc.c
+++ b/
libpcsxcore/misc.c
@@
-22,12
+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 <assert.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>
@@
-112,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) {
@@
-173,12
+175,20
@@
static void getFromCnf(char *buf, const char *key, u32 *val)
buf = strstr(buf, key);
if (buf)
buf = strchr(buf, '=');
buf = strstr(buf, key);
if (buf)
buf = strchr(buf, '=');
- if (buf)
- *val = strtol(buf + 1, NULL, 16);
+ 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];
struct iso_directory_record *dir;
u8 time[4], *buf;
u8 mdir[4096];
@@
-186,8
+196,10
@@
int LoadCdrom() {
u32 cnf_tcb = 4;
u32 cnf_event = 16;
u32 cnf_stack = 0;
u32 cnf_tcb = 4;
u32 cnf_event = 16;
u32 cnf_stack = 0;
+ u32 t_addr;
+ u32 t_size;
u32 sp = 0;
u32 sp = 0;
- int ret;
+ int
i,
ret;
if (!Config.HLE) {
if (psxRegs.pc != 0x80030000) // BiosBootBypass'ed or custom BIOS?
if (!Config.HLE) {
if (psxRegs.pc != 0x80030000) // BiosBootBypass'ed or custom BIOS?
@@
-243,39
+255,41
@@
int LoadCdrom() {
getFromCnf((char *)buf + 12, "EVENT", &cnf_event);
getFromCnf((char *)buf + 12, "STACK", &cnf_stack);
if (Config.HLE)
getFromCnf((char *)buf + 12, "EVENT", &cnf_event);
getFromCnf((char *)buf + 12, "STACK", &cnf_stack);
if (Config.HLE)
- psxBiosCnfLoaded(cnf_tcb, cnf_event);
+ 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]);
- SysPrintf("manual booting '%s' pc=%x\n", exename,
SWAP32(tmpHead.pc0)
);
- sp =
SWAP32(tmpHead.s_addr)
;
+ SysPrintf("manual booting '%s' pc=%x\n", exename,
tmpHead.h.pc0
);
+ sp =
tmpHead.h.s_addr
;
if (cnf_stack)
sp = cnf_stack;
if (cnf_stack)
sp = cnf_stack;
- SetBootRegs(SWAP32(tmpHead.pc0), SWAP32(tmpHead.gp0), sp);
-
- 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();
+ 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;
}
@@
-682,6
+696,7
@@
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:
result = 0;
cleanup:
@@
-690,6
+705,7
@@
cleanup:
}
int LoadState(const char *file) {
}
int LoadState(const char *file) {
+ u32 biosBranchCheckOld = psxRegs.biosBranchCheck;
void *f;
GPUFreeze_t *gpufP = NULL;
SPUFreeze_t *spufP = NULL;
void *f;
GPUFreeze_t *gpufP = NULL;
SPUFreeze_t *spufP = NULL;
@@
-721,6
+737,9
@@
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;
+ psxRegs.gpuIdleAfter = psxRegs.cycle - 1;
+ HW_GPU_STATUS &= SWAP32(~PSXGPU_nBUSY);
psxCpu->Notify(R3000ACPU_NOTIFY_AFTER_LOAD, NULL);
psxCpu->Notify(R3000ACPU_NOTIFY_AFTER_LOAD, NULL);
@@
-733,8
+752,7
@@
int LoadState(const char *file) {
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);
- if (HW_GPU_STATUS == 0)
- HW_GPU_STATUS = SWAP32(GPU_readStatus());
+ gpuSyncPluginSR();
// spu
SaveFuncs.read(f, &Size, 4);
// spu
SaveFuncs.read(f, &Size, 4);
@@
-750,6
+768,11
@@
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);
+
+ events_restore();
+ if (Config.HLE)
+ psxBiosCheckExe(biosBranchCheckOld, 0x60, 1);
result = 0;
cleanup:
result = 0;
cleanup: