Merging BSDPort into HotSpot mainline
Kurt Miller
kurt at intricatesoftware.com
Fri Sep 16 06:46:26 PDT 2011
On Wednesday 14 September 2011 10:45:46 pm Kurt Miller wrote:
> On 9/14/11 4:38 PM, Christian Thalinger wrote:
> > On Sep 14, 2011, at 10:21 PM, Tom Rodriguez wrote:
> >> On Sep 14, 2011, at 6:28 AM, Christian Thalinger wrote:
> >>> src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp
> >>>
> >>> + #ifndef _ALLBSD_SOURCE
> >>> #include<byteswap.h>
> >>> + #endif
>
> byteswap doesn't exist on bsd (Checked Mac OS X 10.5, OpenBSD 5.0 and
> FreeBSD 7.0). Instead of ifndef _ALLBSD_SOURCE this should just be
> deleted since this is already a bsd only file. I went a little overboard
> with the ifdef/ifndef approach to minimize the differences between linux
> and bsd to help with merges.
>
> >>> + #ifdef __APPLE__
> >>> + #include<libkern/OSByteOrder.h>
> >>> + #endif
> >>> +
> >>> + #if defined(AMD64)
> >>> + # if defined(__APPLE__)
> >>> + # define bswap_16(x) OSSwapInt16(x)
> >>> + # define bswap_32(x) OSSwapInt32(x)
> >>> + # define bswap_64(x) OSSwapInt64(x)
> >>> + # elif defined(__OpenBSD__)
> >>> + # define bswap_16(x) swap16(x)
> >>> + # define bswap_32(x) swap32(x)
> >>> + # define bswap_64(x) swap64(x)
> >>> + # elif defined(__NetBSD__)
> >>> + # define bswap_16(x) bswap16(x)
> >>> + # define bswap_32(x) bswap32(x)
> >>> + # define bswap_64(x) bswap64(x)
> >>> + # else
> >>> + # define bswap_16(x) __bswap16(x)
> >>> + # define bswap_32(x) __bswap32(x)
> >>> + # define bswap_64(x) __bswap64(x)
> >>> + # endif
> >>> + #endif
> >>>
> >>> src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp:
> >>>
> >>> - #include<byteswap.h>
> >>> + #ifdef __APPLE__
> >>> + #include<libkern/OSByteOrder.h>
> >>> + #define bswap16(x) OSSwapInt16(x)
> >>> + #define bswap32(x) OSSwapInt32(x)
> >>> + #define bswap64(x) OSSwapInt64(x)
> >>> + #else
> >>> + # include<sys/endian.h>
> >>> + #endif
> >>>
> >>> Why is byteswap.h removed from bytes_bsd_zero but sys/endian.h is used for !APPLE? bytes_bsd_x86 does something different.
>
> byteswap.h is remove from both.
>
> sys/endian.h is how the BSD's get the bswap* definitions, except APPLE
> which gets them from libkern/OSByteOrder.h. It looks like this is
> different because zero support has been tested on APPLE and FreeBSD. I
> the zero file will need to end up with this block too:
>
> + # if defined(__APPLE__)
> + # define bswap_16(x) OSSwapInt16(x)
> + # define bswap_32(x) OSSwapInt32(x)
> + # define bswap_64(x) OSSwapInt64(x)
> + # elif defined(__OpenBSD__)
> + # define bswap_16(x) swap16(x)
> + # define bswap_32(x) swap32(x)
> + # define bswap_64(x) swap64(x)
> + # elif defined(__NetBSD__)
> + # define bswap_16(x) bswap16(x)
> + # define bswap_32(x) bswap32(x)
> + # define bswap_64(x) bswap64(x)
> + # else
> + # define bswap_16(x) __bswap16(x)
> + # define bswap_32(x) __bswap32(x)
> + # define bswap_64(x) __bswap64(x)
> + # endif
>
> and the rest of the file changed to use the bswap_NN() versions of the
> definitions to have full support.
I tested the zero build on OpenBSD and found that the above changes are needed
for the build to work. There was one other minor change needed as well.
The following is the diff that can be applied on top of the webrev to fix this fiile:
================ begin =====================
--- hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp.orig Thu Sep 15 19:18:02 2011
+++ hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp Thu Sep 15 19:19:50 2011
@@ -30,23 +30,38 @@
#ifdef __APPLE__
#include <libkern/OSByteOrder.h>
-#define bswap16(x) OSSwapInt16(x)
-#define bswap32(x) OSSwapInt32(x)
-#define bswap64(x) OSSwapInt64(x)
#else
# include <sys/endian.h>
#endif
+#if defined(__APPLE__)
+# define bswap_16(x) OSSwapInt16(x)
+# define bswap_32(x) OSSwapInt32(x)
+# define bswap_64(x) OSSwapInt64(x)
+#elif defined(__OpenBSD__)
+# define bswap_16(x) swap16(x)
+# define bswap_32(x) swap32(x)
+# define bswap_64(x) swap64(x)
+#elif defined(__NetBSD__)
+# define bswap_16(x) bswap16(x)
+# define bswap_32(x) bswap32(x)
+# define bswap_64(x) bswap64(x)patch-hotspot_src_os_cpu_bsd_zero_vm_bytes_bsd_zero_inline_hpp
+#else
+# define bswap_16(x) __bswap16(x)
+# define bswap_32(x) __bswap32(x)
+# define bswap_64(x) __bswap64(x)
+#endif
+
inline u2 Bytes::swap_u2(u2 x) {
- return bswap16(x);
+ return bswap_16(x);
}
inline u4 Bytes::swap_u4(u4 x) {
- return bswap32(x);
+ return bswap_32(x);
}
inline u8 Bytes::swap_u8(u8 x) {
- return bswap64(x);
+ return bswap_64(x);
}
#endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
================== end =================
The above change makes the bsd diff to linux version minimal (this is not to be applied, just for information):
================begin ==================
--- hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp.orig.linux Thu Sep 15 19:17:51 2011
+++ hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp Thu Sep 15 19:19:50 2011
@@ -28,7 +28,29 @@
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
-#include <byteswap.h>
+#ifdef __APPLE__
+#include <libkern/OSByteOrder.h>
+#else
+# include <sys/endian.h>
+#endif
+
+#if defined(__APPLE__)
+# define bswap_16(x) OSSwapInt16(x)
+# define bswap_32(x) OSSwapInt32(x)
+# define bswap_64(x) OSSwapInt64(x)
+#elif defined(__OpenBSD__)
+# define bswap_16(x) swap16(x)
+# define bswap_32(x) swap32(x)
+# define bswap_64(x) swap64(x)
+#elif defined(__NetBSD__)
+# define bswap_16(x) bswap16(x)
+# define bswap_32(x) bswap32(x)
+# define bswap_64(x) bswap64(x)
+#else
+# define bswap_16(x) __bswap16(x)
+# define bswap_32(x) __bswap32(x)
+# define bswap_64(x) __bswap64(x)
+#endif
inline u2 Bytes::swap_u2(u2 x) {
return bswap_16(x);
================== end ===============
If possible, this minor change is needed to fix the zero build on OpenBSD. This is diff would be applied on top of the webrev. Alternatively this can be handled later after the webrev is merged.:
=========== start ==================
--- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig Fri Sep 16 07:31:22 2011
+++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Fri Sep 16 07:31:45 2011
@@ -24,6 +24,7 @@
*/
#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__) && !defined(__NetBSD__)
+# include <pthread.h>
# include <pthread_np.h> /* For pthread_attr_get_np */
#endif
@@ -341,7 +342,7 @@ static void current_stack_region(address *bottom, size
stack_top = (address) ss.ss_sp;
stack_bytes = ss.ss_size;
- stack_bottom = stacktop - stack_bytes;
+ stack_bottom = stack_top - stack_bytes;
#elif defined(_ALLBSD_SOURCE)
pthread_attr_t attr;
=========== end ===================
More information about the hotspot-dev
mailing list