summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-06-04 04:27:30 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-06-04 04:27:30 +0000
commit2025410a8c2128a58039ba277d9e8794fc3147d8 (patch)
treec09ab918670cc2899516fd3d322a0b73c512fa01
parentd07dbe52595739096642d3733c065a26f3306623 (diff)
downloadpcsxr-2025410a8c2128a58039ba277d9e8794fc3147d8.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@50883 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--ChangeLog1
-rw-r--r--libpcsxcore/psxmem.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 64927244..13b95485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Jun 4, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
fix.
* win32/gui/WndMain.c: Changed language code corresponding to the ones in
source tree.
+ * libpcsxcore/psxmem.c: Minor comment fix.
Jun 3, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 47c1ef12..fc4a90e9 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -35,7 +35,7 @@
s8 *psxM = NULL; // Kernel & User Memory (2 Meg)
s8 *psxP = NULL; // Parallel Port (64K)
s8 *psxR = NULL; // BIOS ROM (512K)
-s8 *psxH = NULL; // Hardware Registers (8K)
+s8 *psxH = NULL; // Scratch Pad (1K) & Hardware Registers (8K)
u8 **psxMemWLUT = NULL;
u8 **psxMemRLUT = NULL;
@@ -97,6 +97,7 @@ int psxMemInit() {
// MemW
for (i = 0; i < 0x80; i++) psxMemWLUT[i + 0x0000] = (u8 *)&psxM[(i & 0x1f) << 16];
+
memcpy(psxMemWLUT + 0x8000, psxMemWLUT, 0x80 * sizeof(void *));
memcpy(psxMemWLUT + 0xa000, psxMemWLUT, 0x80 * sizeof(void *));