Use CBM_64_COMPAT for Commodore 128

CHANGELOG.md

@@ -48,6 +48,8 @@
 
 * On most Commodore targets printing double quote characters doesn't toggle the quotation mode anymore. 
 
+* **Potentially breaking change!** Commodore 128 target no longer defines `CBM_64` feature.
+
 * 6502: Fixed optimizations using index registers.
 
 * 6502: Fixed optimizations of comparisons.

docs/lang/preprocessor.md

@@ -75,7 +75,7 @@ The following features are defined based on the chosen CPU and compilation optio
 
 * `CBM` – 1 if the target is an 8-bit Commodore computer, 0 otherwise
 
-* `CBM_64` – 1 if the target is an 8-bit Commodore computer compatible with Commodore 64, 0 otherwise
+* `CBM_64_COMPAT` – 1 if the target is an 8-bit Commodore computer compatible with Commodore 64, 0 otherwise
 
 * `CBM_64_CRT` – 1 if the target is a cartridge for Commodore 64, 0 otherwise
 

include/c128.ini

@@ -14,7 +14,7 @@ segment_default_end=$FEFF
 [define]
 CBM=1
 CBM_128=1
-CBM_64=1
+CBM_64_COMPAT=1
 MOS_6510=1
 WIDESCREEN=1
 KEYBOARD=1

include/c64_cia.mfk

@@ -1,6 +1,6 @@
 // Hardware addresses for C64
 
-#if not(CBM_64)
+#if not(CBM_64) && not(CBM_64_COMPAT)
 #warn c64_cia module should be only used on C64-compatible targets
 #endif
 

include/c64_joy.mfk

@@ -1,6 +1,6 @@
 // standard joystick driver for Commodore 64
 
-#if not(CBM_64)
+#if not(CBM_64) && not(CBM_64_COMPAT)
 #warn c64_joy module should be only used on C64-compatible targets
 #endif
 

include/c64_sid.mfk

@@ -1,6 +1,6 @@
 // Hardware addresses for C64
 
-#if not(CBM_64)
+#if not(CBM_64) && not(CBM_64_COMPAT)
 #warn c64_sid module should be only used on C64-compatible targets
 #endif
 

include/c64_vic.mfk

@@ -1,6 +1,6 @@
 // Hardware addresses for C64
 
-#if not(CBM_64)
+#if not(CBM_64) && not(CBM_64_COMPAT)
 #warn c64_vic module should be only used on C64-compatible targets
 #endif