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

diff --combined README.md
index 359fdaa08b7f976adcf26273cbf69f627a624638,16e92e8783e5f1b7afaba5d8d8b3f78d42749459..f8914c45af37f8e38d7cd99493dfc34a8566e566
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -29,8 -29,8 +29,9 @@@ includin
  - the NEC PC-Engine (aka TurboGrafx-16).
  - the Nintendo Entertainment System (NES) console.
  - the Watara Supervision console.
 +- the VTech Creativision console.
  - the Oric Atmos.
+ - the Oric Telestrat.
  - the Lynx console.
  - the Ohio Scientific Challenger 1P.
  

diff --combined libsrc/Makefile
index 6b98696813fe769b294e14e0b23a41bc7a382c96,bfe68baa1e741384387b62dcf9a32377d7c0d436..54b54860c3ab9987bf35f0942be15c4d0b14946d
--- 1/libsrc/Makefile
--- 2/libsrc/Makefile
+++ b/libsrc/Makefile
@@@ -22,7 -22,6 +22,7 @@@ TARGETS = apple2    
            atari2600 \
            atari5200 \
            atmos     \
 +          creativision \
            $(CBMS)   \
            $(GEOS)   \
            gamate    \
@@@ -32,7 -31,8 +32,8 @@@
            pce       \
            sim6502   \
            sim65c02  \
-           supervision
+           supervision\
+           telestrat
  
  DRVTYPES = emd \
             joy \

diff --combined src/ca65/main.c
index a83cab5b6b89967c9d2ff2cfe4b4da57c8d49701,2ed3ad600f458e2ed92c3040e157311efc15fc6e..3c3daf7f72287f3aa1c5ccdb6ffa87cfccd7992b
--- 1/src/ca65/main.c
--- 2/src/ca65/main.c
+++ b/src/ca65/main.c
@@@ -282,10 -282,6 +282,10 @@@ static void SetSys (const char* Sys
              NewSymbol ("__GEOS_CBM__", 1);
              break;
  
 +        case TGT_CREATIVISION:
 +            NewSymbol ("__CREATIVISION__", 1);
 +            break;
 +
          case TGT_GEOS_APPLE:
              NewSymbol ("__GEOS__", 1);
              NewSymbol ("__GEOS_APPLE__", 1);
@@@ -297,7 -293,11 +297,11 @@@
  
          case TGT_ATMOS:
              NewSymbol ("__ATMOS__", 1);
-             break;
+             break; 
+ 
+         case TGT_TELESTRAT:
+              NewSymbol ("__TELESTRAT__", 1);
+              break;
  
          case TGT_NES:
              NewSymbol ("__NES__", 1);

diff --combined src/cc65/main.c
index 780c52b57542faad65616284501a71c962a4d5d4,06cbb3d2af6e546e700bb01f9924bdbc3a0c60f6..9ed19b90c99a21e713acd0282eb9e2dcef57d4bd
--- 1/src/cc65/main.c
--- 2/src/cc65/main.c
+++ b/src/cc65/main.c
@@@ -234,10 -234,6 +234,10 @@@ static void SetSys (const char* Sys
              DefineNumericMacro ("__GEOS_CBM__", 1);
              break;
  
 +        case TGT_CREATIVISION:
 +            DefineNumericMacro ("__CREATIVISION__", 1);
 +            break;
 +
          case TGT_GEOS_APPLE:
              DefineNumericMacro ("__GEOS__", 1);
              DefineNumericMacro ("__GEOS_APPLE__", 1);
@@@ -251,6 -247,10 +251,10 @@@
              DefineNumericMacro ("__ATMOS__", 1);
              break;
  
+         case TGT_TELESTRAT:
+             DefineNumericMacro ("__TELESTRAT__", 1);
+             break;
+                                 
          case TGT_NES:
              DefineNumericMacro ("__NES__", 1);
              break;

diff --combined src/common/target.c
index 84559b0e7e80db385c9634481987947b09c9fc55,72de86a6779dc12d90d6472da577e3fbd76cc085..56ea0a2ffe9a085e05d3efc7c26e2082f7fc82c9
--- 1/src/common/target.c
--- 2/src/common/target.c
+++ b/src/common/target.c
@@@ -134,7 -134,7 +134,7 @@@ static const unsigned char CTPET[256] 
  /* One entry in the target map */
  typedef struct TargetEntry TargetEntry;
  struct TargetEntry {
 -    char        Name[12];               /* Target name */
 +    char        Name[13];               /* Target name */
      target_t    Id;                     /* Target id */
  };
  
@@@ -142,38 -142,38 +142,39 @@@
  ** 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      },
 -    {   "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       },
 +    {   "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]))
  
@@@ -199,10 -199,10 +200,11 @@@ static const TargetProperties PropertyT
      { "apple2",         CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "apple2enh",      CPU_65C02,      BINFMT_BINARY,      CTNone  },
      { "geos-cbm",       CPU_6502,       BINFMT_BINARY,      CTNone  },
 +    { "creativision",   CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "geos-apple",     CPU_65C02,      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  },

diff --combined src/common/target.h
index 054c4f2baf5d323f5b4cc550880cebef138c93ed,d849c9d9b1668816a2aa6323b086286cfaddca9c..c8e2472d3062283ab9721435ef0207c4e668270d
--- 1/src/common/target.h
--- 2/src/common/target.h
+++ b/src/common/target.h
@@@ -71,10 -71,10 +71,11 @@@ typedef enum 
      TGT_APPLE2,
      TGT_APPLE2ENH,
      TGT_GEOS_CBM,
 +    TGT_CREATIVISION,
      TGT_GEOS_APPLE,
      TGT_LUNIX,
      TGT_ATMOS,
+     TGT_TELESTRAT,
      TGT_NES,
      TGT_SUPERVISION,
      TGT_LYNX,
@@@ -89,7 -89,7 +90,7 @@@
  /* Collection of target properties */
  typedef struct TargetProperties TargetProperties;
  struct TargetProperties {
 -    const char              Name[12];   /* Name of the target */
 +    const char              Name[13];   /* Name of the target */
      cpu_t                   DefaultCPU; /* Default CPU for this target */
      unsigned char           BinFmt;     /* Default binary format for this target */
      const unsigned char*    CharMap;    /* Character translation table */