From 9c29ce3a84888d398b34f21803ea7e4908c1336f Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Mon, 19 Feb 2018 20:03:20 +0200 Subject: [PATCH] Revert JIT direct support in CSPPC config. Enable it only in CSMK3. --- cpuboard.cpp | 4 ++-- include/cpuboard.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpuboard.cpp b/cpuboard.cpp index 11089818..b38b398e 100644 --- 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 ac043da0..41730551 100644 --- 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 -- 2.47.3