mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2024-11-21 03:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'cyr/hpa-list'

Browse Source
This commit is contained in:
H. Peter Anvin 2009-07-30 15:06:47 -07:00
commit e873c9b16b
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assemble.c
View File

@ -378,7 +378,7 @@ int64_t assemble(int32_t segment, int64_t offset, int bits, uint32_t cp,
"instruction->times < 0 (%ld) in assemble()", t);
while (t--) { /* repeat TIMES times */
for (e = instruction->eops; e; e = e->next) {
list_for_each(e, instruction->eops) {
if (e->type == EOT_DB_NUMBER) {
if (wsize == 1) {
if (e->segment != NO_SEG)
@ -704,7 +704,7 @@ int64_t insn_size(int32_t segment, int64_t offset, int bits, uint32_t cp,
break;
}
for (e = instruction->eops; e; e = e->next) {
list_for_each(e, instruction->eops) {
int32_t align;
osize = 0;

6
nasm.c
View File

@ -284,7 +284,7 @@ static void emit_dependencies(StrList *list)
}
linepos = fprintf(deps, "%s:", depend_target);
for (l = list; l; l = l->next) {
list_for_each(l, list) {
len = strlen(l->str);
if (linepos + len > 62) {
fprintf(deps, " \\\n ");
@ -295,11 +295,9 @@ static void emit_dependencies(StrList *list)
}
fprintf(deps, "\n\n");
for (l = list; l; l = nl) {
list_for_each_safe(l, nl, list) {
if (depend_emit_phony)
fprintf(deps, "%s:\n\n", l->str);
nl = l->next;
nasm_free(l);
}

10
output/outaout.c
View File

@ -508,7 +508,7 @@ static int32_t aout_add_gsym_reloc(struct Section *sect,
/*
* Find a symbol pointing _exactly_ at this one.
*/
for (sym = shead; sym; sym = sym->next)
list_for_each(sym, shead)
if (sym->value == offset)
break;
} else {
@ -516,7 +516,7 @@ static int32_t aout_add_gsym_reloc(struct Section *sect,
* Find the nearest symbol below this one.
*/
sym = NULL;
for (sm = shead; sm; sm = sm->next)
list_for_each(sm, shead)
if (sm->value <= offset && (!sym || sm->value > sym->value))
sym = sm;
}
@ -774,7 +774,7 @@ static void aout_fixup_relocs(struct Section *sect)
struct Reloc *r;
saa_rewind(sect->data);
for (r = sect->head; r; r = r->next) {
list_for_each(r, sect->head) {
uint8_t *p, *q, blk[4];
int32_t l;
@ -843,7 +843,7 @@ static void aout_write(void)
static void aout_write_relocs(struct Reloc *r)
{
while (r) {
list_for_each(r, r) {
uint32_t word2;
fwriteint32_t(r->address, ofile);
@ -856,8 +856,6 @@ static void aout_write_relocs(struct Reloc *r)
word2 |= (r->bytes == 1 ? 0 :
r->bytes == 2 ? 0x2000000L : 0x4000000L);
fwriteint32_t(word2, ofile);
r = r->next;
}
}