Module Name: src
Committed By: matt
Date: Sun Aug 23 07:49:56 UTC 2009
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: types.h
Log Message:
Fix LP64 botch with vaddr_t/vsize_t
To generate a diff of this commit:
cvs rdiff -u -r1.43.36.4 -r1.43.36.5 src/sys/arch/mips/include/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/types.h
diff -u src/sys/arch/mips/include/types.h:1.43.36.4 src/sys/arch/mips/include/types.h:1.43.36.5
--- src/sys/arch/mips/include/types.h:1.43.36.4 Sun Aug 23 06:38:07 2009
+++ src/sys/arch/mips/include/types.h Sun Aug 23 07:49:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.43.36.4 2009/08/23 06:38:07 matt Exp $ */
+/* $NetBSD: types.h,v 1.43.36.5 2009/08/23 07:49:56 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -63,12 +63,20 @@
#define PRIxPSIZE PRIx32
#define PRIdPSIZE PRId32
#endif
+#ifdef _LP64
+typedef __uint64_t vaddr_t;
+typedef __uint64_t vsize_t;
+#define PRIxVADDR PRIx64
+#define PRIxVSIZE PRIx64
+#define PRIdVSIZE PRId64
+#else
typedef __uint32_t vaddr_t;
typedef __uint32_t vsize_t;
#define PRIxVADDR PRIx32
#define PRIxVSIZE PRIx32
#define PRIdVSIZE PRId32
#endif
+#endif
/* Make sure this is signed; we need pointers to be sign-extended. */
#if defined(__mips_o64) || defined(__mips_o32)