Changeset 249


Ignore:
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
Files:
2 added
15 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/make/Makefile

    r232 r249  
    260260all build:: sanity-all post-sanity-all
    261261
    262 ifndef OS2_TEMP
    263262SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
    264 else # disable JPDA
    265 SUBDIRS    = tools java javax org sun sunw com mkdemo mksample launchers
    266 endif
    267263all build::
    268264        $(SUBDIRS-loop)

  • trunk/openjdk/jdk/make/common/Release.gmk

    r238 r249  
    338338TOOLS = \
    339339
    340 ifndef OS2_TEMP # JPDA
    341340TOOLS += \
    342341        META-INF/services/com.sun.jdi.connect.Connector \
    343342        META-INF/services/com.sun.jdi.connect.spi.TransportService \
    344 
    345 endif
    346 TOOLS += \
    347343        sun/tools/asm           \
    348344        sun/tools/jar           \
    … …  
    370366        sun/jvmstat             \
    371367        com/sun/javadoc         \
    372 
    373 ifndef OS2_TEMP # JPDA
    374 TOOLS += \
    375368        com/sun/jdi             \
    376 
    377 endif
    378 TOOLS += \
    379369        com/sun/jarsigner       \
    380370        com/sun/mirror          \
    381371        com/sun/source          \
    382372        com/sun/tools/doclets   \
    383 
    384 ifndef OS2_TEMP # JPDA
    385 TOOLS += \
    386373        com/sun/tools/example/debug/expr \
    387374        com/sun/tools/example/debug/tty  \
    388375        com/sun/tools/extcheck  \
    389 
    390 endif
    391 TOOLS += \
    392376        com/sun/tools/hat       \
    393377        com/sun/tools/javac     \
    … …  
    408392        org/relaxng/datatype   \
    409393        com/sun/xml/internal/dtdparser \
    410 
    411 ifndef OS2_TEMP # JPDA
    412 TOOLS += \
    413394        com/sun/tools/jdi       \
    414 
    415 endif
    416 TOOLS += \
    417395        com/sun/tools/script/shell      \
    418396

  • trunk/openjdk/jdk/make/jpda/transport/Makefile

    r2 r249  
    3333
    3434SUBDIRS = socket
    35 ifeq ($(PLATFORM), windows)
     35ifeq ($(filter-out windows os2, $(PLATFORM)),)
    3636SUBDIRS += shmem
    3737endif # PLATFORM

  • trunk/openjdk/jdk/make/jpda/transport/shmem/Makefile

    r2 r249  
    8282# vpaths for the transport (should not be seen by others)
    8383#
    84 vpath %.c $(SHARE_SRC)/native/com/sun/tools/jdi:$(SHARE_SRC)/transport/shmem:$(PLATFORM_SRC)/transport/shmem
     84vpath %.c $(SHARE_SRC)/native/com/sun/tools/jdi $(SHARE_SRC)/transport/shmem $(PLATFORM_SRC)/transport/shmem

  • trunk/openjdk/jdk/make/jpda/transport/socket/Makefile

    r2 r249  
    3030BUILDDIR = ../../..
    3131LIBRARY = dt_socket
     32LIBRARY_SHORT = dt_sock
    3233PRODUCT = jbug
    3334
    … …  
    5455endif
    5556
     57ifeq ($(PLATFORM), os2)
     58  OTHER_LDLIBS += -lws2_32.lib
     59endif
     60
    5661OTHER_INCLUDES = -I$(INCLUDEDIR) -I$(PLATFORM_INCLUDE) \
    5762                 -I$(SHARE_SRC)/transport/export \
    … …  
    7378endif
    7479
    75 #
    76 # Rules.
    77 #
    78 include $(BUILDDIR)/common/Library.gmk
    79 
    8080# We don't want to link against -ljava
    8181JAVALIB=
    … …  
    8686endif
    8787
     88ifeq ($(PLATFORM), os2)
     89
     90FILES_c += socket_md_init.c
     91vpath %.c $(PLATFORM_SRC_OS2)/transport/socket
     92
     93# exports live in .def file
     94DEF_FILE = $(OBJDIR)/$(LIBRARY).def
     95$(DEF_FILE): $(MAKEFILE_LIST)
     96        @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
     97        @$(ECHO) 'EXPORTS \n \
     98  jdwpTransport_OnLoad = "_jdwpTransport_OnLoad@16" \n \
     99' >> $@
     100
     101clean::
     102        -$(RM) $(DEF_FILE)
     103
     104endif
     105
     106#
     107# Rules.
     108#
     109include $(BUILDDIR)/common/Library.gmk
     110
    88111#
    89112# Add to ambient vpath so we pick up the library files
    90113#
    91 vpath %.c $(SHARE_SRC)/transport/socket:$(PLATFORM_SRC)/transport/socket
     114vpath %.c $(SHARE_SRC)/transport/socket $(PLATFORM_SRC)/transport/socket

  • trunk/openjdk/jdk/make/mkdemo/Makefile

    r232 r249  
    3232include $(BUILDDIR)/common/Defs.gmk
    3333
    34 ifndef OS2_TEMP
    3534SUBDIRS = applets jfc jvmti management jni scripting jpda
    36 else # disable JPDA
    37 SUBDIRS = applets jfc jvmti management jni scripting
    38 endif
    3935
    4036all build:: nbproject

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

    r2 r249  
    123123
    124124        TransportService ts = null;
    125         if (lib.equals("dt_socket")) {
     125        final String sockLib = System.getProperty("os.name").startsWith("OS/2") ? "dt_sock" : "dt_socket";
     126        if (lib.equals(sockLib)) {
    126127            ts = new SocketTransportService();
    127128        } else {

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

    r2 r249  
    7171            transport = new Transport() {
    7272                public String name() {
     73                    if (System.getProperty("os.name").startsWith("OS/2"))
     74                        return "dt_sock";
    7375                    return "dt_socket";
    7476                }

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

    r2 r249  
    6969        transport = new Transport() {
    7070            public String name() {
     71                if (System.getProperty("os.name").startsWith("OS/2"))
     72                    return "dt_sock";
    7173                return "dt_socket";     // for compatability reasons
    7274            }

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

    r2 r249  
    5959        transport = new Transport() {
    6060            public String name() {
     61                if (System.getProperty("os.name").startsWith("OS/2"))
     62                    return "dt_sock";
    6163                return "dt_socket";     // for compatability reasons
    6264            }

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

    r2 r249  
    8282            transport = new Transport() {
    8383                public String name() {
     84                    if (System.getProperty("os.name").startsWith("OS/2"))
     85                        return "dt_sock";
    8486                    return "dt_socket";
    8587                }

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

    r2 r249  
    3232#include "jdwpTransport.h"  /* for Packet, TransportCallback */
    3333
     34#ifndef MIN
    3435#define MIN(x,y) ((x)<(y)?(x):(y))
     36#endif
    3537
    3638/*
    … …  
    8385} SharedListener;
    8486
    85 typedef struct SharedMemoryTransport {
     87struct SharedMemoryTransport {
    8688    char name[MAX_IPC_PREFIX];
    8789    sys_ipmutex_t mutex;
    … …  
    9092    sys_shmem_t sharedMemory;
    9193    SharedListener *shared;
    92 } SharedMemoryTransport;
     94};
    9395
    9496/*
    … …  
    143145
    144146
    145 typedef struct SharedMemoryConnection {
     147struct SharedMemoryConnection {
    146148    char name[MAX_IPC_NAME];
    147149    SharedMemory *shared;
    … …  
    151153    sys_process_t otherProcess;
    152154    sys_event_t shutdown;           /* signalled to indicate shutdown */
    153 } SharedMemoryConnection;
     155};
    154156
    155157static jdwpTransportCallback *callback;

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

    r2 r249  
    3030#include <stdlib.h>      /* for _MAx_PATH */
    3131
     32#ifdef __EMX__
     33typedef __uint64_t UNSIGNED_JLONG;
     34#define CONST_JLONG(x) x##LL
     35#else
    3236typedef unsigned __int64 UNSIGNED_JLONG;
     37#define CONST_JLONG(x) x
     38#endif
     39
    3340typedef unsigned long UNSIGNED_JINT;
    3441
    … …  
    5158#define HOST_TO_JAVA_LONG(x)                                            \
    5259                  ((x << 56) |                                          \
    53                    ((x & 0x000000000000ff00) << 40) |                   \
    54                    ((x & 0x0000000000ff0000) << 24) |                   \
    55                    ((x & 0x00000000ff000000) << 8) |                    \
    56                    ((x & 0x000000ff00000000) >> 8) |                    \
    57                    ((x & 0x0000ff0000000000) >> 24) |                   \
    58                    ((x & 0x00ff000000000000) >> 40) |                   \
    59                    (((UNSIGNED_JLONG)(x & 0xff00000000000000)) >> 56))
     60                   ((x & CONST_JLONG(0x000000000000ff00)) << 40) |                   \
     61                   ((x & CONST_JLONG(0x0000000000ff0000)) << 24) |                   \
     62                   ((x & CONST_JLONG(0x00000000ff000000)) << 8) |                    \
     63                   ((x & CONST_JLONG(0x000000ff00000000)) >> 8) |                    \
     64                   ((x & CONST_JLONG(0x0000ff0000000000)) >> 24) |                   \
     65                   ((x & CONST_JLONG(0x00ff000000000000)) >> 40) |                   \
     66                   (((UNSIGNED_JLONG)(x & CONST_JLONG(0xff00000000000000))) >> 56))
    6067#define HOST_TO_JAVA_FLOAT(x) stream_encodeFloat(x)
    6168#define HOST_TO_JAVA_DOUBLE(x) stream_encodeDouble(x)

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

    r2 r249  
    2727#include <errno.h>
    2828
    29 #include "shmem_md.h"
    3029#include "sysShmem.h"
    3130#include "shmemBase.h"  /* for exitTransportWithError */

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

    r2 r249  
    2626#include <winsock2.h>
    2727
     28#ifdef __EMX__
     29#include <string.h>
     30#include <memory.h>
     31#endif
     32
    2833#include "sysSocket.h"
    2934#include "socketTransport.h"
    … …  
    4146    const char *errString;
    4247} const winsock_errors[] = {
     48#ifndef __WIN32OS2__
    4349    { WSAEPROVIDERFAILEDINIT,   "Provider initialization failed (check %SystemRoot%)" },
     50#endif
    4451    { WSAEACCES,                "Permission denied" },
    4552    { WSAEADDRINUSE,            "Address already in use" },
    … …  
    427434
    428435#define FT2INT64(ft) \
    429         ((long)(ft).dwHighDateTime << 32 | (long)(ft).dwLowDateTime)
     436        ((jlong)(ft).dwHighDateTime << 32 | (jlong)(ft).dwLowDateTime)
    430437
    431438long
    432439dbgsysCurrentTimeMillis() {
    433     static long fileTime_1_1_70 = 0;    /* midnight 1/1/70 */
     440    static jlong fileTime_1_1_70 = 0;    /* midnight 1/1/70 */
    434441    SYSTEMTIME st0;
    435442    FILETIME   ft0;
Note: See TracChangeset for help on using the changeset viewer.