diff --git a/src/ca65/dbginfo.c b/src/ca65/dbginfo.c index e4f50159f..d2fb2c364 100644 --- a/src/ca65/dbginfo.c +++ b/src/ca65/dbginfo.c @@ -37,7 +37,7 @@ /* common */ #include "coll.h" -#include "hldbgsym.h" +#include "hlldbgsym.h" #include "strbuf.h" /* ca65 */ @@ -63,7 +63,7 @@ static LineInfo* CurLineInfo = 0; /* List of high level language debug symbols */ -static Collection HLDbgSyms = STATIC_COLLECTION_INITIALIZER; +static Collection HLLDbgSyms = STATIC_COLLECTION_INITIALIZER; @@ -73,11 +73,11 @@ static Collection HLDbgSyms = STATIC_COLLECTION_INITIALIZER; -static HLDbgSym* NewHLDbgSym (unsigned Flags, unsigned Name, unsigned Type) -/* Allocate and return a new HLDbgSym structure */ +static HLLDbgSym* NewHLLDbgSym (unsigned Flags, unsigned Name, unsigned Type) +/* Allocate and return a new HLLDbgSym structure */ { /* Allocate memory */ - HLDbgSym* S = xmalloc (sizeof (*S)); + HLLDbgSym* S = xmalloc (sizeof (*S)); /* Initialize the fields as necessary */ S->Flags = Flags; @@ -144,7 +144,7 @@ void DbgInfoFunc (void) unsigned Type; unsigned AsmName; unsigned Flags; - HLDbgSym* S; + HLLDbgSym* S; /* Parameters are separated by a comma */ @@ -178,8 +178,8 @@ void DbgInfoFunc (void) return; } switch (GetSubKey (StorageKeys, sizeof (StorageKeys)/sizeof (StorageKeys[0]))) { - case 0: Flags = HL_TYPE_FUNC | HL_SC_EXTERN; break; - case 1: Flags = HL_TYPE_FUNC | HL_SC_STATIC; break; + case 0: Flags = HLL_TYPE_FUNC | HLL_SC_EXTERN; break; + case 1: Flags = HLL_TYPE_FUNC | HLL_SC_STATIC; break; default: ErrorSkip ("Storage class specifier expected"); return; } NextTok (); @@ -206,9 +206,9 @@ void DbgInfoFunc (void) CurrentScope->Flags |= ST_EXTFUNC; /* Add the function */ - S = NewHLDbgSym (Flags, Name, Type); + S = NewHLLDbgSym (Flags, Name, Type); S->AsmName = AsmName; - CollAppend (&HLDbgSyms, S); + CollAppend (&HLLDbgSyms, S); } @@ -279,7 +279,7 @@ void DbgInfoSym (void) unsigned AsmName = EMPTY_STRING_ID; unsigned Flags; int Offs; - HLDbgSym* S; + HLLDbgSym* S; /* Parameters are separated by a comma */ @@ -313,10 +313,10 @@ void DbgInfoSym (void) return; } switch (GetSubKey (StorageKeys, sizeof (StorageKeys)/sizeof (StorageKeys[0]))) { - case 0: Flags = HL_SC_AUTO; break; - case 1: Flags = HL_SC_EXTERN; break; - case 2: Flags = HL_SC_REG; break; - case 3: Flags = HL_SC_STATIC; break; + case 0: Flags = HLL_SC_AUTO; break; + case 1: Flags = HLL_SC_EXTERN; break; + case 2: Flags = HLL_SC_REG; break; + case 3: Flags = HLL_SC_STATIC; break; default: ErrorSkip ("Storage class specifier expected"); return; } @@ -325,7 +325,7 @@ void DbgInfoSym (void) ConsumeComma (); /* The next tokens depend on the storage class */ - if (Flags == HL_SC_AUTO) { + if (Flags == HLL_SC_AUTO) { /* Auto: Stack offset follows */ Offs = ConstExpression (); } else { @@ -338,22 +338,22 @@ void DbgInfoSym (void) NextTok (); /* For register, an offset follows */ - if (Flags == HL_SC_REG) { + if (Flags == HLL_SC_REG) { ConsumeComma (); Offs = ConstExpression (); } } /* Add the function */ - S = NewHLDbgSym (Flags | HL_TYPE_SYM, Name, Type); + S = NewHLLDbgSym (Flags | HLL_TYPE_SYM, Name, Type); S->AsmName = AsmName; S->Offs = Offs; - CollAppend (&HLDbgSyms, S); + CollAppend (&HLLDbgSyms, S); } -void WriteHLDbgSyms (void) +void WriteHLLDbgSyms (void) /* Write a list of all high level language symbols to the object file. */ { unsigned I; @@ -362,13 +362,13 @@ void WriteHLDbgSyms (void) if (DbgSyms) { /* Write the symbol count to the list */ - ObjWriteVar (CollCount (&HLDbgSyms)); + ObjWriteVar (CollCount (&HLLDbgSyms)); /* Walk through list and write all symbols to the file. */ - for (I = 0; I < CollCount (&HLDbgSyms); ++I) { + for (I = 0; I < CollCount (&HLLDbgSyms); ++I) { /* Get the next symbol */ - const HLDbgSym* S = CollAtUnchecked (&HLDbgSyms, I); + const HLLDbgSym* S = CollAtUnchecked (&HLLDbgSyms, I); /* Write the symbol data */ ObjWriteVar (S->Flags); diff --git a/src/ca65/dbginfo.h b/src/ca65/dbginfo.h index 5604067b2..f8da71461 100644 --- a/src/ca65/dbginfo.h +++ b/src/ca65/dbginfo.h @@ -56,7 +56,7 @@ void DbgInfoLine (void); void DbgInfoSym (void); /* Parse and handle SYM subcommand of the .dbg pseudo instruction */ -void WriteHLDbgSyms (void); +void WriteHLLDbgSyms (void); /* Write a list of all high level language symbols to the object file. */ diff --git a/src/ca65/symtab.c b/src/ca65/symtab.c index acb1ed3bb..a6d1cbfdd 100644 --- a/src/ca65/symtab.c +++ b/src/ca65/symtab.c @@ -911,7 +911,7 @@ void WriteDbgSyms (void) } /* Write the high level symbols */ - WriteHLDbgSyms (); + WriteHLLDbgSyms (); /* Done writing debug symbols */ ObjEndDbgSyms (); diff --git a/src/common/hldbgsym.h b/src/common/hlldbgsym.h similarity index 79% rename from src/common/hldbgsym.h rename to src/common/hlldbgsym.h index 68f328f4f..879c05c65 100644 --- a/src/common/hldbgsym.h +++ b/src/common/hlldbgsym.h @@ -1,6 +1,6 @@ /*****************************************************************************/ /* */ -/* hldbgsym.h */ +/* hlldbgsym.h */ /* */ /* Definitions for high level language debug symbols */ /* */ @@ -41,8 +41,8 @@ -#ifndef HLDBGSYM_H -#define HLDBGSYM_H +#ifndef HLLDBGSYM_H +#define HLLDBGSYM_H @@ -53,24 +53,24 @@ /* Flag bits that tell something about the symbol */ -#define HL_TYPE_FUNC 0x0000U /* Function */ -#define HL_TYPE_SYM 0x0001U /* Symbol */ -#define HL_TYPE_MASK 0x0007U -#define HL_GET_TYPE(x) ((x) & HL_TYPE_MASK) -#define HL_IS_FUNC(x) (HL_GET_TYPE(x) == HL_TYPE_FUNC) -#define HL_IS_SYM(x) (HL_GET_TYPE(x) == HL_TYPE_SYM) +#define HLL_TYPE_FUNC 0x0000U /* Function */ +#define HLL_TYPE_SYM 0x0001U /* Symbol */ +#define HLL_TYPE_MASK 0x0007U +#define HLL_GET_TYPE(x) ((x) & HL_TYPE_MASK) +#define HLL_IS_FUNC(x) (HL_GET_TYPE(x) == HL_TYPE_FUNC) +#define HLL_IS_SYM(x) (HL_GET_TYPE(x) == HL_TYPE_SYM) /* Storage class */ -#define HL_SC_AUTO 0x0000U /* On stack */ -#define HL_SC_REG 0x0008U /* Register */ -#define HL_SC_STATIC 0x0010U /* Static linkage */ -#define HL_SC_EXTERN 0x0018U /* External linkage */ -#define HL_SC_MASK 0x0078U -#define HL_GET_SC(x) ((x) & HL_SC_MASK) +#define HLL_SC_AUTO 0x0000U /* On stack */ +#define HLL_SC_REG 0x0008U /* Register */ +#define HLL_SC_STATIC 0x0010U /* Static linkage */ +#define HLL_SC_EXTERN 0x0018U /* External linkage */ +#define HLL_SC_MASK 0x0078U +#define HLL_GET_SC(x) ((x) & HL_SC_MASK) -/* Structure used for a high level function or symbol */ -typedef struct HLDbgSym HLDbgSym; -struct HLDbgSym { +/* Structure used for a high level language function or symbol */ +typedef struct HLLDbgSym HLLDbgSym; +struct HLLDbgSym { unsigned Flags; /* See above */ unsigned Name; /* String id of name */ unsigned AsmName; /* String id of assembler name */ @@ -81,7 +81,7 @@ struct HLDbgSym { -/* End of hldbgsyms.h */ +/* End of hlldbgsyms.h */ #endif