Changeset 1848

Timestamp:

Mar 14, 2005, 12:35:54 AM (20 years ago)

Author:

bird

Message:

Remove the BSD profiler. Added resp and wild variations.

Location:

trunk/src/emx/src/lib/startup

Files:

• 386/crt0.s (modified) (2 diffs, 1 prop)
• 386/dll0.s (modified) (2 diffs, 1 prop)
• gmon.c (deleted)
• startup.smak (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/startup/386/crt0.s

@@ -39 +39 @@
     .text
 
+#if defined(HIGHMEM)
+#define FLAG_HIGHMEM    1
+#else
+#define FLAG_HIGHMEM    0
+#endif
+
+#if defined(NOUNIX)
+#define FLAG_NOUNIX     2
+#else
+#define FLAG_NOUNIX     0
+#endif
+
 __text:
 
@@ -48 +60 @@
     addl    $8, %esp
 #endif
-#if defined(HIGHMEM) && defined(NOUNIX)
-    pushl    $3     /* vote for high mem for default heap; & less unixness. */
-#elif defined(HIGHMEM)
-    pushl    $1     /* vote for high mem for default heap */
-#elif defined(NOUNIX)
-    pushl    $2     /* vote against high memory for deault heap; lexx unixness */
-#else
-    pushl    $0     /* veto against high mem for default heap. */
-#endif
+    pushl   $(FLAG_HIGHMEM + FLAG_NOUNIX)
     call    ___init_app
     /* esp points to main() call frame. */
     cld
-#if defined (MCRT0)
-    pushl   $__mcleanup
-    call    _atexit
-    pushl   $__etext
-    pushl   $__text
-    call    _monstartup
-    addl    $3*4, %esp
+#ifdef ARGS_RESP
+    lea     4(%esp), %eax               /* &argv */
+    movl    %esp, %ecx                  /* &argc */
+    pushl   %eax
+    pushl   %ecx
+    call    __response
+    addl    $8, %esp
+#endif
+#ifdef ARGS_WILD
+    lea     4(%esp), %eax               /* &argv */
+    movl    %esp, %ecx                  /* &argc */
+    pushl   %eax
+    pushl   %ecx
+    call    __wildcard
+    addl    $8, %esp
 #endif
     call    __CRT_init

trunk/src/emx/src/lib/startup/386/dll0.s

@@ -37 +37 @@
     .text
 
+
+#if defined(HIGHMEM)
+#define FLAG_HIGHMEM    1
+#else
+#define FLAG_HIGHMEM    0
+#endif
+
+#if defined(NOUNIX)
+#define FLAG_NOUNIX     2
+#else
+#define FLAG_NOUNIX     0
+#endif
+
 __text:
     cmpl    $0, 8(%esp)
@@ -68 +81 @@
 do_init:
 #endif
-#if defined(HIGHMEM) && defined(NOUNIX)
-    pushl    $3     /* vote for high mem for default heap; & less unixness. */
-#elif defined(HIGHMEM)
-    pushl    $1     /* vote for high mem for default heap */
-#elif defined(NOUNIX)
-    pushl    $2     /* vote against high memory for deault heap; lexx unixness */
-#else
-    pushl    $0     /* veto against high mem for default heap. */
-#endif
+    pushl   $(FLAG_HIGHMEM + FLAG_NOUNIX)
     call    ___init_dll
     add     $4, %esp

trunk/src/emx/src/lib/startup/startup.smak

@@ -10 +10 @@
 include common.smak
 
-.OBJS += $(addprefix $.$(.TKIND.DIR)src/lib/startup/,mcrt0.o gcrt0.o) \
-  $(addprefix $.omf/src/lib/startup/,mcrt0.obj gcrt0.obj $(CPU)/crt0.obj $(CPU)/dll0.obj )
-.DIRS := $(sort $(dir $(.OBJS)))
-TARGDIRS += $(.DIRS)
+# define what to do     
+define def_startup
+$$.aout/src/lib/startup/386/crt0$(i).o: src/lib/startup/386/crt0.s
+        $$(call DO.COMPILE.s, $(subst wild, -DARGS_WILD, $(subst resp, -DARGS_RESP, $(subst noux, -DNOUNIX,$(subst nofork, -DNOFORK,$(subst hi, -DHIGHMEM, $i))))))
 
-# define to do  
-define def_startup
-$(eval .OBJS += $.aout/src/lib/startup/crt0$(i).o)
-$$.aout/src/lib/startup/crt0$(i).o: src/lib/startup/386/crt0.s
-        $$(call DO.COMPILE.s, $(subst noux, -DNOUNIX,$(subst nofork, -DNOFORK,$(subst hi, -DHIGHMEM, $i))))
-
-$(eval .OBJS += $.aout/src/lib/startup/dll0$(i).o)
-$$.aout/src/lib/startup/dll0$(i).o: src/lib/startup/386/dll0.s
-        $$(call DO.COMPILE.s, $(subst noux, -DNOUNIX,$(subst nofork, -DNOFORK,$(subst hi, -DHIGHMEM, $i))))
+$$.omf/src/lib/startup/386/crt0$(i).obj: $$.aout/src/lib/startup/386/crt0$(i).o
+        $$(call DO.EMXOMF,-m__text)
+$(eval .OBJS += $.aout/src/lib/startup/386/crt0$(i).o \
+                                 $.omf/src/lib/startup/386/crt0$(i).obj)
         
-$(eval .OBJS += $.omf/src/lib/startup/crt0$(i).obj)
-$$.omf/src/lib/startup/crt0$(i).obj: $$.aout/src/lib/startup/crt0$(i).o
-        $$(call DO.EMXOMF,-m__text)
+ifeq ($(subst resp,,$(subst wild,,$(i))),$(i))
+$$.aout/src/lib/startup/386/dll0$(i).o: src/lib/startup/386/dll0.s
+        $$(call DO.COMPILE.s, $(subst wild, -DARGS_WILD, $(subst resp, -DARGS_RESP, $(subst noux, -DNOUNIX,$(subst nofork, -DNOFORK,$(subst hi, -DHIGHMEM, $i))))))
         
-$(eval .OBJS += $.omf/src/lib/startup/dll0$(i).obj)
-$$.omf/src/lib/startup/dll0$(i).obj: $$.aout/src/lib/startup/dll0$(i).o
+$$.omf/src/lib/startup/386/dll0$(i).obj: $$.aout/src/lib/startup/386/dll0$(i).o
         $$(call DO.EMXOMF,-l__text)
+$$(eval .OBJS += $.aout/src/lib/startup/386/dll0$(i).o \
+                             $.omf/src/lib/startup/386/dll0$(i).obj)
+endif   
 endef
 
 # generate
-$(foreach i,hi hinofork hinoux hinoforknoux nofork noforknoux noux,$(eval $(def_startup)))
+$(foreach i,\
+hi \
+hinofork \
+hinoforknoux \
+hinoforknouxwild \
+hinoforknouxwildresp \
+hinoforknouxresp \
+hinoforkwild \
+hinoforkwildresp \
+hinoforkresp \
+hinoux \
+hinouxwild \
+hinouxwildresp \
+hinouxresp \
+hiwild \
+hiwildresp \
+hiresp \
+\
+nofork \
+noforknoux \
+noforknouxwild \
+noforknouxwildresp \
+noforknouxresp \
+noforkwild \
+noforkwildresp \
+noforkresp \
+\
+noux \
+nouxwild \
+nouxwildresp \
+nouxresp \
+\
+wild \
+wildresp \
+\
+resp \
+,$(eval $(def_startup)))
 
 
-libc: emxomf ld $(.DIRS) $(.OBJS)
-
+.DIRS := $(sort $(dir $(.OBJS)))
+TARGDIRS += $(.DIRS)
 INS.FILES += $(addprefix $(INS)lib/,$(notdir $(.OBJS)))
 $(addprefix $(INS)lib/,$(notdir $(.OBJS))): $(.OBJS)
         $(call CP,$^,$(dir $@))
 
-$.aout/src/lib/startup/mcrt0.o: src/lib/startup/386/crt0.s
-        $(call DO.COMPILE.s, -DMCRT0)
-
-$.aout/src/lib/startup/gcrt0.o: src/lib/startup/386/crt0.s src/lib/startup/gmon.c
-        $(CC) $(CFLAGS) -x assembler-with-cpp -DMCRT0 -o tmp1.o $<
-        $(CC) $(CFLAGS) -o tmp2.o src/lib/startup/gmon.c
-        $(call GETTOOL2,ld) -r -o $@ tmp1.o tmp2.o
-        $(call RM,tmp1.o tmp2.o)
+libc: emxomf ld $(.DIRS) $(.OBJS)
+startup: $(.DIRS) $(.OBJS)
 
 # This rule doesn't work if the aout/src/lib/startup/ directory does not
@@ -59 +86 @@
 
 # Additional dependencies to help stupid make.
-$.omf/src/lib/startup/mcrt0.obj: $.aout/src/lib/startup/mcrt0.o
-        $(call DO.EMXOMF,-m__text)
-$.omf/src/lib/startup/gcrt0.obj: $.aout/src/lib/startup/gcrt0.o
-        $(call DO.EMXOMF,-m__text)
 $.omf/src/lib/startup/386/dll0.obj: $.aout/src/lib/startup/386/dll0.o
         $(call DO.EMXOMF,-l__text)