Changeset 236 for trunk/src/emx/include

Timestamp:

May 26, 2003, 4:43:12 PM (22 years ago)

Author:

zap

Message:

See ChangeLog.

Location:

trunk/src/emx/include

Files:

• a_out.h (modified) (2 diffs, 1 prop)
• a_out_stab.h (added)
• emx/asm386.h (modified) (3 diffs, 1 prop)
• emx/io.h (modified) (2 diffs, 1 prop)
• emx/startup.h (modified) (3 diffs, 1 prop)
• emx/thread.h (modified) (2 diffs, 1 prop)
• emx/umalloc.h (modified) (3 diffs, 1 prop)
• os2thunk.h (modified) (4 diffs, 1 prop)
• stdio.h (modified) (3 diffs, 1 prop)
• stdlib.h (modified) (3 diffs, 1 prop)
• string.h (modified) (1 diff, 1 prop)
• sys/errno.h (modified) (1 diff, 1 prop)
• sys/omflib.h (modified) (1 diff, 1 prop)
• sys/uio.h (modified) (1 diff, 1 prop)

trunk/src/emx/include/a_out.h

@@ -138 +138 @@
 /* emx */
 #define N_IMP1  0x68            /* Import definition symbol */
+#define N_IMP2  0x6a            /* Import definition symbol */
 
 
@@ -168 +169 @@
   unsigned int r_pad:4;
 };
+
 #endif /* __A_OUT_GNU_H__ */

trunk/src/emx/include/emx/asm386.h

@@ -2 +2 @@
 
 #include <sys/errno.h>
+
+/* Macros for defining standard libc functions */
+
+#define _STD(x) __std_ ## x
 
 #define _xam fxam; fstsw %ax; andb $0x45, %ah
@@ -14 +18 @@
 #if defined (LONG_DOUBLE)
 #define FLD fldt
-#define MATHSUFFIX1(X)   _##X##l
-#define MATHSUFFIX2(X)  _##X##l
-#define MATHSUFFIX3(X)  X##l
+#define MATHSUFFIX1(X)  _STD(##X##l)
+#define MATHSUFFIX2(X)  _STD(##X##l)
+#define MATHSUFFIX3(X)  _##X##l
 #define CONV(X)
 #elif defined (FLOAT)
 #define FLD flds
-#define MATHSUFFIX1(X)  _##X##f
-#define MATHSUFFIX2(X)  _##X##f
-#define MATHSUFFIX3(X)  X##f
+#define MATHSUFFIX1(X)  _STD(##X##f)
+#define MATHSUFFIX2(X)  _STD(##X##f)
+#define MATHSUFFIX3(X)  _##X##f
 #define CONV(X) fstps X; flds X
 #else
 #define FLD fldl
-#define MATHSUFFIX1(X)  X
-#define MATHSUFFIX2(X)  _##X
-#define MATHSUFFIX3(X)  X
+#define MATHSUFFIX1(X)  _STD(X)
+#define MATHSUFFIX2(X)  _STD(X)
+#define MATHSUFFIX3(X)  _##X
 #define CONV(X) fstpl X; fldl X
 #endif
 
-#define LABEL0(name)    _##name
-#define LABEL(name)     LABEL0(name)
-
 #define ALIGN   .align  2, 0x90
-
-#if !defined (__MT__)
-
-#define SET_ERRNO_CONST(x) \
-        movl    x, _errno
-
-#else
 
 #define SET_ERRNO_CONST(x) \
         call    __errno ;\
         movl    x, (%eax)
-
-#endif
 
 #if defined (__GPROF__)
@@ -73 +65 @@
 #define FP_INFINITE     3
 #define FP_NAN          4
-
-/* Macros for defining standard libc functions */
-
-#define CONCAT(x,y) x ## y
-#define _STD(x) CONCAT(__std_,x)

trunk/src/emx/include/emx/io.h

@@ -165 +165 @@
 extern struct fdvec _fdvec_head;
 
-#if defined (__MT__)
-
 /* This is currently used only in the multi-thread libraries.  We
    can't use and reallocate a single array because rmutex semaphores
@@ -207 +205 @@
 
 #endif /* defined (_SYS_RMUTEX_H) */
-
-#else /* !defined (__MT__) */
-
-#define STREAMV_LOCK            (void)0
-#define STREAMV_UNLOCK          (void)0
-
-#define STREAM_LOCK(f)          (void)0
-#define STREAM_UNLOCK(f)        (void)0
-#define STREAM_LOCK_NOWAIT(f)   1
-#define STREAM_UNLOCKED(f)      1
-
-#endif /* !defined (__MT__) */
 
 

trunk/src/emx/include/emx/startup.h

@@ -8 +8 @@
 #endif
 
+extern int _CRT_init (void);
+extern void _CRT_term (void);
+
 /* argv[i][-1] contains some flag bits: */
 
@@ -16 +19 @@
 #define _ARG_NONZERO  0x80          /* Always set, to avoid end of string   */
 
-/* Arrange that FUN will be called by _startup(). */
+/* Arrange that FUN will be called by _CRT_init(). */
 
 #define _CRT_INIT1(fun) __asm__ (".stabs \"___crtinit1__\", 23, 0, 0, _" #fun);
 
-/* Arrange that FUN will be called by _cleanup(). */
+/* Arrange that FUN will be called by _CRT_term(). */
 
 #define _CRT_EXIT1(fun) __asm__ (".stabs \"___crtexit1__\", 23, 0, 0, _" #fun);
@@ -29 +32 @@
 extern char ** _org_environ;
 
-extern char _cdll_flag;
-
-void _cleanup (void);
-
 #if defined (__cplusplus)
 }

trunk/src/emx/include/emx/thread.h

@@ -7 +7 @@
 extern "C" {
 #endif
-
-#if defined (__MT__)
 
 #if !defined (_TM)
@@ -53 +51 @@
 struct _thread *_thread (void);
 
-#endif /* defined (__MT__) */
-
 
 #if defined (__cplusplus)

trunk/src/emx/include/emx/umalloc.h

@@ -598 +598 @@
 /* Each thread has its own default heap. */
 
-#if defined (__MT__)
 #define _UM_DEFAULT_REGULAR_HEAP tp->_th_rheap
 #define _UM_DEFAULT_TILED_HEAP   tp->_th_theap
 #define _UM_MT_DECL              struct _thread *tp = _thread ();
-#else
-#define _UM_DEFAULT_REGULAR_HEAP _um_regular_heap
-#define _UM_DEFAULT_TILED_HEAP   _um_tiled_heap
-#define _UM_MT_DECL
-#endif
 
 /* Note that _um_regular_heap is declared in <umalloc.h>.
@@ -735 +729 @@
 static __inline__ void _um_heap_lock (Heap_t h)
 {
-#if defined (__MT__)
   _rmutex_checked_request (&h->rsem, _FMR_IGNINT);
-#endif
 }
 
@@ -743 +735 @@
 static __inline__ void _um_heap_unlock (Heap_t h)
 {
-#if defined (__MT__)
   _rmutex_checked_release (&h->rsem);
-#endif
 }
 

trunk/src/emx/include/os2thunk.h

@@ -6 +6 @@
 typedef unsigned long _far16ptr;
 
-_far16ptr _emx_32to16 (void *ptr);
-void *_emx_16to32 (_far16ptr ptr);
+_far16ptr _libc_32to16 (void *ptr);
+void *_libc_16to32 (_far16ptr ptr);
 
-unsigned long _emx_thunk1 (void *args, void *fun);
+unsigned long _libc_thunk1 (void *args, void *fun);
 
 #define _THUNK_PASCAL_PROLOG(SIZE) \
@@ -17 +17 @@
 #define _THUNK_PASCAL_SHORT(ARG)    (*--((unsigned short *)_tp) = (ARG))
 #define _THUNK_PASCAL_LONG(ARG)     (*--((unsigned long *)_tp) = (ARG))
-#define _THUNK_PASCAL_FLAT(ARG)     _THUNK_PASCAL_LONG (_emx_32to16 (ARG))
+#define _THUNK_PASCAL_FLAT(ARG)     _THUNK_PASCAL_LONG (_libc_32to16 (ARG))
 #define _THUNK_PASCAL_FAR16(ARG)    _THUNK_PASCAL_LONG (ARG)
 #define _THUNK_PASCAL_FUNCTION(FUN) APIENTRY _16_##FUN
-#define _THUNK_PASCAL_CALL(FUN)     _emx_thunk1 (_tb, (void *)(_16_##FUN)); })
-#define _THUNK_PASCAL_CALLI(FUN)    _emx_thunk1 (_tb, (void *)(FUN)); })
+#define _THUNK_PASCAL_CALL(FUN)     _libc_thunk1 (_tb, (void *)(_16_##FUN)); })
+#define _THUNK_PASCAL_CALLI(FUN)    _libc_thunk1 (_tb, (void *)(FUN)); })
 
 #define _THUNK_C_PROLOG(SIZE) \
@@ -29 +29 @@
 #define _THUNK_C_SHORT(ARG)    (*((unsigned short *)_tp)++ = (ARG))
 #define _THUNK_C_LONG(ARG)     (*((unsigned long *)_tp)++ = (ARG))
-#define _THUNK_C_FLAT(ARG)     _THUNK_C_LONG (_emx_32to16 (ARG))
+#define _THUNK_C_FLAT(ARG)     _THUNK_C_LONG (_libc_32to16 (ARG))
 #define _THUNK_C_FAR16(ARG)    _THUNK_C_LONG (ARG)
 #define _THUNK_C_FUNCTION(FUN) _16__##FUN
-#define _THUNK_C_CALL(FUN)     _emx_thunk1 (_tb, (void *)(_16__##FUN)); })
-#define _THUNK_C_CALLI(FUN)    _emx_thunk1 (_tb, (void *)(FUN)); })
+#define _THUNK_C_CALL(FUN)     _libc_thunk1 (_tb, (void *)(_16__##FUN)); })
+#define _THUNK_C_CALLI(FUN)    _libc_thunk1 (_tb, (void *)(FUN)); })
 
 #define _THUNK_PROLOG(SIZE)  _THUNK_PASCAL_PROLOG (SIZE)
@@ -46 +46 @@
 
 #define MAKE16P(sel,off)   ((_far16ptr)((sel) << 16 | (off)))
-#define MAKEP(sel,off)     _emx_16to32 (MAKE16P (sel, off))
+#define MAKEP(sel,off)     _libc_16to32 (MAKE16P (sel, off))
 #define SELECTOROF(farptr) ((SEL)((farptr) >> 16))
 #define OFFSETOF(farptr)   ((USHORT)(farptr))

trunk/src/emx/include/stdio.h

@@ -112 +112 @@
 #if !defined (_VA_LIST)
 #define _VA_LIST
-typedef char *va_list;
+typedef __builtin_va_list va_list;
 #endif
 
@@ -159 +159 @@
 int _rmtmp (void);
 
-int _getc_inline (FILE *);
-int _putc_inline (int, FILE *);
-
 extern __inline__ int feof (FILE *_s)
 {
@@ -172 +169 @@
 }
 
-/* Do not use this function in application programs! */
-
-extern __inline__ int _getc_inline (FILE *_s)
-{
-  return (--_s->_rcount >= 0
-          ? (unsigned char)*_s->_ptr++
-          : _fill (_s));
-}
-
-/* Do not use this function in application programs! */
-
-extern __inline__ int _putc_inline (int _c, FILE *_s)
-{
-  return (--_s->_wcount >= 0 && (_c != '\n' || !(_s->_flags & _IOLBF))
-          ? (unsigned char)(*_s->_ptr++ = (char)_c)
-          : _flush (_c, _s));
-}
-
-#if defined (__MT__)
-
 #define getc(s)   fgetc(s)
 #define putc(c,s) fputc(c,s)
-
-#else
-
-#define getc(s)   _getc_inline(s)
-#define putc(c,s) _putc_inline(c,s)
-
-#endif
 
 extern __inline__ int getchar (void) { return getc (stdin); }

trunk/src/emx/include/stdlib.h

@@ -116 +116 @@
 #if !defined (_ERRNO)
 #define _ERRNO
-#if defined (__MT__) || defined (__ST_MT_ERRNO__)
 extern int *_errno (void);
 #define errno (*_errno ())
-#else
-extern int errno;
-#endif
 #endif
 
@@ -148 +144 @@
 extern __const__ int sys_nerr;
 
-extern __const__ unsigned int _emx_vcmp;
-extern __const__ unsigned int _emx_env;
-extern __const__ unsigned int _emx_rev;
 extern __const__ unsigned char _osminor;
 extern __const__ unsigned char _osmajor;
-extern __const__ unsigned char _osmode;
-extern __const__ char _emx_vprt[5];
-
+
+/* No DOS support ... */
+#define _osmode OS2_MODE
 
 unsigned alarm (unsigned);
@@ -263 +256 @@
 void _wildcard (int *, char ***);
 
-#if defined (__MT__)
 int _beginthread (void (*)(void *), void *, unsigned, void *);
 void _endthread (void);
 void **_threadstore (void);
-#endif
 
 #endif

trunk/src/emx/include/string.h

@@ -58 +58 @@
 char *strdup (__const__ char *);
 int stricmp (__const__ char *, __const__ char *);
+int strcasecmp (__const__ char *, __const__ char *);
 char *strlwr (char *);
 int strnicmp (__const__ char *, __const__ char *, size_t);
+int strncasecmp (__const__ char *, __const__ char *, size_t);
 char *strnset (char *, int, size_t);
 char *strrev (char *);

trunk/src/emx/include/sys/errno.h

@@ -10 +10 @@
 #if !defined (__ASSEMBLER__) && !defined (_ERRNO)
 #define _ERRNO
-#if defined (__MT__) || defined (__ST_MT_ERRNO__)
 extern int *_errno (void);
 #define errno (*_errno ())
-#else
-extern int errno;
-#endif
 #endif
 

trunk/src/emx/include/sys/omflib.h

@@ -10 +10 @@
 #endif
 
+#ifndef _BYTE_WORD_DWORD
+#define _BYTE_WORD_DWORD
+typedef unsigned char byte;
+typedef unsigned short word;
+typedef unsigned long dword;
+#endif /* _BYTE_WORD_DWORD */
 
 #if !defined (THEADR)
 
-#define THEADR 0x80
-#define LHEADR 0x82
-#define COMENT 0x88
-#define MODEND 0x8a
-#define PUBDEF 0x90
-#define ALIAS  0xc6
-#define LIBHDR 0xf0
-#define LIBEND 0xf1
+/* OMF record types.  To get the 32-bit variant of a record type, add
+   REC32. */
+#define THEADR          0x80    /* Translator module header record */
+#define COMENT          0x88    /* Comment record */
+#define MODEND          0x8a    /* Module end record */
+#define EXTDEF          0x8c    /* External names definition record */
+#define TYPDEF          0x8e    /* Type definition record */
+#define PUBDEF          0x90    /* Public names definition record */
+#define LINNUM          0x94    /* Line numbers record */
+#define LNAMES          0x96    /* List of names record */
+#define SEGDEF          0x98    /* Segment definition record */
+#define GRPDEF          0x9a    /* Group definition record */
+#define FIXUPP          0x9c    /* Fixup record */
+#define LEDATA          0xa0    /* Logical enumerated data record */
+#define LIDATA          0xa2    /* Logical iterated data record */
+#define COMDEF          0xb0    /* Communal names definition record */
+#define COMDAT          0xc2    /* Common block */
+#define ALIAS           0xc6    /* Alias definition record */
+#define LIBHDR          0xf0    /* Library header */
+#define LIBEND          0xf1    /* Library end */
 
-#define REC32  0x01
+/* Add this constant (using the | operator) to get the 32-bit variant
+   of a record type.  Some fields will contain 32-bit values instead
+   of 16-bit values. */
+#define REC32           0x01
 
 #endif

trunk/src/emx/include/sys/uio.h

@@ -48 +48 @@
 /** @name tcpip40 function mappings.
  * @{ */
-#define readv         tcpip40_readv
-#define writev       tcpip40_writev
+//@@@ name conflict - a.z. #define readv         tcpip40_readv
+//@@@ name conflict - a.z. #define writev        tcpip40_writev
 /* @} */