mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-01-18 16:25:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

asm/assemble.c: correct the listing address for TIMES

Browse Source 
We need to set the listing offset before calling LIST_TIMES, but we
had already advanced data.offset by calling out().  Move the call to
lfmt->set_offset() and lfmt->uplevel() to the top and out of the loop;
there is no reason for it to be in the loop in the first place.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2017-05-01 15:34:00 -07:00
parent 571592ea63
commit 440ba7e13e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
asm/assemble.c
View File

@ -566,6 +566,10 @@ int64_t assemble(int32_t segment, int64_t start, int bits, insn *instruction)
if (t < 0)
nasm_panic(0, "instruction->times < 0 (%"PRId32") in assemble()", t);
if (t > 1) {
lfmt->set_offset(data.offset);
lfmt->uplevel(LIST_TIMES);
}
while (t--) { /* repeat TIMES times */
list_for_each(e, instruction->eops) {
if (e->type == EOT_DB_NUMBER) {
@ -596,19 +600,17 @@ int64_t assemble(int32_t segment, int64_t start, int bits, insn *instruction)
out_rawdata(&data, zero_buffer, align);
}
}
if (t > 0 && t == instruction->times - 1) {
lfmt->set_offset(data.offset);
lfmt->uplevel(LIST_TIMES);
}
}
if (instruction->times > 1)
if (instruction->times > 1) {
lfmt->downlevel(LIST_TIMES);
}
} else if (instruction->opcode == I_INCBIN) {
const char *fname = instruction->eops->stringval;
FILE *fp;
size_t t = instruction->times;
off_t base = 0;
off_t len;
uint64_t list_offset;
const void *map = NULL;
char *buf = NULL;
size_t blk = 0; /* Buffered I/O block size */
@ -641,6 +643,7 @@ int64_t assemble(int32_t segment, int64_t start, int bits, insn *instruction)
}
}
list_offset = data.offset;
lfmt->set_offset(data.offset);
lfmt->uplevel(LIST_INCBIN);
@ -700,7 +703,7 @@ int64_t assemble(int32_t segment, int64_t start, int bits, insn *instruction)
end_incbin:
lfmt->downlevel(LIST_INCBIN);
if (instruction->times > 1) {
lfmt->set_offset(data.offset);
lfmt->set_offset(list_offset);
lfmt->uplevel(LIST_TIMES);
lfmt->downlevel(LIST_TIMES);
}
@ -736,6 +739,10 @@ int64_t assemble(int32_t segment, int64_t start, int bits, insn *instruction)
data.itemp = temp;
data.bits = bits;
if (itimes > 1) {
lfmt->set_offset(data.offset);
lfmt->uplevel(LIST_TIMES);
}
while (itimes--) {
data.insoffs = 0;
data.inslen = insn_size;
@ -743,10 +750,6 @@ int64_t assemble(int32_t segment, int64_t start, int bits, insn *instruction)
gencode(&data, instruction);
nasm_assert(data.insoffs == insn_size);
if (itimes > 0 && itimes == instruction->times - 1) {
lfmt->set_offset(data.offset);
lfmt->uplevel(LIST_TIMES);
}
}
if (instruction->times > 1)
lfmt->downlevel(LIST_TIMES);