Address data is int64_t; simplify writing an address object

Address data is always int64_t even if the size itself is smaller;
this was broken on bigendian hosts (still need testing!)

Create simple "write sized object" macros.

12 files changed, 31 insertions, 66 deletions

diff --git a/output/outaout.c b/output/outaout.c
index a359b949..fec12623 100644
--- a/output/outaout.c
+++ b/output/outaout.c
@@ -622,7 +622,7 @@ static void aout_out(int32_t segto, const void *data,
             error(ERR_PANIC, "OUT_RAWDATA with other than NO_SEG");
         aout_sect_write(s, data, size);
     } else if (type == OUT_ADDRESS) {
-        addr = *(int32_t *)data;
+        addr = *(int64_t *)data;
         if (segment != NO_SEG) {
             if (segment % 2) {
                 error(ERR_NONFATAL, "a.out format does not support"
@@ -699,7 +699,7 @@ static void aout_out(int32_t segto, const void *data,
             }
         }
         p = mydata;
-        WRITESHORT(p, *(int32_t *)data - (size + s->len));
+        WRITESHORT(p, *(int64_t *)data - (size + s->len));
         aout_sect_write(s, mydata, 2L);
     } else if (type == OUT_REL4ADR) {
         if (segment == segto)
@@ -729,7 +729,7 @@ static void aout_out(int32_t segto, const void *data,
             }
         }
         p = mydata;
-        WRITELONG(p, *(int32_t *)data - (size + s->len));
+        WRITELONG(p, *(int64_t *)data - (size + s->len));
         aout_sect_write(s, mydata, 4L);
     }
 }
diff --git a/output/outas86.c b/output/outas86.c
index f3423140..476e8c95 100644
--- a/output/outas86.c
+++ b/output/outas86.c
@@ -320,12 +320,12 @@ static void as86_out(int32_t segto, const void *data,
                 error(ERR_NONFATAL, "as86 format does not support"
                       " segment base references");
             } else {
-                offset = *(int32_t *)data;
+                offset = *(int64_t *)data;
                 as86_add_piece(s, 1, offset, segment, size, 0);
             }
         } else {
             p = mydata;
-            WRITELONG(p, *(int32_t *)data);
+            WRITELONG(p, *(int64_t *)data);
             as86_sect_write(s, data, size);
             as86_add_piece(s, 0, 0L, 0L, size, 0);
         }
@@ -337,7 +337,7 @@ static void as86_out(int32_t segto, const void *data,
                 error(ERR_NONFATAL, "as86 format does not support"
                       " segment base references");
             } else {
-                offset = *(int32_t *)data;
+                offset = *(int64_t *)data;
                 as86_add_piece(s, 1, offset - size + 2, segment, 2L,
                                1);
             }
@@ -350,7 +350,7 @@ static void as86_out(int32_t segto, const void *data,
                 error(ERR_NONFATAL, "as86 format does not support"
                       " segment base references");
             } else {
-                offset = *(int32_t *)data;
+                offset = *(int64_t *)data;
                 as86_add_piece(s, 1, offset - size + 4, segment, 4L,
                                1);
             }
diff --git a/output/outbin.c b/output/outbin.c
index d5ec3c7c..68c5d958 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -788,12 +788,7 @@ static void bin_out(int32_t segto, const void *data,
             if (segment != NO_SEG)
                 add_reloc(s, size, segment, -1L);
             p = mydata;
-            if (size == 4)
-                WRITELONG(p, *(int32_t *)data);
-            else if (size == 8)
-                WRITEDLONG(p, *(int64_t *)data);
-            else
-                WRITESHORT(p, *(int32_t *)data);
+	    WRITEADDR(p, *(int64_t *)data, size);
             saa_wbytes(s->contents, mydata, size);
         }
         s->length += size;
@@ -836,11 +831,7 @@ static void bin_out(int32_t segto, const void *data,
         if (s->flags & TYPE_PROGBITS) {
             add_reloc(s, size, segment, segto);
             p = mydata;
-	    /* XXX: WHAT ABOUT SIZE == 8? */
-            if (size == 4)
-                WRITELONG(p, *(int32_t *)data - size - s->length);
-            else
-                WRITESHORT(p, *(int32_t *)data - size - s->length);
+	    WRITEADDR(p, *(int64_t *)data - size - s->length, size);
             saa_wbytes(s->contents, mydata, size);
         }
         s->length += size;
diff --git a/output/outcoff.c b/output/outcoff.c
index 95a16033..9be558bd 100644
--- a/output/outcoff.c
+++ b/output/outcoff.c
@@ -533,7 +533,7 @@ static void coff_out(int32_t segto, const void *data,
                         fix = coff_add_reloc(s, segment, false, false);
                 }
                 p = mydata;
-                WRITELONG(p, *(int32_t *)data + fix);
+                WRITELONG(p, *(int64_t *)data + fix);
                 coff_sect_write(s, mydata, size);
             }
         } else {
@@ -555,7 +555,7 @@ static void coff_out(int32_t segto, const void *data,
                 coff_sect_write(s, mydata, size);
             } else {
                 fix = coff_add_reloc(s, segment, false, false);
-                WRITELONG(p, *(int32_t *)data + fix);
+                WRITELONG(p, *(int64_t *)data + fix);
                 coff_sect_write(s, mydata, size);
             }
         }
@@ -577,9 +577,9 @@ static void coff_out(int32_t segto, const void *data,
                 fix = coff_add_reloc(s, segment, true, false);
             p = mydata;
             if (win32 | win64) {
-                WRITELONG(p, *(int32_t *)data + 4 - size + fix);
+                WRITELONG(p, *(int64_t *)data + 4 - size + fix);
             } else {
-                WRITELONG(p, *(int32_t *)data - (size + s->len) + fix);
+                WRITELONG(p, *(int64_t *)data - (size + s->len) + fix);
             }
             coff_sect_write(s, mydata, 4L);
         }
diff --git a/output/outdbg.c b/output/outdbg.c
index 07e1b080..a1396999 100644
--- a/output/outdbg.c
+++ b/output/outdbg.c
@@ -125,13 +125,7 @@ static void dbg_out(int32_t segto, const void *data,
         fprintf(dbgf, "\n");
         break;
     case OUT_ADDRESS:
-        ldata = 0;              /* placate gcc */
-        if (size == 1)
-            ldata = *((char *)data);
-        else if (size == 2)
-            ldata = *((int16_t *)data);
-        else if (size == 4)
-            ldata = *((int32_t *)data);
+	ldata = *(int64_t *)data;
         fprintf(dbgf, "addr %08lx (seg %08lx, wrt %08lx)\n", ldata,
                 segment, wrt);
         break;
diff --git a/output/outelf32.c b/output/outelf32.c
index 8599a655..4976942d 100644
--- a/output/outelf32.c
+++ b/output/outelf32.c
@@ -841,7 +841,7 @@ static void elf_out(int32_t segto, const void *data,
         elf_sect_write(s, data, size);
     } else if (type == OUT_ADDRESS) {
         bool gnu16 = false;
-        addr = *(int32_t *)data;
+        addr = *(int64_t *)data;
         if (segment != NO_SEG) {
             if (segment % 2) {
                 error(ERR_NONFATAL, "ELF format does not support"
@@ -916,7 +916,7 @@ static void elf_out(int32_t segto, const void *data,
             }
         }
         p = mydata;
-        WRITESHORT(p, *(int32_t *)data - size);
+        WRITESHORT(p, *(int64_t *)data - size);
         elf_sect_write(s, mydata, 2L);
     } else if (type == OUT_REL4ADR) {
         if (segment == segto)
@@ -941,7 +941,7 @@ static void elf_out(int32_t segto, const void *data,
             }
         }
         p = mydata;
-        WRITELONG(p, *(int32_t *)data - size);
+        WRITELONG(p, *(int64_t *)data - size);
         elf_sect_write(s, mydata, 4L);
     }
 }
diff --git a/output/outelf64.c b/output/outelf64.c
index d3642687..dcf3def6 100644
--- a/output/outelf64.c
+++ b/output/outelf64.c
@@ -798,8 +798,8 @@ static void elf_out(int32_t segto, const void *data,
 
 #if defined(DEBUG) && DEBUG>2
     fprintf(stderr,
-            " elf_out type: %x seg: %d bytes: %x data: %x\n",
-               (type >> 24), segment, size, *(int32_t *)data);
+            " elf_out type: %x seg: %d bytes: %x data: %"PRIx64"\n",
+               (type >> 24), segment, size, *(int64_t *)data);
 #endif
 
     /*
@@ -951,7 +951,7 @@ static void elf_out(int32_t segto, const void *data,
             }
         }
         p = mydata;
-        WRITESHORT(p, *(int32_t *)data - size);
+        WRITESHORT(p, *(int64_t *)data - size);
         elf_sect_write(s, mydata, 2L);
     } else if (type == OUT_REL4ADR) {
         if (segment == segto)
@@ -976,7 +976,7 @@ static void elf_out(int32_t segto, const void *data,
             }
         }
         p = mydata;
-        WRITELONG(p, *(int32_t *)data - size);
+        WRITELONG(p, *(int64_t *)data - size);
         elf_sect_write(s, mydata, 4L);
     }
 }
diff --git a/output/outieee.c b/output/outieee.c
index 431a6d8c..93a27b54 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -418,7 +418,7 @@ static void ieee_out(int32_t segto, const void *data,
         if (segment == NO_SEG && type != OUT_ADDRESS)
             error(ERR_NONFATAL, "relative call to absolute address not"
                   " supported by IEEE format");
-        ldata = *(int32_t *)data;
+        ldata = *(int64_t *)data;
         if (type == OUT_REL2ADR)
             ldata += (size - 2);
         if (type == OUT_REL4ADR)
diff --git a/output/outmacho.c b/output/outmacho.c
index 802ea97e..14633f47 100644
--- a/output/outmacho.c
+++ b/output/outmacho.c
@@ -464,7 +464,7 @@ static void macho_output(int32_t secto, const void *data,
         break;
 
     case OUT_ADDRESS:
-        addr = *(int32_t *)data;
+        addr = *(int64_t *)data;
 
         if (section != NO_SEG) {
             if (section % 2) {
@@ -475,12 +475,7 @@ static void macho_output(int32_t secto, const void *data,
         }
 
         p = mydata;
-
-        if (size == 2)
-            WRITESHORT(p, addr);
-        else
-            WRITELONG(p, addr);
-
+	WRITEADDR(p, addr, size);
         sect_write(s, mydata, size);
         break;
 
diff --git a/output/outobj.c b/output/outobj.c
index 95339e24..3dfbf965 100644
--- a/output/outobj.c
+++ b/output/outobj.c
@@ -1061,7 +1061,7 @@ static void obj_out(int32_t segto, const void *data,
         if (segment >= SEG_ABS)
             error(ERR_NONFATAL, "far-absolute relocations not supported"
                   " by OBJ format");
-        ldata = *(int32_t *)data;
+        ldata = *(int64_t *)data;
         if (type == OUT_REL2ADR) {
             ldata += (size - 2);
             size = 2;
diff --git a/output/outrdf.c b/output/outrdf.c
index 23e661e5..9c3785bb 100644
--- a/output/outrdf.c
+++ b/output/outrdf.c
@@ -392,16 +392,8 @@ static void rdf_out(int32_t segto, void *data, uint32_t type,
         }
 
         pd = databuf;           /* convert address to little-endian */
-        if (bytes == 4)
-            WRITELONG(pd, *(int32_t *)data);
-        else if (bytes == 8)
-            WRITEDLONG(pd, *(int64_t *)data);
-        else
-            WRITESHORT(pd, *(int32_t *)data);
-
-
+	WRITEADDR(pd, *(int64_t *)data, bytes);
         membufwrite(seg[segto], databuf, bytes);
-
     } else if (type == OUT_REL2ADR) {
         if (segment == segto)
             error(ERR_PANIC, "intra-segment OUT_REL2ADR");
@@ -422,7 +414,7 @@ static void rdf_out(int32_t segto, void *data, uint32_t type,
          * address of imported symbol onto it to get address relative to end of
          * instruction: import_address + data(offset) - end_of_instrn */
 
-        rr.offset = *(int32_t *)data - (rr.offset + bytes);
+        rr.offset = *(int64_t *)data - (rr.offset + bytes);
 
         membufwrite(seg[segto], &rr.offset, -2);
     } else if (type == OUT_REL4ADR) {
@@ -440,7 +432,7 @@ static void rdf_out(int32_t segto, void *data, uint32_t type,
         rr.refseg = segment;    /* segment referred to */
         write_reloc_rec(&rr);
 
-        rr.offset = *(int32_t *)data - (rr.offset + bytes);
+        rr.offset = *(int64_t *)data - (rr.offset + bytes);
         membufwrite(seg[segto], &rr.offset, -4);
     }
 }
diff --git a/output/outrdf2.c b/output/outrdf2.c
index 980d1137..5bc00d58 100644
--- a/output/outrdf2.c
+++ b/output/outrdf2.c
@@ -583,15 +583,8 @@ static void rdf2_out(int32_t segto, const void *data,
         }
 
         pd = databuf;           /* convert address to little-endian */
-        if (size == 4)
-            WRITESHORT(pd, *(int32_t *)data);
-        else if (size == 8)
-            WRITEDLONG(pd, *(int64_t *)data);
-        else
-            WRITESHORT(pd, *(int32_t *)data);
-
+	WRITEADDR(pd, *(int64_t *)data, size);
         membufwrite(segto, databuf, size);
-
     } else if (type == OUT_REL2ADR) {
         if (segment == segto)
             error(ERR_PANIC, "intra-segment OUT_REL2ADR");
@@ -609,7 +602,7 @@ static void rdf2_out(int32_t segto, const void *data,
             /* what do we put in the code? Simply the data. This should almost
              * always be zero, unless someone's doing segment arithmetic...
              */
-            rr.offset = *(int32_t *)data;
+            rr.offset = *(int64_t *)data;
         } else {
             rr.type = RDFREC_RELOC;     /* type signature */
             rr.segment = segto + 64;    /* segment we're currently in + rel flag */
@@ -639,7 +632,7 @@ static void rdf2_out(int32_t segto, const void *data,
         rr.reclen = 8;
         write_reloc_rec(&rr);
 
-        rr.offset = *(int32_t *)data - (rr.offset + size);
+        rr.offset = *(int64_t *)data - (rr.offset + size);
 
         membufwrite(segto, &rr.offset, -4);
     }