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

diff --combined include/conio.h
index f8a880c7703ac1a47acaf56055217754aa2be9e7,10806785c87785ef29d5da9f5a9e97eab2f80685..8638e94d425b26ceaf4fab599eacc1204ee4e805
--- 1/include/conio.h
--- 2/include/conio.h
+++ b/include/conio.h
@@@ -77,8 -77,8 +77,10 @@@
  #  include <lynx.h>
  #elif defined(__NES__)
  #  include <nes.h>
+ #elif defined(__OSIC1P__)
+ #  include <osic1p.h>
 +#elif defined(__PCE__)
 +#  include <pce.h>
  #endif
  
  

diff --combined libsrc/Makefile
index dc944ee05b45ba9368d3289a70b38cb1c9f9cee5,42aaf078b8a936e211a9c71bb78ce4c286d1057f..d70ad5a3156251e6dfb935a976d7599bae3f8a62
--- 1/libsrc/Makefile
--- 2/libsrc/Makefile
+++ b/libsrc/Makefile
@@@ -24,7 -24,7 +24,8 @@@ TARGETS = apple2    
            $(GEOS)   \
            lynx      \
            nes       \
+           osic1p    \
 +          pce       \
            sim6502   \
            sim65c02  \
            supervision

diff --combined src/ca65/main.c
index 4f39eb286744a6b28d139727580b9297f7ba2bb5,508f49603ed82eea736bad892f94be586e7cb936..d81a875778211560c3960f2179fdd4209197ac17
--- 1/src/ca65/main.c
--- 2/src/ca65/main.c
+++ b/src/ca65/main.c
@@@ -303,10 -303,10 +303,14 @@@ static void SetSys (const char* Sys
              NewSymbol ("__SIM65C02__", 1);
              break;
  
+         case TGT_OSIC1P:
+             NewSymbol ("__OSIC1P__", 1);
+             break;
+ 
 +        case TGT_PCENGINE:
 +            NewSymbol ("__PCE__", 1);
 +            break;
 +
          default:
              AbEnd ("Invalid target name: `%s'", Sys);
  

diff --combined src/cc65/main.c
index 13fe76db490993bc40026821e90ad21f11b050e1,6b42c4db16bd755e36952c6ffbfe5697e03b933c..1041b8fa2df57d33019dd5b88ed2e5fb7eb432b5
--- 1/src/cc65/main.c
--- 2/src/cc65/main.c
+++ b/src/cc65/main.c
@@@ -6,7 -6,7 +6,7 @@@
  /*                                                                           */
  /*                                                                           */
  /*                                                                           */
- /* (C) 2000-2013, Ullrich von Bassewitz                                      */
+ /* (C) 2000-2015, Ullrich von Bassewitz                                      */
  /*                Roemerstrasse 52                                           */
  /*                D-70794 Filderstadt                                        */
  /* EMail:         uz@cc65.org                                                */
@@@ -104,6 -104,7 +104,7 @@@ static void Usage (void
              "\n"
              "Long options:\n"
              "  --add-source\t\t\tInclude source as comment\n"
+             "  --all-cdecl\t\t\tMake functions default to __cdecl__\n"
              "  --bss-name seg\t\tSet the name of the BSS segment\n"
              "  --check-stack\t\t\tGenerate stack overflow checks\n"
              "  --code-name seg\t\tSet the name of the CODE segment\n"
@@@ -258,10 -259,10 +259,14 @@@ static void SetSys (const char* Sys
              DefineNumericMacro ("__SIM65C02__", 1);
              break;
  
+         case TGT_OSIC1P:
+             DefineNumericMacro ("__OSIC1P__", 1);
+             break;
+ 
 +        case TGT_PCENGINE:
 +            DefineNumericMacro ("__PCE__", 1);
 +            break;
 +
          default:
              AbEnd ("Unknown target system type %d", Target);
      }
@@@ -350,6 -351,15 +355,15 @@@ static void OptAddSource (const char* O
  
  
  
+ static void OptAllCDecl (const char* Opt attribute ((unused)),
+                          const char* Arg attribute ((unused)))
+ /* Make functions default to cdecl instead of fastcall. */
+ {
+     AutoCDecl = 1;
+ }
+ 
+ 
+ 
  static void OptBssName (const char* Opt attribute ((unused)), const char* Arg)
  /* Handle the --bss-name option */
  {
@@@ -790,6 -800,7 +804,7 @@@ int main (int argc, char* argv[]
      /* Program long options */
      static const LongOpt OptTab[] = {
          { "--add-source",       0,      OptAddSource            },
+         { "--all-cdecl",        0,      OptAllCDecl             },
          { "--bss-name",         1,      OptBssName              },
          { "--check-stack",      0,      OptCheckStack           },
          { "--code-name",        1,      OptCodeName             },

diff --combined src/common/target.c
index 013afe8ba2fe5c64c76f9811e35b8f8b9a8cf362,7e152fe945e10aa07e8159e1e9037fd75c77ea4c..60b9af6603c1f75d4d3751c6d2c6c8e08169f532
--- 1/src/common/target.c
--- 2/src/common/target.c
+++ b/src/common/target.c
@@@ -6,7 -6,7 +6,7 @@@
  /*                                                                           */
  /*                                                                           */
  /*                                                                           */
- /* (C) 2000-2011, Ullrich von Bassewitz                                      */
+ /* (C) 2000-2015, Ullrich von Bassewitz                                      */
  /*                Roemerstrasse 52                                           */
  /*                D-70794 Filderstadt                                        */
  /* EMail:         uz@cc65.org                                                */
@@@ -50,7 -50,7 +50,7 @@@
  
  
  /* Translation table with direct (no) translation */
- static unsigned char CTNone[256] = {
+ static const unsigned char CTNone[256] = {
      0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
      0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
      0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
@@@ -69,8 -69,8 +69,8 @@@
      0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
  };
  
- /* Translation table ISO-8859-1 -> ATASCII */
- static const unsigned char CTAtari [256] = {
+ /* Translation table ISO-8859-1 -> AtASCII */
+ static const unsigned char CTAtari[256] = {
      0x00,0x01,0x02,0x03,0x04,0x05,0x06,0xFD,0x08,0x7F,0x9B,0x0B,0x7D,0x0D,0x0E,0x0F,
      0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
      0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
@@@ -89,8 -89,28 +89,28 @@@
      0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
  };
  
- /* Translation table ISO-8859-1 -> PETSCII */
- static const unsigned char CTPET [256] = {
+ /* Translation table ISO-8859-1 -> OSASCII */
+ static const unsigned char CTOSI[256] = {
+     0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+     0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+     0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+     0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+     0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+     0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+     0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+     0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7D,0x7C,0x7F,0x7E,
+     0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+     0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+     0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
+     0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+     0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+     0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+     0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+     0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
+ };
+ 
+ /* Translation table ISO-8859-1 -> PetSCII */
+ static const unsigned char CTPET[256] = {
      0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x14,0x09,0x0D,0x11,0x93,0x0A,0x0E,0x0F,
      0x10,0x0B,0x12,0x13,0x08,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
      0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
@@@ -142,7 -162,7 +162,8 @@@ static const TargetEntry TargetMap[] = 
      {   "module",       TGT_MODULE      },
      {   "nes",          TGT_NES         },
      {   "none",         TGT_NONE        },
+     {   "osic1p",       TGT_OSIC1P      },
 +    {   "pce",          TGT_PCENGINE    },
      {   "pet",          TGT_PET         },
      {   "plus4",        TGT_PLUS4       },
      {   "sim6502",      TGT_SIM6502     },
@@@ -168,6 -188,7 +189,7 @@@ static const TargetProperties PropertyT
      { "plus4",          CPU_6502,       BINFMT_BINARY,      CTPET   },
      { "cbm510",         CPU_6502,       BINFMT_BINARY,      CTPET   },
      { "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  },
@@@ -181,7 -202,6 +203,7 @@@
      { "lynx",           CPU_65C02,      BINFMT_BINARY,      CTNone  },
      { "sim6502",        CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "sim65c02",       CPU_65C02,      BINFMT_BINARY,      CTNone  },
 +    { "pce",            CPU_HUC6280,    BINFMT_BINARY,      CTNone  },
  };
  
  /* Target system */

diff --combined src/common/target.h
index ae9f931c40bd2be4832737b41845cfb9b9e9f922,0b50e506032b1b4901019a645a54df366db49652..3ea562aa6dc9c4d26761ad13533b40c5b22ab31f
--- 1/src/common/target.h
--- 2/src/common/target.h
+++ b/src/common/target.h
@@@ -64,6 -64,7 +64,7 @@@ typedef enum 
      TGT_PLUS4,
      TGT_CBM510,
      TGT_CBM610,
+     TGT_OSIC1P,
      TGT_PET,
      TGT_BBC,
      TGT_APPLE2,
@@@ -77,7 -78,6 +78,7 @@@
      TGT_LYNX,
      TGT_SIM6502,
      TGT_SIM65C02,
 +    TGT_PCENGINE,
      TGT_COUNT                   /* Number of target systems */
  } target_t;