]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
Allow also ROM in SSP is out of bounds test.
authorToni Wilen <twilen@winuae.net>
Sat, 14 May 2016 15:57:34 +0000 (18:57 +0300)
committerToni Wilen <twilen@winuae.net>
Sat, 14 May 2016 15:57:34 +0000 (18:57 +0300)
newcpu.cpp

index 7de401c94676a334610e77b6868fcac0c0c1a65d..ffe912329f1f4935c6992adc263e63e626c6da8f 100644 (file)
@@ -2713,8 +2713,10 @@ static void Exception_normal (int nr)
        }
 
        if (!currprefs.cpu_compatible) {
-               addrbank *ab = &get_mem_bank(m68k_areg(regs, 7));
-               if (!ab || !(ab->flags & ABFLAG_RAM)) {
+               addrbank *ab = &get_mem_bank(m68k_areg(regs, 7) - 4);
+               // Not plain RAM check because some CPU type tests that
+               // don't need to return set stack to ROM..
+               if (!ab || ab == &dummy_bank || (ab->flags & ABFLAG_IO)) {
                        cpu_halt(CPU_HALT_SSP_IN_NON_EXISTING_ADDRESS);
                        return;
                }