Changeset 213

Timestamp:

May 21, 2003, 11:57:27 PM (22 years ago)

Author:

zap

Message:

o Added OS/2 Unicode API headers and import file.
o Modified most standard functions in .s files to use the _std_ prefix.
o Fixed c_alias.a build rules so that it uses the correct c.a file (either

debug or optimized depending on build mode).

Location:

trunk/src/emx

Files:

• Makefile (modified) (8 diffs, 1 prop)
• include/emx/asm386.h (modified) (1 diff, 1 prop)
• include/emx/syscalls.h (modified) (2 diffs, 1 prop)
• include/uconv.h (added)
• include/ulserrno.h (added)
• include/ulsitem.h (added)
• include/unidef.h (added)
• mkexe.smak (modified) (1 diff, 1 prop)
• src/emxexp/emxexp.c (modified) (1 diff, 1 prop)
• src/lib/alias/alias.smak (modified) (1 diff, 1 prop)
• src/lib/alias/aliasfuncs.awk (modified) (1 diff, 1 prop)
• src/lib/app/Attic/386/crt2.s (modified) (3 diffs, 1 prop)
• src/lib/os2_386/unicode.imp (added)
• src/lib/str/386/memchr.s (modified) (2 diffs, 1 prop)
• src/lib/str/386/memcmp.s (modified) (2 diffs, 1 prop)
• src/lib/str/386/memcpy.s (modified) (2 diffs, 1 prop)
• src/lib/str/386/memmove.s (modified) (2 diffs, 1 prop)
• src/lib/str/386/memset.s (modified) (2 diffs, 1 prop)
• src/lib/str/386/strcat.s (modified) (2 diffs, 1 prop)
• src/lib/str/386/strchr.s (modified) (2 diffs, 1 prop)
• src/lib/str/386/strcmp.s (modified) (2 diffs, 1 prop)
• src/lib/str/386/strcpy.s (modified) (2 diffs, 1 prop)
• src/lib/str/386/strlen.s (modified) (2 diffs, 1 prop)
• src/lib/str/386/strrchr.s (modified) (2 diffs, 1 prop)
• src/lib/sys/__fork.c (modified) (1 prop)
• src/lib/sys/__select.c (modified) (1 prop)
• src/lib/sys/__settime.c (modified) (1 prop)
• src/lib/sys/__ttyname.c (modified) (1 prop)
• src/libos2/unicode.imp (added)

trunk/src/emx/Makefile

@@ -82 +82 @@
 DO.LINK.dll = $(LD) $(strip $(LDFLAGS.DLL) $(filter-out -l%,$1)) -o $@ $(^O) $(^DEF) $(^LIB) $(filter -l%,$1)
 
-# emxbind tool - you can depend on EMXBIND.BUILT :-)
-EMXBIND = $(if $(wildcard $(EMXBIND.BUILT)),$(EMXBIND.BUILT),emxbind$E)
-EMXBIND.BUILT = $.$(TOOLFMT)/emxbind$E
+# emxbind tool
+EMXBIND = $(call FINDTOOL,emxbind)
 # emxbind flags
 EMXBINDFLAGS = -q $(EMXBINDFLAGS.$(MODE))
@@ -103 +102 @@
 DO.LIBRARY = $(call RM,$@); $(AR) $(ARFLAGS)$1 $@ $(^O)
 
-# The tool to extract exports from object files and archives
-EMXEXP = $(if $(wildcard $(EMXEXP.BUILT)),$(EMXEXP.BUILT),emxexp$E)
-EMXEXP.BUILT = $./$(TOOLFMT)/emxexp$E
+# The tool to extract exports from object files and archives,
+# removing unused stuff (like empty lines and comments)
+# and sorting alphabetically (looks nicer).
+EMXEXP = $(call FINDTOOL,emxexp)
+EMXEXPFLAGS = -u
+DO.EMXEXP = $(EMXEXP) $(strip $(EMXEXPFLAGS) $1) $^ | sed -e "/^$$/d" -e "/^ *;/d" | sort -d >>$@
 
 # The tool to create import libraries
-IMPLIB = $(if $(wildcard $(IMPLIB.BUILT)),$(IMPLIB.BUILT),emximp$E)
-IMPLIB.BUILT = $./$(TOOLFMT)/emximp$E
+IMPLIB = $(call FINDTOOL,emximp)
 IMPLIBFLAGS.prof = -m
 IMPLIBFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(IMPLIBFLAGS.$x))
@@ -122 +123 @@
 
 # How to convert an a.out file to the OMF format
-EMXOMF = $(if $(wildcard $(EMXOMF.BUILT)),$(EMXOMF.BUILT),emxomf$E)
-EMXOMF.BUILT = $./$(TOOLFMT)/emxomf$E
-DO.AOUT2OMF = $(EMXOMF) $(strip $1 -o) $@ $<
+EMXOMF = $(call FINDTOOL,emxomf)
+DO.EMXOMF = $(EMXOMF) $(strip $1 -o) $@ $<
 
 # How to filter just the object files from $^
@@ -134 +134 @@
 # How to filter the libraries from $^
 ^LIB = $(filter %.$(if $(findstring omf,$(.TKIND)),lib,a),$^)
+# This function finds a tool: if it has been already built, prefer it
+FINDTOOL = $(firstword $(wildcard $.$(TOOLFMT)/$1$E) $(wildcard $(OUT)dbg/aout/$1$E) $1)
 
 # A newline
@@ -187 +189 @@
 TARGDEPEND :=
 
-.PHONY: default help all clean install cleandep cleandepend dep depend depdone
+.PHONY: default help all tools clean install cleandep cleandepend dep depend depdone
 .SUFFIXES:
 .SUFFIXES: .c .cpp .asm .s .o .exe .dll .a .lib .obj
@@ -207 +209 @@
 help:
         @$(call ECHO,$(SEP))
-        @$(call ECHO,Welcome to $(PACKAGE) build system!)
+        @$(call ECHO,Welcome to $(PACKAGE) version $(VERSION) build system!)
         @$(call ECHO,$(COPYRIGHT))
         @$(call ECHO,To build something, type 'make {target} {vars}', where {target} is one of:)
         @$(call ECHO,    all - build all available modules)
         @$(call ECHO,    {module-name} - build just a particular module)
+        @$(call ECHO,    tools - build just the tools)
         @$(call ECHO,    clean - remove all generated files (remove all built files))
         @$(call ECHO,    install - generate a installation tree in $(INS))
@@ -247 +250 @@
 # bird: add rule for forcibly re-generating the rules.
 rules:
-        @$(call RM,$(OUT)genrules.smak)
-        $(MAKE) $(OUT)genrules.smak
-
-$(OUT)genrules.smak: $(SUBMAK) # Makefile $(wildcard *.smak)
-        @$(call MKDIR,$(OUT))
+        @$(call RM,$.genrules.smak)
+        $(MAKE) $.genrules.smak
+
+$.genrules.smak: $(SUBMAK) # Makefile $(wildcard *.smak)
+        @$(call MKDIR,$.)
         @$(call ECHO,Please wait, rebuilding make rules ...)
         @$(call RM,$@)
@@ -259 +262 @@
 # The general a.out -> OMF conversion rule for object files
 $.omf/%.obj: $.aout/%.o
-        $(call DO.AOUT2OMF)
+        $(call DO.EMXOMF)
 
 # The general a.out -> OMF conversion rule for libraries
 $.omf%.lib: $.aout%.a
-        $(call DO.AOUT2OMF)
-
--include $(OUT)genrules.smak
+        $(call DO.EMXOMF)
+
+-include $.genrules.smak

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

@@ -73 +73 @@
 #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/syscalls.h

@@ -53 +53 @@
 struct timeb;
 struct timeval;
-struct _fd_set;
 
 struct _find
@@ -104 +103 @@
 {
   int              nfds;
-  struct _fd_set * readfds;
-  struct _fd_set * writefds;
-  struct _fd_set * exceptfds;
+  struct fd_set * readfds;
+  struct fd_set * writefds;
+  struct fd_set * exceptfds;
   struct timeval * timeout;
 };

trunk/src/emx/mkexe.smak

@@ -4 +4 @@
 
 include common.smak
+
+tools: $(.MODULE)
 
 # Linking rule

trunk/src/emx/src/emxexp/emxexp.c

@@ -209 +209 @@
       }
     else if ((sym_ptr[i].type == N_EXT ||
+              sym_ptr[i].type == (N_BSS|N_EXT) ||
               (weak_flag && sym_ptr[i].type == N_WEAKB)) &&
              sym_ptr[i].value != 0)

trunk/src/emx/src/lib/alias/alias.smak

@@ -14 +14 @@
 include common.smak
 
-ALIAS.FUNCS = $(shell gawk -f src/lib/alias/aliasfuncs.awk _)
-ALIAS._FUNCS = $(shell gawk -f src/lib/alias/aliasfuncs.awk __)
+ALIAS.FUNCS = $(shell gawk -f src/lib/alias/aliasfuncs.awk $. _)
+ALIAS._FUNCS = $(shell gawk -f src/lib/alias/aliasfuncs.awk $. __)
 
 $(.MODULE): $.$(.TARG)

trunk/src/emx/src/lib/alias/aliasfuncs.awk

@@ -35 +35 @@
 
 BEGIN {
-  gulp("out/dbg/aout/c.a");
-  gulp("out/dbg/aout/c_app.a");
+  gulp(ARGV[1]"aout/c.a");
+  gulp(ARGV[1]"aout/c_app.a");
 
-  prefix = ARGV[1];
+  prefix = ARGV[2];
 
   for (x in stdfuncs)

trunk/src/emx/src/lib/app/Attic/386/crt2.s

@@ -9 +9 @@
 
         .globl  __entry1
-        .globl  __std_environ
+        .globl  _STD(environ)
         .globl  __org_environ
 
@@ -19 +19 @@
         xorl    %ebp, %ebp      /* End of stack frames */
         leal    (%esp), %edi    /* argv[] */
-        movl    %edi, __std_environ
+        movl    %edi, _STD(environ)
         movl    %edi, __org_environ
         pushl   %edi            /* envp */
@@ -39 +39 @@
         .bss
 
-__std_environ:  .space  4
+_STD(environ):  .space  4
 __org_environ:  .space  4

trunk/src/emx/src/lib/str/386/memchr.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _memchr
+        .globl _STD(memchr)
 
 / void *memchr (const void *s, int c, size_t n)
@@ -23 +23 @@
         ALIGN
 
-_memchr:
+_STD(memchr):
         PROFILE_NOFRAME
         pushl   %edi

trunk/src/emx/src/lib/str/386/memcmp.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _memcmp
+        .globl _STD(memcmp)
 
 / int memcmp (const void *s1, const void *s2, size_t n)
@@ -25 +25 @@
         ALIGN
 
-_memcmp:
+_STD(memcmp):
         PROFILE_NOFRAME
         pushl   %esi

trunk/src/emx/src/lib/str/386/memcpy.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _memcpy
+        .globl _STD(memcpy)
 
 / void *memcpy (void *s1, const void *s2, size_t n)
@@ -20 +20 @@
         ALIGN
 
-_memcpy:
+_STD(memcpy):
         PROFILE_NOFRAME
         pushl   %esi

trunk/src/emx/src/lib/str/386/memmove.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _memmove
+        .globl _STD(memmove)
 
 / void *memmove (void *s1, const void *s2, size_t n)
@@ -24 +24 @@
         ALIGN
 
-_memmove:
+_STD(memmove):
         PROFILE_NOFRAME
         pushl   %esi

trunk/src/emx/src/lib/str/386/memset.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _memset
+        .globl _STD(memset)
 
 / void *memset (void *s, int c, size_t n)
@@ -20 +20 @@
         ALIGN
 
-_memset:
+_STD(memset):
         PROFILE_NOFRAME
         pushl   %edi

trunk/src/emx/src/lib/str/386/strcat.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _strcat
+        .globl _STD(strcat)
 
 / char *strcat (char *string1, const char *string2)
@@ -23 +23 @@
         ALIGN
 
-_strcat:
+_STD(strcat):
         PROFILE_NOFRAME
         pushl   %esi

trunk/src/emx/src/lib/str/386/strchr.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _strchr
+        .globl _STD(strchr)
 
 / char *strchr (const char *string, int c)
@@ -19 +19 @@
         ALIGN
 
-_strchr:
+_STD(strchr):
         PROFILE_NOFRAME
         pushl   %esi

trunk/src/emx/src/lib/str/386/strcmp.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _strcmp
+        .globl _STD(strcmp)
 
 / int strcmp (const char *string1, const char *string2)
@@ -24 +24 @@
         ALIGN
 
-_strcmp:
+_STD(strcmp):
         PROFILE_NOFRAME
         pushl   %esi

trunk/src/emx/src/lib/str/386/strcpy.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _strcpy
+        .globl _STD(strcpy)
 
 / char *strcpy (char *string1, const char *string2)
@@ -21 +21 @@
         ALIGN
 
-_strcpy:
+_STD(strcpy):
         PROFILE_NOFRAME
         pushl   %esi

trunk/src/emx/src/lib/str/386/strlen.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _strlen
+        .globl _STD(strlen)
 
 / size_t strlen (const char *string)
@@ -20 +20 @@
         ALIGN
 
-_strlen:
+_STD(strlen):
         PROFILE_NOFRAME
         pushl   %edi

trunk/src/emx/src/lib/str/386/strrchr.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl _strrchr
+        .globl _STD(strrchr)
   
 / char *strrchr (const char *string, int c)
@@ -23 +23 @@
         ALIGN
 
-_strrchr:
+_STD(strrchr):
         PROFILE_NOFRAME
         pushl   %edi