summaryrefslogtreecommitdiff
path: root/output
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2010-04-21 13:45:32 +0400
committerCyrill Gorcunov <gorcunov@gmail.com>2010-04-21 18:09:54 +0400
commit2ef5c27be7a4e94c49560823d5074dafca6a2ac5 (patch)
tree34d8ad6a65e9b0b480c4fce2091ca93a110e0585 /output
parent1f3db76ee973355489ea3a2296211d796b59a61f (diff)
downloadnasm-2ef5c27be7a4e94c49560823d5074dafca6a2ac5.tar.gz
Rename SEGALIGN to SECTALIGN
"sectalign" is preferred over "segalign" since it operates over section attributes. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Diffstat (limited to 'output')
-rw-r--r--output/nullout.c2
-rw-r--r--output/outaout.c4
-rw-r--r--output/outas86.c2
-rw-r--r--output/outbin.c6
-rw-r--r--output/outcoff.c6
-rw-r--r--output/outdbg.c4
-rw-r--r--output/outelf32.c6
-rw-r--r--output/outelf64.c6
-rw-r--r--output/outieee.c2
-rw-r--r--output/outlib.h2
-rw-r--r--output/outmacho32.c2
-rw-r--r--output/outmacho64.c2
-rw-r--r--output/outobj.c2
-rw-r--r--output/outrdf2.c2
14 files changed, 24 insertions, 24 deletions
diff --git a/output/nullout.c b/output/nullout.c
index bcb1bd83..196a09df 100644
--- a/output/nullout.c
+++ b/output/nullout.c
@@ -50,7 +50,7 @@ int null_directive(enum directives directive, char *value, int pass)
return 0;
}
-void null_segalign(int32_t seg, int value)
+void null_sectalign(int32_t seg, unsigned int value)
{
(void)seg;
(void)value;
diff --git a/output/outaout.c b/output/outaout.c
index e0a12e8b..e0963924 100644
--- a/output/outaout.c
+++ b/output/outaout.c
@@ -924,7 +924,7 @@ struct ofmt of_aout = {
aout_out,
aout_deflabel,
aout_section_names,
- null_segalign,
+ null_sectalign,
aout_segbase,
null_directive,
aout_filename,
@@ -947,7 +947,7 @@ struct ofmt of_aoutb = {
aout_out,
aout_deflabel,
aout_section_names,
- null_segalign,
+ null_sectalign,
aout_segbase,
null_directive,
aout_filename,
diff --git a/output/outas86.c b/output/outas86.c
index f0327301..b288637b 100644
--- a/output/outas86.c
+++ b/output/outas86.c
@@ -638,7 +638,7 @@ struct ofmt of_as86 = {
as86_out,
as86_deflabel,
as86_section_names,
- null_segalign,
+ null_sectalign,
as86_segbase,
null_directive,
as86_filename,
diff --git a/output/outbin.c b/output/outbin.c
index 9b831a24..260d99d5 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -1672,7 +1672,7 @@ struct ofmt of_bin = {
bin_out,
bin_deflabel,
bin_secname,
- null_segalign,
+ null_sectalign,
bin_segbase,
bin_directive,
bin_filename,
@@ -1691,7 +1691,7 @@ struct ofmt of_ith = {
bin_out,
bin_deflabel,
bin_secname,
- null_segalign,
+ null_sectalign,
bin_segbase,
bin_directive,
ith_filename,
@@ -1710,7 +1710,7 @@ struct ofmt of_srec = {
bin_out,
bin_deflabel,
bin_secname,
- null_segalign,
+ null_sectalign,
bin_segbase,
bin_directive,
srec_filename,
diff --git a/output/outcoff.c b/output/outcoff.c
index 20bd7053..07974d8c 100644
--- a/output/outcoff.c
+++ b/output/outcoff.c
@@ -1012,7 +1012,7 @@ struct ofmt of_coff = {
coff_out,
coff_deflabel,
coff_section_names,
- null_segalign,
+ null_sectalign,
coff_segbase,
coff_directives,
coff_std_filename,
@@ -1035,7 +1035,7 @@ struct ofmt of_win32 = {
coff_out,
coff_deflabel,
coff_section_names,
- null_segalign,
+ null_sectalign,
coff_segbase,
coff_directives,
coff_win32_filename,
@@ -1058,7 +1058,7 @@ struct ofmt of_win64 = {
coff_out,
coff_deflabel,
coff_section_names,
- null_segalign,
+ null_sectalign,
coff_segbase,
coff_directives,
coff_win32_filename,
diff --git a/output/outdbg.c b/output/outdbg.c
index c365a93d..13d53bd8 100644
--- a/output/outdbg.c
+++ b/output/outdbg.c
@@ -166,7 +166,7 @@ static void dbg_out(int32_t segto, const void *data,
}
}
-static void dbg_segalign(int32_t seg, int value)
+static void dbg_sectalign(int32_t seg, unsigned int value)
{
fprintf(ofile, "set alignment (%d) for segment (%d)\n",
seg, value);
@@ -265,7 +265,7 @@ struct ofmt of_dbg = {
dbg_out,
dbg_deflabel,
dbg_section_names,
- dbg_segalign,
+ dbg_sectalign,
dbg_segbase,
dbg_directive,
dbg_filename,
diff --git a/output/outelf32.c b/output/outelf32.c
index 2179f6ba..4d238a72 100644
--- a/output/outelf32.c
+++ b/output/outelf32.c
@@ -1305,7 +1305,7 @@ static void elf_sect_write(struct Section *sect,
sect->len += len;
}
-static void elf_segalign(int32_t seg, int value)
+static void elf_sectalign(int32_t seg, unsigned int value)
{
struct Section *s = NULL;
int i;
@@ -1319,7 +1319,7 @@ static void elf_segalign(int32_t seg, int value)
if (!s || !is_power2(value))
return;
- if ((unsigned int)value > s->align)
+ if (value > s->align)
s->align = value;
}
@@ -1419,7 +1419,7 @@ struct ofmt of_elf32 = {
elf_out,
elf_deflabel,
elf_section_names,
- elf_segalign,
+ elf_sectalign,
elf_segbase,
elf_directive,
elf_filename,
diff --git a/output/outelf64.c b/output/outelf64.c
index c7baf4f5..47581b4b 100644
--- a/output/outelf64.c
+++ b/output/outelf64.c
@@ -1405,7 +1405,7 @@ static void elf_sect_writeaddr(struct Section *sect, int64_t data, size_t len)
sect->len += len;
}
-static void elf_segalign(int32_t seg, int value)
+static void elf_sectalign(int32_t seg, unsigned int value)
{
struct Section *s = NULL;
int i;
@@ -1419,7 +1419,7 @@ static void elf_segalign(int32_t seg, int value)
if (!s || !is_power2(value))
return;
- if ((unsigned int)value > s->align)
+ if (value > s->align)
s->align = value;
}
@@ -1519,7 +1519,7 @@ struct ofmt of_elf64 = {
elf_out,
elf_deflabel,
elf_section_names,
- elf_segalign,
+ elf_sectalign,
elf_segbase,
elf_directive,
elf_filename,
diff --git a/output/outieee.c b/output/outieee.c
index 4b2be9e8..d4432719 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -1501,7 +1501,7 @@ struct ofmt of_ieee = {
ieee_out,
ieee_deflabel,
ieee_segment,
- null_segalign,
+ null_sectalign,
ieee_segbase,
ieee_directive,
ieee_filename,
diff --git a/output/outlib.h b/output/outlib.h
index 0448ae4d..29c27a09 100644
--- a/output/outlib.h
+++ b/output/outlib.h
@@ -41,7 +41,7 @@ uint64_t realsize(enum out_type type, uint64_t size);
/* Do-nothing versions of some output routines */
int null_setinfo(enum geninfo type, char **string);
int null_directive(enum directives directive, char *value, int pass);
-void null_segalign(int32_t seg, int value);
+void null_sectalign(int32_t seg, unsigned int value);
/* Do-nothing versions of all the debug routines */
struct ofmt;
diff --git a/output/outmacho32.c b/output/outmacho32.c
index 44eb0ecf..b0c95600 100644
--- a/output/outmacho32.c
+++ b/output/outmacho32.c
@@ -1317,7 +1317,7 @@ struct ofmt of_macho32 = {
macho_output,
macho_symdef,
macho_section,
- null_segalign,
+ null_sectalign,
macho_segbase,
null_directive,
macho_filename,
diff --git a/output/outmacho64.c b/output/outmacho64.c
index c54e6d99..f9498811 100644
--- a/output/outmacho64.c
+++ b/output/outmacho64.c
@@ -1488,7 +1488,7 @@ struct ofmt of_macho64 = {
macho_output,
macho_symdef,
macho_section,
- null_segalign,
+ null_sectalign,
macho_segbase,
null_directive,
macho_filename,
diff --git a/output/outobj.c b/output/outobj.c
index 8c3c9efe..053ca4fb 100644
--- a/output/outobj.c
+++ b/output/outobj.c
@@ -2559,7 +2559,7 @@ struct ofmt of_obj = {
obj_out,
obj_deflabel,
obj_segment,
- null_segalign,
+ null_sectalign,
obj_segbase,
obj_directive,
obj_filename,
diff --git a/output/outrdf2.c b/output/outrdf2.c
index 4c2851d6..02518a1a 100644
--- a/output/outrdf2.c
+++ b/output/outrdf2.c
@@ -788,7 +788,7 @@ struct ofmt of_rdf2 = {
rdf2_out,
rdf2_deflabel,
rdf2_section_names,
- null_segalign,
+ null_sectalign,
rdf2_segbase,
rdf2_directive,
rdf2_filename,