mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-03-07 17:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

outmac: allow section alignment to be declared more than once

Browse Source 
Allow section alignment to be declared more than once, with different
values.  The strictest alignment value via either a section or
sectalign directive becomes the controlling parameter.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2016-02-12 03:23:25 -08:00
parent 7dcd1a1549
commit b13df02490
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
output/outmac.c
View File

@ -707,14 +707,14 @@ static int32_t macho_section(char *name, int pass, int *bits)
newAlignment = alignlog2_32(value); newAlignment = alignlog2_32(value);
if (0 != *end) { if (0 != *end) {
nasm_error(ERR_PANIC, nasm_error(ERR_FATAL,
"unknown or missing alignment value \"%s\" " "unknown or missing alignment value \"%s\" "
"specified for section \"%s\"", "specified for section \"%s\"",
currentAttribute + 6, currentAttribute + 6,
name); name);
return NO_SEG; return NO_SEG;
} else if (0 > newAlignment) { } else if (0 > newAlignment) {
nasm_error(ERR_PANIC, nasm_error(ERR_FATAL,
"alignment of %d (for section \"%s\") is not " "alignment of %d (for section \"%s\") is not "
"a power of two", "a power of two",
value, value,
@ -722,24 +722,12 @@ static int32_t macho_section(char *name, int pass, int *bits)
return NO_SEG; return NO_SEG;
} }
if ((-1 != originalIndex) if (s->align < newAlignment)
&& (s->align != newAlignment)
&& (s->align != -1)) {
nasm_error(ERR_PANIC,
"section \"%s\" has already been specified "
"with alignment %d, conflicts with new "
"alignment of %d",
name,
(1 << s->align),
value);
return NO_SEG;
}
s->align = newAlignment; s->align = newAlignment;
} else if (!nasm_stricmp("data", currentAttribute)) { } else if (!nasm_stricmp("data", currentAttribute)) {
/* Do nothing; 'data' is implicit */ /* Do nothing; 'data' is implicit */
} else { } else {
nasm_error(ERR_PANIC, nasm_error(ERR_FATAL,
"unknown section attribute %s for section %s", "unknown section attribute %s for section %s",
currentAttribute, currentAttribute,
name); name);
@ -752,7 +740,7 @@ static int32_t macho_section(char *name, int pass, int *bits)
} }
} }
nasm_error(ERR_PANIC, "invalid section name %s", name); nasm_error(ERR_FATAL, "invalid section name %s", name);
return NO_SEG; return NO_SEG;
} }
@ -845,6 +833,7 @@ static void macho_symdef(char *name, int32_t section, int64_t offset,
static void macho_sectalign(int32_t seg, unsigned int value) static void macho_sectalign(int32_t seg, unsigned int value)
{ {
struct section *s; struct section *s;
int align;
list_for_each(s, sects) { list_for_each(s, sects) {
if (s->index == seg) if (s->index == seg)
@ -854,9 +843,9 @@ static void macho_sectalign(int32_t seg, unsigned int value)
if (!s || !is_power2(value)) if (!s || !is_power2(value))
return; return;
value = alignlog2_32(value); align = alignlog2_32(value);
if (s->align < (int)value) if (s->align < align);
s->align = value; s->align = align;
} }
static int32_t macho_segbase(int32_t section) static int32_t macho_segbase(int32_t section)