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

[cc65] / src / common / target.c

diff --git a/src/common/target.c b/src/common/target.c
index 475f22797430b4162803469072bb25937a83f0a2..803a8894c310d173ed5af08e48c0c46cf40e03ac 100644 (file)
--- a/src/common/target.c
+++ b/src/common/target.c
@@ -1,8 +1,8 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                target.c                                  */
+/*                                 target.c                                  */
 /*                                                                           */
-/*                          Target specification                            */
+/*                           Target specification                            */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
@@ -125,6 +125,8 @@ static const TargetEntry TargetMap[] = {
     {   "apple2",       TGT_APPLE2      },
     {   "apple2enh",    TGT_APPLE2ENH   },
     {   "atari",        TGT_ATARI       },
+    {   "atari5200",    TGT_ATARI5200   },
+    {   "atarixl",      TGT_ATARIXL     },
     {   "atmos",        TGT_ATMOS       },
     {   "bbc",          TGT_BBC         },
     {   "c128",         TGT_C128        },
@@ -142,6 +144,8 @@ static const TargetEntry TargetMap[] = {
     {   "none",         TGT_NONE        },
     {   "pet",          TGT_PET         },
     {   "plus4",        TGT_PLUS4       },
+    {   "sim6502",      TGT_SIM6502     },
+    {   "sim65c02",     TGT_SIM65C02    },
     {   "supervision",  TGT_SUPERVISION },
     {   "vc20",         TGT_VIC20       },
     {   "vic20",        TGT_VIC20       },
@@ -151,36 +155,40 @@ static const TargetEntry TargetMap[] = {
 
 /* Table with target properties by target id */
 static const TargetProperties PropertyTable[TGT_COUNT] = {
-    { "none",           CPU_6502,       CTNone  },
-    { "module",         CPU_6502,       CTNone  },
-    { "atari",          CPU_6502,       CTAtari },
-    { "vic20",          CPU_6502,       CTPET   },
-    { "c16",            CPU_6502,       CTPET   },
-    { "c64",            CPU_6502,       CTPET   },
-    { "c128",           CPU_6502,       CTPET   },
-    { "plus4",          CPU_6502,       CTPET   },
-    { "cbm510",         CPU_6502,       CTPET   },
-    { "cbm610",         CPU_6502,       CTPET   },
-    { "pet",            CPU_6502,       CTPET   },
-    { "bbc",            CPU_6502,       CTNone  },
-    { "apple2",         CPU_6502,       CTNone  },
-    { "apple2enh",      CPU_65C02,      CTNone  },
-    { "geos-cbm",       CPU_6502,       CTNone  },
-    { "geos-apple2",    CPU_6502,       CTNone  },
-    { "lunix",          CPU_6502,       CTNone  },
-    { "atmos",          CPU_6502,       CTNone  },
-    { "nes",            CPU_6502,       CTNone  },
-    { "supervision",    CPU_65SC02,     CTNone  },
-    { "lynx",           CPU_65C02,      CTNone  },
+    { "none",           CPU_6502,       BINFMT_BINARY,      CTNone  },
+    { "module",         CPU_6502,       BINFMT_O65,         CTNone  },
+    { "atari",          CPU_6502,       BINFMT_BINARY,      CTAtari },
+    { "atari5200",      CPU_6502,       BINFMT_BINARY,      CTAtari },
+    { "atarixl",        CPU_6502,       BINFMT_BINARY,      CTAtari },
+    { "vic20",          CPU_6502,       BINFMT_BINARY,      CTPET   },
+    { "c16",            CPU_6502,       BINFMT_BINARY,      CTPET   },
+    { "c64",            CPU_6502,       BINFMT_BINARY,      CTPET   },
+    { "c128",           CPU_6502,       BINFMT_BINARY,      CTPET   },
+    { "plus4",          CPU_6502,       BINFMT_BINARY,      CTPET   },
+    { "cbm510",         CPU_6502,       BINFMT_BINARY,      CTPET   },
+    { "cbm610",         CPU_6502,       BINFMT_BINARY,      CTPET   },
+    { "pet",            CPU_6502,       BINFMT_BINARY,      CTPET   },
+    { "bbc",            CPU_6502,       BINFMT_BINARY,      CTNone  },
+    { "apple2",         CPU_6502,       BINFMT_BINARY,      CTNone  },
+    { "apple2enh",      CPU_65C02,      BINFMT_BINARY,      CTNone  },
+    { "geos-cbm",       CPU_6502,       BINFMT_BINARY,      CTNone  },
+    { "geos-apple",     CPU_65C02,      BINFMT_BINARY,      CTNone  },
+    { "lunix",          CPU_6502,       BINFMT_O65,         CTNone  },
+    { "atmos",          CPU_6502,       BINFMT_BINARY,      CTNone  },
+    { "nes",            CPU_6502,       BINFMT_BINARY,      CTNone  },
+    { "supervision",    CPU_65SC02,     BINFMT_BINARY,      CTNone  },
+    { "lynx",           CPU_65C02,      BINFMT_BINARY,      CTNone  },
+    { "sim6502",        CPU_6502,       BINFMT_BINARY,      CTNone  },
+    { "sim65c02",       CPU_65C02,      BINFMT_BINARY,      CTNone  },
 };
 
 /* Target system */
-target_t Target        = TGT_NONE;
+target_t Target = TGT_NONE;
 
 
 
 /*****************************************************************************/
-/*                                          Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -226,4 +234,3 @@ const char* GetTargetName (target_t Target)
     /* Return the array entry */
     return GetTargetProperties (Target)->Name;
 }
-