Merge https://github.com/cc65/cc65 into c1p

diff --git a/cfg/c1p.cfg b/cfg/c1p.cfg
new file mode 100644 (file)
index 0000000..f1d7392
--- /dev/null
+++ b/cfg/c1p.cfg
@@ -0,0 +1,27 @@
+SYMBOLS {
+    __STACKSIZE__: type = weak, value = $0400; # 1k stack
+}
+MEMORY {
+    ZP:       file = "", define = yes, start = $0002, size = $001A;
+    RAM:      file = %O, define = yes, start = $0400, size = $2000 - __STACKSIZE__;
+}
+SEGMENTS {
+    STARTUP:  load = RAM, type = ro;
+    LOWCODE:  load = RAM, type = ro,                optional = yes;
+    INIT:     load = RAM, type = ro,  define = yes, optional = yes;
+    CODE:     load = RAM, type = rw;
+    RODATA:   load = RAM, type = rw;
+    DATA:     load = RAM, type = rw;
+    BSS:      load = RAM, type = bss, define = yes;
+    ZEROPAGE: load = ZP,  type = zp;
+}
+FEATURES {
+    CONDES: type    = constructor,
+            label   = __CONSTRUCTOR_TABLE__,
+            count   = __CONSTRUCTOR_COUNT__,
+            segment = INIT;
+    CONDES: type    = destructor,
+            label   = __DESTRUCTOR_TABLE__,
+            count   = __DESTRUCTOR_COUNT__,
+            segment = RODATA;
+}

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 6a801695a444f982bb478f03eefe151e3baeb948..b35ae1e382c171441999cbe96deadb11a471e7a9 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -20,6 +20,7 @@ TARGETS = apple2    \
           atarixl   \
           atari5200 \
           atmos     \
+          c1p       \
           $(CBMS)   \
           $(GEOS)   \
           lynx      \

diff --git a/libsrc/c1p/crt0.s b/libsrc/c1p/crt0.s
new file mode 100644 (file)
index 0000000..97d5726
--- /dev/null
+++ b/libsrc/c1p/crt0.s
@@ -0,0 +1,55 @@
+; ---------------------------------------------------------------------------
+; crt0.s
+; ---------------------------------------------------------------------------
+;
+; Startup code for Ohio Scientific Challenger 1P
+
+.export   _init, _exit
+.import   _main
+
+.export   __STARTUP__ : absolute = 1        ; Mark as startup
+.import   __RAM_START__, __RAM_SIZE__       ; Linker generated
+
+.import    zerobss, initlib, donelib
+
+.include  "zeropage.inc"
+
+; ---------------------------------------------------------------------------
+; Place the startup code in a special segment
+
+.segment  "STARTUP"
+
+; ---------------------------------------------------------------------------
+; A little light 6502 housekeeping
+
+_init:    LDX     #$FF                 ; Initialize stack pointer to $01FF
+          TXS
+          CLD                          ; Clear decimal mode
+
+; ---------------------------------------------------------------------------
+; Set cc65 argument stack pointer
+
+          LDA     #<(__RAM_START__ + __RAM_SIZE__)
+          STA     sp
+          LDA     #>(__RAM_START__ + __RAM_SIZE__)
+          STA     sp+1
+
+; ---------------------------------------------------------------------------
+; Initialize memory storage
+; copydata seems to be only necessary for special systems
+
+          JSR     zerobss              ; Clear BSS segment
+          ; JSR     copydata           ; Initialize DATA segment
+          JSR     initlib              ; Run constructors
+
+; ---------------------------------------------------------------------------
+; Call main()
+
+          JSR     _main
+
+; ---------------------------------------------------------------------------
+; Back from main (this is also the _exit entry):  force a software break
+
+_exit:    JSR     donelib              ; Run destructors
+          BRK
+

diff --git a/src/Makefile b/src/Makefile
index 5aafc4bb8f4b9a44b5d65c531f116bda15679e09..34706fab57830b76d08c1b8446f29fcc4df68312 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,6 +3,7 @@ ifneq ($(shell echo),)
 endif
 
 PROGS = ar65  \
+        c1p65 \
         ca65  \
         cc65  \
         cl65  \

diff --git a/src/c1p65.vcxproj b/src/c1p65.vcxproj
new file mode 100644 (file)
index 0000000..2f4ff02
--- /dev/null
+++ b/src/c1p65.vcxproj
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="c1p65\main.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4E031DE0-82B4-4204-8529-536626F7E0DF}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>c1p65</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>
+    </CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>
+    </CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\bin\</OutDir>
+    <IntDir>$(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\bin\</OutDir>
+    <IntDir>$(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>common</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(IntDir)..\..\common\$(Configuration)\common.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>common</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(IntDir)..\..\common\$(Configuration)\common.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

diff --git a/src/c1p65/main.c b/src/c1p65/main.c
new file mode 100644 (file)
index 0000000..c15c77a
--- /dev/null
+++ b/src/c1p65/main.c
@@ -0,0 +1,219 @@
+/* Object file conversion utility for Challenger 1P
+
+   by Stephan Muehlstrasser
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+
+/* common stuff */
+#include "abend.h"
+#include "cmdline.h"
+#include "fname.h"
+#include "chartype.h"
+#include "target.h"
+#include "version.h"
+#include "xmalloc.h"
+
+static void Usage (void)
+{
+    printf (
+        "Usage: %s [options] file\n"
+        "Short options:\n"
+        "  -V\t\t\tPrint the version number\n"
+        "  -h\t\t\tHelp (this text)\n"
+               "  -o name\t\tName the C1P output file (default: <input.c1p>)\n"
+               "  -S addr\t\tLoad address (default 0x400)\n"
+        "\n"
+        "Long options:\n"
+        "  --help\t\tHelp (this text)\n"
+        "  --version\t\tPrint the version number\n",
+        ProgName);
+}
+
+static void OptHelp (const char* Opt attribute ((unused)),
+                     const char* Arg attribute ((unused)))
+/* Print usage information and exit */
+{
+    Usage ();
+    exit (EXIT_SUCCESS);
+}
+
+
+static void OptVersion (const char* Opt attribute ((unused)),
+                        const char* Arg attribute ((unused)))
+/* Print the program version */
+{
+    fprintf (stderr, "grc65 V%s\n", GetVersionAsString ());
+}
+
+
+static unsigned long CvtNumber (const char* Arg, const char* Number)
+/* Convert a number from a string. Allow '$' and '0x' prefixes for hex
+ * numbers. Duplicated from ld65's main.c.
+ */
+{
+    unsigned long Val;
+    int           Converted;
+
+    /* Convert */
+    if (*Number == '$') {
+        ++Number;
+        Converted = sscanf (Number, "%lx", &Val);
+    } else {
+        Converted = sscanf (Number, "%li", (long*)&Val);
+    }
+
+    /* Check if we do really have a number */
+    if (Converted != 1) {
+        AbEnd ("Invalid number given in argument: %s\n", Arg);
+    }
+
+    /* Return the result */
+    return Val;
+}
+
+/* Commands of C1P PROM monitor */
+#define ADDRESS_MODE_CMD     '.'
+#define DATA_MODE_CMD        '/'
+#define EXECUTE_CMD          'G'
+
+/* Transform the cc65 executable binary into a series of
+   commands that make the C1P PROM monitor load the bytes
+   into memory.
+*/
+static void Transform (unsigned long StartAddress, FILE *In, FILE *Out)
+{
+       int c;
+       unsigned long CurrentAddress;
+
+       /* Loop over all input bytes, position to current address,
+          switch to data mod, output input byte
+       */
+       for (CurrentAddress = StartAddress, c = getc(In);
+                               c != EOF;
+                               c = getc(In), CurrentAddress += 1) {
+               fprintf (Out, "%c%04.4X%c%02.2X",
+                       ADDRESS_MODE_CMD, (unsigned int) CurrentAddress & 0xFFFF,
+                       DATA_MODE_CMD, (unsigned int) c & 0xFF);
+       }
+
+       /* And execute
+       fprintf (Out, "%c%04.4x%c",
+                       ADDRESS_MODE_CMD, (unsigned int) StartAddress & 0xFFFF,
+                       EXECUTE_CMD);
+                        */
+} 
+
+/* Default suffix for C1P object file */
+#define C1P_SUFFIX ".c1p"
+
+int main (int argc, char *argv[])
+{
+    /* Program long options */
+    static const LongOpt OptTab[] = {
+        { "--help",    0, OptHelp},
+        { "--version", 0, OptVersion},
+    };
+
+       /* Initialize input and output file name */
+    const char* InputFile = 0;
+    const char* OutputFile = 0;
+       char *GeneratedOutputFile = 0;
+
+       /* Initialize file pointers */
+       FILE *InputFileFp = 0;
+       FILE *OutputFileFp = 0;
+
+       /* Initialize with default start address defined in c1p.cfg */
+       unsigned long StartAddr = 0x400;
+
+    unsigned int I;
+
+    /* Initialize the cmdline module */
+    InitCmdLine (&argc, &argv, "c1p65");
+
+    /* Check the parameters */
+    I = 1;
+    while (I < ArgCount) {
+
+        /* Get the argument */
+        const char* Arg = ArgVec [I];
+
+        /* Check for an option */
+        if (Arg[0] == '-') {
+            switch (Arg[1]) {
+
+                case '-':
+                    LongOption (&I, OptTab, sizeof(OptTab)/sizeof(OptTab[0]));
+                    break;
+
+                case 'o':
+                    OutputFile = GetArg (&I, 2);
+                    break;
+
+                case 'S':
+                    StartAddr = CvtNumber (Arg, GetArg (&I, 2));
+                    break;
+
+                case 'h':
+                case '?':
+                    OptHelp (Arg, 0);
+                    break;
+
+                case 'V':
+                    OptVersion (Arg, 0);
+                    break;
+
+                default:
+                    UnknownOption (Arg);
+            }
+
+        } else {
+            if (InputFile) {
+                fprintf (stderr, "additional file specs ignored\n");
+            } else {
+                InputFile = Arg;
+            }
+        }
+
+        /* Next argument */
+        ++I;
+    }
+
+    if (!InputFile) AbEnd ("No input file");
+
+       if (!OutputFile) {
+               const size_t len = strlen(InputFile) + sizeof(C1P_SUFFIX);
+               
+               GeneratedOutputFile = (char *) xmalloc(len);
+               sprintf(GeneratedOutputFile, "%s%s", InputFile, C1P_SUFFIX);
+               OutputFile = GeneratedOutputFile;
+       }
+
+       /* Open input and output files */
+       InputFileFp = fopen(InputFile, "rb");
+       if (!InputFileFp) AbEnd ("Unable to open input file");
+
+       OutputFileFp = fopen(OutputFile, "wb");
+       if (!OutputFileFp) AbEnd ("Unable to open output file");
+
+       /* Generate object file */
+       Transform (StartAddr, InputFileFp, OutputFileFp);
+
+       /* Cleanup */
+       if (fclose(InputFileFp) == EOF) AbEnd ("Error closing input file");
+
+       if (fclose(OutputFileFp) == EOF) AbEnd ("Error closing output file");
+
+       if (GeneratedOutputFile) {
+               xfree(GeneratedOutputFile);
+       }
+
+    return EXIT_SUCCESS;
+}

diff --git a/src/ca65/main.c b/src/ca65/main.c
index 3f31a2b88d203f2a0acb0422b139f3080c4bb5a8..50878f47a44256fd2c3c4a2d88d560145116e234 100644 (file)
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -303,6 +303,10 @@ static void SetSys (const char* Sys)
             NewSymbol ("__SIM65C02__", 1);
             break;
 
+               case TGT_C1P:
+            NewSymbol ("__OSIC1P__", 1);
+            break;
+
         default:
             AbEnd ("Invalid target name: `%s'", Sys);
 

diff --git a/src/cc65/main.c b/src/cc65/main.c
index 34688e97ebc325a739ccc1e86627236988c8b7a2..b8963258d6eb2a581781560ca7959054b530ad57 100644 (file)
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -258,6 +258,10 @@ static void SetSys (const char* Sys)
             DefineNumericMacro ("__SIM65C02__", 1);
             break;
 
+               case TGT_C1P:
+            DefineNumericMacro ("__OSIC1P__", 1);
+            break;
+
         default:
             AbEnd ("Unknown target system type %d", Target);
     }

diff --git a/src/common/target.c b/src/common/target.c
index ffb342e2553fa9e637f6696a72445e54b45ce5a4..b909e4d70971d6370bcbd48407e9fc4b5650c3a8 100644 (file)
--- a/src/common/target.c
+++ b/src/common/target.c
@@ -131,6 +131,7 @@ static const TargetEntry TargetMap[] = {
     {   "bbc",          TGT_BBC         },
     {   "c128",         TGT_C128        },
     {   "c16",          TGT_C16         },
+       {   "c1p",          TGT_C1P         },
     {   "c64",          TGT_C64         },
     {   "cbm510",       TGT_CBM510      },
     {   "cbm610",       TGT_CBM610      },
@@ -162,6 +163,7 @@ static const TargetProperties PropertyTable[TGT_COUNT] = {
     { "atarixl",        CPU_6502,       BINFMT_BINARY,      CTAtari },
     { "vic20",          CPU_6502,       BINFMT_BINARY,      CTPET   },
     { "c16",            CPU_6502,       BINFMT_BINARY,      CTPET   },
+    { "c1p",            CPU_6502,       BINFMT_BINARY,      CTNone  },
     { "c64",            CPU_6502,       BINFMT_BINARY,      CTPET   },
     { "c128",           CPU_6502,       BINFMT_BINARY,      CTPET   },
     { "plus4",          CPU_6502,       BINFMT_BINARY,      CTPET   },

diff --git a/src/common/target.h b/src/common/target.h
index 72dffe38220bf5120aed779772b653e00c8ad166..067352deb68734ff035fc4d757d1814b92c84928 100644 (file)
--- a/src/common/target.h
+++ b/src/common/target.h
@@ -59,6 +59,7 @@ typedef enum {
     TGT_ATARIXL,
     TGT_VIC20,
     TGT_C16,
+       TGT_C1P,
     TGT_C64,
     TGT_C128,
     TGT_PLUS4,