aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog6
-rw-r--r--include/aout/ChangeLog11
-rw-r--r--include/aout/adobe.h18
-rw-r--r--include/aout/aout64.h20
-rw-r--r--include/aout/dynix3.h16
-rw-r--r--include/aout/encap.h4
-rw-r--r--include/aout/hp.h8
-rw-r--r--include/aout/hp300hpux.h18
-rw-r--r--include/aout/sun4.h6
-rw-r--r--include/bout.h14
-rw-r--r--include/os9k.h2
11 files changed, 70 insertions, 53 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index c8c0900..cd33a61 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-01 Alan Modra <amodra@gmail.com>
+
+ * bout.h: Invoke aout N_* macros with pointer to
+ struct internal_exec.
+ * os9k.h: Likewise.
+
2015-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* vtv-change-permission.h (VTV_PAGE_SIZE) [__sun__ && __svr4__ &&
diff --git a/include/aout/ChangeLog b/include/aout/ChangeLog
index 790763b..bf5dfdb 100644
--- a/include/aout/ChangeLog
+++ b/include/aout/ChangeLog
@@ -1,3 +1,14 @@
+2015-12-01 Alan Modra <amodra@gmail.com>
+
+ * adobe.h: Invoke aout N_* macros with pointer to
+ struct internal_exec.
+ * aout64.h: Likewise.
+ * dynix3.h: Likewise.
+ * encap.h: Likewise.
+ * hp.h: Likewise.
+ * hp300hpux.h: Likewise.
+ * sun4.h: Likewise.
+
2015-01-01 Alan Modra <amodra@gmail.com>
Update year range in copyright notice of all files.
diff --git a/include/aout/adobe.h b/include/aout/adobe.h
index 9c72fa5..cf8cfce 100644
--- a/include/aout/adobe.h
+++ b/include/aout/adobe.h
@@ -47,7 +47,7 @@ struct external_exec
#undef OMAGIC
#undef NMAGIC
-#define N_BADMAG(x) ((x).a_info != ZMAGIC)
+#define N_BADMAG(x) ((x)->a_info != ZMAGIC)
/* By default, segment size is constant. But some machines override this
to be a function of the a.out header (e.g. machine type). */
@@ -77,25 +77,25 @@ struct internal_segdesc {
unsigned int a_filebase; /* Base address in object file */
};
-#define N_TXTADDR(x) \
+#define N_TXTADDR(x) is_this_really_unused?
/* This is documented to be at 1024, but appears to really be at 2048.
FIXME?! */
#define N_TXTOFF(x) 2048
-#define N_TXTSIZE(x) ((x).a_text)
+#define N_TXTSIZE(x) ((x)->a_text)
-#define N_DATADDR(x)
+#define N_DATADDR(x) is_this_really_unused?
-#define N_BSSADDR(x)
+#define N_BSSADDR(x) is_this_really_unused?
/* Offsets of the various portions of the file after the text segment. */
#define N_DATOFF(x) ( N_TXTOFF(x) + N_TXTSIZE(x) )
-#define N_TRELOFF(x) ( N_DATOFF(x) + (x).a_data )
-#define N_DRELOFF(x) ( N_TRELOFF(x) + (x).a_trsize )
-#define N_SYMOFF(x) ( N_DRELOFF(x) + (x).a_drsize )
-#define N_STROFF(x) ( N_SYMOFF(x) + (x).a_syms )
+#define N_TRELOFF(x) ( N_DATOFF(x) + (x)->a_data )
+#define N_DRELOFF(x) ( N_TRELOFF(x) + (x)->a_trsize )
+#define N_SYMOFF(x) ( N_DRELOFF(x) + (x)->a_drsize )
+#define N_STROFF(x) ( N_SYMOFF(x) + (x)->a_syms )
/* Symbols */
struct external_nlist {
diff --git a/include/aout/aout64.h b/include/aout/aout64.h
index 7a25010..08fd193 100644
--- a/include/aout/aout64.h
+++ b/include/aout/aout64.h
@@ -136,7 +136,7 @@ struct external_exec
in the text. */
#ifndef N_HEADER_IN_TEXT
#define N_HEADER_IN_TEXT(x) \
- (((x).a_entry & (TARGET_PAGE_SIZE-1)) >= EXEC_BYTES_SIZE)
+ (((x)->a_entry & (TARGET_PAGE_SIZE-1)) >= EXEC_BYTES_SIZE)
#endif
/* Sun shared libraries, not linux. This macro is only relevant for ZMAGIC
@@ -199,12 +199,12 @@ struct external_exec
#define N_TXTSIZE(x) \
(/* For QMAGIC, we don't consider the header part of the text section. */\
N_IS_QMAGIC (x) \
- ? (x).a_text - EXEC_BYTES_SIZE \
+ ? (x)->a_text - EXEC_BYTES_SIZE \
: ((N_MAGIC (x) != ZMAGIC || N_SHARED_LIB (x)) \
- ? (x).a_text \
+ ? (x)->a_text \
: (N_HEADER_IN_TEXT (x) \
- ? (x).a_text - EXEC_BYTES_SIZE /* No padding. */ \
- : (x).a_text /* A page of padding. */ )))
+ ? (x)->a_text - EXEC_BYTES_SIZE /* No padding. */ \
+ : (x)->a_text /* A page of padding. */ )))
#endif
/* The address of the data segment in virtual memory.
It is the text segment address, plus text segment size, rounded
@@ -218,7 +218,7 @@ struct external_exec
#endif
/* The address of the BSS segment -- immediately after the data segment. */
-#define N_BSSADDR(x) (N_DATADDR (x) + (x).a_data)
+#define N_BSSADDR(x) (N_DATADDR (x) + (x)->a_data)
/* Offsets of the various portions of the file after the text segment. */
@@ -238,16 +238,16 @@ struct external_exec
#define N_DATOFF(x) (N_TXTOFF (x) + N_TXTSIZE (x))
#endif
#ifndef N_TRELOFF
-#define N_TRELOFF(x) (N_DATOFF (x) + (x).a_data)
+#define N_TRELOFF(x) (N_DATOFF (x) + (x)->a_data)
#endif
#ifndef N_DRELOFF
-#define N_DRELOFF(x) (N_TRELOFF (x) + (x).a_trsize)
+#define N_DRELOFF(x) (N_TRELOFF (x) + (x)->a_trsize)
#endif
#ifndef N_SYMOFF
-#define N_SYMOFF(x) (N_DRELOFF (x) + (x).a_drsize)
+#define N_SYMOFF(x) (N_DRELOFF (x) + (x)->a_drsize)
#endif
#ifndef N_STROFF
-#define N_STROFF(x) (N_SYMOFF (x) + (x).a_syms)
+#define N_STROFF(x) (N_SYMOFF (x) + (x)->a_syms)
#endif
/* Symbols */
diff --git a/include/aout/dynix3.h b/include/aout/dynix3.h
index 972477d..2703782 100644
--- a/include/aout/dynix3.h
+++ b/include/aout/dynix3.h
@@ -69,19 +69,19 @@ struct dynix_external_exec
#define N_TXTOFF(x) (EXEC_BYTES_SIZE)
#define N_DATOFF(x) (N_TXTOFF(x) + N_TXTSIZE(x))
-#define N_SHDATOFF(x) (N_DATOFF(x) + (x).a_data)
-#define N_TRELOFF(x) (N_SHDATOFF(x) + (x).a_shdata)
-#define N_DRELOFF(x) (N_TRELOFF(x) + (x).a_trsize)
-#define N_SHDRELOFF(x) (N_DRELOFF(x) + (x).a_drsize)
-#define N_SYMOFF(x) (N_SHDRELOFF(x) + (x).a_shdrsize)
-#define N_STROFF(x) (N_SYMOFF(x) + (x).a_syms)
+#define N_SHDATOFF(x) (N_DATOFF(x) + (x)->a_data)
+#define N_TRELOFF(x) (N_SHDATOFF(x) + (x)->a_shdata)
+#define N_DRELOFF(x) (N_TRELOFF(x) + (x)->a_trsize)
+#define N_SHDRELOFF(x) (N_DRELOFF(x) + (x)->a_drsize)
+#define N_SYMOFF(x) (N_SHDRELOFF(x) + (x)->a_shdrsize)
+#define N_STROFF(x) (N_SYMOFF(x) + (x)->a_syms)
#define N_TXTADDR(x) \
(((OMAGIC == N_MAGIC(x)) || (SMAGIC == N_MAGIC(x))) ? 0 \
: TEXT_START_ADDR + EXEC_BYTES_SIZE)
#define N_TXTSIZE(x) \
- (((OMAGIC == N_MAGIC(x)) || (SMAGIC == N_MAGIC(x))) ? ((x).a_text) \
- : ((x).a_text - N_ADDRADJ(x) - EXEC_BYTES_SIZE))
+ (((OMAGIC == N_MAGIC(x)) || (SMAGIC == N_MAGIC(x))) ? ((x)->a_text) \
+ : ((x)->a_text - N_ADDRADJ(x) - EXEC_BYTES_SIZE))
#endif /* A_OUT_DYNIX3_H */
diff --git a/include/aout/encap.h b/include/aout/encap.h
index 6797e73..afed9b5 100644
--- a/include/aout/encap.h
+++ b/include/aout/encap.h
@@ -131,5 +131,5 @@ short __header_offset_temp;
#define N_DATADDR(x) \
((N_FLAGS(x) & N_FLAGS_COFF_ENCAPSULATE) ? \
- (SEGMENT_SIZE + ((N_TXTADDR(x)+(x).a_text-1) & ~(SEGMENT_SIZE-1))) : \
- (N_TXTADDR(x)+(x).a_text))
+ (SEGMENT_SIZE + ((N_TXTADDR(x)+(x)->a_text-1) & ~(SEGMENT_SIZE-1))) : \
+ (N_TXTADDR(x)+(x)->a_text))
diff --git a/include/aout/hp.h b/include/aout/hp.h
index be27668..91b77bd 100644
--- a/include/aout/hp.h
+++ b/include/aout/hp.h
@@ -60,10 +60,10 @@ struct exec
#undef N_SET_MACHTYPE
#undef N_SET_FLAGS
-#define N_MAGIC(exec) ((exec) . a_magic)
-#define N_MACHTYPE(exec) ((exec) . a_machtype)
-#define N_SET_MAGIC(exec, magic) (((exec) . a_magic) = (magic))
-#define N_SET_MACHTYPE(exec, machtype) (((exec) . a_machtype) = (machtype))
+#define N_MAGIC(execp) ((execp)->a_magic)
+#define N_MACHTYPE(execp) ((execp)->a_machtype)
+#define N_SET_MAGIC(execp, magic) (((execp)->a_magic) = (magic))
+#define N_SET_MACHTYPE(execp, machtype) (((execp)->a_machtype) = (machtype))
#undef N_BADMAG
#define N_BADMAG(x) ((_N_BADMAG (x)) || (_N_BADMACH (x)))
diff --git a/include/aout/hp300hpux.h b/include/aout/hp300hpux.h
index 527e421..cc65927 100644
--- a/include/aout/hp300hpux.h
+++ b/include/aout/hp300hpux.h
@@ -113,18 +113,18 @@ struct hp300hpux_header_extension
#undef N_STROFF
#define N_DATOFF(x) ( N_TXTOFF(x) + N_TXTSIZE(x) )
-#define N_PASOFF(x) ( N_DATOFF(x) + (x).a_data)
-#define N_SYMOFF(x) ( N_PASOFF(x) /* + (x).a_passize*/ )
-#define N_SUPOFF(x) ( N_SYMOFF(x) + (x).a_syms )
-#define N_TRELOFF(x) ( N_SUPOFF(x) /* + 0 (x).a_supsize*/ )
-#define N_DRELOFF(x) ( N_TRELOFF(x) + (x).a_trsize )
-#define N_EXTHOFF(x) ( N_DRELOFF(x) /* + 0 (x).a_drsize */)
+#define N_PASOFF(x) ( N_DATOFF(x) + (x)->a_data)
+#define N_SYMOFF(x) ( N_PASOFF(x) /* + (x)->a_passize*/ )
+#define N_SUPOFF(x) ( N_SYMOFF(x) + (x)->a_syms )
+#define N_TRELOFF(x) ( N_SUPOFF(x) /* + (x)->a_supsize*/ )
+#define N_DRELOFF(x) ( N_TRELOFF(x) + (x)->a_trsize )
+#define N_EXTHOFF(x) ( N_DRELOFF(x) /* + (x)->a_drsize */)
#define N_STROFF(x) ( 0 /* no string table */ )
/* use these when the file has gnu symbol tables */
-#define N_GNU_TRELOFF(x) (N_DATOFF(x) + (x).a_data)
-#define N_GNU_DRELOFF(x) (N_GNU_TRELOFF(x) + (x).a_trsize)
-#define N_GNU_SYMOFF(x) (N_GNU_DRELOFF(x) + (x).a_drsize)
+#define N_GNU_TRELOFF(x) (N_DATOFF(x) + (x)->a_data)
+#define N_GNU_DRELOFF(x) (N_GNU_TRELOFF(x) + (x)->a_trsize)
+#define N_GNU_SYMOFF(x) (N_GNU_DRELOFF(x) + (x)->a_drsize)
#define TARGET_PAGE_SIZE 0x1000
#define SEGMENT_SIZE 0x1000
diff --git a/include/aout/sun4.h b/include/aout/sun4.h
index c6e3d2c..9be0a11 100644
--- a/include/aout/sun4.h
+++ b/include/aout/sun4.h
@@ -44,8 +44,8 @@
expected text address. These kludges have gotta go!
For linked files, should reflect reality if we know it. */
-#define N_SHARED_LIB(x) ((x).a_entry < TEXT_START_ADDR \
- && (x).a_text >= EXEC_BYTES_SIZE)
+#define N_SHARED_LIB(x) ((x)->a_entry < TEXT_START_ADDR \
+ && (x)->a_text >= EXEC_BYTES_SIZE)
/* This differs from the version in aout64.h (which we override by defining
it here) only for NMAGIC (we return TEXT_START_ADDR+EXEC_BYTES_SIZE;
@@ -53,7 +53,7 @@
#define N_TXTADDR(x) \
(N_MAGIC(x)==OMAGIC? 0 \
- : (N_MAGIC(x) == ZMAGIC && (x).a_entry < TEXT_START_ADDR)? 0 \
+ : (N_MAGIC(x) == ZMAGIC && (x)->a_entry < TEXT_START_ADDR)? 0 \
: TEXT_START_ADDR+EXEC_BYTES_SIZE)
/* When a file is linked against a shared library on SunOS 4, the
diff --git a/include/bout.h b/include/bout.h
index b28cdaa..dbbfc5e 100644
--- a/include/bout.h
+++ b/include/bout.h
@@ -87,16 +87,16 @@ struct external_exec
/* These macros use the a_xxx field names, since they operate on the exec
structure after it's been byte-swapped and realigned on the host machine. */
-#define N_BADMAG(x) (((x).a_info)!=BMAGIC)
+#define N_BADMAG(x) (((x)->a_info)!=BMAGIC)
#define N_TXTOFF(x) EXEC_BYTES_SIZE
-#define N_DATOFF(x) ( N_TXTOFF(x) + (x).a_text )
-#define N_TROFF(x) ( N_DATOFF(x) + (x).a_data )
+#define N_DATOFF(x) ( N_TXTOFF(x) + (x)->a_text )
+#define N_TROFF(x) ( N_DATOFF(x) + (x)->a_data )
#define N_TRELOFF N_TROFF
-#define N_DROFF(x) ( N_TROFF(x) + (x).a_trsize )
+#define N_DROFF(x) ( N_TROFF(x) + (x)->a_trsize )
#define N_DRELOFF N_DROFF
-#define N_SYMOFF(x) ( N_DROFF(x) + (x).a_drsize )
-#define N_STROFF(x) ( N_SYMOFF(x) + (x).a_syms )
-#define N_DATADDR(x) ( (x).a_dload )
+#define N_SYMOFF(x) ( N_DROFF(x) + (x)->a_drsize )
+#define N_STROFF(x) ( N_SYMOFF(x) + (x)->a_syms )
+#define N_DATADDR(x) ( (x)->a_dload )
/* Address of text segment in memory after it is loaded. */
#if !defined (N_TXTADDR)
diff --git a/include/os9k.h b/include/os9k.h
index 4329013..accd9d0 100644
--- a/include/os9k.h
+++ b/include/os9k.h
@@ -100,7 +100,7 @@ Boston, MA 02110-1301, USA. */
#define MODSIZE(mod) ((u_int32)((Mh_com)mod)->m_size)
#endif /* 0 */
#define MHCOM_BYTES_SIZE 80
-#define N_BADMAG(a) (((a).a_info) != MODSYNC)
+#define N_BADMAG(a) (((a)->a_info) != MODSYNC)
typedef struct mh_com
{
generated by cgit v1.1 at 2024-11-06 10:56:22 +0000