mirror of
https://github.com/cc65/cc65.git
synced 2025-01-10 19:29:45 +00:00
Change target handling, use modules from the common directory.
New long options: --config and --mapfile. git-svn-id: svn://svn.cc65.org/cc65/trunk@302 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
parent
e163b07d1b
commit
c3105a4e5d
142
src/ld65/main.c
142
src/ld65/main.c
@ -6,10 +6,10 @@
|
||||
/* */
|
||||
/* */
|
||||
/* */
|
||||
/* (C) 1998 Ullrich von Bassewitz */
|
||||
/* Wacholderweg 14 */
|
||||
/* D-70597 Stuttgart */
|
||||
/* EMail: uz@musoftware.de */
|
||||
/* (C) 1998-2000 Ullrich von Bassewitz */
|
||||
/* Wacholderweg 14 */
|
||||
/* D-70597 Stuttgart */
|
||||
/* EMail: uz@musoftware.de */
|
||||
/* */
|
||||
/* */
|
||||
/* This software is provided 'as-is', without any expressed or implied */
|
||||
@ -38,23 +38,27 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "../common/cmdline.h"
|
||||
#include "../common/libdefs.h"
|
||||
#include "../common/objdefs.h"
|
||||
#include "../common/version.h"
|
||||
#include "../common/xmalloc.h"
|
||||
|
||||
#include "global.h"
|
||||
#include "error.h"
|
||||
/* common */
|
||||
#include "cmdline.h"
|
||||
#include "libdefs.h"
|
||||
#include "objdefs.h"
|
||||
#include "target.h"
|
||||
#include "fileio.h"
|
||||
#include "scanner.h"
|
||||
#include "version.h"
|
||||
#include "xmalloc.h"
|
||||
|
||||
/* ld65 */
|
||||
#include "binfmt.h"
|
||||
#include "config.h"
|
||||
#include "objfile.h"
|
||||
#include "library.h"
|
||||
#include "error.h"
|
||||
#include "exports.h"
|
||||
#include "segments.h"
|
||||
#include "fileio.h"
|
||||
#include "global.h"
|
||||
#include "library.h"
|
||||
#include "mapfile.h"
|
||||
#include "objfile.h"
|
||||
#include "scanner.h"
|
||||
#include "segments.h"
|
||||
#include "tgtcfg.h"
|
||||
|
||||
|
||||
|
||||
@ -86,7 +90,7 @@ static void Usage (void)
|
||||
" -h\t\t\tHelp (this text)\n"
|
||||
" -m name\t\tCreate a map file\n"
|
||||
" -o name\t\tName the default output file\n"
|
||||
" -t type\t\tType of target system\n"
|
||||
" -t sys\t\tSet the target system\n"
|
||||
" -v\t\t\tVerbose mode\n"
|
||||
" -vm\t\t\tVerbose map file\n"
|
||||
" -C name\t\tUse linker config file\n"
|
||||
@ -97,6 +101,8 @@ static void Usage (void)
|
||||
"\n"
|
||||
"Long options:\n"
|
||||
" --help\t\tHelp (this text)\n"
|
||||
" --mapfile name\tCreate a map file\n"
|
||||
" --target sys\t\tSet the target system\n"
|
||||
" --version\t\tPrint the linker version\n",
|
||||
ProgName);
|
||||
}
|
||||
@ -207,6 +213,17 @@ static void LinkFile (const char* Name)
|
||||
|
||||
|
||||
|
||||
static void OptConfig (const char* Opt, const char* Arg)
|
||||
/* Define the config file */
|
||||
{
|
||||
if (CfgAvail ()) {
|
||||
Error ("Cannot use -C/-t twice");
|
||||
}
|
||||
CfgSetName (Arg);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void OptHelp (const char* Opt, const char* Arg)
|
||||
/* Print usage information and exit */
|
||||
{
|
||||
@ -216,6 +233,35 @@ static void OptHelp (const char* Opt, const char* Arg)
|
||||
|
||||
|
||||
|
||||
static void OptMapFile (const char* Opt, const char* Arg)
|
||||
/* Give the name of the map file */
|
||||
{
|
||||
MapFileName = Arg;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void OptTarget (const char* Opt, const char* Arg)
|
||||
/* Set the target system */
|
||||
{
|
||||
const TargetDesc* D;
|
||||
|
||||
/* Map the target name to a target id */
|
||||
Target = FindTarget (Arg);
|
||||
if (Target == TGT_UNKNOWN) {
|
||||
Error ("Invalid target name: `%s'", Arg);
|
||||
}
|
||||
|
||||
/* Get the target description record */
|
||||
D = &Targets[Target];
|
||||
|
||||
/* Set the target data */
|
||||
DefaultBinFmt = D->BinFmt;
|
||||
CfgSetBuf (D->Cfg);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void OptVersion (const char* Opt, const char* Arg)
|
||||
/* Print the assembler version */
|
||||
{
|
||||
@ -231,8 +277,11 @@ int main (int argc, char* argv [])
|
||||
{
|
||||
/* Program long options */
|
||||
static const LongOpt OptTab[] = {
|
||||
{ "--help", 0, OptHelp },
|
||||
{ "--version", 0, OptVersion },
|
||||
{ "--config", 1, OptConfig },
|
||||
{ "--help", 0, OptHelp },
|
||||
{ "--mapfile", 1, OptMapFile },
|
||||
{ "--target", 1, OptTarget },
|
||||
{ "--version", 0, OptVersion },
|
||||
};
|
||||
|
||||
int I;
|
||||
@ -255,7 +304,7 @@ int main (int argc, char* argv [])
|
||||
/* Check the parameters */
|
||||
I = 1;
|
||||
while (I < argc) {
|
||||
|
||||
|
||||
/* Get the argument */
|
||||
const char* Arg = argv [I];
|
||||
|
||||
@ -266,37 +315,34 @@ int main (int argc, char* argv [])
|
||||
switch (Arg [1]) {
|
||||
|
||||
case '-':
|
||||
LongOption (&I, OptTab, sizeof(OptTab)/sizeof(OptTab[0]));
|
||||
break;
|
||||
LongOption (&I, OptTab, sizeof(OptTab)/sizeof(OptTab[0]));
|
||||
break;
|
||||
|
||||
case 'm':
|
||||
MapFileName = GetArg (&I, 2);
|
||||
break;
|
||||
case 'm':
|
||||
OptMapFile (Arg, GetArg (&I, 2));
|
||||
break;
|
||||
|
||||
case 'o':
|
||||
OutputName = GetArg (&I, 2);
|
||||
break;
|
||||
case 'o':
|
||||
OutputName = GetArg (&I, 2);
|
||||
break;
|
||||
|
||||
case 't':
|
||||
if (CfgAvail ()) {
|
||||
Error ("Cannot use -C/-t twice");
|
||||
}
|
||||
TgtSet (GetArg (&I, 2));
|
||||
break;
|
||||
case 't':
|
||||
if (CfgAvail ()) {
|
||||
Error ("Cannot use -C/-t twice");
|
||||
}
|
||||
OptTarget (Arg, GetArg (&I, 2));
|
||||
break;
|
||||
|
||||
case 'v':
|
||||
switch (Arg [2]) {
|
||||
case 'm': VerboseMap = 1; break;
|
||||
case 'v':
|
||||
switch (Arg [2]) {
|
||||
case 'm': VerboseMap = 1; break;
|
||||
case '\0': ++Verbose; break;
|
||||
default: UnknownOption (Arg);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'C':
|
||||
if (CfgAvail ()) {
|
||||
Error ("Cannot use -C/-t twice");
|
||||
}
|
||||
CfgSetName (GetArg (&I, 2));
|
||||
OptConfig (Arg, GetArg (&I, 2));
|
||||
break;
|
||||
|
||||
case 'L':
|
||||
@ -315,9 +361,9 @@ int main (int argc, char* argv [])
|
||||
OptVersion (Arg, 0);
|
||||
break;
|
||||
|
||||
default:
|
||||
UnknownOption (Arg);
|
||||
break;
|
||||
default:
|
||||
UnknownOption (Arg);
|
||||
break;
|
||||
}
|
||||
|
||||
} else {
|
||||
@ -333,14 +379,12 @@ int main (int argc, char* argv [])
|
||||
|
||||
/* Check if we had any object files */
|
||||
if (ObjFiles == 0) {
|
||||
fprintf (stderr, "No object files to link\n");
|
||||
exit (EXIT_FAILURE);
|
||||
Error ("No object files to link");
|
||||
}
|
||||
|
||||
/* Check if we have a valid configuration */
|
||||
if (!CfgAvail ()) {
|
||||
fprintf (stderr, "Memory configuration missing\n");
|
||||
exit (EXIT_FAILURE);
|
||||
Error ("Memory configuration missing");
|
||||
}
|
||||
|
||||
/* Read the config file */
|
||||
|
||||
@ -29,7 +29,7 @@ OBJS = bin.o \
|
||||
objfile.o \
|
||||
scanner.o \
|
||||
segments.o \
|
||||
target.o
|
||||
tgtcfg.o
|
||||
|
||||
LIBS = $(COMMON)/common.a
|
||||
|
||||
|
||||
@ -85,7 +85,7 @@ OBJS = bin.obj \
|
||||
objfile.obj \
|
||||
scanner.obj \
|
||||
segments.obj \
|
||||
target.obj
|
||||
tgtcfg.obj
|
||||
|
||||
LIBS = ..\common\common.lib
|
||||
|
||||
@ -93,16 +93,16 @@ LIBS = ..\common\common.lib
|
||||
# ------------------------------------------------------------------------------
|
||||
# Main targets
|
||||
|
||||
all: ld65
|
||||
all: ld65
|
||||
|
||||
ld65: ld65.exe
|
||||
ld65: ld65.exe
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Other targets
|
||||
|
||||
|
||||
ld65.exe: $(OBJS) $(LIBS)
|
||||
ld65.exe: $(OBJS) $(LIBS)
|
||||
$(LD) system $(SYSTEM) @&&|
|
||||
DEBUG ALL
|
||||
OPTION QUIET
|
||||
@ -125,7 +125,7 @@ FILE objdata.obj
|
||||
FILE objfile.obj
|
||||
FILE scanner.obj
|
||||
FILE segments.obj
|
||||
FILE target.obj
|
||||
FILE tgtcfg.obj
|
||||
LIBRARY ..\common\common.lib
|
||||
|
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* target.c */
|
||||
/* tgtcfg.c */
|
||||
/* */
|
||||
/* Target system support for the ld65 linker */
|
||||
/* Target machine configurations the ld65 linker */
|
||||
/* */
|
||||
/* */
|
||||
/* */
|
||||
@ -32,18 +32,9 @@
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "error.h"
|
||||
#include "global.h"
|
||||
|
||||
#include "binfmt.h"
|
||||
#include "scanner.h"
|
||||
#include "config.h"
|
||||
#include "target.h"
|
||||
#include "tgtcfg.h"
|
||||
|
||||
|
||||
|
||||
@ -221,131 +212,22 @@ static const char CfgGeos [] =
|
||||
|
||||
|
||||
|
||||
/* Supported systems */
|
||||
#define TGT_NONE 0
|
||||
#define TGT_ATARI 1 /* Atari 8 bit machines */
|
||||
#define TGT_C64 2
|
||||
#define TGT_C128 3
|
||||
#define TGT_ACE 4
|
||||
#define TGT_PLUS4 5
|
||||
#define TGT_CBM610 6 /* CBM 600/700 family */
|
||||
#define TGT_PET 7 /* CBM PET family */
|
||||
#define TGT_NES 8 /* Nintendo Entertainment System */
|
||||
#define TGT_LUNIX 9
|
||||
#define TGT_OSA65 10
|
||||
#define TGT_APPLE2 11
|
||||
#define TGT_GEOS 12
|
||||
#define TGT_COUNT 13 /* Count of supported systems */
|
||||
|
||||
|
||||
|
||||
/* Structure describing a target */
|
||||
typedef struct TargetCfg_ TargetCfg;
|
||||
struct TargetCfg_ {
|
||||
const char* Name; /* Name of the system */
|
||||
unsigned char BinFmt; /* Default binary format for the target */
|
||||
const char* Cfg; /* Pointer to configuration */
|
||||
/* Target configurations for all systems */
|
||||
const TargetDesc Targets [TGT_COUNT] = {
|
||||
{ BINFMT_BINARY, CfgNone },
|
||||
{ BINFMT_BINARY, CfgAtari },
|
||||
{ BINFMT_BINARY, CfgC64 },
|
||||
{ BINFMT_BINARY, CfgC128 },
|
||||
{ BINFMT_BINARY, CfgAce },
|
||||
{ BINFMT_BINARY, CfgPlus4 },
|
||||
{ BINFMT_BINARY, CfgCBM610 },
|
||||
{ BINFMT_BINARY, CfgPET },
|
||||
{ BINFMT_BINARY, CfgNES },
|
||||
{ BINFMT_O65, CfgLunix },
|
||||
{ BINFMT_O65, CfgOSA65 },
|
||||
{ BINFMT_BINARY, CfgApple2 },
|
||||
{ BINFMT_BINARY, CfgGeos },
|
||||
};
|
||||
|
||||
static const TargetCfg Targets [TGT_COUNT] = {
|
||||
{ "none", BINFMT_BINARY, CfgNone },
|
||||
{ "atari", BINFMT_BINARY, CfgAtari },
|
||||
{ "c64", BINFMT_BINARY, CfgC64 },
|
||||
{ "c128", BINFMT_BINARY, CfgC128 },
|
||||
{ "ace", BINFMT_BINARY, CfgAce },
|
||||
{ "plus4", BINFMT_BINARY, CfgPlus4 },
|
||||
{ "cbm610", BINFMT_BINARY, CfgCBM610 },
|
||||
{ "pet", BINFMT_BINARY, CfgPET },
|
||||
{ "nes", BINFMT_BINARY, CfgNES },
|
||||
{ "lunix", BINFMT_O65, CfgLunix },
|
||||
{ "osa65", BINFMT_O65, CfgOSA65 },
|
||||
{ "apple2", BINFMT_BINARY, CfgApple2 },
|
||||
{ "geos", BINFMT_BINARY, CfgGeos },
|
||||
};
|
||||
|
||||
/* Selected target system type */
|
||||
static const TargetCfg* Target;
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
static int StrICmp (const char* S1, const char* S2)
|
||||
/* Compare two strings case insensitive */
|
||||
{
|
||||
int Diff = 0;
|
||||
while (1) {
|
||||
Diff = tolower (*S1) - tolower (*S2);
|
||||
if (Diff != 0 || *S1 == '\0') {
|
||||
return Diff;
|
||||
}
|
||||
++S1;
|
||||
++S2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int TgtMap (const char* Name)
|
||||
/* Map a target name to a system code. Return -1 in case of an error */
|
||||
{
|
||||
unsigned I;
|
||||
|
||||
/* Check for a numeric target */
|
||||
if (isdigit (*Name)) {
|
||||
int Target = atoi (Name);
|
||||
if (Target >= 0 && Target < TGT_COUNT) {
|
||||
return Target;
|
||||
}
|
||||
}
|
||||
|
||||
/* Check for a target string */
|
||||
for (I = 0; I < TGT_COUNT; ++I) {
|
||||
if (StrICmp (Targets [I].Name, Name) == 0) {
|
||||
return I;
|
||||
}
|
||||
}
|
||||
|
||||
/* Not found */
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void TgtSet (const char* T)
|
||||
/* Set the target system, initialize internal stuff for this target */
|
||||
{
|
||||
/* Map the target to a number */
|
||||
int TgtNum = TgtMap (T);
|
||||
if (TgtNum == -1) {
|
||||
Error ("Invalid target system: %s", T);
|
||||
}
|
||||
Target = &Targets [TgtNum];
|
||||
|
||||
/* Set the target data */
|
||||
DefaultBinFmt = Target->BinFmt;
|
||||
CfgSetBuf (Target->Cfg);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void TgtPrintList (FILE* F)
|
||||
/* Print a list of the available target systems */
|
||||
{
|
||||
unsigned I;
|
||||
|
||||
/* Print a header */
|
||||
fprintf (F, "Available targets:\n");
|
||||
|
||||
/* Print a list of the target systems */
|
||||
for (I = 0; I < TGT_COUNT; ++I) {
|
||||
fprintf (F, " %s\n", Targets [I].Name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* target.h */
|
||||
/* tgtcfg.h */
|
||||
/* */
|
||||
/* Target system support for the ld65 linker */
|
||||
/* Target machine configurations the ld65 linker */
|
||||
/* */
|
||||
/* */
|
||||
/* */
|
||||
@ -33,30 +33,35 @@
|
||||
|
||||
|
||||
|
||||
#ifndef TARGET_H
|
||||
#define TARGET_H
|
||||
#ifndef TGTCFG_H
|
||||
#define TGTCFG_H
|
||||
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
/* common */
|
||||
#include "target.h"
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Target configurations */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
void TgtSet (const char* T);
|
||||
/* Set the target system, initialize internal stuff for this target */
|
||||
/* Structure describing a target */
|
||||
typedef struct TargetDesc TargetDesc;
|
||||
struct TargetDesc {
|
||||
unsigned char BinFmt; /* Default binary format for the target */
|
||||
const char* Cfg; /* Pointer to configuration */
|
||||
};
|
||||
|
||||
void TgtPrintList (FILE* F);
|
||||
/* Print a list of the available target systems */
|
||||
/* Target configurations for all systems */
|
||||
extern const TargetDesc Targets [TGT_COUNT];
|
||||
|
||||
|
||||
|
||||
/* End of target.h */
|
||||
/* End of tgtcfg.h */
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user