diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-07-01 10:48:54 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-07-01 10:48:54 +0000 |
| commit | 1f5a3c7ba462489e5a7a00580b0c0c6ce9cb3275 (patch) | |
| tree | 71e342f07f356562beebc04a98137ae5693aab8f | |
| parent | b62a83071df627179761ec75b6a3a9598de2008f (diff) | |
| download | pcsxr-1f5a3c7ba462489e5a7a00580b0c0c6ce9cb3275.tar.gz | |
fixed MSVC6 error
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@23861 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | libpcsxcore/psxbios.c | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -1,7 +1,7 @@ July 1, 2009 Wei Mingzhi <weimingzhi@gmail.com> * libpcsxcore/psxbios.c: Use s32 instead of long in DIRENTRY struct for - compatibility with x86_64. + compatibility with x86_64. Fixed error in MSVC6.
June 30, 2009 Peter Collingbourne <peter@pcc.me.uk> diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c index 16f23e7a..d55ee101 100644 --- a/libpcsxcore/psxbios.c +++ b/libpcsxcore/psxbios.c @@ -613,14 +613,14 @@ void psxBios_InitHeap() { // 39 #endif unsigned int size; - + if (((a0 & 0x1fffff) + a1)>= 0x200000) size = 0x1ffffc - (a0 & 0x1fffff); else size = a1; - + size &= 0xfffffffc; - - heap_addr = (u32*)Ra0; - heap_end = (u32*)((void *)heap_addr + size); + + heap_addr = (u32 *)Ra0; + heap_end = (u32 *)((u8 *)heap_addr + size); *heap_addr = SWAP32(size | 1); SysPrintf("InitHeap %lx,%lx : %lx %lx\n",a0,a1, (uptr)heap_addr-(uptr)psxM, size); |