the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Christian Groessler
2013-06-28 00:49:12 +02:00
parent 82e73447c9 5edcd639e0
commit 1e9823306a
7 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cfg/module.cfg
View File

@@ -10,7 +10,7 @@ SEGMENTS {
DATA: load = COMBINED, type = rw, define = yes; DATA: load = COMBINED, type = rw, define = yes;
BSS: load = COMBINED, type = bss, define = yes; BSS: load = COMBINED, type = bss, define = yes;
ZEROPAGE: load = ZP, type = zp; ZEROPAGE: load = ZP, type = zp;
EXTZP: load = ZP, type = zp; EXTZP: load = ZP, type = zp, optional = yes;
} }
FILES { FILES {
%O: format = o65; %O: format = o65;

2
include/cbm264.h
View File

@@ -39,7 +39,7 @@
/* Check for errors */ /* Check for errors */
#if !defined(__PLUS4__) && !defined(__C16__) #if !defined(__C16__)
# error This module may only be used when compiling for the Plus/4 or C16! # error This module may only be used when compiling for the Plus/4 or C16!
#endif #endif

2
libsrc/dbg/dbg.c
View File

@@ -47,7 +47,7 @@ static char GetKeyUpdate (void);
/* Color definitions */ /* Color definitions */
#if defined(__PLUS4__) || defined(__C16__) #if defined(__C16__)
# define COLOR_BORDER (BCOLOR_DARKBLUE | CATTR_LUMA6) # define COLOR_BORDER (BCOLOR_DARKBLUE | CATTR_LUMA6)
# define COLOR_BACKGROUND COLOR_WHITE # define COLOR_BACKGROUND COLOR_WHITE
# define COLOR_TEXTHIGH COLOR_BLACK # define COLOR_TEXTHIGH COLOR_BLACK

7
libsrc/runtime/zeropage.s
View File

@@ -22,10 +22,3 @@ tmp2: .res 1
tmp3: .res 1 tmp3: .res 1
tmp4: .res 1 tmp4: .res 1
regbank: .res regbanksize ; Register bank regbank: .res regbanksize ; Register bank
; Add an empty EXTZP zeropage segment to avoid linker warnings that this
; segment does not exist (it does not exist in most builtin linker configs
; but is used when linking modules).
.segment "EXTZP" : zeropage

2
libsrc/sim6502/exehdr.s
View File

@@ -6,8 +6,6 @@
.export __EXEHDR__ : absolute = 1 ; Linker referenced .export __EXEHDR__ : absolute = 1 ; Linker referenced
; ------------------------------------------------------------------------
.segment "EXEHDR" .segment "EXEHDR"
.byte .defined(__SIM65C02__) .byte .defined(__SIM65C02__)

3
src/ca65/main.c
View File

@@ -230,7 +230,8 @@ static void SetSys (const char* Sys)
break; break;
case TGT_PLUS4: case TGT_PLUS4:
CBMSystem ("__PLUS4__"); CBMSystem ("__C16__");
NewSymbol ("__PLUS4__", 1);
break; break;
case TGT_CBM510: case TGT_CBM510:

3
src/cc65/main.c
View File

@@ -186,7 +186,8 @@ static void SetSys (const char* Sys)
break; break;
case TGT_PLUS4: case TGT_PLUS4:
cbmsys ("__PLUS4__"); cbmsys ("__C16__");
DefineNumericMacro ("__PLUS4__", 1);
break; break;
case TGT_CBM510: case TGT_CBM510: