X-Git-Url: https://deadsoftware.ru/gitweb?p=cpc.git;a=blobdiff_plain;f=src%2Fgeneric%2FDsw%2FMod%2FMakeMain.cp;h=e024a3c913d0944e511175121e9b210f793d901a;hp=04388d2a574ddde1ce50e7968e6b0b5c32867c0c;hb=d04c6367a927c536552ae595c92cc15347d3a65f;hpb=25c73fbcd04d973272e0f8939a9de956fa9afbeb

diff --git a/src/generic/Dsw/Mod/MakeMain.cp b/src/generic/Dsw/Mod/MakeMain.cp
index 04388d2..e024a3c 100644
--- a/src/generic/Dsw/Mod/MakeMain.cp
+++ b/src/generic/Dsw/Mod/MakeMain.cp
@@ -5,6 +5,9 @@ MODULE DswMakeMain;
   CONST
     version = "0.3.0";
 
+    modDir = "Mod";
+    sysDir = "System";
+
     maxImps = 127;
     maxJobs = maxImps;
 
@@ -57,9 +60,9 @@ MODULE DswMakeMain;
 
     Module = POINTER TO RECORD
       name: DevCPT.Name;
-      path: Files.Name;
-      selectors: Selector; (* with head, list of selectors for this module *)
+      odc: Files.Name;
       depth: INTEGER; (* 0: leaf, MAX: root *)
+      dir: DevCPM.Directory;
       mno: INTEGER;
       imp: ARRAY maxImps OF Module;
       flags: SET;
@@ -74,9 +77,13 @@ MODULE DswMakeMain;
     processor, compiler, os, linker: INTEGER;
     cpcExe, cplExe: String;
     cpcArgs, cplArgs: StringList;
+    dirList: DevCPM.Directory;
     auto: BOOLEAN;
     jobs: INTEGER;
     exe: String;
+    printCompileModList: BOOLEAN;
+    printLinkModList: BOOLEAN;
+    printCompileFileList: BOOLEAN;
 
   PROCEDURE Error (e: INTEGER; IN p0, p1: ARRAY OF CHAR; i2: INTEGER);
     VAR msg, p2: ARRAY 128 OF CHAR;
@@ -107,6 +114,8 @@ MODULE DswMakeMain;
     | 22: msg := "linker terminated with code ^2"
     | 23: msg := "unable to execute linker"
     | 24: msg := "trap occured"
+    | 25: msg := "compiler not installed"
+    | 26: msg := "linker not installed"
     ELSE
       Strings.IntToString(err, msg)
     END;
@@ -128,7 +137,7 @@ MODULE DswMakeMain;
     RETURN i
   END IdentLen;
 
-  PROCEDURE Define (n: ARRAY OF CHAR);
+  PROCEDURE Define (n: ARRAY OF CHAR; overwrite: BOOLEAN);
     VAR i: INTEGER; v: BOOLEAN; s: Selector;
   BEGIN
     i := IdentLen(n);
@@ -141,41 +150,17 @@ MODULE DswMakeMain;
       IF s.next = NIL THEN
         NEW(s.next);
         Strings.StringToUtf8(n, s.next.name, i);
-        ASSERT(i = 0)
-      END;
-      s.next.value := v
+        ASSERT(i = 0);
+        s.next.value := v
+      ELSIF overwrite THEN
+        s.next.value := v
+      END
     ELSE
       Error(1, "", "", 0)
     END
   END Define;
 
-  PROCEDURE Undefine (IN n: ARRAY OF CHAR);
-    VAR i: INTEGER; s: Selector;
-  BEGIN
-    i := IdentLen(n);
-    IF (i # 0) & (n[i] = 0X) THEN
-      s := def;
-      WHILE (s.next # NIL) & (s.next.name$ # n$) DO s := s.next END;
-      IF s.next # NIL THEN s.next := s.next.next END
-    ELSE
-      Error(2, "", "", 0)
-    END
-  END Undefine;
-
-  PROCEDURE CopySelectorList (base: Selector): Selector;
-    VAR s, t, x: Selector;
-  BEGIN
-    ASSERT(base # NIL, 20);
-    s := base; NEW(t); x := t;
-    WHILE s # NIL DO
-      x^ := s^;
-      IF s.next # NIL THEN NEW(x.next); x := x.next END;
-      s := s.next
-    END;
-    RETURN t
-  END CopySelectorList;
-
-  PROCEDURE AddModule (IN n: ARRAY OF CHAR; selectors: Selector);
+  PROCEDURE AddModule (IN n: ARRAY OF CHAR; selectors: Selector; dir: DevCPM.Directory);
     VAR i, res: INTEGER; m: Module;
   BEGIN
     i := IdentLen(n);
@@ -186,7 +171,7 @@ MODULE DswMakeMain;
         NEW(m);
         Strings.StringToUtf8(n, m.name, res);
         ASSERT(res = 0);
-        m.selectors := CopySelectorList(selectors);
+        m.dir := dir;
         modList[i] := m;
         INC(mno)
       END
@@ -289,17 +274,22 @@ MODULE DswMakeMain;
     Log.String("      dev2     Dev2 based ELF/PE linker"); Log.Ln;
 (*
     Log.String("  -Fp path     Add path with project"); Log.Ln;
-    Log.String("  -Fx path     Add postfix for project directories"); Log.Ln;
 *)
     Log.String("  -Xp path     Use executable file for Component Pascal compiler"); Log.Ln;
     Log.String("  -Xi path     Use executable file for internal linker (native only)"); Log.Ln;
     Log.String("  -Cg params   Pass parameters to Component Pasacal compiler directly"); Log.Ln;
     Log.String("  -Ci params   Pass parameters to internal linker directly"); Log.Ln;
+    Log.String("  -II          Trap on user interrupt"); Log.Ln;
+    Log.String("  -IC          Print module list for compilation and quit"); Log.Ln;
+    Log.String("  -IL          Print module list for linking and quit"); Log.Ln;
+    Log.String("  -Ic          Print file list for compilation and quit"); Log.Ln;
+(*
+    Log.String("  -Il          Print file list for linking and quit"); Log.Ln;
+*)
     Log.String("  -a           Enable automatic dependency resolution"); Log.Ln;
     Log.String("  -o name      Generate executable file"); Log.Ln;
     Log.String("  -j num       Specifies the number of jobs to run simultaneously"); Log.Ln;
     Log.String('  -D ident["+"|"-"] Add preprocessor selector'); Log.Ln;
-    Log.String('  -U ident     Remove preprocessor selector'); Log.Ln;
     Log.String("  -h           Print help and quit"); Log.Ln;
     Log.String("  -V           Print version and quit"); Log.Ln;
     Kernel.Quit(1)
@@ -376,31 +366,66 @@ MODULE DswMakeMain;
     END
   END ParseExternalOpts;
 
+  PROCEDURE ParseInfoOpts;
+  BEGIN
+    CASE DswOpts.GetOpt("CLcI") OF
+    | "I": Kernel.intTrap := TRUE
+    | "C": printCompileModList := TRUE
+    | "L": printLinkModList := TRUE
+    | "c": printCompileFileList := TRUE
+    | ":": Error(10, "-I" + DswOpts.str, "", 0)
+    | "?": Error(11, "-I" + DswOpts.str, "", 0)
+    | 0X: Error(11, "-I", "", 0)
+    END
+  END ParseInfoOpts;
+
+  PROCEDURE ParseFileOpts;
+    VAR d: DevCPM.Directory;
+  BEGIN
+    CASE DswOpts.GetOpt("p:") OF
+    | "p": NEW(d); d.path := DswOpts.str$; d.legacy := TRUE; d.next := dirList; dirList := d
+    | ":": Error(10, "-F" + DswOpts.str, "", 0)
+    | "?": Error(11, "-F" + DswOpts.str, "", 0)
+    | 0X: Error(11, "-F", "", 0)
+    END
+  END ParseFileOpts;
+
   PROCEDURE ParseArgs;
   BEGIN
     exe := NIL; auto := FALSE; jobs := 1; def.next := NIL; mno := 0; rno := 0;
     processor := anymach; os := anyos; compiler := anycp;
     LOOP
-      CASE DswOpts.GetOpt("ao:j:D:U:TCXhV") OF
+      CASE DswOpts.GetOpt("ao:j:D:TCXIFhV") OF
       | "a": auto := TRUE
       | "o": exe := DswOpts.str
       | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs)
       | "h": Help
       | "V": Version
-      | "D": Define(DswOpts.str)
-      | "U": Undefine(DswOpts.str)
+      | "D": Define(DswOpts.str, TRUE)
       | "T": ParseTargetOpts
       | "C": ParseCommandOpts
       | "X": ParseExternalOpts
+      | "I": ParseInfoOpts
+      | "F": ParseFileOpts
       | ":": Error(10, "-" + DswOpts.str, "", 0)
       | "?": Error(11, "-" + DswOpts.str, "", 0)
-      | "$": AddModule(DswOpts.str, def)
+      | "$": AddModule(DswOpts.str, def, dirList)
       | 0X: EXIT
       END
     END;
   END ParseArgs;
 
   PROCEDURE CheckParams;
+
+    PROCEDURE Default (IN name: ARRAY OF CHAR; value: BOOLEAN);
+    BEGIN
+      IF value = TRUE THEN
+        Define(name + "+", FALSE)
+      ELSE
+        Define(name + "-", FALSE)
+      END
+    END Default;
+
   BEGIN
     IF compiler = anycp THEN
       Error(12, "", "", 0)
@@ -426,14 +451,37 @@ MODULE DswMakeMain;
     IF (exe # NIL) & (exe^ = "") THEN
       Error(19, "", "", 0)
     END;
-    IF cpcExe = NIL THEN
-      IF compiler = cpnative THEN cpcExe := NewStr("cpc486")
-      ELSIF compiler = cpfront THEN cpcExe := NewStr("cpfront")
+    IF (cpcExe = NIL) & (compiler # anycp) THEN
+      IF compiler = cpnative THEN cpcExe := DswProcs.dir.GetPath("cpc486")
+      ELSIF compiler = cpfront THEN cpcExe := DswProcs.dir.GetPath("cpfront")
+      END;
+      IF cpcExe = NIL THEN
+        Error(25, "", "", 0)
       END
     END;
-    IF cplExe = NIL THEN
-      IF linker = dev2 THEN cplExe := NewStr("cpl486") END
-    END
+    IF (cplExe = NIL) & (linker # anyint) THEN
+      cplExe := DswProcs.dir.GetPath("cpl486");
+      IF cplExe = NIL THEN
+        Error(26, "", "", 0)
+      END
+    END;
+    (* cpompiler *)
+    Default("NATIVE",  compiler = cpnative);
+    Default("CPFRONT", compiler = cpfront);
+    (* processor *)
+    Default("I486", processor = mach386);
+    Default("I386", processor = mach386);
+    Default("M68K", processor = mach68k);
+    (* operating system *)
+    Default("LINUX", os = linux);
+    Default("FREEBSD", os = freebsd);
+    Default("OPENBSD", os = openbsd);
+    Default("DARWIN", os = darwin);
+    Default("WIN32", os = win32);
+    Default("CYGWIN", os = cygwin);
+    Default("POSIX", os IN {linux, freebsd, openbsd, darwin, cygwin});
+    (* linker *)
+    Default("DEV2", linker = dev2);
   END CheckParams;
 
   (* --------- loader --------- *)
@@ -458,7 +506,7 @@ MODULE DswMakeMain;
           IF ~auto THEN
             Log.String("module " + name + " required before " + m.name); Log.Ln; INC(werr)
           END;
-          NEW(imp); imp.name := name$; imp.selectors := CopySelectorList(m.selectors);
+          NEW(imp); imp.name := name$;
           modList[mno] := imp; INC(mno)
         ELSE
           imp := modList[j]
@@ -548,8 +596,8 @@ MODULE DswMakeMain;
     VAR s: Selector;
   BEGIN
     DevCPM.Init(source);
+    DevCPM.symList := m.dir;
 (*
-    DevCPM.symList := m.insym;
     DevCPM.codePath := m.outcode;
     DevCPM.symPath := m.outsym;
 *)
@@ -560,7 +608,7 @@ MODULE DswMakeMain;
     IF oberon IN m.opts THEN INCL(DevCPM.options, DevCPM.oberon) END;
 *)
     DevCPR.Init;
-    s := m.selectors.next;
+    s := def.next;
     WHILE s # NIL DO
       DevCPR.Set(s.name, s.value);
       s := s.next
@@ -574,31 +622,27 @@ MODULE DswMakeMain;
     Kernel.FastCollect
   END CheckModule;
 
-  PROCEDURE GetSource (IN modName: ARRAY OF CHAR; OUT path: Files.Name; OUT s: String);
-    CONST modDir = "Mod"; sysDir = "System";
-    VAR dir, name: Files.Name; loc: Files.Locator;
-      text: DswDocuments.Model; r: DswDocuments.Reader; i, res: INTEGER;
-
-    PROCEDURE MakePath (dir, name: Files.Name; type: Files.Type; OUT path: Files.Name);
-    BEGIN
-      ASSERT(name # "", 21);
-      IF dir = "" THEN path := modDir + "/" + name
-      ELSE path := dir + "/" + modDir + "/" + name
-      END;
-      Kernel.MakeFileName(path, type)
-    END MakePath;
+  PROCEDURE MakePath (IN dir, name: Files.Name; IN type: Files.Type; OUT path: Files.Name);
+  BEGIN
+    ASSERT(name # "", 21);
+    IF dir = "" THEN path := modDir + "/" + name
+    ELSE path := dir + "/" + modDir + "/" + name
+    END;
+    Kernel.MakeFileName(path, type)
+  END MakePath;
 
+  PROCEDURE Open (loc: Files.Locator; IN sub, name: Files.Name; OUT path: Files.Name; OUT text: DswDocuments.Model);
+    VAR res: INTEGER;
   BEGIN
-    s := NIL; path := "";
-    Kernel.SplitName(modName, dir, name);
-    loc := Files.dir.This(dir).This(modDir);
-    (* --> Kernel.MakeFileName(name, Kernel.docType); <-- *)
-    MakePath(dir, name, "cp", path);
+    ASSERT(loc # NIL, 20);
+    ASSERT(name # "", 21);
+    (* !!! use Kernel.MakeFileName instead ".ext" concat !!! *)
+    MakePath(sub, name, "cp", path);
     DswDocuments.Open(loc, name + ".cp", text, res);
     IF text = NIL THEN
-      MakePath(dir, name, "odc", path);
+      MakePath(sub, name, "odc", path);
       DswDocuments.Open(loc, name + ".odc", text, res);
-      IF (text = NIL) & (dir = "") THEN
+      IF (text = NIL) & (sub = "") THEN
         MakePath(sysDir, name, "cp", path);
         loc := Files.dir.This(sysDir).This(modDir);
         DswDocuments.Open(loc, name + ".cp", text, res);
@@ -610,6 +654,23 @@ MODULE DswMakeMain;
           END
         END
       END
+    END
+  END Open;
+
+  PROCEDURE GetSource (IN modName: ARRAY OF CHAR; list: DevCPM.Directory; OUT path: Files.Name; OUT s: String);
+    VAR
+      sub, name: Files.Name; loc: Files.Locator; base: DevCPM.Directory; 
+      text: DswDocuments.Model; r: DswDocuments.Reader; i, res: INTEGER;
+  BEGIN
+    s := NIL; path := ""; base := list;
+    Kernel.SplitName(modName, sub, name);
+    loc := Files.dir.This(sub).This(modDir);
+    Open(loc, sub, name, path, text);
+    WHILE (text = NIL) & (base # NIL) DO
+      ASSERT(base.legacy, 100);
+      loc := Files.dir.This(base.path).This(sub).This(modDir);
+      Open(loc, sub, name, path, text);
+      base := base.next
     END;
     IF text # NIL THEN
       NEW(s, text.Length() + 1);
@@ -661,14 +722,14 @@ MODULE DswMakeMain;
   END Sort;
 
   PROCEDURE CheckDeps;
-    VAR i, j, num: INTEGER; m: Module; s: String; ok: BOOLEAN;
+    VAR i, j, num: INTEGER; m: Module; src: String; ok: BOOLEAN;
   BEGIN
     i := 0; rno := mno;
     WHILE (err = 0) & (i < mno) DO
       m := modList[i];
-      GetSource(m.name$, m.path, s);
-      IF s # NIL THEN
-        CheckModule(m, s, ok);
+      GetSource(m.name$, m.dir, m.odc, src);
+      IF src # NIL THEN
+        CheckModule(m, src, ok);
         IF ~ok THEN INC(err) END
       ELSE
         Error(21, m.name$, "", 0)
@@ -734,101 +795,38 @@ MODULE DswMakeMain;
     IF debugArgs THEN Log.Ln END
   END PutParams;
 
+  PROCEDURE PutPathList (w: DswProcs.Process; IN par: ARRAY OF CHAR; base: DevCPM.Directory);
+  BEGIN
+    IF base # NIL THEN
+      PutPathList(w, par, base.next); (* in revese order *)
+      w.PutParam(par);
+      w.PutParam(base.path);
+    END
+  END PutPathList;
+
   PROCEDURE ExecuteCompiler (m: Module): DswProcs.Process;
-    VAR w: DswProcs.Process; ok: BOOLEAN;
+    VAR w: DswProcs.Process; ok: BOOLEAN; s: Selector;
   BEGIN
     ASSERT(m # NIL, 20);
-    ASSERT(m.path # "", 21);
+    ASSERT(m.odc # "", 21);
     ASSERT(m.worker = NIL, 22);
     w := DswProcs.dir.New();
     w.Program(cpcExe);
     w.PutParam("-legacy");
-    PutParams(w, cpcArgs);
-    CASE compiler OF
-    | cpfront:
-      w.PutParam("-define+"); w.PutParam("CPFRONT");
-      w.PutParam("-define-"); w.PutParam("NATIVE");
-    | cpnative:
-      w.PutParam("-define-"); w.PutParam("CPFRONT");
-      w.PutParam("-define+"); w.PutParam("NATIVE");
-    END;
-    CASE processor OF
-    | mach386:
-      w.PutParam("-define+"); w.PutParam("I486");
-      w.PutParam("-define-"); w.PutParam("M68K");
-    | mach68k:
-      w.PutParam("-define+"); w.PutParam("I486");
-      w.PutParam("-define-"); w.PutParam("M68K");
-    ELSE
-      w.PutParam("-define-"); w.PutParam("I486");
-      w.PutParam("-define-"); w.PutParam("M68K");
-    END;
-    CASE os OF
-    | anyos:
-      w.PutParam("-define-"); w.PutParam("POSIX");
-      w.PutParam("-define-"); w.PutParam("LINUX");
-      w.PutParam("-define-"); w.PutParam("FREEBSD");
-      w.PutParam("-define-"); w.PutParam("OPENBSD");
-      w.PutParam("-define-"); w.PutParam("WIN32");
-      w.PutParam("-define-"); w.PutParam("DARWIN");
-    | linux:
-      w.PutParam("-define+"); w.PutParam("POSIX");
-      w.PutParam("-define+"); w.PutParam("LINUX");
-      w.PutParam("-define-"); w.PutParam("FREEBSD");
-      w.PutParam("-define-"); w.PutParam("OPENBSD");
-      w.PutParam("-define-"); w.PutParam("WIN32");
-      w.PutParam("-define-"); w.PutParam("DARWIN");
-    | freebsd:
-      w.PutParam("-define+"); w.PutParam("POSIX");
-      w.PutParam("-define-"); w.PutParam("LINUX");
-      w.PutParam("-define+"); w.PutParam("FREEBSD");
-      w.PutParam("-define-"); w.PutParam("OPENBSD");
-      w.PutParam("-define-"); w.PutParam("WIN32");
-      w.PutParam("-define-"); w.PutParam("CYGWIN");
-      w.PutParam("-define-"); w.PutParam("DARWIN");
-    | openbsd:
-      w.PutParam("-define+"); w.PutParam("POSIX");
-      w.PutParam("-define-"); w.PutParam("LINUX");
-      w.PutParam("-define-"); w.PutParam("FREEBSD");
-      w.PutParam("-define+"); w.PutParam("OPENBSD");
-      w.PutParam("-define-"); w.PutParam("WIN32");
-      w.PutParam("-define-"); w.PutParam("CYGWIN");
-      w.PutParam("-define-"); w.PutParam("DARWIN");
-    | win32:
-      w.PutParam("-define-"); w.PutParam("POSIX");
-      w.PutParam("-define-"); w.PutParam("LINUX");
-      w.PutParam("-define-"); w.PutParam("FREEBSD");
-      w.PutParam("-define-"); w.PutParam("OPENBSD");
-      w.PutParam("-define+"); w.PutParam("WIN32");
-      w.PutParam("-define-"); w.PutParam("CYGWIN");
-      w.PutParam("-define-"); w.PutParam("DARWIN");
-    | cygwin:
-      w.PutParam("-define+"); w.PutParam("POSIX");
-      w.PutParam("-define-"); w.PutParam("LINUX");
-      w.PutParam("-define-"); w.PutParam("FREEBSD");
-      w.PutParam("-define-"); w.PutParam("OPENBSD");
-      w.PutParam("-define+"); w.PutParam("WIN32");
-      w.PutParam("-define+"); w.PutParam("CYGWIN");
-      w.PutParam("-define-"); w.PutParam("DARWIN");
-    | darwin:
-      w.PutParam("-define+"); w.PutParam("POSIX");
-      w.PutParam("-define-"); w.PutParam("LINUX");
-      w.PutParam("-define-"); w.PutParam("FREEBSD");
-      w.PutParam("-define-"); w.PutParam("OPENBSD");
-      w.PutParam("-define-"); w.PutParam("WIN32");
-      w.PutParam("-define-"); w.PutParam("CYGWIN");
-      w.PutParam("-define+"); w.PutParam("DARWIN");
-    END;
-    CASE linker OF
-    | dev2:
-      w.PutParam("-define+"); w.PutParam("DEV2");
-    ELSE
-      w.PutParam("-define-"); w.PutParam("DEV2");
+    PutPathList(w, "-legacysymdir", m.dir);
+    s := def.next;
+    WHILE s # NIL DO
+      IF s.value = TRUE THEN w.PutParam("-define+")
+      ELSE w.PutParam("-define-")
+      END;
+      w.PutParam(s.name$);
+      s := s.next
     END;
-    w.PutParam(m.path);
+    PutParams(w, cpcArgs);
+    w.PutParam(m.odc);
     w.Execute(ok);
     IF ok THEN
-      Log.String("Compile " + m.name + " (" + m.path + ")"); Log.Ln;
+      Log.String("Compile " + m.name + " (" + m.odc + ")"); Log.Ln;
     ELSE
       w := NIL
     END;
@@ -892,6 +890,7 @@ MODULE DswMakeMain;
     ASSERT(compiler = cpnative, 22);
     p := DswProcs.dir.New();
     p.Program(cplExe);
+    PutPathList(p, "-legacycodedir", dirList);
     IF os # anyos THEN
       p.PutParam("-os");
       CASE os OF
@@ -940,19 +939,55 @@ MODULE DswMakeMain;
     END
   END Link;
 
+  PROCEDURE PrintInfo;
+    VAR i: INTEGER;
+  BEGIN
+    IF printCompileModList THEN
+      FOR i := 0 TO mno - 1 DO
+        Log.String(cmpList[i].name$); Log.Char(" ")
+      END;
+      Log.Ln
+    ELSIF printLinkModList THEN
+      FOR i := 0 TO mno - 1 DO
+        IF ~(library IN lnkList[i].flags) THEN
+          Log.String(lnkList[i].name$); Log.Char(" ")
+        END
+      END;
+      Log.Ln
+    ELSIF printCompileFileList THEN
+      FOR i := 0 TO mno - 1 DO
+        Log.String(cmpList[i].odc); Log.Char(" ")
+      END;
+      Log.Ln
+(*  ELSIF printLinkFileList THEN
+      FOR i := 0 TO mno - 1 DO
+        IF ~(library IN lnkList[i].flags) THEN
+          Log.String(lnkList[i].ocf); Log.Char(" ")
+        END
+      END;
+      Log.Ln*)
+    END
+  END PrintInfo;
+
   PROCEDURE Main;
-    VAR m: Module; s: Selector; p: DswProcs.Process; ok: BOOLEAN; i, res: INTEGER;
   BEGIN
     IF Kernel.trapCount = 0 THEN
       ParseArgs;
       IF err = 0 THEN
+        IF printCompileModList OR printLinkModList OR printCompileFileList THEN
+          auto := TRUE
+        END;
         CheckParams;
         IF err = 0 THEN
           CheckDeps;
           IF err = 0 THEN
-            Compile;
-            IF err = 0 THEN
-              Link
+            IF printCompileModList OR printLinkModList OR printCompileFileList THEN
+              PrintInfo
+            ELSE
+              Compile;
+              IF err = 0 THEN
+                Link
+              END
             END
           END
         END
@@ -966,5 +1001,7 @@ MODULE DswMakeMain;
 
 BEGIN
   NEW(def);
+  ASSERT(def # NIL, 100);
+  Kernel.intTrap := FALSE;
   Kernel.Start(Main)
 END DswMakeMain.