Skip to content

Enable recursive mmacro support #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
magicelk235 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Enable recursive mmacro support #230

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c04ed7
asm/preproc.c: fix %clear infinite loop and enable recursive macro su…
magicelk235 May 8, 2026
b4597d2
Merge branch 'master' into fix/preproc-clear-and-rmacro
magicelk235 Jun 5, 2026
8cb2a10
Merge branch 'master' into fix/preproc-clear-and-rmacro
magicelk235 Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 78 additions & 57 deletions asm/preproc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,7 @@ struct mstk {

struct MMacro {
MMacro *next;
#if 0
MMacroInvocation *prev; /* previous invocation */
#endif
struct MMacroInvocation *prev; /* previous invocation */
size_t refcnt; /* references to this macro */
#if DEBUG_MMACRO_REFCOUNTS
struct {
Expand Down Expand Up @@ -327,20 +325,18 @@ struct MMacro {
/* Store the definition of a multi-line macro, as defined in a
* previous recursive macro expansion.
*/
#if 0

struct MMacroInvocation {
MMacroInvocation *prev; /* previous invocation */
struct MMacroInvocation *prev; /* previous invocation */
Token **params; /* actual parameters */
Token *iline; /* invocation line */
char *iname; /* invocation name */
struct mstk mstk; /* saved mstk for proper exit */
unsigned int nparam, rotate;
int *paramlen;
uint64_t unique;
uint64_t condcnt;
};

#endif

#if DEBUG_MMACRO_REFCOUNTS
static void check_mmacro_refcounts(void);
static MMacro *refdbg_list;
Expand Down Expand Up @@ -391,6 +387,15 @@ static void put_mmacro(MMacro **mp)
pop_mmacro(mp, NULL);
}

/* Decrement refcount without changing pointer - for recursive macro exit */
static void unref_mmacro(MMacro *m)
{
if (m) {
nasm_assert(m->refcnt > 0);
m->refcnt--;
}
}

static void pop_mstk(struct mstk *msp, MMacro *nextp)
{
struct mstk next = { NULL, NULL };
Expand Down Expand Up @@ -4727,6 +4732,7 @@ static int do_directive(Token *tline, Token **output, bool suppressed)
t = NULL;
break;
}
t = t->next;
}
}

Expand Down Expand Up @@ -6959,20 +6965,20 @@ static MMacro *is_mmacro(Token * tline, int *nparamp, Token ***paramsp)
}


#if 0

/*
* Save MMacro invocation specific fields in
* preparation for a recursive macro expansion
*/
static void push_mmacro(MMacro *m)
{
MMacroInvocation *i;
struct MMacroInvocation *i;

i = nasm_malloc(sizeof(MMacroInvocation));
i = nasm_malloc(sizeof(struct MMacroInvocation));
i->prev = m->prev;
i->params = m->params;
i->iline = m->iline;
i->iname = m->iname;
i->mstk = m->mstk;
i->nparam = m->nparam;
i->rotate = m->rotate;
i->paramlen = m->paramlen;
Expand All @@ -6986,15 +6992,21 @@ static void push_mmacro(MMacro *m)
* Restore MMacro invocation specific fields that were
* saved during a previous recursive macro expansion
*/
static void pop_mmacro(MMacro *m)
static void pop_rmacro(MMacro *m)
{
MMacroInvocation *i;
struct MMacroInvocation *i;

if (m->prev) {
/* First, clean up the current invocation */
clear_mmacro(m);

/* Now restore the previous invocation */
i = m->prev;
m->prev = i->prev;
m->params = i->params;
m->iline = i->iline;
m->iname = i->iname;
m->mstk = i->mstk;
m->nparam = i->nparam;
m->rotate = i->rotate;
m->paramlen = i->paramlen;
Expand All @@ -7004,8 +7016,6 @@ static void pop_mmacro(MMacro *m)
}
}

#endif

/*
* List an mmacro call with arguments (-Lm option)
*/
Expand Down Expand Up @@ -7348,10 +7358,8 @@ static int expand_mmacro(Token * tline)
* Save the previous MMacro expansion in the case of
* macro recursion
*/
#if 0
if (m->max_depth && m->in_progress)
push_mmacro(m);
#endif

m->in_progress++;
m->params = params;
Expand Down Expand Up @@ -8738,10 +8746,6 @@ static Token *pp_tokline(void)
l = istk->expansion;
continue;
} else {
MMacro *m = istk->mstk.mstk;

nasm_assert(m == fm);

/*
* Check whether a `%rep' was started and not ended
* within this macro expansion. This can happen and
Expand All @@ -8752,16 +8756,12 @@ static Token *pp_tokline(void)
if (defining) {
if (defining->name)
nasm_panic("defining with name in expansion");
else if (m->name)
else if (fm->name)
nasm_fatal("`%%rep' without `%%endrep' within"
" expansion of macro `%s'", m->name);
" expansion of macro `%s'", fm->name);
}

/*
* FIXME: investigate the relationship at this point between
* istk->mstk.mstk and fm
*/
if (m->name) {
if (fm->name) {
/*
* This was a real macro call, not a %rep, and
* therefore the parameter information needs to
Expand All @@ -8778,39 +8778,60 @@ static Token *pp_tokline(void)
nasm_zero(mmacro_deadman); /* Clear all counters */
}

#if 0
if (m->prev) {
pop_mmacro(m);
fm->in_progress --;
} else
#endif
{
clear_mmacro(m);
fm->in_progress = 0;
/*
* Per-invocation cleanup: balance what expand_mmacro did.
* Each invocation increments nolist/noline and calls
* uplevel/debug_macro_start, so we must undo per exit.
*/
if (fm->nolist & NL_LINE) {
istk->noline--;
} else if (!istk->noline) {
MMacro *sm = (MMacro *)src_macro_current();
if (sm == fm) {
src_macro_pop();
put_mmacro(&sm);
}
src_update(l->where);
}
}

if (fm->nolist & NL_LINE) {
istk->noline--;
} else if (!istk->noline) {
MMacro *sm = (MMacro *)src_macro_current();
if (sm == fm) {
src_macro_pop();
put_mmacro(&sm);
if (fm->nolist & NL_LIST) {
istk->nolist--;
} else if (!istk->nolist) {
lfmt->downlevel(LIST_MACRO);
if ((ppdbg & PDBG_MMACROS) && fm->name)
debug_macro_end(fm);
}
src_update(l->where);
}

if (fm->nolist & NL_LIST) {
istk->nolist--;
} else if (!istk->nolist) {
lfmt->downlevel(LIST_MACRO);
if ((ppdbg & PDBG_MMACROS) && fm->name)
debug_macro_end(fm);
if (fm->prev) {
/*
* Recursive exit: restore istk->mstk from fm->mstk.
* Unref fm twice for the refs added by expand_mmacro
* (lines 7361-7362).
*/
unref_mmacro(fm);
unref_mmacro(fm);
istk->mstk = fm->mstk;
pop_rmacro(fm);
fm->in_progress--;
} else {
clear_mmacro(fm);
fm->in_progress = 0;
/* Final exit: restore location and pop mstk */
istk->where = l->where;
pop_mstk(&istk->mstk, fm);
}
} else {
/*
* %rep final exit: restore istk->mstk.mstk from fm->mstk.
* Release the %rep from mstk and restore the saved value.
* Also release the ref that %rep holds in fm->mstk (from
* line 5159 get_mmacro) since it won't be released by
* free_mmacro.
*/
put_mmacro(&istk->mstk.mstk); /* Release %rep */
istk->mstk.mstk = fm->mstk.mstk; /* Restore saved */
put_mmacro(&fm->mstk.mstk); /* Release the saved ref */
}

istk->where = l->where;
pop_mstk(&istk->mstk, m);
}
check_mmacro_refcounts();

Expand Down