From 801938e71408e6fbdd862dc98660f3476f0afaa0 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@NetBSD.org>
Date: Fri, 1 Jul 1994 01:29:41 +0000
Subject: [PATCH] macros in exec_aout.h now

---
 include/a.out.h | 77 +------------------------------------------------
 1 file changed, 1 insertion(+), 76 deletions(-)

diff --git a/include/a.out.h b/include/a.out.h
index a502c55df669..c087280d560c 100644
--- a/include/a.out.h
+++ b/include/a.out.h
@@ -32,88 +32,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)a.out.h	5.6 (Berkeley) 4/30/91
- *	$Id: a.out.h,v 1.13 1994/04/07 06:34:03 deraadt Exp $
+ *	$Id: a.out.h,v 1.14 1994/07/01 01:29:41 deraadt Exp $
  */
 
 #ifndef	_AOUT_H_
 #define	_AOUT_H_
 
 #include <sys/exec.h>
-#include <machine/exec.h>
-
-
-#ifndef N_PAGSIZ
-#define	N_PAGSIZ(ex)	(__LDPGSZ)
-#endif
-
-/*
- * The a.out structure's a_midmag field is a network-byteorder encoding
- * of this int
- *	FFFFFFmmmmmmmmmmMMMMMMMMMMMMMMMM
- * Where `F' is 6 bits of flag like EX_DYNAMIC,
- *       `m' is 10 bits of machine-id like MID_I386, and
- *       `M' is 16 bits worth of magic number, ie. ZMAGIC.
- * The macros below will set/get the needed fields.
- */
-#define	N_GETMAGIC(ex) \
-    ( (((ex).a_midmag)&0xffff0000) ? (ntohl(((ex).a_midmag))&0xffff) : ((ex).a_midmag))
-#define	N_GETMAGIC2(ex) \
-    ( (((ex).a_midmag)&0xffff0000) ? (ntohl(((ex).a_midmag))&0xffff) : \
-    (((ex).a_midmag) | 0x10000) )
-#define	N_GETMID(ex) \
-    ( (((ex).a_midmag)&0xffff0000) ? ((ntohl(((ex).a_midmag))>>16)&0x03ff) : MID_ZERO )
-#define	N_GETFLAG(ex) \
-    ( (((ex).a_midmag)&0xffff0000) ? ((ntohl(((ex).a_midmag))>>26)&0x3f) : 0 )
-#define	N_SETMAGIC(ex,mag,mid,flag) \
-    ( (ex).a_midmag = htonl( (((flag)&0x3f)<<26) | (((mid)&0x03ff)<<16) | \
-    (((mag)&0xffff)) ) )
-
-#define	N_ALIGN(ex,x) \
-	(N_GETMAGIC(ex) == ZMAGIC || N_GETMAGIC(ex) == QMAGIC ? \
-	((x) + __LDPGSZ - 1) & ~(__LDPGSZ - 1) : (x))
-
-/* Valid magic number check. */
-#define	N_BADMAG(ex) \
-	(N_GETMAGIC(ex) != NMAGIC && N_GETMAGIC(ex) != OMAGIC && \
-	N_GETMAGIC(ex) != ZMAGIC && N_GETMAGIC(ex) != QMAGIC)
-
-/* Address of the bottom of the text segment. */
-#define	N_TXTADDR(ex)	(N_GETMAGIC2(ex) == (ZMAGIC|0x10000) ? 0 : __LDPGSZ)
-
-/* Address of the bottom of the data segment. */
-#define	N_DATADDR(ex) \
-	(N_GETMAGIC(ex) == OMAGIC ? N_TXTADDR(ex) + (ex).a_text : \
-	(N_TXTADDR(ex) + (ex).a_text + __LDPGSZ - 1) & ~(__LDPGSZ - 1))
-
-/* Address of the bottom of the bss segment. */
-#define	N_BSSADDR(ex) \
-	(N_DATADDR(ex) + (ex).a_data)
-
-/* Text segment offset. */
-#define	N_TXTOFF(ex) \
-	( N_GETMAGIC2(ex)==ZMAGIC || N_GETMAGIC2(ex)==(QMAGIC|0x10000) ? \
-	0 : (N_GETMAGIC2(ex)==(ZMAGIC|0x10000) ? __LDPGSZ : \
-	sizeof(struct exec)) )
-
-/* Data segment offset. */
-#define	N_DATOFF(ex) \
-	N_ALIGN(ex, N_TXTOFF(ex) + (ex).a_text)
-
-/* Text relocation table offset. */
-#define	N_TRELOFF(ex) \
-	(N_DATOFF(ex) + (ex).a_data)
-
-/* Data relocation table offset. */
-#define	N_DRELOFF(ex) \
-	(N_TRELOFF(ex) + (ex).a_trsize)
-
-/* Symbol table offset. */
-#define	N_SYMOFF(ex) \
-	(N_DRELOFF(ex) + (ex).a_drsize)
-
-/* String table offset. */
-#define	N_STROFF(ex) \
-	(N_SYMOFF(ex) + (ex).a_syms)
 
 #define	_AOUT_INCLUDE_
 #include <nlist.h>