6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-22 12:30:41 +00:00
Code Issues Projects Releases Wiki Activity

Rename c1p target to osic1p

Browse Source
This commit is contained in:
Stephan Mühlstrasser 2015-02-03 22:42:35 +01:00
parent 19b3c1b32b
commit 14c7e9fd16
28 changed files with 18 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
cfg/c1p-asm.cfg → cfg/osic1p-asm.cfg
View File

0
cfg/c1p.cfg → cfg/osic1p.cfg
View File

2
include/conio.h
View File

@ -78,7 +78,7 @@
#elif defined(__NES__)
# include <nes.h>
#elif defined(__OSIC1P__)
# include <c1p.h>
# include <osic1p.h>
#endif

8
include/c1p.h → include/osic1p.h
View File

@ -1,12 +1,12 @@
/*****************************************************************************/
/* */
/* c1p.h */
/* osic1p.h */
/* */
/* Challenger 1P system specific definitions */
/* */
/* */
/* */
/* (C) 2014 Stephan Muehlstrasser */
/* (C) 2015 Stephan Muehlstrasser */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
@ -28,8 +28,8 @@
/* */
/*****************************************************************************/
#ifndef _C1P_H
#define _C1P_H
#ifndef _OSIC1P_H
#define _OSIC1P_H
/* Check for errors */
#if !defined(__OSIC1P__)

2
libsrc/Makefile
View File

@ -20,11 +20,11 @@ TARGETS = apple2 \
atarixl \
atari5200 \
atmos \
c1p \
$(CBMS) \
$(GEOS) \
lynx \
nes \
osic1p \
sim6502 \
sim65c02 \
supervision

0
libsrc/c1p/_scrsize.s → libsrc/osic1p/_scrsize.s
View File

0
libsrc/c1p/cclear.s → libsrc/osic1p/cclear.s
View File

2
libsrc/c1p/cgetc.s → libsrc/osic1p/cgetc.s
View File

@ -4,7 +4,7 @@
.export _cgetc
.import cursor
.include "c1p.inc"
.include "osic1p.inc"
.include "extzp.inc"
; Input routine from 65V PROM MONITOR, show cursor if enabled

0
libsrc/c1p/chline.s → libsrc/osic1p/chline.s
View File

2
libsrc/c1p/clrscr.s → libsrc/osic1p/clrscr.s
View File

@ -4,7 +4,7 @@
.export _clrscr
.import plot
.importzp CURS_X, CURS_Y
.include "c1p.inc"
.include "osic1p.inc"
; Adapted from the Challenger Character Graphics
; Reference Manual, "2.3.3 MACHINE LANGUAGE SCREEN CLEAR"

2
libsrc/c1p/cputc.s → libsrc/osic1p/cputc.s
View File

@ -9,7 +9,7 @@
.export newline, plot
.import popa, _gotoxy
.include "c1p.inc"
.include "osic1p.inc"
.include "extzp.inc"
_cputcxy:

0
libsrc/c1p/crt0.s → libsrc/osic1p/crt0.s
View File

0
libsrc/c1p/ctype.s → libsrc/osic1p/ctype.s
View File

0
libsrc/c1p/cvline.s → libsrc/osic1p/cvline.s
View File

0
libsrc/c1p/extzp.inc → libsrc/osic1p/extzp.inc
View File

2
libsrc/c1p/extzp.s → libsrc/osic1p/extzp.s
View File

@ -18,4 +18,4 @@ SCR_LINELEN: .byte 24
SCREEN_PTR: .res 2
; size 6
; Adjust size of this segment in c1p.cfg if the size changes
; Adjust size of this segment in osic1p.cfg if the size changes

0
libsrc/c1p/gotox.s → libsrc/osic1p/gotox.s
View File

0
libsrc/c1p/gotoxy.s → libsrc/osic1p/gotoxy.s
View File

0
libsrc/c1p/gotoy.s → libsrc/osic1p/gotoy.s
View File

0
libsrc/c1p/oserror.s → libsrc/osic1p/oserror.s
View File

0
libsrc/c1p/c1p.inc → libsrc/osic1p/osic1p.inc
View File

0
libsrc/c1p/wherex.s → libsrc/osic1p/wherex.s
View File

0
libsrc/c1p/wherey.s → libsrc/osic1p/wherey.s
View File

94
src/c1p65.vcxproj
View File

@ -1,94 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.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>v120</PlatformToolset>
<CharacterSet>
</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</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>

2
src/ca65/main.c
View File

@ -303,7 +303,7 @@ static void SetSys (const char* Sys)
NewSymbol ("__SIM65C02__", 1);
break;
case TGT_C1P:
case TGT_OSIC1P:
NewSymbol ("__OSIC1P__", 1);
break;

2
src/cc65/main.c
View File

@ -258,7 +258,7 @@ static void SetSys (const char* Sys)
DefineNumericMacro ("__SIM65C02__", 1);
break;
case TGT_C1P:
case TGT_OSIC1P:
DefineNumericMacro ("__OSIC1P__", 1);
break;

6
src/common/target.c
View File

@ -131,7 +131,6 @@ 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 },
@ -143,6 +142,7 @@ static const TargetEntry TargetMap[] = {
{ "module", TGT_MODULE },
{ "nes", TGT_NES },
{ "none", TGT_NONE },
{ "osic1p", TGT_OSIC1P },
{ "pet", TGT_PET },
{ "plus4", TGT_PLUS4 },
{ "sim6502", TGT_SIM6502 },
@ -163,12 +163,12 @@ 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 },
{ "cbm510", CPU_6502, BINFMT_BINARY, CTPET },
{ "cbm610", CPU_6502, BINFMT_BINARY, CTPET },
{ "osic1p", CPU_6502, BINFMT_BINARY, CTNone },
{ "pet", CPU_6502, BINFMT_BINARY, CTPET },
{ "bbc", CPU_6502, BINFMT_BINARY, CTNone },
{ "apple2", CPU_6502, BINFMT_BINARY, CTNone },
@ -201,7 +201,7 @@ static int Compare (const void* Key, const void* Entry)
return strcmp ((const char*) Key, ((const TargetEntry*)Entry)->Name);
}
#include <stdio.h>
target_t FindTarget (const char* Name)
/* Find a target by name and return the target id. TGT_UNKNOWN is returned if

6
src/common/target.h
View File

@ -59,13 +59,13 @@ typedef enum {
TGT_ATARIXL,
TGT_VIC20,
TGT_C16,
TGT_C1P,
TGT_C64,
TGT_C128,
TGT_PLUS4,
TGT_CBM510,
TGT_CBM610,
TGT_PET,
TGT_OSIC1P,
TGT_PET,
TGT_BBC,
TGT_APPLE2,
TGT_APPLE2ENH,
@ -76,7 +76,7 @@ typedef enum {
TGT_NES,
TGT_SUPERVISION,
TGT_LYNX,
TGT_SIM6502,
TGT_SIM6502,
TGT_SIM65C02,
TGT_COUNT /* Number of target systems */
} target_t;