Removed (pretty inconsistently used) tab chars from source code base.
This commit is contained in:
@@ -54,7 +54,7 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
@@ -459,7 +459,7 @@ void Convert (const O65Data* D)
|
||||
|
||||
/* Select the CPU */
|
||||
if ((D->Header.mode & O65_CPU_MASK) == O65_CPU_65816) {
|
||||
fprintf (F, ".p816\n");
|
||||
fprintf (F, ".p816\n");
|
||||
}
|
||||
|
||||
/* Object file options */
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Data */
|
||||
/* Data */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ struct O65Data;
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* error.c */
|
||||
/* error.c */
|
||||
/* */
|
||||
/* Error handling for the co65 object file converter */
|
||||
/* */
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* error.h */
|
||||
/* error.h */
|
||||
/* */
|
||||
/* Error handling for the co65 object file converter */
|
||||
/* */
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* fileio.c */
|
||||
/* fileio.c */
|
||||
/* */
|
||||
/* Binary file I/O for the co65 object file converter */
|
||||
/* */
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ unsigned Read8 (FILE* F)
|
||||
{
|
||||
int C = getc (F);
|
||||
if (C == EOF) {
|
||||
Error ("Read error (file corrupt?)");
|
||||
Error ("Read error (file corrupt?)");
|
||||
}
|
||||
return C;
|
||||
}
|
||||
@@ -97,9 +97,9 @@ void* ReadData (FILE* F, void* Data, unsigned Size)
|
||||
{
|
||||
/* Explicitly allow reading zero bytes */
|
||||
if (Size > 0) {
|
||||
if (fread (Data, 1, Size, F) != Size) {
|
||||
Error ("Read error (file corrupt?)");
|
||||
}
|
||||
if (fread (Data, 1, Size, F) != Size) {
|
||||
Error ("Read error (file corrupt?)");
|
||||
}
|
||||
}
|
||||
return Data;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* fileio.h */
|
||||
/* fileio.h */
|
||||
/* */
|
||||
/* Binary file I/O for the co65 object file converter */
|
||||
/* */
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* global.c */
|
||||
/* global.c */
|
||||
/* */
|
||||
/* Global variables for the co65 object file converter */
|
||||
/* */
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Data */
|
||||
/* Data */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* global.h */
|
||||
/* global.h */
|
||||
/* */
|
||||
/* Global variables for the co65 object file converter */
|
||||
/* */
|
||||
@@ -39,17 +39,17 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Data */
|
||||
/* Data */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
/* File names */
|
||||
extern const char* InputName; /* Name of input file */
|
||||
extern const char* OutputName; /* Name of output file */
|
||||
extern const char* InputName; /* Name of input file */
|
||||
extern const char* OutputName; /* Name of output file */
|
||||
|
||||
/* Default extensions */
|
||||
extern const char AsmExt[]; /* Default assembler extension */
|
||||
extern const char AsmExt[]; /* Default assembler extension */
|
||||
|
||||
/* Segment names */
|
||||
extern const char* CodeSeg; /* Name of the code segment */
|
||||
|
||||
122
src/co65/main.c
122
src/co65/main.c
@@ -1,6 +1,6 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* main.c */
|
||||
/* main.c */
|
||||
/* */
|
||||
/* Main program for the co65 object file converter */
|
||||
/* */
|
||||
@@ -60,7 +60,7 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
@@ -123,7 +123,7 @@ static void CheckSegName (const char* Seg)
|
||||
{
|
||||
/* Print an error and abort if the name is not ok */
|
||||
if (!ValidSegName (Seg)) {
|
||||
Error ("Segment name `%s' is invalid", Seg);
|
||||
Error ("Segment name `%s' is invalid", Seg);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -202,7 +202,7 @@ static void OptDataName (const char* Opt attribute ((unused)), const char* Arg)
|
||||
|
||||
|
||||
static void OptDebug (const char* Opt attribute ((unused)),
|
||||
const char* Arg attribute ((unused)))
|
||||
const char* Arg attribute ((unused)))
|
||||
/* Enable debugging code */
|
||||
{
|
||||
++Debug;
|
||||
@@ -211,7 +211,7 @@ static void OptDebug (const char* Opt attribute ((unused)),
|
||||
|
||||
|
||||
static void OptDebugInfo (const char* Opt attribute ((unused)),
|
||||
const char* Arg attribute ((unused)))
|
||||
const char* Arg attribute ((unused)))
|
||||
/* Add debug info to the object file */
|
||||
{
|
||||
DebugInfo = 1;
|
||||
@@ -220,7 +220,7 @@ static void OptDebugInfo (const char* Opt attribute ((unused)),
|
||||
|
||||
|
||||
static void OptHelp (const char* Opt attribute ((unused)),
|
||||
const char* Arg attribute ((unused)))
|
||||
const char* Arg attribute ((unused)))
|
||||
/* Print usage information and exit */
|
||||
{
|
||||
Usage ();
|
||||
@@ -230,7 +230,7 @@ static void OptHelp (const char* Opt attribute ((unused)),
|
||||
|
||||
|
||||
static void OptNoOutput (const char* Opt attribute ((unused)),
|
||||
const char* Arg attribute ((unused)))
|
||||
const char* Arg attribute ((unused)))
|
||||
/* Handle the --no-output option */
|
||||
{
|
||||
NoOutput = 1;
|
||||
@@ -251,7 +251,7 @@ static void OptO65Model (const char* Opt attribute ((unused)), const char* Arg)
|
||||
|
||||
|
||||
static void OptVerbose (const char* Opt attribute ((unused)),
|
||||
const char* Arg attribute ((unused)))
|
||||
const char* Arg attribute ((unused)))
|
||||
/* Increase verbosity */
|
||||
{
|
||||
++Verbosity;
|
||||
@@ -260,7 +260,7 @@ static void OptVerbose (const char* Opt attribute ((unused)),
|
||||
|
||||
|
||||
static void OptVersion (const char* Opt attribute ((unused)),
|
||||
const char* Arg attribute ((unused)))
|
||||
const char* Arg attribute ((unused)))
|
||||
/* Print the assembler version */
|
||||
{
|
||||
fprintf (stderr, "co65 V%s\n", GetVersionAsString ());
|
||||
@@ -313,21 +313,21 @@ int main (int argc, char* argv [])
|
||||
{
|
||||
/* Program long options */
|
||||
static const LongOpt OptTab[] = {
|
||||
{ "--bss-label", 1, OptBssLabel },
|
||||
{ "--bss-name", 1, OptBssName },
|
||||
{ "--code-label", 1, OptCodeLabel },
|
||||
{ "--code-name", 1, OptCodeName },
|
||||
{ "--data-label", 1, OptDataLabel },
|
||||
{ "--data-name", 1, OptDataName },
|
||||
{ "--debug", 0, OptDebug },
|
||||
{ "--debug-info", 0, OptDebugInfo },
|
||||
{ "--help", 0, OptHelp },
|
||||
{ "--no-output", 0, OptNoOutput },
|
||||
{ "--bss-label", 1, OptBssLabel },
|
||||
{ "--bss-name", 1, OptBssName },
|
||||
{ "--code-label", 1, OptCodeLabel },
|
||||
{ "--code-name", 1, OptCodeName },
|
||||
{ "--data-label", 1, OptDataLabel },
|
||||
{ "--data-name", 1, OptDataName },
|
||||
{ "--debug", 0, OptDebug },
|
||||
{ "--debug-info", 0, OptDebugInfo },
|
||||
{ "--help", 0, OptHelp },
|
||||
{ "--no-output", 0, OptNoOutput },
|
||||
{ "--o65-model", 1, OptO65Model },
|
||||
{ "--verbose", 0, OptVerbose },
|
||||
{ "--version", 0, OptVersion },
|
||||
{ "--zeropage-label", 1, OptZeropageLabel },
|
||||
{ "--zeropage-name", 1, OptZeropageName },
|
||||
{ "--verbose", 0, OptVerbose },
|
||||
{ "--version", 0, OptVersion },
|
||||
{ "--zeropage-label", 1, OptZeropageLabel },
|
||||
{ "--zeropage-name", 1, OptZeropageName },
|
||||
};
|
||||
|
||||
unsigned I;
|
||||
@@ -339,24 +339,24 @@ int main (int argc, char* argv [])
|
||||
I = 1;
|
||||
while (I < ArgCount) {
|
||||
|
||||
/* Get the argument */
|
||||
const char* Arg = ArgVec [I];
|
||||
/* Get the argument */
|
||||
const char* Arg = ArgVec [I];
|
||||
|
||||
/* Check for an option */
|
||||
if (Arg [0] == '-') {
|
||||
switch (Arg [1]) {
|
||||
/* Check for an option */
|
||||
if (Arg [0] == '-') {
|
||||
switch (Arg [1]) {
|
||||
|
||||
case '-':
|
||||
LongOption (&I, OptTab, sizeof(OptTab)/sizeof(OptTab[0]));
|
||||
break;
|
||||
case '-':
|
||||
LongOption (&I, OptTab, sizeof(OptTab)/sizeof(OptTab[0]));
|
||||
break;
|
||||
|
||||
case 'g':
|
||||
OptDebugInfo (Arg, 0);
|
||||
break;
|
||||
case 'g':
|
||||
OptDebugInfo (Arg, 0);
|
||||
break;
|
||||
|
||||
case 'h':
|
||||
OptHelp (Arg, 0);
|
||||
break;
|
||||
case 'h':
|
||||
OptHelp (Arg, 0);
|
||||
break;
|
||||
|
||||
case 'm':
|
||||
OptO65Model (Arg, GetArg (&I, 2));
|
||||
@@ -366,39 +366,39 @@ int main (int argc, char* argv [])
|
||||
OptNoOutput (Arg, 0);
|
||||
break;
|
||||
|
||||
case 'o':
|
||||
OutputName = GetArg (&I, 2);
|
||||
break;
|
||||
case 'o':
|
||||
OutputName = GetArg (&I, 2);
|
||||
break;
|
||||
|
||||
case 'v':
|
||||
OptVerbose (Arg, 0);
|
||||
break;
|
||||
case 'v':
|
||||
OptVerbose (Arg, 0);
|
||||
break;
|
||||
|
||||
case 'V':
|
||||
OptVersion (Arg, 0);
|
||||
break;
|
||||
case 'V':
|
||||
OptVersion (Arg, 0);
|
||||
break;
|
||||
|
||||
default:
|
||||
UnknownOption (Arg);
|
||||
break;
|
||||
default:
|
||||
UnknownOption (Arg);
|
||||
break;
|
||||
|
||||
}
|
||||
} else {
|
||||
/* Filename. Check if we already had one */
|
||||
if (InputName) {
|
||||
Error ("Don't know what to do with `%s'", Arg);
|
||||
} else {
|
||||
InputName = Arg;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* Filename. Check if we already had one */
|
||||
if (InputName) {
|
||||
Error ("Don't know what to do with `%s'", Arg);
|
||||
} else {
|
||||
InputName = Arg;
|
||||
}
|
||||
}
|
||||
|
||||
/* Next argument */
|
||||
++I;
|
||||
/* Next argument */
|
||||
++I;
|
||||
}
|
||||
|
||||
/* Do we have an input file? */
|
||||
if (InputName == 0) {
|
||||
Error ("No input file");
|
||||
Error ("No input file");
|
||||
}
|
||||
|
||||
/* Generate the name of the output file if none was specified */
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Data */
|
||||
/* Data */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ static const char* NameTable[O65_MODEL_COUNT] = {
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Data */
|
||||
/* Data */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ extern O65Model Model;
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* o65.h */
|
||||
/* o65.h */
|
||||
/* */
|
||||
/* Definitions and code for the o65 file format */
|
||||
/* */
|
||||
@@ -76,7 +76,7 @@ static O65Data* NewO65Data (void)
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*****************************************************************************/
|
||||
/* */
|
||||
/* o65.h */
|
||||
/* o65.h */
|
||||
/* */
|
||||
/* Definitions and code for the o65 file format */
|
||||
/* */
|
||||
@@ -64,7 +64,7 @@ typedef struct O65Header O65Header;
|
||||
struct O65Header {
|
||||
char marker[2]; /* Non-C64 marker */
|
||||
char magic[3]; /* o65 magic */
|
||||
char version; /* Version number */
|
||||
char version; /* Version number */
|
||||
unsigned mode; /* Mode word */
|
||||
unsigned long tbase; /* Original text (code) segment address */
|
||||
unsigned long tlen; /* Size of text (code) segment */
|
||||
@@ -133,7 +133,7 @@ struct O65Data {
|
||||
#define O65_VERSION 0x00
|
||||
|
||||
/* Defines for the mode word */
|
||||
#define O65_CPU_65816 0x8000 /* Executable is for 65816 */
|
||||
#define O65_CPU_65816 0x8000 /* Executable is for 65816 */
|
||||
#define O65_CPU_6502 0x0000 /* Executable is for the 6502 */
|
||||
#define O65_CPU_MASK 0x8000 /* Mask to extract CPU type */
|
||||
|
||||
@@ -141,7 +141,7 @@ struct O65Data {
|
||||
#define O65_RELOC_BYTE 0x0000 /* Byte wise relocation */
|
||||
#define O65_RELOC_MASK 0x4000 /* Mask to extract relocation type */
|
||||
|
||||
#define O65_SIZE_32BIT 0x2000 /* All size words are 32bit */
|
||||
#define O65_SIZE_32BIT 0x2000 /* All size words are 32bit */
|
||||
#define O65_SIZE_16BIT 0x0000 /* All size words are 16bit */
|
||||
#define O65_SIZE_MASK 0x2000 /* Mask to extract size */
|
||||
|
||||
@@ -168,9 +168,9 @@ struct O65Data {
|
||||
O65_ALIGN_1)
|
||||
|
||||
/* The four o65 segment types. */
|
||||
#define O65_SEGID_UNDEF 0x00
|
||||
#define O65_SEGID_UNDEF 0x00
|
||||
#define O65_SEGID_ABS 0x01
|
||||
#define O65_SEGID_TEXT 0x02
|
||||
#define O65_SEGID_TEXT 0x02
|
||||
#define O65_SEGID_DATA 0x03
|
||||
#define O65_SEGID_BSS 0x04
|
||||
#define O65_SEGID_ZP 0x05
|
||||
@@ -195,20 +195,20 @@ struct O65Data {
|
||||
|
||||
/* Option tags */
|
||||
#define O65_OPT_FILENAME 0
|
||||
#define O65_OPT_OS 1
|
||||
#define O65_OPT_ASM 2
|
||||
#define O65_OPT_AUTHOR 3
|
||||
#define O65_OPT_TIMESTAMP 4
|
||||
#define O65_OPT_OS 1
|
||||
#define O65_OPT_ASM 2
|
||||
#define O65_OPT_AUTHOR 3
|
||||
#define O65_OPT_TIMESTAMP 4
|
||||
|
||||
/* Operating system codes for O65_OPT_OS */
|
||||
#define O65_OS_OSA65 1
|
||||
#define O65_OS_LUNIX 2
|
||||
#define O65_OS_OSA65 1
|
||||
#define O65_OS_LUNIX 2
|
||||
#define O65_OS_CC65_MODULE 3
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user