aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CP15.cpp12
-rw-r--r--src/libui_sdl/main.cpp3
2 files changed, 11 insertions, 4 deletions
diff --git a/src/CP15.cpp b/src/CP15.cpp
index 61a3ec4..a4db5f3 100644
--- a/src/CP15.cpp
+++ b/src/CP15.cpp
@@ -174,7 +174,15 @@ void ARMv5::UpdatePURegions()
for (int n = 0; n < 8; n++)
{
u32 rgn = PU_Region[n];
- if (!(rgn & (1<<0))) continue;
+ if (!(rgn & (1<<0)))
+ {
+ coderw >>= 4;
+ datarw >>= 4;
+ codecache >>= 1;
+ datacache >>= 1;
+ datawrite >>= 1;
+ continue;
+ }
u32 start = rgn >> 12;
u32 sz = 2 << ((rgn >> 1) & 0x1F);
@@ -399,7 +407,7 @@ void ARMv5::ICacheInvalidateAll()
void ARMv5::CP15Write(u32 id, u32 val)
{
- //printf("CP15 write op %03X %08X %08X\n", id, val, NDS::ARM9->R[15]);
+ //printf("CP15 write op %03X %08X %08X\n", id, val, R[15]);
switch (id)
{
diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp
index 1696c2e..064be0b 100644
--- a/src/libui_sdl/main.cpp
+++ b/src/libui_sdl/main.cpp
@@ -1199,8 +1199,7 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt)
}
if (evt->Scancode == 0x57) // F11
- OSD::AddMessage(0x00FFFF, "OSD test");
- //NDS::debug(0);
+ NDS::debug(0);
}
return 1;