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

[cc65] / src / common / target.c

diff --git a/src/common/target.c b/src/common/target.c
index bf87b17e0ade1ad593bc79949ab1c2c6ce6b30c9..56ea0a2ffe9a085e05d3efc7c26e2082f7fc82c9 100644 (file)
--- a/src/common/target.c
+++ b/src/common/target.c
@@ -142,38 +142,39 @@ struct TargetEntry {
 ** Allows multiple entries for one target id (target name aliases).
 */
 static const TargetEntry TargetMap[] = {
-    {   "apple2",       TGT_APPLE2      },
-    {   "apple2enh",    TGT_APPLE2ENH   },
-    {   "atari",        TGT_ATARI       },
-    {   "atari2600",    TGT_ATARI2600   },
-    {   "atari5200",    TGT_ATARI5200   },
-    {   "atarixl",      TGT_ATARIXL     },
-    {   "atmos",        TGT_ATMOS       },
-    {   "bbc",          TGT_BBC         },
-    {   "c128",         TGT_C128        },
-    {   "c16",          TGT_C16         },
-    {   "c64",          TGT_C64         },
-    {   "c65",          TGT_C65         },
-    {   "cbm510",       TGT_CBM510      },
-    {   "cbm610",       TGT_CBM610      },
-    {   "creativision", TGT_CREATIVISION},
-    {   "gamate",       TGT_GAMATE      },
-    {   "geos",         TGT_GEOS_CBM    },
-    {   "geos-apple",   TGT_GEOS_APPLE  },
-    {   "geos-cbm",     TGT_GEOS_CBM    },
-    {   "lunix",        TGT_LUNIX       },
-    {   "lynx",         TGT_LYNX        },
-    {   "module",       TGT_MODULE      },
-    {   "nes",          TGT_NES         },
-    {   "none",         TGT_NONE        },
-    {   "osic1p",       TGT_OSIC1P      },
-    {   "pce",          TGT_PCENGINE    },
-    {   "pet",          TGT_PET         },
-    {   "plus4",        TGT_PLUS4       },
-    {   "sim6502",      TGT_SIM6502     },
-    {   "sim65c02",     TGT_SIM65C02    },
-    {   "supervision",  TGT_SUPERVISION },
-    {   "vic20",        TGT_VIC20       },
+    {   "apple2",       TGT_APPLE2       },
+    {   "apple2enh",    TGT_APPLE2ENH    },
+    {   "atari",        TGT_ATARI        },
+    {   "atari2600",    TGT_ATARI2600    },
+    {   "atari5200",    TGT_ATARI5200    },
+    {   "atarixl",      TGT_ATARIXL      },
+    {   "atmos",        TGT_ATMOS        },
+    {   "bbc",          TGT_BBC          },
+    {   "c128",         TGT_C128         },
+    {   "c16",          TGT_C16          },
+    {   "c64",          TGT_C64          },
+    {   "c65",          TGT_C65          },
+    {   "cbm510",       TGT_CBM510       },
+    {   "cbm610",       TGT_CBM610       },
+    {   "creativision", TGT_CREATIVISION },
+    {   "gamate",       TGT_GAMATE       },
+    {   "geos",         TGT_GEOS_CBM     },
+    {   "geos-apple",   TGT_GEOS_APPLE   },
+    {   "geos-cbm",     TGT_GEOS_CBM     },
+    {   "lunix",        TGT_LUNIX        },
+    {   "lynx",         TGT_LYNX         },
+    {   "module",       TGT_MODULE       },
+    {   "nes",          TGT_NES          },
+    {   "none",         TGT_NONE         },
+    {   "osic1p",       TGT_OSIC1P       },
+    {   "pce",          TGT_PCENGINE     },
+    {   "pet",          TGT_PET          },
+    {   "plus4",        TGT_PLUS4        },
+    {   "sim6502",      TGT_SIM6502      },
+    {   "sim65c02",     TGT_SIM65C02     },
+    {   "supervision",  TGT_SUPERVISION  },
+    {   "telestrat",    TGT_TELESTRAT    },
+    {   "vic20",        TGT_VIC20        },
 };
 #define MAP_ENTRY_COUNT         (sizeof (TargetMap) / sizeof (TargetMap[0]))
 
@@ -195,15 +196,15 @@ static const TargetProperties PropertyTable[TGT_COUNT] = {
     { "cbm610",         CPU_6502,       BINFMT_BINARY,      CTPET   },
     { "osic1p",         CPU_6502,       BINFMT_BINARY,      CTOSI   },
     { "pet",            CPU_6502,       BINFMT_BINARY,      CTPET   },
+    { "bbc",            CPU_6502,       BINFMT_BINARY,      CTNone  },
     { "apple2",         CPU_6502,       BINFMT_BINARY,      CTNone  },
     { "apple2enh",      CPU_65C02,      BINFMT_BINARY,      CTNone  },
-    { "atmos",          CPU_6502,       BINFMT_BINARY,      CTNone  },
-    { "bbc",            CPU_6502,       BINFMT_BINARY,      CTNone  },
+    { "geos-cbm",       CPU_6502,       BINFMT_BINARY,      CTNone  },
     { "creativision",   CPU_6502,       BINFMT_BINARY,      CTNone  },
     { "geos-apple",     CPU_65C02,      BINFMT_BINARY,      CTNone  },
-    { "geos-cbm",       CPU_6502,       BINFMT_BINARY,      CTNone  },
     { "lunix",          CPU_6502,       BINFMT_O65,         CTNone  },
     { "atmos",          CPU_6502,       BINFMT_BINARY,      CTNone  },
+    { "telestrat",      CPU_6502,       BINFMT_BINARY,      CTNone  },
     { "nes",            CPU_6502,       BINFMT_BINARY,      CTNone  },
     { "supervision",    CPU_65SC02,     BINFMT_BINARY,      CTNone  },
     { "lynx",           CPU_65SC02,     BINFMT_BINARY,      CTNone  },
@@ -211,7 +212,6 @@ static const TargetProperties PropertyTable[TGT_COUNT] = {
     { "sim65c02",       CPU_65C02,      BINFMT_BINARY,      CTNone  },
     { "pce",            CPU_HUC6280,    BINFMT_BINARY,      CTNone  },
     { "gamate",         CPU_6502,       BINFMT_BINARY,      CTNone  },
-    { "supervision",    CPU_65SC02,     BINFMT_BINARY,      CTNone  },
     { "c65",            CPU_4510,       BINFMT_BINARY,      CTPET   },
 };