Changeset 6529 for branches/mini/src

Timestamp:

Aug 15, 2001, 12:14:34 AM (24 years ago)

Author:

bird

Message:

Ilink was a fault. back to wlink. use clibrary.

Location:

branches/mini/src/win32k/test

Files:

• mini.asm (modified) (3 diffs)
• mini.mak (modified) (3 diffs)

branches/mini/src/win32k/test/mini.asm

@@ -1 @@
-; $Id: mini.asm,v 1.1.2.6 2001-08-14 21:17:31 bird Exp $
+; $Id: mini.asm,v 1.1.2.7 2001-08-14 22:14:34 bird Exp $
 ;
 ; Haveing great fun making small executables...
@@ -18 +18 @@
 ;
     .386
-;    .model flat
-;    .stack 1000h
-
-
-;
-; Segment definitions. (needed somehow ot
-;
-DATA32 segment byte public use32 'DATA'
-DATA32 ends
-
-BSS32 segment byte public use32 'BSS'
-BSS32 ends
-
-DGROUP  group BSS32, DATA32
-;    assume  cs:FLAT, ds:FLAT, ss:FLAT, es:FLAT
-
-;APIRET APIENTRY  DosPutMessage(HFILE hfile,
-;                               ULONG cbMsg,
-;                               PCHAR pBuf);
-extrn DosPutMessage:PROC
-
-
-CODE32 segment byte public use32 'CODE'
+
+; config
+CLIB EQU 1
+
+ifdef CLIB
+extrn vprintf:PROC                      ; optlink, 2+ parameters. second NULL.
+else
+extrn DosPutMessage:PROC                ; system, tree parameters.
+endif
+
+
+CODE32 segment byte public use32 'STACK'
 ;
 ; Data
 ;
 public minilx
+ImReallySmall   db  "I'm really small!",013,0
 minilx:
+ifdef CLIB
+    inc     eax
+    shl     eax,16
+    jmp     vprintf
+else
     push    offset ImReallySmall
     push    18
@@ -52 +47 @@
     add     esp, 12
     ret
-ImReallySmall   db  "I'm really small!",013
+endif
 
 CODE32 ends

branches/mini/src/win32k/test/mini.mak

@@ -1 @@
-# $Id: mini.mak,v 1.1.2.3 2001-08-14 21:17:31 bird Exp $
+# $Id: mini.mak,v 1.1.2.4 2001-08-14 22:14:34 bird Exp $
 
 #
@@ -72 +72 @@
 #
 !ifdef NORMAL
-!if 0
+!if 1
 $(OBJDIR)\$(TARGET).exe: $(OBJS)  $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
-    wlink system os2v2 file {$(OBJS)} name $(OBJDIR)\.exe import DosPutMessage MSG.5 \
-        option offset=0x10000 option alignment=1 option stack=4060
+    wlink system os2v2 file {$(OBJS)} name $(OBJDIR)\.exe \
+    import vprintf LIBCN.150 \
+#    import DosPutMessage MSG.5   \
+        option offset=0x0000 option alignment=1 option stack=4060
     mv $(OBJDIR)\.exe $@
 #    link386 /ALIGNMENT:1 /NONULLSDOSSEG /NOSECTORALIGNCODE /BASE:0x10000 /PACKCODE /PACKDATA \
@@ -86 +88 @@
     -8 ilink /NOFREE /FORCE /ALIGNMENT:1 /Map /BASE:0x10000 \
             /PACKCODE /PACKDATA /EXEPACK:1 /STACK:4000  \
-            $(OBJS), $(OBJDIR)\$(TARGET).exe, $(OBJDIR)\$(TARGET).map, os2386.lib, mini.def;
+            $(OBJS), $(OBJDIR)\$(TARGET).exe, $(OBJDIR)\$(TARGET).map, os2386.lib libcmi.lib, mini.def;
     $(LXLITE) /AN:1 /ZS:1024 /ZX:1024 /MF3 /YXD /YND $@
 !endif