From e653204ffe3fe6f4b275fa3d9f736e722237d40f Mon Sep 17 00:00:00 2001
From: Karri Kaksonen <karri@sipo.fi>
Date: Tue, 1 Mar 2022 06:44:55 +0200
Subject: [PATCH] Add target atari7800

---
 README.md           | 1 +
 doc/ca65.sgml       | 1 +
 doc/index.sgml      | 3 +++
 doc/ld65.sgml       | 1 +
 include/target.h    | 2 ++
 libsrc/Makefile     | 1 +
 src/ca65/main.c     | 4 ++++
 src/cc65/main.c     | 4 ++++
 src/common/target.c | 2 ++
 src/common/target.h | 1 +
 targettest/Makefile | 4 ++++
 11 files changed, 24 insertions(+)

diff --git a/README.md b/README.md
index efc0ff6a9..32e3345c6 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ including
 - the Atari 8-bit machines.
 - the Atari 2600 console.
 - the Atari 5200 console.
+- the Atari 7800 console.
 - GEOS for the C64, C128 and Apple //e.
 - the Bit Corporation Gamate console.
 - the NEC PC-Engine (aka TurboGrafx-16) console.
diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 8797f2c60..c0ebe3688 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -4763,6 +4763,7 @@ compiler, depending on the target system selected:
 <item><tt/__APPLE2ENH__/ - Target system is <tt/apple2enh/
 <item><tt/__ATARI2600__/ - Target system is <tt/atari2600/
 <item><tt/__ATARI5200__/ - Target system is <tt/atari5200/
+<item><tt/__ATARI7800__/ - Target system is <tt/atari7800/
 <item><tt/__ATARI__/ - Target system is <tt/atari/ or <tt/atarixl/
 <item><tt/__ATARIXL__/ - Target system is <tt/atarixl/
 <item><tt/__ATMOS__/ - Target system is <tt/atmos/
diff --git a/doc/index.sgml b/doc/index.sgml
index 3bb085bf6..bb3ad5357 100644
--- a/doc/index.sgml
+++ b/doc/index.sgml
@@ -124,6 +124,9 @@
   <tag><htmlurl url="atari5200.html" name="atari5200.html"></tag>
   Topics specific to the Atari 5200 Game Console.
 
+  <tag><htmlurl url="atari7800.html" name="atari7800.html"></tag>
+  Topics specific to the Atari 7800 Game Console.
+
   <tag><htmlurl url="atmos.html" name="atmos.html"></tag>
   Topics specific to the Oric Atmos.
 
diff --git a/doc/ld65.sgml b/doc/ld65.sgml
index 87c2cae51..307caeaa4 100644
--- a/doc/ld65.sgml
+++ b/doc/ld65.sgml
@@ -166,6 +166,7 @@ Here is a description of all of the command-line options:
   <item>apple2
   <item>apple2enh
   <item>atari2600
+  <item>atari7800
   <item>atari
   <item>atarixl
   <item>atmos
diff --git a/include/target.h b/include/target.h
index af401ec35..7663a39dd 100644
--- a/include/target.h
+++ b/include/target.h
@@ -43,6 +43,8 @@
 #  include <atari2600.h>
 #elif defined(__ATARI5200__)
 #  include <atari5200.h>
+#elif defined(__ATARI7800__)
+#  include <atari7800.h>
 #elif defined(__ATMOS__)
 #  include <atmos.h>
 #elif defined(__CBM__)
diff --git a/libsrc/Makefile b/libsrc/Makefile
index 60946b59f..177314bdf 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -21,6 +21,7 @@ TARGETS = apple2       \
           atarixl      \
           atari2600    \
           atari5200    \
+          atari7800    \
           atmos        \
           creativision \
           $(CBMS)      \
diff --git a/src/ca65/main.c b/src/ca65/main.c
index 0eaf4ba6b..b1ef3a3db 100644
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -212,6 +212,10 @@ static void SetSys (const char* Sys)
             NewSymbol ("__ATARI5200__", 1);
             break;
 
+        case TGT_ATARI7800:
+            NewSymbol ("__ATARI7800__", 1);
+            break;
+
         case TGT_ATARI:
             NewSymbol ("__ATARI__", 1);
             break;
diff --git a/src/cc65/main.c b/src/cc65/main.c
index 74d4fd146..c08616efa 100644
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -173,6 +173,10 @@ static void SetSys (const char* Sys)
             DefineNumericMacro ("__ATARI5200__", 1);
             break;
 
+        case TGT_ATARI7800:
+            DefineNumericMacro ("__ATARI7800__", 1);
+            break;
+
         case TGT_ATARI:
             DefineNumericMacro ("__ATARI__", 1);
             break;
diff --git a/src/common/target.c b/src/common/target.c
index a35bf67a8..4a851034a 100644
--- a/src/common/target.c
+++ b/src/common/target.c
@@ -147,6 +147,7 @@ static const TargetEntry TargetMap[] = {
     {   "atari",        TGT_ATARI        },
     {   "atari2600",    TGT_ATARI2600    },
     {   "atari5200",    TGT_ATARI5200    },
+    {   "atari7800",    TGT_ATARI7800    },
     {   "atarixl",      TGT_ATARIXL      },
     {   "atmos",        TGT_ATMOS        },
     {   "bbc",          TGT_BBC          },
@@ -188,6 +189,7 @@ static const TargetProperties PropertyTable[TGT_COUNT] = {
     { "atari",          CPU_6502,       BINFMT_BINARY,      CTAtari },
     { "atari2600",      CPU_6502,       BINFMT_BINARY,      CTNone  },
     { "atari5200",      CPU_6502,       BINFMT_BINARY,      CTAtari },
+    { "atari7800",      CPU_6502,       BINFMT_BINARY,      CTNone  },
     { "atarixl",        CPU_6502,       BINFMT_BINARY,      CTAtari },
     { "vic20",          CPU_6502,       BINFMT_BINARY,      CTPET   },
     { "c16",            CPU_6502,       BINFMT_BINARY,      CTPET   },
diff --git a/src/common/target.h b/src/common/target.h
index 7f85713cf..7087048e2 100644
--- a/src/common/target.h
+++ b/src/common/target.h
@@ -57,6 +57,7 @@ typedef enum {
     TGT_ATARI,
     TGT_ATARI2600,
     TGT_ATARI5200,
+    TGT_ATARI7800,
     TGT_ATARIXL,
     TGT_VIC20,
     TGT_C16,
diff --git a/targettest/Makefile b/targettest/Makefile
index 806f6b445..0450bfd4e 100644
--- a/targettest/Makefile
+++ b/targettest/Makefile
@@ -673,6 +673,9 @@ EXELIST_atari2600 = \
 EXELIST_atari5200 = \
 	minimal
 
+EXELIST_atari7800 = \
+	minimal
+
 EXELIST_gamate = \
 	minimal
 
@@ -728,6 +731,7 @@ TARGETS :=     \
   atarixl      \
   atari2600    \
   atari5200    \
+  atari7800    \
   atmos        \
   bbc          \
   c128         \