From b85e17529232076637fb025213a23c24c9fbc2a6 Mon Sep 17 00:00:00 2001 From: Karol Stasiak Date: Wed, 26 Jun 2019 13:40:33 +0200 Subject: [PATCH] Use CBM_64_COMPAT for Commodore 128 --- CHANGELOG.md | 2 ++ docs/lang/preprocessor.md | 2 +- include/c128.ini | 2 +- include/c64_cia.mfk | 2 +- include/c64_joy.mfk | 2 +- include/c64_sid.mfk | 2 +- include/c64_vic.mfk | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 268baadd..bed9597d 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/docs/lang/preprocessor.md b/docs/lang/preprocessor.md index ec4b95a8..dd75a66d 100644 --- a/docs/lang/preprocessor.md +++ b/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 diff --git a/include/c128.ini b/include/c128.ini index 520d8fe3..cdba9d26 100644 --- a/include/c128.ini +++ b/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 diff --git a/include/c64_cia.mfk b/include/c64_cia.mfk index 2e0883f5..ead189e2 100644 --- a/include/c64_cia.mfk +++ b/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 diff --git a/include/c64_joy.mfk b/include/c64_joy.mfk index 18ab9df0..928fca7a 100644 --- a/include/c64_joy.mfk +++ b/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 diff --git a/include/c64_sid.mfk b/include/c64_sid.mfk index 85350928..1db9861f 100644 --- a/include/c64_sid.mfk +++ b/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 diff --git a/include/c64_vic.mfk b/include/c64_vic.mfk index edc35e4d..e19d9dee 100644 --- a/include/c64_vic.mfk +++ b/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