Changeset 34

Timestamp:

Jun 19, 2010, 6:33:45 PM (15 years ago)

Author:

dmik

Message:

jdk/hpi: Adopt windows thread_md/memory_md sources and related headers to EMX (gcc for OS/2).

Location:

trunk/openjdk/jdk/src/windows

Files:

• hpi/export/byteorder_md.h (modified) (2 diffs)
• hpi/export/hpi_md.h (modified) (1 diff)
• hpi/export/io_md.h (modified) (3 diffs)
• hpi/export/timeval_md.h (modified) (2 diffs)
• hpi/include/monitor_md.h (modified) (2 diffs)
• hpi/include/threads_md.h (modified) (2 diffs)
• hpi/src/memory_md.c (modified) (1 diff)
• javavm/export/jni_md.h (modified) (1 diff)
• javavm/include/typedefs_md.h (modified) (2 diffs)

trunk/openjdk/jdk/src/windows/hpi/export/byteorder_md.h

@@ -31 +31 @@
 #define _JAVASOFT_WIN32_BYTEORDER_MD_H_
 
+#ifndef __EMX__
+
 #ifdef  x86
 #define ntohl(x)        ((x << 24) |                            \
@@ -46 +48 @@
 #endif  /* x86 */
 
+#endif /* __EMX__ */
+
 #endif /* !_JAVASOFT_WIN32_BYTEORDER_MD_H_ */

trunk/openjdk/jdk/src/windows/hpi/export/hpi_md.h

@@ -32 +32 @@
 #include "byteorder_md.h"
 
+#ifdef __EMX__
+#define EMXNOP(expr)
+#define EMXONLY(expr) expr
+#define EMXNOEMX(expr_emx,expr_otherwise) expr_emx
+#else /* __EMX__ */
+#define EMXNOP(expr) expr
+#define EMXONLY(expr)
+#define EMXNOEMX(expr_emx,expr_otherwise) expr_otherwise
+#endif /* __EMX__ */
+
 #define HPI_TIMEOUT_INFINITY ((jlong)(-1))
 

trunk/openjdk/jdk/src/windows/hpi/export/io_md.h

@@ -31 +31 @@
 #define _JAVASOFT_WIN32_IO_MD_H_
 
+#ifndef __EMX__
+
 #include <stdio.h>
 #include <io.h>                 /* For read(), lseek() etc. */
@@ -40 +42 @@
 #include <stdlib.h>
 
+#endif /* __EMX__ */
+
 #include "jvm_md.h"
+
+#ifndef __EMX__
 
 #define R_OK    4
@@ -54 +60 @@
 #define S_ISREG(mode)   (((mode) & _S_IFREG) == _S_IFREG)
 
+#endif /* __EMX__ */
+
 #define LINE_SEPARATOR "\r\n"
 

trunk/openjdk/jdk/src/windows/hpi/export/timeval_md.h

@@ -27 +27 @@
 #define _JAVASOFT_WIN32_TIMEVAL_H_
 
+#ifndef __EMX__
+
 typedef struct {
         long tv_sec;
@@ -48 +50 @@
 void timersub(timeval_t*, timeval_t*);
 
+#endif /* __EMX__ */
+
 #endif /* !_JAVASOFT_WIN32_TIMEVAL_H_ */

trunk/openjdk/jdk/src/windows/hpi/include/monitor_md.h

@@ -38 +38 @@
 #define SYS_MID_NULL ((sys_mon_t *) 0)
 
-typedef struct sys_mon {
+EMXNOP(typedef) struct sys_mon {
     long            atomic_count;   /* Variable for atomic compare swap */
     HANDLE          semaphore;      /* Semaphore used for the contention */
@@ -45 +45 @@
     sys_thread_t   *monitor_waiter; /* Monitor waiting queue head */
     long            waiter_count;   /* For debugging purpose */
-} sys_mon_t;
+} EMXNOP(sys_mon_t);
 
 #endif /* !_JAVASOFT_WIN32_MONITOR_MD_H_ */

trunk/openjdk/jdk/src/windows/hpi/include/threads_md.h

@@ -56 +56 @@
  * Machine dependent thread data structure
  */
-typedef struct sys_thread {
+EMXNOP(typedef) struct sys_thread {
     HANDLE handle;                  /* Win32 thread handle */
     unsigned long id;               /* Win32 thread id */
@@ -74 +74 @@
     unsigned int last_sum;
     PNT_TIB nt_tib;                 /* Pointer to NT thread-local block */
-} sys_thread_t;
+} EMXNOP(sys_thread_t);
 
 #define MONITOR_WAIT_SUSPENDED 0x0001

trunk/openjdk/jdk/src/windows/hpi/src/memory_md.c

@@ -48 +48 @@
 #include <windows.h>
 #include <sys/types.h>
+
+#ifdef __EMX__
+#include <string.h>
+#endif /* __EMX__ */
 
 #include "hpi_impl.h"

trunk/openjdk/jdk/src/windows/javavm/export/jni_md.h

@@ -32 +32 @@
 
 typedef long jint;
+#ifdef __EMX__
+typedef int64_t jlong;
+#else
 typedef __int64 jlong;
+#endif
 typedef signed char jbyte;
 

trunk/openjdk/jdk/src/windows/javavm/include/typedefs_md.h

@@ -35 +35 @@
 #define VARGS(x) (&x)
 
+#ifndef __EMX__
+
 typedef char             int8_t;
 typedef __int16          int16_t;
@@ -45 +47 @@
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
+
+#endif /* EMX */
 
 /* Make sure that we have the intptr_t and uintptr_t definitions */