Changeset 3650 for trunk/src

Timestamp:

Jun 3, 2000, 5:50:46 AM (25 years ago)

Author:

bird

Message:

Rewrote kRx.c in assembly!

Location:

trunk/src/win32k/rexx

Files:

• kRx.c (modified) (7 diffs)
• kRxa.asm (added)
• makefile (modified) (4 diffs)

trunk/src/win32k/rexx/kRx.c

@@ -1 @@
-/* $Id: kRx.c,v 1.1 2000-05-10 16:04:30 bird Exp $
+/* $Id: kRx.c,v 1.2 2000-06-03 03:50:45 bird Exp $
  *
  * kRx - Small rexx script interpreter.
+ *
+ * Will be re-written in assembly later!!!
  *
  * Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
@@ -17 +19 @@
 #define INCL_DOSERRORS
 
+#undef DEBUGOUT
+
 /*******************************************************************************
 *   Internal Functions                                                         *
@@ -25 +29 @@
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+/*#include <malloc.h> */
 
 /**
@@ -51 +55 @@
     int         argi;                   /* Argument index loop variable. */
     APIRET      rc;                     /* Return code from RexxStart. */
-
+    ULONG       ul;                     /* Dummy used by DosWrite. */
 
     /*
@@ -68 +72 @@
     if (iScriptName >= argc)
     {
-        fprintf(stderr, "Invalid parameters, script filename is missing\n");
+        DosWrite(2, "Invalid parameters, script filename is missing.\r\n", 47, &ul);
         return -10000;
     }
@@ -120 +124 @@
      * Debug display result.
      */
+    #ifdef DEBUGOUT
     printf(
         "Interpreter rc:    %d\n"
@@ -127 +132 @@
         sRexxRc,
         rxstrRexxRc.strptr);
-
+    #endif
 
     DosFreeMem(rxstrRexxRc.strptr);     /* Release storage from RexxStart. */

trunk/src/win32k/rexx/makefile

@@ -1 +1 @@
 ##############################################################################
-# $Id: makefile,v 1.1 2000-05-10 16:04:31 bird Exp $
+# $Id: makefile,v 1.2 2000-06-03 03:50:46 bird Exp $
 #
 # PD-Win32 API
@@ -26 +26 @@
 
 LD         = ilink
-LDFLAGS    = /nologo /NOI /A:16 /NOE /packcode /packdata /pmtype:vio /Stack:4096 \
+LDFLAGS    = /nologo /NOI /A:16 /NOE /packcode /packdata /pmtype:vio /Stack:0x10000 \
 !ifdef DEBUG
 !ifndef NODEBUGINFO
@@ -47 +47 @@
     @$(CXX) $(CXXFLAGS) -c -Fa$(WIN32KLIST)\$(@B).asm -Fo$(@) $<
 
+.asm{$(OBJDIR)}.obj:
+    @$(ECHO) assembling:      $<
+    @$(AS) $(ASFLAGS) $(ADEFINES) $(AINCLUDES) $< -Fo:$@ -Fl:$(WIN32KLIST)\$(*B).lst
+
 #
 # Visual slick edit!
@@ -64 +68 @@
 TARGET   = kRx
 
-OBJS     =  $(OBJDIR)\kRx.obj
+OBJS     =  $(OBJDIR)\kRxa.obj
 
 
-all:      $(OBJDIR) $(OBJDIR)\$(TARGET).exe
+all:        $(OBJDIR) \
+            $(OBJDIR)\$(TARGET).exe
 
 
 $(OBJDIR)\$(TARGET).exe: $(OBJS) $(TARGET).def
     @echo linking $@
-    $(LD2) $(LD2FLAGS) /OUT:$@ /MAP:$*.map $** OS2386.lib $(RTLLIB) REXX.LIB
+    -4 $(LD) $(LDFLAGS) /BASE:0x10000 /OUT:$@ /MAP:$*.map $** OS2386.lib REXX.lib
     $(CP) $@ $(PDWIN32_BIN)
+
+$(OBJDIR)\$(TARGET)c.exe: $(OBJDIR)\kRx.obj $(TARGET).def
+    @echo linking $@
+    $(LD) $(LDFLAGS) /BASE:0x10000 /OUT:$@ /MAP:$*.map $** OS2386.lib REXX.lib
+    $(CP) $@ $(PDWIN32_BIN)
+