[Nasm-devel] [PATCH 09/18] out: Elf32, Elfx32 -- Unify elf_sect_write, elf_section_header and add elf_sect_writeaddr

[Cyrill G. <gor...@gm...>]

elf_sect_writeaddr is unused by now.

Signed-off-by: Cyrill Gorcunov <gor...@gm...>
---
 output/outelf32.c  | 19 ++++++++++++-------
 output/outelfx32.c | 11 ++++++-----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/output/outelf32.c b/output/outelf32.c
index 67cdaa3..3d72f6c 100644
--- a/output/outelf32.c
+++ b/output/outelf32.c
@@ -93,9 +93,9 @@ static int elf_nsect, nsections;
 static int64_t elf_foffs;
 
 static void elf_write(void);
-static void elf_sect_write(struct elf_section *, const uint8_t *,
-                           uint32_t);
-static void elf_section_header(int, int, int, void *, bool, int32_t, int, int,
+static void elf_sect_write(struct elf_section *, const void *, size_t);
+static void elf_sect_writeaddr(struct elf_section *, int64_t, size_t);
+static void elf_section_header(int, int, uint64_t, void *, bool, uint64_t, int, int,
                                int, int);
 static void elf_write_sections(void);
 static struct SAA *elf_build_symtab(int32_t *, int32_t *);
@@ -1246,8 +1246,8 @@ static struct SAA *elf_build_reltab(uint64_t *len, struct elf_reloc *r)
     return s;
 }
 
-static void elf_section_header(int name, int type, int flags,
-                               void *data, bool is_saa, int32_t datalen,
+static void elf_section_header(int name, int type, uint64_t flags,
+                               void *data, bool is_saa, uint64_t datalen,
                                int link, int info, int align, int eltsize)
 {
     elf_sects[elf_nsect].data = data;
@@ -1285,13 +1285,18 @@ static void elf_write_sections(void)
         }
 }
 
-static void elf_sect_write(struct elf_section *sect,
-                           const uint8_t *data, uint32_t len)
+static void elf_sect_write(struct elf_section *sect, const void *data, size_t len)
 {
     saa_wbytes(sect->data, data, len);
     sect->len += len;
 }
 
+static void elf_sect_writeaddr(struct elf_section *sect, int64_t data, size_t len)
+{
+    saa_writeaddr(sect->data, data, len);
+    sect->len += len;
+}
+
 static void elf_sectalign(int32_t seg, unsigned int value)
 {
     struct elf_section *s = NULL;
diff --git a/output/outelfx32.c b/output/outelfx32.c
index 5e83239..3a0bac8 100644
--- a/output/outelfx32.c
+++ b/output/outelfx32.c
@@ -94,8 +94,8 @@ static int64_t elf_foffs;
 
 static void elf_write(void);
 static void elf_sect_write(struct elf_section *, const void *, size_t);
-static void elf_sect_writeaddr(struct elf_section *, int32_t, size_t);
-static void elf_section_header(int, int, uint32_t, void *, bool, uint32_t, int, int,
+static void elf_sect_writeaddr(struct elf_section *, int64_t, size_t);
+static void elf_section_header(int, int, uint64_t, void *, bool, uint64_t, int, int,
                                int, int);
 static void elf_write_sections(void);
 static struct SAA *elf_build_symtab(int32_t *, int32_t *);
@@ -1283,8 +1283,8 @@ static struct SAA *elf_build_reltab(uint64_t *len, struct elf_reloc *r)
     return s;
 }
 
-static void elf_section_header(int name, int type, uint32_t flags,
-                               void *data, bool is_saa, uint32_t datalen,
+static void elf_section_header(int name, int type, uint64_t flags,
+                               void *data, bool is_saa, uint64_t datalen,
                                int link, int info, int align, int eltsize)
 {
     elf_sects[elf_nsect].data = data;
@@ -1327,7 +1327,8 @@ static void elf_sect_write(struct elf_section *sect, const void *data, size_t le
     saa_wbytes(sect->data, data, len);
     sect->len += len;
 }
-static void elf_sect_writeaddr(struct elf_section *sect, int32_t data, size_t len)
+
+static void elf_sect_writeaddr(struct elf_section *sect, int64_t data, size_t len)
 {
     saa_writeaddr(sect->data, data, len);
     sect->len += len;
-- 
2.5.5