mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-04-12 18:40:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

macros: Define ofmt specific macros late

Browse Source 
In commits e1f985c1674951 and f7606613d047ff
we reordered macros handling, but ofmt specific
macros are to be handled after standart ones
are processed.

In particular __SECT__ handling must not change,
so the order of inclusion does matter.

https://bugzilla.nasm.us/show_bug.cgi?id=3392376

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2017-01-06 20:21:28 +03:00
parent c7b0fe6bbe
commit 15ce78fc5b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
asm/preproc.c
View File

@ -444,6 +444,7 @@ static uint64_t nested_rep_count;
static macros_t *stdmacpos;
static macros_t **stdmacnext;
static macros_t *stdmacros[8];
static macros_t *extrastdmac;
/*
* Tokens are allocated in blocks to improve speed
@ -4969,6 +4970,9 @@ pp_reset(char *file, int apass, StrList **deplist)
pp_add_stdmac(nasm_stdmac_nasm);
pp_add_stdmac(nasm_stdmac_version);
if (extrastdmac)
pp_add_stdmac(extrastdmac);
stdmacpos = stdmacros[0];
stdmacnext = &stdmacros[1];
@ -5362,6 +5366,11 @@ static void pp_add_stdmac(macros_t *macros)
*mp = macros;
}
static void pp_extra_stdmac(macros_t *macros)
{
extrastdmac = macros;
}
static void make_tok_num(Token * tok, int64_t val)
{
char numbuf[32];
@ -5403,7 +5412,7 @@ const struct preproc_ops nasmpp = {
pp_reset,
pp_getline,
pp_cleanup,
pp_add_stdmac,
pp_extra_stdmac,
pp_pre_define,
pp_pre_undefine,
pp_pre_include,