Skip to content

Commit

Permalink
Remove 'inline' from functions not in headers
Browse files Browse the repository at this point in the history
  • Loading branch information
Rangi42 committed Apr 13, 2021
1 parent 25a8518 commit c08cf78
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 26 deletions.
6 changes: 3 additions & 3 deletions src/asm/charmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ struct CharmapStackEntry {

struct CharmapStackEntry *charmapStack;

static inline struct Charmap *charmap_Get(const char *name)
static struct Charmap *charmap_Get(const char *name)
{
return hash_GetElement(charmaps, name);
}

static inline struct Charmap *resizeCharmap(struct Charmap *map, size_t capacity)
static struct Charmap *resizeCharmap(struct Charmap *map, size_t capacity)
{
struct Charmap *new = realloc(map, sizeof(*map) + sizeof(*map->nodes) * capacity);

Expand All @@ -69,7 +69,7 @@ static inline struct Charmap *resizeCharmap(struct Charmap *map, size_t capacity
return new;
}

static inline void initNode(struct Charnode *node)
static void initNode(struct Charnode *node)
{
node->isTerminal = false;
memset(node->next, 0, sizeof(node->next));
Expand Down
2 changes: 1 addition & 1 deletion src/asm/lexer.c
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ struct KeywordDictNode {
} keywordDict[351] = {0}; /* Make sure to keep this correct when adding keywords! */

/* Convert a char into its index into the dict */
static inline uint8_t dictIndex(char c)
static uint8_t dictIndex(char c)
{
/* Translate uppercase to lowercase (roughly) */
if (c > 0x60)
Expand Down
4 changes: 2 additions & 2 deletions src/asm/parser.y
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ static void freeDsArgList(struct DsArgList *args)
free(args->args);
}

static inline void failAssert(enum AssertionType type)
static void failAssert(enum AssertionType type)
{
switch (type) {
case ASSERT_FATAL:
Expand All @@ -349,7 +349,7 @@ static inline void failAssert(enum AssertionType type)
}
}

static inline void failAssertMsg(enum AssertionType type, char const *msg)
static void failAssertMsg(enum AssertionType type, char const *msg)
{
switch (type) {
case ASSERT_FATAL:
Expand Down
19 changes: 9 additions & 10 deletions src/asm/section.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct UnionStackEntry {
/*
* A quick check to see if we have an initialized section
*/
static inline void checksection(void)
static void checksection(void)
{
if (pCurrentSection == NULL)
fatalerror("Code generation before SECTION directive\n");
Expand All @@ -51,7 +51,7 @@ static inline void checksection(void)
* A quick check to see if we have an initialized section that can contain
* this much initialized data
*/
static inline void checkcodesection(void)
static void checkcodesection(void)
{
checksection();

Expand All @@ -60,7 +60,7 @@ static inline void checkcodesection(void)
pCurrentSection->name);
}

static inline void checkSectionSize(struct Section const *sect, uint32_t size)
static void checkSectionSize(struct Section const *sect, uint32_t size)
{
uint32_t maxSize = maxsize[sect->type];

Expand All @@ -72,7 +72,7 @@ static inline void checkSectionSize(struct Section const *sect, uint32_t size)
/*
* Check if the section has grown too much.
*/
static inline void reserveSpace(uint32_t delta_size)
static void reserveSpace(uint32_t delta_size)
{
/*
* This check is here to trap broken code that generates sections that
Expand Down Expand Up @@ -474,7 +474,7 @@ void sect_AlignPC(uint8_t alignment, uint16_t offset)
}
}

static inline void growSection(uint32_t growth)
static void growSection(uint32_t growth)
{
curOffset += growth;
if (curOffset + loadOffset > pCurrentSection->size)
Expand All @@ -483,28 +483,27 @@ static inline void growSection(uint32_t growth)
currentLoadSection->size = curOffset;
}

static inline void writebyte(uint8_t byte)
static void writebyte(uint8_t byte)
{
pCurrentSection->data[sect_GetOutputOffset()] = byte;
growSection(1);
}

static inline void writeword(uint16_t b)
static void writeword(uint16_t b)
{
writebyte(b & 0xFF);
writebyte(b >> 8);
}

static inline void writelong(uint32_t b)
static void writelong(uint32_t b)
{
writebyte(b & 0xFF);
writebyte(b >> 8);
writebyte(b >> 16);
writebyte(b >> 24);
}

static inline void createPatch(enum PatchType type, struct Expression const *expr,
uint32_t pcShift)
static void createPatch(enum PatchType type, struct Expression const *expr, uint32_t pcShift)
{
out_CreatePatch(type, expr, sect_GetOutputOffset(), pcShift);
}
Expand Down
4 changes: 2 additions & 2 deletions src/asm/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ struct Symbol const *sym_GetPC(void)
return PCSymbol;
}

static inline bool isReferenced(struct Symbol const *sym)
static bool isReferenced(struct Symbol const *sym)
{
return sym->ID != (uint32_t)-1;
}
Expand Down Expand Up @@ -680,7 +680,7 @@ void sym_SetExportAll(bool set)
exportall = set;
}

static inline struct Symbol *createBuiltinSymbol(char const *name)
static struct Symbol *createBuiltinSymbol(char const *name)
{
struct Symbol *sym = createsymbol(name);

Expand Down
3 changes: 1 addition & 2 deletions src/link/assign.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ static void processLinkerScript(void)
* @param section The section to assign
* @param location The location to assign the section to
*/
static inline void assignSection(struct Section *section,
struct MemoryLocation const *location)
static void assignSection(struct Section *section, struct MemoryLocation const *location)
{
section->org = location->address;
section->bank = location->bank;
Expand Down
2 changes: 1 addition & 1 deletion src/link/object.c
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ static void readAssertion(FILE *file, struct Assertion *assert,
fileName);
}

static inline struct Section *getMainSection(struct Section *section)
static struct Section *getMainSection(struct Section *section)
{
if (section->modifier != SECTION_NORMAL)
section = sect_GetSection(section->name);
Expand Down
6 changes: 3 additions & 3 deletions src/link/patch.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct RPNStack {
size_t capacity;
} stack;

static inline void initRPNStack(void)
static void initRPNStack(void)
{
stack.capacity = 64;
stack.values = malloc(sizeof(*stack.values) * stack.capacity);
Expand All @@ -46,7 +46,7 @@ static inline void initRPNStack(void)
err(1, "Failed to init RPN stack");
}

static inline void clearRPNStack(void)
static void clearRPNStack(void)
{
stack.size = 0;
}
Expand Down Expand Up @@ -92,7 +92,7 @@ static int32_t popRPN(struct FileStackNode const *node, uint32_t lineNo)
return stack.values[stack.size];
}

static inline void freeRPNStack(void)
static void freeRPNStack(void)
{
free(stack.values);
free(stack.errorFlags);
Expand Down
4 changes: 2 additions & 2 deletions src/link/script.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ static bool popFile(void)
return true;
}

static inline bool isWhiteSpace(int c)
static bool isWhiteSpace(int c)
{
return c == ' ' || c == '\t';
}

static inline bool isNewline(int c)
static bool isNewline(int c)
{
return c == '\r' || c == '\n';
}
Expand Down

0 comments on commit c08cf78

Please sign in to comment.