Changeset 123 for trunk/src/emx/include

Timestamp:

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

Author:

zap

Message:

Started the work for re-designing the EMX C runtime library to not require
EMX.DLL. The new design is projected to be as follows:

• all emx syscalls are replaced with the routines from the old sys.lib library which is now compilable in both a.out and OMF formats.
• the sys.a library should be made replaceable and selectable by some gcc switch (e.g. -msyslib=emx would link with emx.a instead of sys.a which would give almost full backward compatibility with emx).
• All C functions names were renamed to not contain the starting underscore (e.g. fopen and not _fopen). The underscored aliases will be added later with the c_alias library (which will be generated automatically from all public symbols of libc; any exported symbol that do not start with an underscore will be given an underscored alias unless such a symbol is already defined).

Also a lot of updates to the building system. It is now much faster (thanks
to Knut's suggestion of using ash's builtin echo).
Also re-wrote thunk1.asm and thunk2.asm to GAS format; this removes the need
for MASM and makes it possible to use 16-bit functions in a.out programs
without the need for EMX.DLL.
Also made a lot of small changes I don't remember now.

Location:

trunk/src/emx/include

Files:

• ansidecl.h (added)
• ctype.h (modified) (1 diff, 1 prop)
• demangle.h (added)
• dyn-string.h (added)
• emx/fnmatch.h (added)
• fibheap.h (added)
• floatformat.h (added)
• fnmatch.h (modified) (1 diff, 1 prop)
• getopt.h (modified) (3 diffs, 1 prop)
• hashtab.h (added)
• libiberty.h (added)
• malloc.h (modified) (1 prop)
• math.h (modified) (1 prop)
• md5.h (added)
• objalloc.h (added)
• obstack.h (added)
• partition.h (added)
• safe-ctype.h (added)
• sort.h (added)
• splay-tree.h (added)
• stddef.h (modified) (1 prop)
• stdio.h (modified) (1 prop)
• stdlib.h (modified) (1 prop)
• string.h (modified) (1 prop)
• symcat.h (added)
• sys/errno.h (modified) (1 prop)
• sys/fcntl.h (modified) (1 prop)
• sys/process.h (modified) (1 prop)
• sys/stat.h (modified) (1 diff, 1 prop)
• sys/types.h (modified) (1 diff, 1 prop)
• sys/wait.h (modified) (1 prop)
• ternary.h (added)
• time.h (modified) (1 prop)
• unistd.h (modified) (1 prop)
• xregex.h (added)
• xregex2.h (added)

trunk/src/emx/include/ctype.h

@@ -46 +46 @@
 #else
 
-#define isalnum(c)  ((_ctype+1)[c] & (_UPPER|_LOWER|_DIGIT))
-#define isalpha(c)  ((_ctype+1)[c] & (_UPPER|_LOWER))
-#define iscntrl(c)  ((_ctype+1)[c] & (_CNTRL))
-#define isdigit(c)  ((_ctype+1)[c] & (_DIGIT))
-#define isgraph(c)  ((_ctype+1)[c] & (_PUNCT|_UPPER|_LOWER|_DIGIT))
-#define islower(c)  ((_ctype+1)[c] & (_LOWER))
-#define isprint(c)  ((_ctype+1)[c] & (_PRINT))
-#define ispunct(c)  ((_ctype+1)[c] & (_PUNCT))
-#define isspace(c)  ((_ctype+1)[c] & (_SPACE))
-#define isupper(c)  ((_ctype+1)[c] & (_UPPER))
-#define isxdigit(c) ((_ctype+1)[c] & (_XDIGIT))
+#define isalnum(c)  ((_ctype+1)[(unsigned char)c] & (_UPPER|_LOWER|_DIGIT))
+#define isalpha(c)  ((_ctype+1)[(unsigned char)c] & (_UPPER|_LOWER))
+#define iscntrl(c)  ((_ctype+1)[(unsigned char)c] & (_CNTRL))
+#define isdigit(c)  ((_ctype+1)[(unsigned char)c] & (_DIGIT))
+#define isgraph(c)  ((_ctype+1)[(unsigned char)c] & (_PUNCT|_UPPER|_LOWER|_DIGIT))
+#define islower(c)  ((_ctype+1)[(unsigned char)c] & (_LOWER))
+#define isprint(c)  ((_ctype+1)[(unsigned char)c] & (_PRINT))
+#define ispunct(c)  ((_ctype+1)[(unsigned char)c] & (_PUNCT))
+#define isspace(c)  ((_ctype+1)[(unsigned char)c] & (_SPACE))
+#define isupper(c)  ((_ctype+1)[(unsigned char)c] & (_UPPER))
+#define isxdigit(c) ((_ctype+1)[(unsigned char)c] & (_XDIGIT))
 
 int (isalnum)(int);

trunk/src/emx/include/fnmatch.h

@@ -1 @@
-/* fnmatch.h (emx+gcc) */
+/* Copyright 1991, 1992, 1993, 1996 Free Software Foundation, Inc.
 
-#ifndef _FNMATCH_H
-#define _FNMATCH_H
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
-#if defined (__cplusplus)
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#ifndef _FNMATCH_H
+
+#define _FNMATCH_H      1
+
+#ifdef  __cplusplus
 extern "C" {
 #endif
 
-/* POSIX.2 */
-
-#define FNM_NOMATCH        1
-
-#define FNM_NOESCAPE       16
-#define FNM_PATHNAME       32
-#define FNM_PERIOD         64
-
-int fnmatch (__const__ char *, __const__ char *, int);
+#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
+#undef  __P
+#define __P(args)       args
+#else /* Not C++ or ANSI C.  */
+#undef  __P
+#define __P(args)       ()
+/* We can get away without defining `const' here only because in this file
+   it is used only inside the prototype for `fnmatch', which is elided in
+   non-ANSI C where `const' is problematical.  */
+#endif /* C++ or ANSI C.  */
 
 
-#if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE)
+/* We #undef these before defining them because some losing systems
+   (HP-UX A.08.07 for example) define these in <unistd.h>.  */
+#undef  FNM_PATHNAME
+#undef  FNM_NOESCAPE
+#undef  FNM_PERIOD
 
-/* emx extensions */
+/* Bits set in the FLAGS argument to `fnmatch'.  */
+#define FNM_PATHNAME    (1 << 0) /* No wildcard can ever match `/'.  */
+#define FNM_NOESCAPE    (1 << 1) /* Backslashes don't quote special chars.  */
+#define FNM_PERIOD      (1 << 2) /* Leading `.' is matched only explicitly.  */
 
-#define _FNM_MATCH         0
-#define _FNM_ERR           2
-
-#define _FNM_STYLE_MASK    15
-
-#define _FNM_POSIX         0
-#define _FNM_OS2           1
-#define _FNM_DOS           2
-
-#define _FNM_IGNORECASE    128
-#define _FNM_PATHPREFIX    256
-
-int _fnmatch (__const__ char *, __const__ char *, int);
-
+#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE)
+#define FNM_FILE_NAME   FNM_PATHNAME /* Preferred GNU name.  */
+#define FNM_LEADING_DIR (1 << 3) /* Ignore `/...' after a match.  */
+#define FNM_CASEFOLD    (1 << 4) /* Compare without regard to case.  */
 #endif
 
+/* Value returned by `fnmatch' if STRING does not match PATTERN.  */
+#define FNM_NOMATCH     1
 
-#if defined (__cplusplus)
+/* Match STRING against the filename pattern PATTERN,
+   returning zero if it matches, FNM_NOMATCH if not.  */
+extern int fnmatch __P ((const char *__pattern, const char *__string,
+                         int __flags));
+
+#ifdef  __cplusplus
 }
 #endif
 
-#endif /* not _FNMATCH_H */
+#endif /* fnmatch.h */

trunk/src/emx/include/getopt.h

@@ -1 +1 @@
 /* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000
+   Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
@@ -100 +101 @@
 
 #if defined (__STDC__) && __STDC__
-#ifdef __GNU_LIBRARY__
+/* HAVE_DECL_* is a three-state macro: undefined, 0 or 1.  If it is
+   undefined, we haven't run the autoconf check so provide the
+   declaration without arguments.  If it is 0, we checked and failed
+   to find the declaration so provide a fully prototyped one.  If it
+   is 1, we found it so don't provide any declaration at all.  */
+#if defined (__GNU_LIBRARY__) || (defined (HAVE_DECL_GETOPT) && !HAVE_DECL_GETOPT)
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
@@ -106 +112 @@
 extern int getopt (int argc, char *const *argv, const char *shortopts);
 #else /* not __GNU_LIBRARY__ */
+# if !defined (HAVE_DECL_GETOPT) && !defined (__cplusplus)
 extern int getopt ();
+# endif
 #endif /* __GNU_LIBRARY__ */
 extern int getopt_long (int argc, char *const *argv, const char *shortopts,

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

@@ -5 +5 @@
 
 #if !defined (_SYS_TYPES_H)
-#warning <sys/stat.h> requires <sys/types.h>
+ #warning <sys/stat.h> requires <sys/types.h>
 #include <sys/types.h>
 #endif

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

@@ -63 +63 @@
 #if !defined (FD_SETSIZE)
 #define FD_SETSIZE      256
-#elif FD_SETSIZE < 256
-#error FD_SETSIZE must be at least 256
+#else
+#if FD_SETSIZE < 256
+ #error FD_SETSIZE must be at least 256
+#endif
 #endif