6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-08-08 06:25:17 +00:00
Code Issues Projects Releases Wiki Activity

Fixed numeric OS ids. Added new OS OPENCBM

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@3435 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2005-03-30 19:28:28 +00:00
parent 43a9802473
commit d194bdd702
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ld65/config.c
View File

@@ -865,6 +865,7 @@ static void ParseO65 (void)
{ "LUNIX", CFGTOK_LUNIX }, { "LUNIX", CFGTOK_LUNIX },
{ "OSA65", CFGTOK_OSA65 }, { "OSA65", CFGTOK_OSA65 },
{ "CC65", CFGTOK_CC65 }, { "CC65", CFGTOK_CC65 },
{ "OPENCBM", CFGTOK_OPENCBM },
}; };
/* Bitmask to remember the attributes we got already */ /* Bitmask to remember the attributes we got already */
@@ -976,10 +977,11 @@ static void ParseO65 (void)
} else { } else {
CfgSpecialToken (OperatingSystems, ENTRY_COUNT (OperatingSystems), "OS type"); CfgSpecialToken (OperatingSystems, ENTRY_COUNT (OperatingSystems), "OS type");
switch (CfgTok) { switch (CfgTok) {
case CFGTOK_LUNIX: OS = O65OS_LUNIX; break; case CFGTOK_LUNIX: OS = O65OS_LUNIX; break;
case CFGTOK_OSA65: OS = O65OS_OSA65; break; case CFGTOK_OSA65: OS = O65OS_OSA65; break;
case CFGTOK_CC65: OS = O65OS_CC65; break; case CFGTOK_CC65: OS = O65OS_CC65; break;
default: CfgError ("Unexpected OS token"); case CFGTOK_OPENCBM: OS = O65OS_OPENCBM; break;
default: CfgError ("Unexpected OS token");
} }
} }
break; break;

10
src/ld65/o65.c
View File

@@ -1155,11 +1155,6 @@ void O65SetOS (O65Desc* D, unsigned OS, unsigned Version, unsigned Id)
/* Write the correct option length */ /* Write the correct option length */
switch (OS) { switch (OS) {
case O65OS_OSA65:
case O65OS_LUNIX:
/* No id for these two */
O65SetOption (D, O65OPT_OS, Opt, 2);
break;
case O65OS_CC65: case O65OS_CC65:
/* Set the 16 bit id */ /* Set the 16 bit id */
@@ -1169,7 +1164,10 @@ void O65SetOS (O65Desc* D, unsigned OS, unsigned Version, unsigned Id)
break; break;
default: default:
Internal ("Trying to set invalid O65 operating system: %u", OS); /* No id for OS/A65, Lunix, and unknown OSes */
O65SetOption (D, O65OPT_OS, Opt, 2);
break;
} }
} }

1
src/ld65/o65.h
View File

@@ -66,6 +66,7 @@ typedef struct O65Desc O65Desc;
#define O65OS_OSA65 1 #define O65OS_OSA65 1
#define O65OS_LUNIX 2 #define O65OS_LUNIX 2
#define O65OS_CC65 3 #define O65OS_CC65 3
#define O65OS_OPENCBM 4
#define O65OS_MAX 255 #define O65OS_MAX 255

1
src/ld65/scanner.h
View File

@@ -105,6 +105,7 @@ typedef enum {
CFGTOK_LUNIX, CFGTOK_LUNIX,
CFGTOK_OSA65, CFGTOK_OSA65,
CFGTOK_CC65, CFGTOK_CC65,
CFGTOK_OPENCBM,
CFGTOK_CONDES, CFGTOK_CONDES,
CFGTOK_STARTADDRESS, CFGTOK_STARTADDRESS,