summaryrefslogtreecommitdiff
path: root/sys/arch/alpha
diff options
context:
space:
mode:
authorPhilip Guenthe <guenther@cvs.openbsd.org>2011-09-08 03:40:33 +0000
committerPhilip Guenthe <guenther@cvs.openbsd.org>2011-09-08 03:40:33 +0000
commit211427d868f8aecd29999f2831103f73bfc92516 (patch)
tree5a25fcd1af5efcfaa5c78baf48489585ce16228e /sys/arch/alpha
parent6f53e4ebb844e940e8bd7264ebb259719834ebe2 (diff)
Provide namespace-safe alignment macros in <machine/_types.h>, with
compat names kept in <machine/param.h>. In <sys/socket.h>, pull in <sys/_types.h> instead of the namespace polluting <machine/param.h> and completely eliminate __CMSG_ALIGN, replaced by _ALIGN ok deraadt@
Diffstat (limited to 'sys/arch/alpha')
-rw-r--r--sys/arch/alpha/include/_types.h16
-rw-r--r--sys/arch/alpha/include/param.h19
2 files changed, 19 insertions, 16 deletions
diff --git a/sys/arch/alpha/include/_types.h b/sys/arch/alpha/include/_types.h
index 48123f9f0df..55f1fa0e8be 100644
--- a/sys/arch/alpha/include/_types.h
+++ b/sys/arch/alpha/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.14 2011/09/08 02:47:13 guenther Exp $ */
+/* $OpenBSD: _types.h,v 1.15 2011/09/08 03:40:32 guenther Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,6 +41,20 @@ typedef struct label_t {
} label_t;
#endif
+/*
+ * _ALIGN(p) rounds p (pointer or byte index) up to a correctly-aligned
+ * value for all data types (int, long, ...). The result is an
+ * unsigned long and must be cast to any desired pointer type.
+ *
+ * _ALIGNED_POINTER is a boolean macro that checks whether an address
+ * is valid to fetch data elements of type t from on this architecture.
+ * This does not reflect the optimal alignment, just the possibility
+ * (within reasonable limits).
+ */
+#define _ALIGNBYTES 7
+#define _ALIGN(p) (((unsigned long)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
+#define _ALIGNED_POINTER(p,t) ((((unsigned long)(p)) & (sizeof(t) - 1)) == 0)
+
/* 7.18.1.1 Exact-width integer types */
typedef __signed char __int8_t;
typedef unsigned char __uint8_t;
diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h
index ace9b16468c..db908ff515e 100644
--- a/sys/arch/alpha/include/param.h
+++ b/sys/arch/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.34 2009/10/02 17:57:23 miod Exp $ */
+/* $OpenBSD: param.h,v 1.35 2011/09/08 03:40:32 guenther Exp $ */
/* $NetBSD: param.h,v 1.30 2000/06/09 16:03:04 thorpej Exp $ */
/*
@@ -51,20 +51,9 @@
#include <machine/alpha_cpu.h>
#include <machine/cpu.h>
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value for all
- * data types (int, long, ...). The result is u_long and must be cast to
- * any desired pointer type.
- *
- * ALIGNED_POINTER is a boolean macro that checks whether an address
- * is valid to fetch data elements of type t from on this architecture.
- * This does not reflect the optimal alignment, just the possibility
- * (within reasonable limits).
- *
- */
-#define ALIGNBYTES 7
-#define ALIGN(p) (((u_long)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-#define ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0)
+#define ALIGNBYTES _ALIGNBYTES
+#define ALIGN(p) _ALIGN(p)
+#define ALIGNED_POINTER(p,t) _ALIGNED_POINTER(p,t)
#define NBPG (1 << ALPHA_PGSHIFT) /* bytes/page */
#define PGOFSET (NBPG-1) /* byte off. into pg */