Changeset 249 for trunk/openjdk/jdk/src

Timestamp:

Jan 27, 2011, 6:22:28 PM (15 years ago)

Author:

dmik

Message:

jdk: Adopted JPDA to OS/2 and included in the build (closes #19).

Location:

trunk/openjdk/jdk/src

Files:

• os2/transport (added)
• os2/transport/socket (added)
• os2/transport/socket/socket_md_init.c (copied) (copied from trunk/openjdk/jdk/src/os2/native/java/net/net_util_md_init.c )
• share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java (modified) (1 diff)
• share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java (modified) (1 diff)
• share/classes/com/sun/tools/jdi/SocketAttachingConnector.java (modified) (1 diff)
• share/classes/com/sun/tools/jdi/SocketListeningConnector.java (modified) (1 diff)
• share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java (modified) (1 diff)
• share/transport/shmem/shmemBase.c (modified) (5 diffs)
• windows/back/util_md.h (modified) (2 diffs)
• windows/transport/shmem/shmem_md.c (modified) (1 diff)
• windows/transport/socket/socket_md.c (modified) (3 diffs)

trunk/openjdk/jdk/src/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java

@@ -123 +123 @@
 
         TransportService ts = null;
-        if (lib.equals("dt_socket")) {
+        final String sockLib = System.getProperty("os.name").startsWith("OS/2") ? "dt_sock" : "dt_socket";
+        if (lib.equals(sockLib)) {
             ts = new SocketTransportService();
         } else {

trunk/openjdk/jdk/src/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java

@@ -71 +71 @@
             transport = new Transport() {
                 public String name() {
+                    if (System.getProperty("os.name").startsWith("OS/2"))
+                        return "dt_sock";
                     return "dt_socket";
                 }

trunk/openjdk/jdk/src/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java

@@ -69 +69 @@
         transport = new Transport() {
             public String name() {
+                if (System.getProperty("os.name").startsWith("OS/2"))
+                    return "dt_sock";
                 return "dt_socket";     // for compatability reasons
             }

trunk/openjdk/jdk/src/share/classes/com/sun/tools/jdi/SocketListeningConnector.java

@@ -59 +59 @@
         transport = new Transport() {
             public String name() {
+                if (System.getProperty("os.name").startsWith("OS/2"))
+                    return "dt_sock";
                 return "dt_socket";     // for compatability reasons
             }

trunk/openjdk/jdk/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java

@@ -82 +82 @@
             transport = new Transport() {
                 public String name() {
+                    if (System.getProperty("os.name").startsWith("OS/2"))
+                        return "dt_sock";
                     return "dt_socket";
                 }

trunk/openjdk/jdk/src/share/transport/shmem/shmemBase.c

@@ -32 +32 @@
 #include "jdwpTransport.h"  /* for Packet, TransportCallback */
 
+#ifndef MIN
 #define MIN(x,y) ((x)<(y)?(x):(y))
+#endif
 
 /*
@@ -83 +85 @@
 } SharedListener;
 
-typedef struct SharedMemoryTransport {
+struct SharedMemoryTransport {
     char name[MAX_IPC_PREFIX];
     sys_ipmutex_t mutex;
@@ -90 +92 @@
     sys_shmem_t sharedMemory;
     SharedListener *shared;
-} SharedMemoryTransport;
+};
 
 /*
@@ -143 +145 @@
 
 
-typedef struct SharedMemoryConnection {
+struct SharedMemoryConnection {
     char name[MAX_IPC_NAME];
     SharedMemory *shared;
@@ -151 +153 @@
     sys_process_t otherProcess;
     sys_event_t shutdown;           /* signalled to indicate shutdown */
-} SharedMemoryConnection;
+};
 
 static jdwpTransportCallback *callback;

trunk/openjdk/jdk/src/windows/back/util_md.h

@@ -30 +30 @@
 #include <stdlib.h>      /* for _MAx_PATH */
 
+#ifdef __EMX__
+typedef __uint64_t UNSIGNED_JLONG;
+#define CONST_JLONG(x) x##LL
+#else
 typedef unsigned __int64 UNSIGNED_JLONG;
+#define CONST_JLONG(x) x
+#endif
+
 typedef unsigned long UNSIGNED_JINT;
 
@@ -51 +58 @@
 #define HOST_TO_JAVA_LONG(x)                                            \
                   ((x << 56) |                                          \
-                   ((x & 0x000000000000ff00) << 40) |                   \
-                   ((x & 0x0000000000ff0000) << 24) |                   \
-                   ((x & 0x00000000ff000000) << 8) |                    \
-                   ((x & 0x000000ff00000000) >> 8) |                    \
-                   ((x & 0x0000ff0000000000) >> 24) |                   \
-                   ((x & 0x00ff000000000000) >> 40) |                   \
-                   (((UNSIGNED_JLONG)(x & 0xff00000000000000)) >> 56))
+                   ((x & CONST_JLONG(0x000000000000ff00)) << 40) |                   \
+                   ((x & CONST_JLONG(0x0000000000ff0000)) << 24) |                   \
+                   ((x & CONST_JLONG(0x00000000ff000000)) << 8) |                    \
+                   ((x & CONST_JLONG(0x000000ff00000000)) >> 8) |                    \
+                   ((x & CONST_JLONG(0x0000ff0000000000)) >> 24) |                   \
+                   ((x & CONST_JLONG(0x00ff000000000000)) >> 40) |                   \
+                   (((UNSIGNED_JLONG)(x & CONST_JLONG(0xff00000000000000))) >> 56))
 #define HOST_TO_JAVA_FLOAT(x) stream_encodeFloat(x)
 #define HOST_TO_JAVA_DOUBLE(x) stream_encodeDouble(x)

trunk/openjdk/jdk/src/windows/transport/shmem/shmem_md.c

@@ -27 +27 @@
 #include <errno.h>
 
-#include "shmem_md.h"
 #include "sysShmem.h"
 #include "shmemBase.h"  /* for exitTransportWithError */

trunk/openjdk/jdk/src/windows/transport/socket/socket_md.c

@@ -26 +26 @@
 #include <winsock2.h>
 
+#ifdef __EMX__
+#include <string.h>
+#include <memory.h>
+#endif
+
 #include "sysSocket.h"
 #include "socketTransport.h"
@@ -41 +46 @@
     const char *errString;
 } const winsock_errors[] = {
+#ifndef __WIN32OS2__
     { WSAEPROVIDERFAILEDINIT,   "Provider initialization failed (check %SystemRoot%)" },
+#endif
     { WSAEACCES,                "Permission denied" },
     { WSAEADDRINUSE,            "Address already in use" },
@@ -427 +434 @@
 
 #define FT2INT64(ft) \
-        ((long)(ft).dwHighDateTime << 32 | (long)(ft).dwLowDateTime)
+        ((jlong)(ft).dwHighDateTime << 32 | (jlong)(ft).dwLowDateTime)
 
 long
 dbgsysCurrentTimeMillis() {
-    static long fileTime_1_1_70 = 0;    /* midnight 1/1/70 */
+    static jlong fileTime_1_1_70 = 0;    /* midnight 1/1/70 */
     SYSTEMTIME st0;
     FILETIME   ft0;