WebSVN – Kolibri OS – Diff – /programs/develop/oberon07/Source/Compiler.ob07

(root)/programs/develop/oberon07/Source/Compiler.ob07 – Rev 7597 → 7693

     All rights reserved.
 *)
 MODULE Compiler;
-IMPORT ST := STATEMENTS, PARS, UTILS, PATHS, C := CONSOLE, ERRORS, STRINGS, mConst := CONSTANTS, WRITER;
+IMPORT ST := STATEMENTS, PARS, UTILS, PATHS, PROG, C := CONSOLE, ERRORS, STRINGS, mConst := CONSTANTS, WRITER, MSP430;
         res := mConst.Target_iGUI64
     ELSIF s = mConst.Target_sDLL64 THEN
         res := mConst.Target_iDLL64
     ELSIF s = mConst.Target_sELF32 THEN
         res := mConst.Target_iELF32
+    ELSIF s = mConst.Target_sELFSO32 THEN
+        res := mConst.Target_iELFSO32
     ELSIF s = mConst.Target_sELF64 THEN
         res := mConst.Target_iELF64
+    ELSIF s = mConst.Target_sELFSO64 THEN
+        res := mConst.Target_iELFSO64
+    ELSIF s = mConst.Target_sMSP430 THEN
+        res := mConst.Target_iMSP430
     ELSE
         res := 0
     END
     RETURN res
 END Target;
-PROCEDURE keys (VAR StackSize, BaseAddress, Version: INTEGER; VAR pic: BOOLEAN; VAR checking: SET);
+PROCEDURE keys (VAR options: PROG.OPTIONS);
 VAR
     param: PARS.PATH;
     i, j:  INTEGER;
     end:   BOOLEAN;
+    value: INTEGER;
-    value: INTEGER;
+    minor,
+    major: INTEGER;
-    minor,
+    checking: SET;
     major: INTEGER;
 BEGIN
-BEGIN
+    checking := options.checking;
     end := FALSE;
     i := 4;
     REPEAT
         UTILS.GetArg(i, param);
         IF param = "-stk" THEN
             INC(i);
             UTILS.GetArg(i, param);
             IF STRINGS.StrToInt(param, value) & (1 <= value) & (value <= 32) THEN
-                StackSize := value
+                options.stack := value
             END;
             IF param[0] = "-" THEN
                 DEC(i)
             END
+        ELSIF param = "-base" THEN
+            INC(i);
+            UTILS.GetArg(i, param);
+            IF STRINGS.StrToInt(param, value) THEN
+                options.base := ((value DIV 64) * 64) * 1024
+            END;
+            IF param[0] = "-" THEN
+                DEC(i)
+            END
+        ELSIF param = "-ram" THEN
+            INC(i);
+            UTILS.GetArg(i, param);
+            IF STRINGS.StrToInt(param, value) THEN
+                options.ram := value
+            END;
+            IF param[0] = "-" THEN
+                DEC(i)
+            END
-        ELSIF param = "-base" THEN
+        ELSIF param = "-rom" THEN
             INC(i);
             UTILS.GetArg(i, param);
                     ELSIF param[j] = "a" THEN
                         checking := {}
                     END;
                     INC(j)
+                END;
                 END
             END
         ELSIF param = "-ver" THEN
             INC(i);
             UTILS.GetArg(i, param);
             IF STRINGS.StrToVer(param, major, minor) THEN
-                Version := major * 65536 + minor
+                options.version := major * 65536 + minor
             END;
             IF param[0] = "-" THEN
                 DEC(i)
             END
         ELSIF param = "-pic" THEN
-            pic := TRUE
+            options.pic := TRUE
         ELSIF param = "" THEN
             end := TRUE
+        ELSE
-        ELSE
+            ERRORS.BadParam(param)
-            ERRORS.error3("bad parameter: ", param, "")
+        END;
         END;
     lib_path:   PARS.PATH;
     modname:    PARS.PATH;
     outname:    PARS.PATH;
     param:      PARS.PATH;
     temp:       PARS.PATH;
     target:     INTEGER;
+    bit_depth:  INTEGER;
     time:       INTEGER;
-    StackSize,
-    Version,
-    BaseAdr:    INTEGER;
-    pic:        BOOLEAN;
+    options:    PROG.OPTIONS;
-    checking:   SET;
-    bits64: BOOLEAN;
 BEGIN
-    StackSize := 2;
+    options.stack := 2;
-    Version := 65536;
+    options.version := 65536;
-    pic := FALSE;
+    options.pic := FALSE;
-    checking := ST.chkALL;
+    options.checking := ST.chkALL;
     PATHS.GetCurrentDirectory(app_path);
+    lib_path := app_path;
+    UTILS.GetArg(1, inname);
+    C.Ln;
-    lib_path := app_path;
+    C.String("Akron Oberon Compiler v"); C.Int(mConst.vMajor); C.String("."); C.Int2(mConst.vMinor);
-    UTILS.GetArg(1, inname);
+        C.String(" ("); C.Int(UTILS.bit_depth); C.StringLn("-bit)");
     C.StringLn("Copyright (c) 2018-2019, Anton Krotov");
     IF inname = "" THEN
-        C.String("Akron Oberon-07/16 Compiler v"); C.Int(mConst.vMajor); C.String("."); C.Int2(mConst.vMinor);
+    IF inname = "" THEN
-            C.String(" ("); C.Int(UTILS.bit_depth); C.StringLn("-bit)"); C.Ln;
+        C.Ln;
         C.StringLn("Usage: Compiler    [optional settings]"); C.Ln;
         IF UTILS.bit_depth = 64 THEN
-            C.StringLn('target = console | gui | dll | console64 | gui64 | dll64 | kos | obj | elfexe | elfexe64'); C.Ln;
+            C.StringLn('target = console | gui | dll | console64 | gui64 | dll64 | kos | obj | elfexe | elfso | elfexe64 | elfso64 | msp430'); C.Ln;
         ELSIF UTILS.bit_depth = 32 THEN
-            C.StringLn('target = console | gui | dll | kos | obj | elfexe'); C.Ln;
+            C.StringLn('target = console | gui | dll | kos | obj | elfexe | elfso | msp430'); C.Ln;
         END;
         C.StringLn("optional settings:"); C.Ln;
         C.StringLn("  -stk             set size of stack in megabytes"); C.Ln;
+        C.StringLn("  -base         set base address of image in kilobytes"); C.Ln;
+        C.StringLn('  -ver      set version of program'); C.Ln;
-        C.StringLn("  -base         set base address of image in kilobytes"); C.Ln;
+        C.StringLn('  -nochk <"ptibcwra">    disable runtime checking (pointers, types, indexes,');
-        C.StringLn('  -ver      set version of program'); C.Ln;
+        C.StringLn('                         BYTE, CHR, WCHR)'); C.Ln;
-        C.StringLn('  -nochk <"ptibcwra">    disable runtime checking (pointers, types, indexes,');
+        C.StringLn("  -ram             set size of RAM in bytes (MSP430)"); C.Ln;
-        C.StringLn('                         BYTE, CHR, WCHR)'); C.Ln;
+        C.StringLn("  -rom             set size of ROM in bytes (MSP430)"); C.Ln;
         UTILS.Exit(0)
     END;
     PATHS.split(inname, path, modname, ext);
     PATHS.split(inname, path, modname, ext);
     IF ext # mConst.FILE_EXT THEN
-    IF ext # mConst.FILE_EXT THEN
+        ERRORS.Error(207)
-        ERRORS.error3('inputfile name extension must be "', mConst.FILE_EXT, '"')
+    END;
     END;
     IF PATHS.isRelative(path) THEN
         PATHS.RelPath(app_path, path, temp);
         path := temp
     END;
     UTILS.GetArg(2, outname);
     IF outname = "" THEN
-        ERRORS.error1("not enough parameters")
+        ERRORS.Error(205)
     END;
     IF PATHS.isRelative(outname) THEN
         PATHS.RelPath(app_path, outname, temp);
         outname := temp
     END;
+    UTILS.GetArg(3, param);
-    UTILS.GetArg(3, param);
+    IF param = "" THEN
-    IF param = "" THEN
-        ERRORS.error1("not enough parameters")
+        ERRORS.Error(205)
+    END;
-    END;
+    target := Target(param);
-    target := Target(param);
+    IF target = 0 THEN
+        ERRORS.Error(206)
-    IF target = 0 THEN
-        ERRORS.error1("bad parameter ")
+    END;
     END;
+    CASE target OF
-    bits64 := target IN {mConst.Target_iConsole64, mConst.Target_iGUI64, mConst.Target_iDLL64, mConst.Target_iELF64};
+    |mConst.Target_iConsole64, mConst.Target_iGUI64, mConst.Target_iDLL64, mConst.Target_iELF64, mConst.Target_iELFSO64:
+        bit_depth := 64
     |mConst.Target_iConsole, mConst.Target_iGUI, mConst.Target_iDLL,
-    IF bits64 THEN
+     mConst.Target_iKolibri, mConst.Target_iObject, mConst.Target_iELF32, mConst.Target_iELFSO32:
+        bit_depth := 32
-        IF UTILS.bit_depth = 32 THEN
+    |mConst.Target_iMSP430:
-            ERRORS.error1("bad parameter ")
+        bit_depth := 16;
-        END;
+        options.ram := MSP430.minRAM;
-        PARS.init(64, target)
+        options.rom := MSP430.minROM
-    ELSE
+    END;
         PARS.init(32, target)
-    END;
+    IF UTILS.bit_depth < bit_depth THEN
+        ERRORS.Error(206)
-    PARS.program.dll := target IN {mConst.Target_iDLL, mConst.Target_iObject, mConst.Target_iDLL64};
+    END;
-    PARS.program.obj := target = mConst.Target_iObject;
     STRINGS.append(lib_path, "lib");
-    STRINGS.append(lib_path, "lib");
+    STRINGS.append(lib_path, UTILS.slash);
     STRINGS.append(lib_path, UTILS.slash);
+    CASE target OF
-    IF target IN {mConst.Target_iConsole, mConst.Target_iGUI, mConst.Target_iDLL} THEN
+    |mConst.Target_iConsole, mConst.Target_iGUI, mConst.Target_iDLL:
+        IF target = mConst.Target_iDLL THEN
+            options.base := 10000000H
+        ELSE
-        IF target = mConst.Target_iDLL THEN
+            options.base := 400000H
-            BaseAdr := 10000000H
+        END;
+        STRINGS.append(lib_path, "Windows32")
-        ELSE
+    |mConst.Target_iKolibri, mConst.Target_iObject:
+        STRINGS.append(lib_path, "KolibriOS")
+    |mConst.Target_iELF32, mConst.Target_iELFSO32:
-            BaseAdr := 400000H
+        STRINGS.append(lib_path, "Linux32")
         END;
-        STRINGS.append(lib_path, "Windows32")
+    |mConst.Target_iELF64, mConst.Target_iELFSO64:
         STRINGS.append(lib_path, "Linux64")

Subversion Repositories Kolibri OS

(root)/programs/develop/oberon07/Source/Compiler.ob07 – Rev 7597 → 7693