large ROM hack fix (up to 10MB now)

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@219 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Memory.s b/Pico/Memory.s
index 351c1a7..fecdb0d 100644 (file)
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -21,7 +21,7 @@ m_read8_def_table:
     .long   m_read8_rom5    @ 0x280000 - 0x2FFFFF\r
     .long   m_read8_rom6    @ 0x300000 - 0x37FFFF\r
     .long   m_read8_rom7    @ 0x380000 - 0x3FFFFF\r
-    .long   m_read8_rom8    @ 0x400000 - 0x47FFFF\r
+    .long   m_read8_rom8    @ 0x400000 - 0x47FFFF - for all those large ROM hacks\r
     .long   m_read8_rom9    @ 0x480000 - 0x4FFFFF\r
     .long   m_read8_romA    @ 0x500000 - 0x57FFFF\r
     .long   m_read8_romB    @ 0x580000 - 0x5FFFFF\r
@@ -29,10 +29,10 @@ m_read8_def_table:
     .long   m_read8_romD    @ 0x680000 - 0x6FFFFF\r
     .long   m_read8_romE    @ 0x700000 - 0x77FFFF\r
     .long   m_read8_romF    @ 0x780000 - 0x7FFFFF\r
-    .long   m_read_null     @ 0x800000 - 0x87FFFF\r
-    .long   m_read_null     @ 0x880000 - 0x8FFFFF\r
-    .long   m_read_null     @ 0x900000 - 0x97FFFF\r
-    .long   m_read_null     @ 0x980000 - 0x9FFFFF\r
+    .long   m_read8_rom10   @ 0x800000 - 0x87FFFF\r
+    .long   m_read8_rom11   @ 0x880000 - 0x8FFFFF\r
+    .long   m_read8_rom12   @ 0x900000 - 0x97FFFF\r
+    .long   m_read8_rom13   @ 0x980000 - 0x9FFFFF\r
     .long   m_read8_misc    @ 0xA00000 - 0xA7FFFF\r
     .long   m_read_null     @ 0xA80000 - 0xAFFFFF\r
     .long   m_read_null     @ 0xB00000 - 0xB7FFFF\r
@@ -63,10 +63,10 @@ m_read16_def_table:
     .long   m_read16_romD    @ 0x680000 - 0x6FFFFF\r
     .long   m_read16_romE    @ 0x700000 - 0x77FFFF\r
     .long   m_read16_romF    @ 0x780000 - 0x7FFFFF\r
-    .long   m_read_null      @ 0x800000 - 0x87FFFF\r
-    .long   m_read_null      @ 0x880000 - 0x8FFFFF\r
-    .long   m_read_null      @ 0x900000 - 0x97FFFF\r
-    .long   m_read_null      @ 0x980000 - 0x9FFFFF\r
+    .long   m_read16_rom10   @ 0x800000 - 0x87FFFF\r
+    .long   m_read16_rom11   @ 0x880000 - 0x8FFFFF\r
+    .long   m_read16_rom12   @ 0x900000 - 0x97FFFF\r
+    .long   m_read16_rom13   @ 0x980000 - 0x9FFFFF\r
     .long   m_read16_misc    @ 0xA00000 - 0xA7FFFF\r
     .long   m_read_null      @ 0xA80000 - 0xAFFFFF\r
     .long   m_read_null      @ 0xB00000 - 0xB7FFFF\r
@@ -97,10 +97,10 @@ m_read32_def_table:
     .long   m_read32_romD    @ 0x680000 - 0x6FFFFF\r
     .long   m_read32_romE    @ 0x700000 - 0x77FFFF\r
     .long   m_read32_romF    @ 0x780000 - 0x7FFFFF\r
-    .long   m_read_null      @ 0x800000 - 0x87FFFF\r
-    .long   m_read_null      @ 0x880000 - 0x8FFFFF\r
-    .long   m_read_null      @ 0x900000 - 0x97FFFF\r
-    .long   m_read_null      @ 0x980000 - 0x9FFFFF\r
+    .long   m_read32_rom10   @ 0x800000 - 0x87FFFF\r
+    .long   m_read32_rom11   @ 0x880000 - 0x8FFFFF\r
+    .long   m_read32_rom12   @ 0x900000 - 0x97FFFF\r
+    .long   m_read32_rom13   @ 0x980000 - 0x9FFFFF\r
     .long   m_read32_misc    @ 0xA00000 - 0xA7FFFF\r
     .long   m_read_null      @ 0xA80000 - 0xAFFFFF\r
     .long   m_read_null      @ 0xB00000 - 0xB7FFFF\r
@@ -329,7 +329,6 @@ m_read8_rom8: @ 0x400000 - 0x47ffff
 m_read8_rom9: @ 0x480000 - 0x4fffff\r
     m_read8_rom 9\r
 \r
-@ is any ROM using that much?\r
 m_read8_romA: @ 0x500000 - 0x57ffff\r
     m_read8_rom 0xA\r
 \r
@@ -348,6 +347,18 @@ m_read8_romE: @ 0x700000 - 0x77ffff
 m_read8_romF: @ 0x780000 - 0x7fffff\r
     m_read8_rom 0xF\r
 \r
+m_read8_rom10: @ 0x800000 - 0x87ffff\r
+    m_read8_rom 0x10\r
+\r
+m_read8_rom11: @ 0x880000 - 0x8fffff\r
+    m_read8_rom 0x11\r
+\r
+m_read8_rom12: @ 0x900000 - 0x97ffff\r
+    m_read8_rom 0x12\r
+\r
+m_read8_rom13: @ 0x980000 - 0x9fffff\r
+    m_read8_rom 0x13\r
+\r
 m_read8_misc:\r
     bic     r2, r0, #0x00ff\r
     bic     r2, r2, #0xbf00\r
@@ -468,7 +479,6 @@ m_read16_rom8: @ 0x400000 - 0x47ffff
 m_read16_rom9: @ 0x480000 - 0x4fffff\r
     m_read16_rom 9\r
 \r
-@ is any ROM using that much?\r
 m_read16_romA: @ 0x500000 - 0x57ffff\r
     m_read16_rom 0xA\r
 \r
@@ -487,6 +497,18 @@ m_read16_romE: @ 0x700000 - 0x77ffff
 m_read16_romF: @ 0x780000 - 0x7fffff\r
     m_read16_rom 0xF\r
 \r
+m_read16_rom10: @ 0x800000 - 0x87ffff\r
+    m_read16_rom 0x10\r
+\r
+m_read16_rom11: @ 0x880000 - 0x8fffff\r
+    m_read16_rom 0x11\r
+\r
+m_read16_rom12: @ 0x900000 - 0x97ffff\r
+    m_read16_rom 0x12\r
+\r
+m_read16_rom13: @ 0x980000 - 0x9fffff\r
+    m_read16_rom 0x13\r
+\r
 m_read16_misc:\r
     bic     r0, r0, #1\r
     mov     r1, #16\r
@@ -595,7 +617,6 @@ m_read32_rom8: @ 0x400000 - 0x47ffff
 m_read32_rom9: @ 0x480000 - 0x4fffff\r
     m_read32_rom 9\r
 \r
-@ is any ROM using that much?\r
 m_read32_romA: @ 0x500000 - 0x57ffff\r
     m_read32_rom 0xA\r
 \r
@@ -614,6 +635,18 @@ m_read32_romE: @ 0x700000 - 0x77ffff
 m_read32_romF: @ 0x780000 - 0x7fffff\r
     m_read32_rom 0xF\r
 \r
+m_read32_rom10: @ 0x800000 - 0x87ffff\r
+    m_read32_rom 0x10\r
+\r
+m_read32_rom11: @ 0x880000 - 0x8fffff\r
+    m_read32_rom 0x11\r
+\r
+m_read32_rom12: @ 0x900000 - 0x97ffff\r
+    m_read32_rom 0x12\r
+\r
+m_read32_rom13: @ 0x980000 - 0x9fffff\r
+    m_read32_rom 0x13\r
+\r
 m_read32_misc:\r
     bic     r0, r0, #1\r
     stmfd   sp!,{r0,lr}\r