From a7b84bb618390cceb87d0062abb4fd28a38a365c Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Sat, 8 Feb 2014 22:48:49 +0100
Subject: [PATCH] Removed references to SunPlus.

---
 asminc/cpu.mac     |  9 ++-------
 doc/ca65.sgml      | 25 ++-----------------------
 src/ca65/instr.c   | 10 ----------
 src/ca65/pseudo.c  |  9 ---------
 src/ca65/scanner.c |  1 -
 src/ca65/token.h   |  1 -
 src/common/cpu.c   |  2 --
 src/common/cpu.h   |  2 --
 8 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/asminc/cpu.mac b/asminc/cpu.mac
index 43c9e160f..6b8aa6d7b 100644
--- 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,8 @@ 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 capabilities
 CPU_NONE           = CPU_ISET_NONE
@@ -17,8 +15,5 @@ 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
-
-                                                                                  
diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index c1c314a2c..75cba986e 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -151,10 +151,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, HuC6280
-
-  The sunplus cpu is not available in the freeware version, because the
-  instruction set is "proprietary and confidential".
+       	6502, 65SC02, 65C02, 65816, sweet16, HuC6280
 
 
   <label id="option-create-dep">
@@ -428,8 +425,6 @@ The assembler accepts
       <tt><ref id=".PC02" name=".PC02"></tt> command was given).
 <item>all valid 65618 mnemonics when in 65816 mode (after the
       <tt><ref id=".P816" name=".P816"></tt> command was given).
-<item>all valid SunPlus mnemonics when in SunPlus mode (after the
-      <tt><ref id=".SUNPLUS" name=".SUNPLUS"></tt> command was given).
 </itemize>
 
 
@@ -3652,10 +3647,7 @@ 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 <tt><ref id="option--cpu" name="--cpu"></tt> command line option,
-  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".
+  namely: 6502, 6502X, 65SC02, 65C02, 65816and HuC6280.
 
   See: <tt><ref id=".CPU" name=".CPU"></tt>,
        <tt><ref id=".IFP02" name=".IFP02"></tt>,
@@ -3714,17 +3706,6 @@ Here's a list of all control commands and a description, what they do:
             <tt><ref id=".UNION" name=".UNION"></tt>
 
 
-<sect1><tt>.SUNPLUS</tt><label id=".SUNPLUS"><p>
-
-  Enable the SunPlus instructions set. This command will not work in the
-  freeware version of the assembler, because the instruction set is
-  "proprietary and confidential".
-
-  See: <tt><ref id=".P02" name=".P02"></tt>, <tt><ref id=".PSC02"
-  name=".PSC02"></tt>, <tt><ref id=".PC02" name=".PC02"></tt>, and
-  <tt><ref id=".P816" name=".P816"></tt>
-
-
 <sect1><tt>.TAG</tt><label id=".TAG"><p>
 
   Allocate space for a struct or union.
@@ -4365,7 +4346,6 @@ each supported CPU a constant similar to
     CPU_65SC02
     CPU_65C02
     CPU_65816
-    CPU_SUNPLUS
     CPU_SWEET16
     CPU_HUC6280
 </verb></tscreen>
@@ -4379,7 +4359,6 @@ another constant is defined:
     CPU_ISET_65SC02
     CPU_ISET_65C02
     CPU_ISET_65816
-    CPU_ISET_SUNPLUS
     CPU_ISET_SWEET16
     CPU_ISET_HUC6280
 </verb></tscreen>
diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index 277676614..777affdee 100644
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -585,11 +585,6 @@ static const struct {
     }
 };
 
-#ifdef SUNPLUS
-/* Table for the SUNPLUS CPU */
-#include "sunplus.inc"
-#endif
-
 /* Instruction table for the SWEET16 pseudo CPU */
 static const struct {
     unsigned Count;
@@ -781,11 +776,6 @@ static const InsTable* InsTabs[CPU_COUNT] = {
     (const InsTable*) &InsTab65SC02,
     (const InsTable*) &InsTab65C02,
     (const InsTable*) &InsTab65816,
-#ifdef SUNPLUS
-    (const InsTable*) &InsTabSunPlus,
-#else
-    0,
-#endif
     (const InsTable*) &InsTabSweet16,
     (const InsTable*) &InsTabHuC6280,
     0,                                  /* Mitsubishi 740 */
diff --git a/src/ca65/pseudo.c b/src/ca65/pseudo.c
index 5c534b29c..3af192610 100644
--- a/src/ca65/pseudo.c
+++ b/src/ca65/pseudo.c
@@ -1810,14 +1810,6 @@ static void DoSmart (void)
 
 
 
-static void DoSunPlus (void)
-/* Switch to the SUNPLUS CPU */
-{
-    SetCPU (CPU_SUNPLUS);
-}
-
-
-
 static void DoTag (void)
 /* Allocate space for a struct */
 {
@@ -2093,7 +2085,6 @@ static CtrlDesc CtrlCmdTab [] = {
     { ccNone,           DoUnexpected    },      /* .STRING */
     { ccNone,           DoUnexpected    },      /* .STRLEN */
     { ccNone,           DoStruct        },
-    { ccNone,           DoSunPlus       },
     { ccNone,           DoTag           },
     { ccNone,           DoUnexpected    },      /* .TCOUNT */
     { ccNone,           DoUnexpected    },      /* .TIME */
diff --git a/src/ca65/scanner.c b/src/ca65/scanner.c
index aadb91d54..1a1127778 100644
--- a/src/ca65/scanner.c
+++ b/src/ca65/scanner.c
@@ -276,7 +276,6 @@ struct DotKeyword {
     { ".STRING",        TOK_STRING      },
     { ".STRLEN",        TOK_STRLEN      },
     { ".STRUCT",        TOK_STRUCT      },
-    { ".SUNPLUS",       TOK_SUNPLUS     },
     { ".TAG",           TOK_TAG         },
     { ".TCOUNT",        TOK_TCOUNT      },
     { ".TIME",          TOK_TIME        },
diff --git a/src/ca65/token.h b/src/ca65/token.h
index 5214771fd..6499a14bd 100644
--- a/src/ca65/token.h
+++ b/src/ca65/token.h
@@ -244,7 +244,6 @@ typedef enum token_t {
     TOK_STRING,
     TOK_STRLEN,
     TOK_STRUCT,
-    TOK_SUNPLUS,
     TOK_TAG,
     TOK_TCOUNT,
     TOK_TIME,
diff --git a/src/common/cpu.c b/src/common/cpu.c
index 59353a6a1..7b61ccdcc 100644
--- a/src/common/cpu.c
+++ b/src/common/cpu.c
@@ -58,7 +58,6 @@ const char* CPUNames[CPU_COUNT] = {
     "65SC02",
     "65C02",
     "65816",
-    "sunplus",
     "sweet16",
     "huc6280",
     "m740",
@@ -72,7 +71,6 @@ const unsigned CPUIsets[CPU_COUNT] = {
     CPU_ISET_6502 | CPU_ISET_65SC02,
     CPU_ISET_6502 | CPU_ISET_65SC02 | CPU_ISET_65C02,
     CPU_ISET_6502 | CPU_ISET_65SC02 | CPU_ISET_65C02 | CPU_ISET_65816,
-    CPU_ISET_SUNPLUS,
     CPU_ISET_SWEET16,
     CPU_ISET_6502 | CPU_ISET_65SC02 | CPU_ISET_65C02 | CPU_ISET_HUC6280,
     CPU_ISET_6502 | CPU_ISET_M740,
diff --git a/src/common/cpu.h b/src/common/cpu.h
index 424053cf9..121a54b7a 100644
--- a/src/common/cpu.h
+++ b/src/common/cpu.h
@@ -53,7 +53,6 @@ typedef enum {
     CPU_65SC02,
     CPU_65C02,
     CPU_65816,
-    CPU_SUNPLUS,                /* Not in the freeware version - sorry */
     CPU_SWEET16,
     CPU_HUC6280,                /* Used in PC engine */
     CPU_M740,                   /* Mitsubishi 740 series MCUs */
@@ -68,7 +67,6 @@ enum {
     CPU_ISET_65SC02     = 1 << CPU_65SC02,
     CPU_ISET_65C02      = 1 << CPU_65C02,
     CPU_ISET_65816      = 1 << CPU_65816,
-    CPU_ISET_SUNPLUS    = 1 << CPU_SUNPLUS,
     CPU_ISET_SWEET16    = 1 << CPU_SWEET16,
     CPU_ISET_HUC6280    = 1 << CPU_HUC6280,
     CPU_ISET_M740       = 1 << CPU_M740,
-- 
2.39.5