Merging BSDPort into HotSpot mainline

[Kurt Miller]

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.

Regards,
-Kurt