Changeset 34 for trunk/openjdk/jdk


Ignore:
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:
9 edited

Legend:

Unmodified
Added
Removed

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

    r2 r34  
    3131#define _JAVASOFT_WIN32_BYTEORDER_MD_H_
    3232
     33#ifndef __EMX__
     34
    3335#ifdef  x86
    3436#define ntohl(x)        ((x << 24) |                            \
    … …  
    4648#endif  /* x86 */
    4749
     50#endif /* __EMX__ */
     51
    4852#endif /* !_JAVASOFT_WIN32_BYTEORDER_MD_H_ */

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

    r2 r34  
    3232#include "byteorder_md.h"
    3333
     34#ifdef __EMX__
     35#define EMXNOP(expr)
     36#define EMXONLY(expr) expr
     37#define EMXNOEMX(expr_emx,expr_otherwise) expr_emx
     38#else /* __EMX__ */
     39#define EMXNOP(expr) expr
     40#define EMXONLY(expr)
     41#define EMXNOEMX(expr_emx,expr_otherwise) expr_otherwise
     42#endif /* __EMX__ */
     43
    3444#define HPI_TIMEOUT_INFINITY ((jlong)(-1))
    3545

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

    r2 r34  
    3131#define _JAVASOFT_WIN32_IO_MD_H_
    3232
     33#ifndef __EMX__
     34
    3335#include <stdio.h>
    3436#include <io.h>                 /* For read(), lseek() etc. */
    … …  
    4042#include <stdlib.h>
    4143
     44#endif /* __EMX__ */
     45
    4246#include "jvm_md.h"
     47
     48#ifndef __EMX__
    4349
    4450#define R_OK    4
    … …  
    5460#define S_ISREG(mode)   (((mode) & _S_IFREG) == _S_IFREG)
    5561
     62#endif /* __EMX__ */
     63
    5664#define LINE_SEPARATOR "\r\n"
    5765

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

    r2 r34  
    2727#define _JAVASOFT_WIN32_TIMEVAL_H_
    2828
     29#ifndef __EMX__
     30
    2931typedef struct {
    3032        long tv_sec;
    … …  
    4850void timersub(timeval_t*, timeval_t*);
    4951
     52#endif /* __EMX__ */
     53
    5054#endif /* !_JAVASOFT_WIN32_TIMEVAL_H_ */

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

    r2 r34  
    3838#define SYS_MID_NULL ((sys_mon_t *) 0)
    3939
    40 typedef struct sys_mon {
     40EMXNOP(typedef) struct sys_mon {
    4141    long            atomic_count;   /* Variable for atomic compare swap */
    4242    HANDLE          semaphore;      /* Semaphore used for the contention */
    … …  
    4545    sys_thread_t   *monitor_waiter; /* Monitor waiting queue head */
    4646    long            waiter_count;   /* For debugging purpose */
    47 } sys_mon_t;
     47} EMXNOP(sys_mon_t);
    4848
    4949#endif /* !_JAVASOFT_WIN32_MONITOR_MD_H_ */

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

    r2 r34  
    5656 * Machine dependent thread data structure
    5757 */
    58 typedef struct sys_thread {
     58EMXNOP(typedef) struct sys_thread {
    5959    HANDLE handle;                  /* Win32 thread handle */
    6060    unsigned long id;               /* Win32 thread id */
    … …  
    7474    unsigned int last_sum;
    7575    PNT_TIB nt_tib;                 /* Pointer to NT thread-local block */
    76 } sys_thread_t;
     76} EMXNOP(sys_thread_t);
    7777
    7878#define MONITOR_WAIT_SUSPENDED 0x0001

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

    r2 r34  
    4848#include <windows.h>
    4949#include <sys/types.h>
     50
     51#ifdef __EMX__
     52#include <string.h>
     53#endif /* __EMX__ */
    5054
    5155#include "hpi_impl.h"

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

    r2 r34  
    3232
    3333typedef long jint;
     34#ifdef __EMX__
     35typedef int64_t jlong;
     36#else
    3437typedef __int64 jlong;
     38#endif
    3539typedef signed char jbyte;
    3640

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

    r2 r34  
    3535#define VARGS(x) (&x)
    3636
     37#ifndef __EMX__
     38
    3739typedef char             int8_t;
    3840typedef __int16          int16_t;
    … …  
    4547typedef unsigned __int32 uint32_t;
    4648typedef unsigned __int64 uint64_t;
     49
     50#endif /* EMX */
    4751
    4852/* Make sure that we have the intptr_t and uintptr_t definitions */
Note: See TracChangeset for help on using the changeset viewer.