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

Merge tag 'nasm-2.15.04'

Browse Source 
NASM 2.15.04

Conflicts:
	asm/listing.h
	asm/pptok.pl
	asm/preproc.c
	version

This doesn't pass travis test 3392711, which is using an extremely odd
construct of %?? in the middle of an argument sequence for an smacro
while not being in a macro itself, and expecting it to expand to the
macro name. This seems to *really* confuse the master branch.

Resolve this later...
This commit is contained in:
H. Peter Anvin (Intel)
2020-08-25 16:16:09 -07:00
parent 1227a5d7fb 7173483043
commit cc843efa38
45 changed files with 1244 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
output/codeview.c
View File

@@ -308,7 +308,7 @@ static void build_type_table(struct coff_Section *const sect);
static void cv8_cleanup(void)
{
struct cv8_symbol *sym;
struct source_file *file;
struct source_file *file, *ftmp;
struct coff_Section *symbol_sect = coff_sects[cv8_state.symbol_sect];
struct coff_Section *type_sect = coff_sects[cv8_state.type_sect];
@@ -319,10 +319,10 @@ static void cv8_cleanup(void)
build_symbol_table(symbol_sect);
build_type_table(type_sect);
list_for_each(file, cv8_state.source_files) {
list_for_each_safe(file, ftmp, cv8_state.source_files) {
nasm_free(file->fullname);
saa_free(file->lines);
free(file);
nasm_free(file);
}
hash_free(&cv8_state.file_hash);
@@ -401,8 +401,7 @@ static struct source_file *register_file(const char *filename)
fullpath = nasm_realpath(filename);
file = nasm_zalloc(sizeof(*file));
nasm_new(file);
file->filename = filename;
file->fullname = fullpath;
file->fullnamelen = strlen(fullpath);