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
spu: put globals into a structure
[pcsx_rearmed.git]
/
libpcsxcore
/
misc.c
diff --git
a/libpcsxcore/misc.c
b/libpcsxcore/misc.c
index
3ee794b
..
917a567
100644
(file)
--- a/
libpcsxcore/misc.c
+++ b/
libpcsxcore/misc.c
@@
-57,7
+57,8
@@
void mmssdd( char *b, char *p )
{
int m, s, d;
#if defined(__arm__)
{
int m, s, d;
#if defined(__arm__)
- int block = (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | b[0];
+ 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
#elif defined(__BIGENDIAN__)
int block = (b[0] & 0xff) | ((b[1] & 0xff) << 8) | ((b[2] & 0xff) << 16) | (b[3] << 24);
#else
@@
-108,6
+109,7
@@
void mmssdd( char *b, char *p )
int GetCdromFile(u8 *mdir, u8 *time, char *filename) {
struct iso_directory_record *dir;
int GetCdromFile(u8 *mdir, u8 *time, char *filename) {
struct iso_directory_record *dir;
+ int retval = -1;
u8 ddir[4096];
u8 *buf;
int i;
u8 ddir[4096];
u8 *buf;
int i;
@@
-121,7
+123,7
@@
int GetCdromFile(u8 *mdir, u8 *time, char *filename) {
if (dir->length[0] == 0) {
return -1;
}
if (dir->length[0] == 0) {
return -1;
}
- i += dir->length[0];
+ i +=
(u8)
dir->length[0];
if (dir->flags[0] & 0x2) { // it's a dir
if (!strnicmp((char *)&dir->name[0], filename, dir->name_len[0])) {
if (dir->flags[0] & 0x2) { // it's a dir
if (!strnicmp((char *)&dir->name[0], filename, dir->name_len[0])) {
@@
-137,11
+139,12
@@
int GetCdromFile(u8 *mdir, u8 *time, char *filename) {
} else {
if (!strnicmp((char *)&dir->name[0], filename, strlen(filename))) {
mmssdd(dir->extent, (char *)time);
} else {
if (!strnicmp((char *)&dir->name[0], filename, strlen(filename))) {
mmssdd(dir->extent, (char *)time);
+ retval = 0;
break;
}
}
}
break;
}
}
}
- return
0
;
+ return
retval
;
}
static const unsigned int gpu_ctl_def[] = {
}
static const unsigned int gpu_ctl_def[] = {
@@
-598,11
+601,11
@@
int SaveState(const char *file) {
// spu
spufP = (SPUFreeze_t *) malloc(16);
// spu
spufP = (SPUFreeze_t *) malloc(16);
- SPU_freeze(2, spufP);
+ SPU_freeze(2, spufP
, psxRegs.cycle
);
Size = spufP->Size; SaveFuncs.write(f, &Size, 4);
free(spufP);
spufP = (SPUFreeze_t *) malloc(Size);
Size = spufP->Size; SaveFuncs.write(f, &Size, 4);
free(spufP);
spufP = (SPUFreeze_t *) malloc(Size);
- SPU_freeze(1, spufP);
+ SPU_freeze(1, spufP
, psxRegs.cycle
);
SaveFuncs.write(f, spufP, Size);
free(spufP);
SaveFuncs.write(f, spufP, Size);
free(spufP);
@@
-667,7
+670,7
@@
int LoadState(const char *file) {
SaveFuncs.read(f, &Size, 4);
spufP = (SPUFreeze_t *)malloc(Size);
SaveFuncs.read(f, spufP, Size);
SaveFuncs.read(f, &Size, 4);
spufP = (SPUFreeze_t *)malloc(Size);
SaveFuncs.read(f, spufP, Size);
- SPU_freeze(0, spufP);
+ SPU_freeze(0, spufP
, psxRegs.cycle
);
free(spufP);
sioFreeze(f, 0);
free(spufP);
sioFreeze(f, 0);