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
Merge branch 'master' into libretro
[pcsx_rearmed.git]
/
libpcsxcore
/
psxbios.c
diff --git
a/libpcsxcore/psxbios.c
b/libpcsxcore/psxbios.c
index
e4fcad3
..
12c17ef
100644
(file)
--- a/
libpcsxcore/psxbios.c
+++ b/
libpcsxcore/psxbios.c
@@
-26,6
+26,7
@@
#include "psxbios.h"
#include "psxhw.h"
#include "gpu.h"
#include "psxbios.h"
#include "psxhw.h"
#include "gpu.h"
+#include <zlib.h>
#undef SysPrintf
#define SysPrintf if (Config.PsxOut) printf
#undef SysPrintf
#define SysPrintf if (Config.PsxOut) printf
@@
-939,7
+940,7
@@
void psxBios_InitHeap() { // 0x39
heap_end = (u32 *)((u8 *)heap_addr + size);
*heap_addr = SWAP32(size | 1);
heap_end = (u32 *)((u8 *)heap_addr + size);
*heap_addr = SWAP32(size | 1);
- SysPrintf("InitHeap %x,%x : %x %x\n",a0,a1, (
uptr)heap_addr-(uptr)psxM
, size);
+ SysPrintf("InitHeap %x,%x : %x %x\n",a0,a1, (
int)((uptr)heap_addr-(uptr)psxM)
, size);
pc0 = ra;
}
pc0 = ra;
}
@@
-989,7
+990,7
@@
_start:
case 'g': case 'G':
ptmp += sprintf(ptmp, tmp2, (double)psxMu32(sp + n * 4)); n++; break;
case 'p':
case 'g': case 'G':
ptmp += sprintf(ptmp, tmp2, (double)psxMu32(sp + n * 4)); n++; break;
case 'p':
- case 'i':
+ case 'i':
case 'u':
case 'd': case 'D':
case 'o': case 'O':
case 'x': case 'X':
case 'd': case 'D':
case 'o': case 'O':
case 'x': case 'X':
@@
-1836,7
+1837,8
@@
int nfile;
if ((*ptr & 0xF0) != 0x50) continue; \
ptr+= 0xa; \
if (pfile[0] == 0) { \
if ((*ptr & 0xF0) != 0x50) continue; \
ptr+= 0xa; \
if (pfile[0] == 0) { \
- strcpy(dir->name, ptr); \
+ strncpy(dir->name, ptr, sizeof(dir->name)); \
+ dir->name[sizeof(dir->name) - 1] = '\0'; \
} else for (i=0; i<20; i++) { \
if (pfile[i] == ptr[i]) { \
dir->name[i] = ptr[i]; \
} else for (i=0; i<20; i++) { \
if (pfile[i] == ptr[i]) { \
dir->name[i] = ptr[i]; \