aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-10-10 00:25:06 -04:00
Code Activity

Change dfmt->debug_macros to dfmt->debug_mmacros

Browse Source 
... in preparation for adding dfmt->debug_smacros.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel)
2020-07-14 12:05:03 -07:00
parent ecd4ea94b6
commit 64c7c763c2
9 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asm/preproc.c
View File

@@ -6333,7 +6333,7 @@ static void free_debug_macro_info(void)
static void debug_macro_output(void)
{
list_reverse(dmi.inv.l);
dfmt->debug_macros(&dmi);
dfmt->debug_mmacros(&dmi);
free_debug_macro_info();
}
@@ -6772,7 +6772,7 @@ void pp_reset(const char *file, enum preproc_mode mode,
ppdbg = 0;
if (!(ppopt & PP_TRIVIAL)) {
if (pass_final()) {
if (dfmt->debug_macros)
if (dfmt->debug_mmacros)
ppdbg |= PDBG_MACROS;
}
}

4
include/nasm.h
View File

@@ -1104,11 +1104,11 @@ struct dfmt {
int is_global, char *special);
/*
* debug_macros - called once at the end with a definition for each
* debug_mmacros - called once at the end with a definition for each
* non-.nolist macro that has been invoked at least once in the program,
* and the corresponding address ranges. See dbginfo.h.
*/
void (*debug_macros)(const struct debug_macro_info *);
void (*debug_mmacros)(const struct debug_macro_info *);
/*
* debug_directive - called whenever a DEBUG directive other than 'LINE'

2
output/codeview.c
View File

@@ -64,7 +64,7 @@ const struct dfmt df_cv8 = {
cv8_init, /* .init */
cv8_linenum, /* .linenum */
cv8_deflabel, /* .debug_deflabel */
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive, /* .debug_directive */
cv8_typevalue, /* .debug_typevalue */
cv8_output, /* .debug_output */

2
output/nulldbg.c
View File

@@ -83,7 +83,7 @@ const struct dfmt null_debug_form = {
null_debug_init,
null_debug_linenum,
null_debug_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
null_debug_typevalue,
null_debug_output,

4
output/outdbg.c
View File

@@ -485,7 +485,7 @@ write_macro_inv_list(const struct debug_macro_inv *inv, int level)
}
}
static void dbgdbg_debug_macros(const struct debug_macro_info *dmi)
static void dbgdbg_debug_mmacros(const struct debug_macro_info *dmi)
{
const struct debug_macro_def *def;
@@ -516,7 +516,7 @@ static const struct dfmt debug_debug_form = {
dbgdbg_init,
dbgdbg_linnum,
dbgdbg_deflabel,
dbgdbg_debug_macros,
dbgdbg_debug_mmacros,
dbgdbg_define,
dbgdbg_typevalue,
dbgdbg_output,

12
output/outelf.c
View File

@@ -2435,7 +2435,7 @@ static const struct dfmt elf32_df_dwarf = {
dwarf32_init,
dwarf_linenum,
null_debug_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
debug_typevalue,
dwarf_output,
@@ -2449,7 +2449,7 @@ static const struct dfmt elf32_df_stabs = {
null_debug_init,
stabs_linenum,
null_debug_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
debug_typevalue,
stabs_output,
@@ -2489,7 +2489,7 @@ static const struct dfmt elf64_df_dwarf = {
dwarf64_init,
dwarf_linenum,
null_debug_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
debug_typevalue,
dwarf_output,
@@ -2503,7 +2503,7 @@ static const struct dfmt elf64_df_stabs = {
null_debug_init,
stabs_linenum,
null_debug_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
debug_typevalue,
stabs_output,
@@ -2543,7 +2543,7 @@ static const struct dfmt elfx32_df_dwarf = {
dwarfx32_init,
dwarf_linenum,
null_debug_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
debug_typevalue,
dwarf_output,
@@ -2557,7 +2557,7 @@ static const struct dfmt elfx32_df_stabs = {
null_debug_init,
stabs_linenum,
null_debug_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
debug_typevalue,
stabs_output,

2
output/outieee.c
View File

@@ -1464,7 +1464,7 @@ static const struct dfmt ladsoft_debug_form = {
dbgls_init,
dbgls_linnum,
dbgls_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
dbgls_typevalue,
dbgls_output,

4
output/outmacho.c
View File

@@ -2289,7 +2289,7 @@ static const struct dfmt macho32_df_dwarf = {
macho_dbg_init,
macho_dbg_linenum,
null_debug_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
null_debug_typevalue,
macho_dbg_output,
@@ -2357,7 +2357,7 @@ static const struct dfmt macho64_df_dwarf = {
macho_dbg_init,
macho_dbg_linenum,
null_debug_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
null_debug_typevalue,
macho_dbg_output,

2
output/outobj.c
View File

@@ -2650,7 +2650,7 @@ static const struct dfmt borland_debug_form = {
dbgbi_init,
dbgbi_linnum,
dbgbi_deflabel,
NULL, /* .debug_macros */
NULL, /* .debug_mmacros */
null_debug_directive,
dbgbi_typevalue,
dbgbi_output,