diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index a8542b63e..c22f3f6eb 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -135,7 +135,7 @@ Here is a description of all the command line options:
Set the default for the CPU type. The option takes a parameter, which
may be one of
- 6502, 65SC02, 65C02, 65816, sunplus, sweet16
+ 6502, 65SC02, 65C02, 65816, sunplus, sweet16, HuC6280
The sunplus cpu is not available in the freeware version, because the
instruction set is "proprietary and confidential".
@@ -2756,7 +2756,7 @@ Here's a list of all control commands and a description, what they do:
cbm Defines the scrcode macro.
cpu Defines constants for the .CPU variable.
generic Defines generic macros like add and sub.
- longbranch Defines conditional long jump macros.
+ longbranch Defines conditional long jump macros.
Including a macro package twice, or including a macro package that
@@ -3091,10 +3091,10 @@ Here's a list of all control commands and a description, what they do:
Switch the CPU instruction set. The command is followed by a string that
specifies the CPU. Possible values are those that can also be supplied to
the command line option,
- namely: 6502, 6502X, 65SC02, 65C02, 65816 and sunplus. Please note that
- support for the sunplus CPU is not available in the freeware version,
- because the instruction set of the sunplus CPU is "proprietary and
- confidential".
+ namely: 6502, 6502X, 65SC02, 65C02, 65816, sunplus and HuC6280. Please
+ note that support for the sunplus CPU is not available in the freeware
+ version, because the instruction set of the sunplus CPU is "proprietary
+ and confidential".
See: ,
,
@@ -3711,6 +3711,7 @@ each supported CPU a constant similar to
CPU_65816
CPU_SUNPLUS
CPU_SWEET16
+ CPU_HUC6280
is defined. These constants may be used to determine the exact type of the
@@ -3724,6 +3725,7 @@ another constant is defined:
CPU_ISET_65816
CPU_ISET_SUNPLUS
CPU_ISET_SWEET16
+ CPU_ISET_HUC6280
The value read from the / pseudo variable may
diff --git a/src/ca65/macpack/cpu.mac b/src/ca65/macpack/cpu.mac
index 29abd5b69..43c9e160f 100644
--- a/src/ca65/macpack/cpu.mac
+++ b/src/ca65/macpack/cpu.mac
@@ -1,15 +1,16 @@
; CPU bitmask constants
-CPU_ISET_NONE = $01
-CPU_ISET_6502 = $02
-CPU_ISET_6502X = $04
-CPU_ISET_65SC02 = $08
-CPU_ISET_65C02 = $10
-CPU_ISET_65816 = $20
-CPU_ISET_SUNPLUS = $40
-CPU_ISET_SWEET16 = $80
+CPU_ISET_NONE = $0001
+CPU_ISET_6502 = $0002
+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 capabilities
+; CPU capabilities
CPU_NONE = CPU_ISET_NONE
CPU_6502 = CPU_ISET_6502
CPU_6502X = CPU_ISET_6502|CPU_ISET_6502X
@@ -18,4 +19,6 @@ 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
+