run indent on header files (whitespace changes)

Merging lai's source with this one is very irritating because
they have different indentation styles. I couldn't find what profile
vegard used for his version, so I used these flags (which should bring
the source close to KNF):
-bap
-br
-ce
-ci4
-cli0
-d0
-di0
-i8
-ip
-l79
-nbc
-ncdb
-ndj
-ei
-nfc1
-nlp
-npcs
-psl
-sc
-sob
This commit is contained in:
anthony
2009-12-30 12:59:36 -07:00
parent a014537837
commit d8070a10eb
10 changed files with 93 additions and 73 deletions

View File

@@ -33,4 +33,4 @@ extern UBYTE oDontExpandStrings;
#define MAXMACROARGS 9
#define MAXINCPATHS 16
#endif // ASM_H
#endif /* // ASM_H */

View File

@@ -105,7 +105,6 @@ enum {
REG_HL_IND,
REG_A
};
/* "rr" defs */
enum {
@@ -114,7 +113,6 @@ enum {
REG_HL_INDINC,
REG_HL_INDDEC,
};
/* "ss" defs */
enum {
@@ -123,7 +121,6 @@ enum {
REG_HL,
REG_SP
};
/* "tt" defs */
/*

View File

@@ -28,7 +28,6 @@ enum eLexerState {
LEX_STATE_NORMAL,
LEX_STATE_MACROARGS
};
#define INITIAL 0
#define macroarg 3

View File

@@ -5,7 +5,8 @@ struct sOptions {
ULONG endian;
char gbgfx[4];
char binary[2];
SLONG fillchar; // -1 == random
SLONG fillchar;
//-1 == random
};
extern char *tzNewMacro;

View File

@@ -115,5 +115,4 @@ enum {
PATCH_WORD_B,
PATCH_LONG_B
};
#endif

View File

@@ -15,48 +15,67 @@ ULONG rpn_isPCRelative(struct Expression *expr);
void rpn_Symbol(struct Expression * expr, char *tzSym);
void rpn_Number(struct Expression * expr, ULONG i);
void rpn_LOGNOT(struct Expression * expr, struct Expression * src1);
void rpn_LOGOR(struct Expression *expr, struct Expression *src1,
void
rpn_LOGOR(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_LOGAND(struct Expression *expr, struct Expression *src1,
void
rpn_LOGAND(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_LOGEQU(struct Expression *expr, struct Expression *src1,
void
rpn_LOGEQU(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_LOGGT(struct Expression *expr, struct Expression *src1,
void
rpn_LOGGT(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_LOGLT(struct Expression *expr, struct Expression *src1,
void
rpn_LOGLT(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_LOGGE(struct Expression *expr, struct Expression *src1,
void
rpn_LOGGE(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_LOGLE(struct Expression *expr, struct Expression *src1,
void
rpn_LOGLE(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_LOGNE(struct Expression *expr, struct Expression *src1,
void
rpn_LOGNE(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_ADD(struct Expression *expr, struct Expression *src1,
void
rpn_ADD(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_SUB(struct Expression *expr, struct Expression *src1,
void
rpn_SUB(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_XOR(struct Expression *expr, struct Expression *src1,
void
rpn_XOR(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_OR(struct Expression *expr, struct Expression *src1,
void
rpn_OR(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_AND(struct Expression *expr, struct Expression *src1,
void
rpn_AND(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_SHL(struct Expression *expr, struct Expression *src1,
void
rpn_SHL(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_SHR(struct Expression *expr, struct Expression *src1,
void
rpn_SHR(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_MUL(struct Expression *expr, struct Expression *src1,
void
rpn_MUL(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_DIV(struct Expression *expr, struct Expression *src1,
void
rpn_DIV(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_MOD(struct Expression *expr, struct Expression *src1,
void
rpn_MOD(struct Expression * expr, struct Expression * src1,
struct Expression * src2);
void rpn_UNNEG(struct Expression * expr, struct Expression * src);
void rpn_UNNOT(struct Expression * expr, struct Expression * src);
UWORD rpn_PopByte(struct Expression * expr);
void rpn_Bank(struct Expression * expr, char *tzSym);
void rpn_Reset(struct Expression * expr);
int rpn_RangeCheck(struct Expression *expr, struct Expression *src, SLONG low,
int
rpn_RangeCheck(struct Expression * expr, struct Expression * src, SLONG low,
SLONG high);
#ifdef GAMEBOY
void rpn_CheckHRAM(struct Expression * expr, struct Expression * src1);

View File

@@ -17,17 +17,23 @@ struct sSymbol {
char *pMacro;
SLONG(*Callback) (struct sSymbol *);
};
#define SYMF_RELOC 0x001 /* symbol will be reloc'ed during linking, it's absolute value is unknown */
#define SYMF_EQU 0x002 /* symbol is defined using EQU, will not be changed during linking */
#define SYMF_SET 0x004 /* symbol is (re)defined using SET, will not be changed during linking */
#define SYMF_RELOC 0x001 /* symbol will be reloc'ed during
* linking, it's absolute value is
* unknown */
#define SYMF_EQU 0x002 /* symbol is defined using EQU, will
* not be changed during linking */
#define SYMF_SET 0x004 /* symbol is (re)defined using SET,
* will not be changed during linking */
#define SYMF_EXPORT 0x008 /* symbol should be exported */
#define SYMF_IMPORT 0x010 /* symbol is imported, it's value is unknown */
#define SYMF_IMPORT 0x010 /* symbol is imported, it's value is
* unknown */
#define SYMF_LOCAL 0x020 /* symbol is a local symbol */
#define SYMF_DEFINED 0x040 /* symbol has been defined, not only referenced */
#define SYMF_DEFINED 0x040 /* symbol has been defined, not only
* referenced */
#define SYMF_MACRO 0x080 /* symbol is a macro */
#define SYMF_STRING 0x100 /* symbol is a stringsymbol */
#define SYMF_CONST 0x200 /* symbol has a constant value, will not be changed during linking */
#define SYMF_CONST 0x200 /* symbol has a constant value, will
* not be changed during linking */
void sym_PrepPass1(void);
void sym_PrepPass2(void);

View File

@@ -9,7 +9,6 @@ enum eBankDefine {
BANK_VRAM,
BANK_HRAM
};
#define MAXBANKS 259
extern SLONG area_Avail(SLONG bank);