]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
Fixed check for Blizzard cpuboard memtype, fixed readonly for rom_f0_ppc
authorFrode Solheim <frode@fs-uae.net>
Mon, 28 Sep 2015 15:46:38 +0000 (17:46 +0200)
committerFrode Solheim <frode@fs-uae.net>
Mon, 28 Sep 2015 15:46:38 +0000 (17:46 +0200)
main.cpp
od-win32/mman.cpp

index 002077c27a28cf98cbea125bb3d69a7ab9cf4325..c68e4d3f0e6622bce1ba9d9e766c2d982b6f4e02 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -310,7 +310,7 @@ void fixup_cpu (struct uae_prefs *p)
                error_log(_T("Cycle-exact mode requires at least Disabled but emulated sound setting."));
        }
 
-       if (p->cpuboard_type && cpuboard_jitdirectompatible(p) && !p->comptrustbyte) {
+       if (p->cachesize && p->cpuboard_type && !cpuboard_jitdirectompatible(p) && !p->comptrustbyte) {
                error_log(_T("JIT direct is not compatible with emulated Blizzard accelerator boards."));
                p->comptrustbyte = 1;
                p->comptrustlong = 1;
index c9113af4111082d744ca96db29764d4dbd3828cf..a6c4a30cd976b26eed64b9463ed72f5609342bbc 100644 (file)
@@ -638,7 +638,7 @@ void *uae_shmat (addrbank *ab, int shmid, void *shmaddr, int shmflg)
                        // this is flash and also contains IO
                        shmaddr=natmem_offset + 0xf00000;
                        got = true;
-                       readonly = true;
+                       readonly = false;
                } else if (!_tcscmp(shmids[shmid].name, _T("rtarea"))) {
                        shmaddr = natmem_offset + rtarea_base;
                        got = true;