Changeset 58 for trunk/openjdk/hotspot/src/share

Timestamp:

Jul 15, 2010, 2:46:42 PM (15 years ago)

Author:

dmik

Message:

hotspot/src: Another big bunch of patches to make the windows code build with Odin32/GCC on OS/2.

Location:

trunk/openjdk/hotspot/src/share/vm

Files:

• prims/forte.cpp (modified) (4 diffs)
• prims/jniFastGetField.hpp (modified) (1 diff)
• utilities/globalDefinitions_gcc.hpp (modified) (1 diff)
• utilities/ostream.cpp (modified) (1 diff)

trunk/openjdk/hotspot/src/share/vm/prims/forte.cpp

@@ -618 +618 @@
 
 
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(OS2)
 // Support for the Forte(TM) Peformance Tools collector.
 //
@@ -637 +637 @@
 #define collector_func_load(x0,x1,x2,x3,x4,x5,x6) \
         ( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),0 : 0 )
-#endif // !_WINDOWS
+#endif // !_WINDOWS && !OS2
 
 } // end extern "C"
@@ -643 +643 @@
 
 void Forte::register_stub(const char* name, address start, address end) {
-#if !defined(_WINDOWS) && !defined(IA64)
+#if !defined(_WINDOWS) && !defined(OS2) && !defined(IA64)
   assert(pointer_delta(end, start, sizeof(jbyte)) < INT_MAX,
     "Code size exceeds maximum range")
@@ -649 +649 @@
   collector_func_load((char*)name, NULL, NULL, start,
     pointer_delta(end, start, sizeof(jbyte)), 0, NULL);
-#endif // !_WINDOWS && !IA64
-}
+#endif // !_WINDOWS && !OS2 && !IA64
+}

trunk/openjdk/hotspot/src/share/vm/prims/jniFastGetField.hpp

@@ -61 +61 @@
 
  public:
-#if defined(_WINDOWS) && !defined(_WIN64)
+#if (defined(_WINDOWS) && !defined(_WIN64)) || defined(OS2)
   static GetBooleanField_t jni_fast_GetBooleanField_fp;
   static GetByteField_t    jni_fast_GetByteField_fp;

trunk/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp

@@ -82 +82 @@
 
 #ifdef OS2
+#include <sys/types.h>
 #ifdef __WIN32OS2__
 #include <excpt.h>
+// compiler's select() would conflict with Winsock
+#define select __io_select
 #include <io.h>
+#undef select
+#ifdef __EMX__
+// we disable BSD visibility for the compiler so define these manually
+int     finite(double) __pure2;
+int     isnanf(float) __pure2;
+#define S_IREAD     S_IRUSR
+#define S_IWRITE    S_IWUSR
+#define S_IEXEC     S_IXUSR
+#include <alloca.h> // <stdlib.h> defines alloca only in BSD mode
+#endif
+#else // __WIN32OS2__
+#include <io.h>
+#endif // __WIN32OS2__
+#ifdef __EMX__
+#include <strings.h> // strcasecmp()
+// EMX doesn't provide some ANSI declarations
+#define _alloca     alloca
+#define _fileno     fileno
+#define _O_BINARY   O_BINARY
+#define _O_TEXT     O_TEXT
+#define _O_CREAT    O_CREAT
+#define _O_TRUNC    O_TRUNC
+#define _O_EXCL     O_TRUNC
+#define _O_WRONLY   O_WRONLY
+#define _O_RDONLY   O_RDONLY
+#define _O_RDWR     O_RDWR
+#define _S_IREAD    S_IREAD
+#define _S_IWRITE   S_IWRITE
+#define _S_IEXEC    S_IEXEC
 #endif
 #endif // OS2

trunk/openjdk/hotspot/src/share/vm/utilities/ostream.cpp

@@ -835 +835 @@
 #endif
 
+#ifdef __WIN32OS2__
+#include <winsock.h>
+#endif
+
 // Network access
 networkStream::networkStream() : bufferedStream(1024*10, 1024*10) {