Revert JIT direct support in CSPPC config. Enable it only in CSMK3.

diff --git a/cpuboard.cpp b/cpuboard.cpp
index 1108981814e0b28cfca964c81e4da9aca111799f..b38b398ea59d65b8563b001c0deae0a620ac7246 100644 (file)
--- a/cpuboard.cpp
+++ b/cpuboard.cpp
@@ -1050,8 +1050,8 @@ static void cyberstorm_maprom(void)
 {
        if (a3000hmem_bank.reserved_size <= 2 * 524288)
                return;
-       if (currprefs.cachesize && !currprefs.comptrustbyte) {
-               write_log(_T("JIT Direct enabled: CSPPC MAPROM not available.\n"));
+       if (currprefs.cachesize && !currprefs.comptrustbyte && ISCPUBOARDP(&currprefs, BOARD_CYBERSTORM, BOARD_CYBERSTORM_SUB_MK3)) {
+               write_log(_T("JIT Direct enabled: CSMK3 MAPROM not available.\n"));
                return;
        }
 

diff --git a/include/cpuboard.h b/include/cpuboard.h
index ac043da074d963695f0f582f03d5d04b6e6cb47c..4173055121f51b1453bec6554182963467fe0bbb 100644 (file)
--- a/include/cpuboard.h
+++ b/include/cpuboard.h
@@ -45,7 +45,7 @@ void blizzardppc_irq_setonly(int id, int level);
 #define BOARD_MEMORY_25BITMEM 6
 #define BOARD_MEMORY_CUSTOM_32 7
 
-#define ISCPUBOARDP(p, type,subtype) (cpuboards[p->cpuboard_type].id == type && (type < 0 || p->cpuboard_subtype == subtype))
+#define ISCPUBOARDP(p, type,subtype) (cpuboards[(p)->cpuboard_type].id == type && (type < 0 || (p)->cpuboard_subtype == subtype))
 #define ISCPUBOARD(type,subtype) (cpuboards[currprefs.cpuboard_type].id == type && (type < 0 || currprefs.cpuboard_subtype == subtype))
 
 #define BOARD_ACT 1