Merge remote-tracking branch 'upstream/master' into cbmkernal_stage2

[cc65] / asminc / cpu.mac

diff --git a/asminc/cpu.mac b/asminc/cpu.mac
index 43c9e160fb049ec8ea59ccb5d8cd2b2e15cf2f1d..6b9cb994705716e1f0ed34a3a4cf6945f8bea702 100644 (file)
--- a/asminc/cpu.mac
+++ b/asminc/cpu.mac
@@ -1,4 +1,3 @@
-
 ; CPU bitmask constants
 CPU_ISET_NONE      = $0001
 CPU_ISET_6502      = $0002
@@ -6,9 +5,10 @@ CPU_ISET_6502X     = $0004
 CPU_ISET_65SC02    = $0008
 CPU_ISET_65C02     = $0010
 CPU_ISET_65816     = $0020
-CPU_ISET_SUNPLUS   = $0040
-CPU_ISET_SWEET16   = $0080
-CPU_ISET_HUC6280   = $0100
+CPU_ISET_SWEET16   = $0040
+CPU_ISET_HUC6280   = $0080
+;CPU_ISET_M740     = $0100 not actually implemented
+CPU_ISET_4510      = $0200
 
 ; CPU capabilities
 CPU_NONE           = CPU_ISET_NONE
@@ -17,8 +17,6 @@ CPU_6502X          = CPU_ISET_6502|CPU_ISET_6502X
 CPU_65SC02         = CPU_ISET_6502|CPU_ISET_65SC02
 CPU_65C02          = CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02
 CPU_65816          = CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65816
-CPU_SUNPLUS        = CPU_ISET_SUNPLUS
 CPU_SWEET16        = CPU_ISET_SWEET16
 CPU_HUC6280        = CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02|CPU_ISET_HUC6280
-
-                                                                                  
+CPU_4510           = CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02|CPU_ISET_4510