From 80de6dc2164864ab04d2bf671245084a57b37799 Mon Sep 17 00:00:00 2001 From: David Brown Date: Sat, 15 Oct 2016 17:15:05 +0100 Subject: [PATCH] Rationalise -O2 vs -OC library build. --- bootstrap/unix-44/Compiler.c | 14 +- bootstrap/unix-44/Configuration.c | 4 +- bootstrap/unix-44/Configuration.h | 2 +- bootstrap/unix-44/Files.c | 2 +- bootstrap/unix-44/Files.h | 2 +- bootstrap/unix-44/Heap.c | 2 +- bootstrap/unix-44/Heap.h | 2 +- bootstrap/unix-44/Modules.c | 2 +- bootstrap/unix-44/Modules.h | 2 +- bootstrap/unix-44/OPB.c | 2 +- bootstrap/unix-44/OPB.h | 2 +- bootstrap/unix-44/OPC.c | 2 +- bootstrap/unix-44/OPC.h | 2 +- bootstrap/unix-44/OPM.c | 20 +- bootstrap/unix-44/OPM.h | 2 +- bootstrap/unix-44/OPP.c | 2 +- bootstrap/unix-44/OPP.h | 2 +- bootstrap/unix-44/OPS.c | 2 +- bootstrap/unix-44/OPS.h | 2 +- bootstrap/unix-44/OPT.c | 2 +- bootstrap/unix-44/OPT.h | 2 +- bootstrap/unix-44/OPV.c | 2 +- bootstrap/unix-44/OPV.h | 2 +- bootstrap/unix-44/Out.c | 3 +- bootstrap/unix-44/Out.h | 2 +- bootstrap/unix-44/Platform.c | 2 +- bootstrap/unix-44/Platform.h | 2 +- bootstrap/unix-44/Reals.c | 2 +- bootstrap/unix-44/Reals.h | 2 +- bootstrap/unix-44/Strings.c | 2 +- bootstrap/unix-44/Strings.h | 2 +- bootstrap/unix-44/Texts.c | 2 +- bootstrap/unix-44/Texts.h | 2 +- bootstrap/unix-44/errors.c | 2 +- bootstrap/unix-44/errors.h | 2 +- bootstrap/unix-44/extTools.c | 3 +- bootstrap/unix-44/extTools.h | 2 +- bootstrap/unix-44/vt100.c | 190 +++++++-------- bootstrap/unix-44/vt100.h | 56 ++--- bootstrap/unix-48/Compiler.c | 14 +- bootstrap/unix-48/Configuration.c | 4 +- bootstrap/unix-48/Configuration.h | 2 +- bootstrap/unix-48/Files.c | 2 +- bootstrap/unix-48/Files.h | 2 +- bootstrap/unix-48/Heap.c | 2 +- bootstrap/unix-48/Heap.h | 2 +- bootstrap/unix-48/Modules.c | 2 +- bootstrap/unix-48/Modules.h | 2 +- bootstrap/unix-48/OPB.c | 2 +- bootstrap/unix-48/OPB.h | 2 +- bootstrap/unix-48/OPC.c | 2 +- bootstrap/unix-48/OPC.h | 2 +- bootstrap/unix-48/OPM.c | 20 +- bootstrap/unix-48/OPM.h | 2 +- bootstrap/unix-48/OPP.c | 2 +- bootstrap/unix-48/OPP.h | 2 +- bootstrap/unix-48/OPS.c | 2 +- bootstrap/unix-48/OPS.h | 2 +- bootstrap/unix-48/OPT.c | 2 +- bootstrap/unix-48/OPT.h | 2 +- bootstrap/unix-48/OPV.c | 2 +- bootstrap/unix-48/OPV.h | 2 +- bootstrap/unix-48/Out.c | 3 +- bootstrap/unix-48/Out.h | 2 +- bootstrap/unix-48/Platform.c | 2 +- bootstrap/unix-48/Platform.h | 2 +- bootstrap/unix-48/Reals.c | 2 +- bootstrap/unix-48/Reals.h | 2 +- bootstrap/unix-48/Strings.c | 2 +- bootstrap/unix-48/Strings.h | 2 +- bootstrap/unix-48/Texts.c | 2 +- bootstrap/unix-48/Texts.h | 2 +- bootstrap/unix-48/errors.c | 2 +- bootstrap/unix-48/errors.h | 2 +- bootstrap/unix-48/extTools.c | 3 +- bootstrap/unix-48/extTools.h | 2 +- bootstrap/unix-48/vt100.c | 190 +++++++-------- bootstrap/unix-48/vt100.h | 56 ++--- bootstrap/unix-88/Compiler.c | 14 +- bootstrap/unix-88/Configuration.c | 4 +- bootstrap/unix-88/Configuration.h | 2 +- bootstrap/unix-88/Files.c | 2 +- bootstrap/unix-88/Files.h | 2 +- bootstrap/unix-88/Heap.c | 2 +- bootstrap/unix-88/Heap.h | 2 +- bootstrap/unix-88/Modules.c | 2 +- bootstrap/unix-88/Modules.h | 2 +- bootstrap/unix-88/OPB.c | 2 +- bootstrap/unix-88/OPB.h | 2 +- bootstrap/unix-88/OPC.c | 2 +- bootstrap/unix-88/OPC.h | 2 +- bootstrap/unix-88/OPM.c | 20 +- bootstrap/unix-88/OPM.h | 2 +- bootstrap/unix-88/OPP.c | 2 +- bootstrap/unix-88/OPP.h | 2 +- bootstrap/unix-88/OPS.c | 2 +- bootstrap/unix-88/OPS.h | 2 +- bootstrap/unix-88/OPT.c | 2 +- bootstrap/unix-88/OPT.h | 2 +- bootstrap/unix-88/OPV.c | 2 +- bootstrap/unix-88/OPV.h | 2 +- bootstrap/unix-88/Out.c | 3 +- bootstrap/unix-88/Out.h | 2 +- bootstrap/unix-88/Platform.c | 2 +- bootstrap/unix-88/Platform.h | 2 +- bootstrap/unix-88/Reals.c | 2 +- bootstrap/unix-88/Reals.h | 2 +- bootstrap/unix-88/Strings.c | 2 +- bootstrap/unix-88/Strings.h | 2 +- bootstrap/unix-88/Texts.c | 2 +- bootstrap/unix-88/Texts.h | 2 +- bootstrap/unix-88/errors.c | 2 +- bootstrap/unix-88/errors.h | 2 +- bootstrap/unix-88/extTools.c | 3 +- bootstrap/unix-88/extTools.h | 2 +- bootstrap/unix-88/vt100.c | 190 +++++++-------- bootstrap/unix-88/vt100.h | 56 ++--- bootstrap/windows-48/Compiler.c | 14 +- bootstrap/windows-48/Configuration.c | 4 +- bootstrap/windows-48/Configuration.h | 2 +- bootstrap/windows-48/Files.c | 2 +- bootstrap/windows-48/Files.h | 2 +- bootstrap/windows-48/Heap.c | 2 +- bootstrap/windows-48/Heap.h | 2 +- bootstrap/windows-48/Modules.c | 2 +- bootstrap/windows-48/Modules.h | 2 +- bootstrap/windows-48/OPB.c | 2 +- bootstrap/windows-48/OPB.h | 2 +- bootstrap/windows-48/OPC.c | 2 +- bootstrap/windows-48/OPC.h | 2 +- bootstrap/windows-48/OPM.c | 20 +- bootstrap/windows-48/OPM.h | 2 +- bootstrap/windows-48/OPP.c | 2 +- bootstrap/windows-48/OPP.h | 2 +- bootstrap/windows-48/OPS.c | 2 +- bootstrap/windows-48/OPS.h | 2 +- bootstrap/windows-48/OPT.c | 2 +- bootstrap/windows-48/OPT.h | 2 +- bootstrap/windows-48/OPV.c | 2 +- bootstrap/windows-48/OPV.h | 2 +- bootstrap/windows-48/Out.c | 3 +- bootstrap/windows-48/Out.h | 2 +- bootstrap/windows-48/Platform.c | 2 +- bootstrap/windows-48/Platform.h | 2 +- bootstrap/windows-48/Reals.c | 2 +- bootstrap/windows-48/Reals.h | 2 +- bootstrap/windows-48/Strings.c | 2 +- bootstrap/windows-48/Strings.h | 2 +- bootstrap/windows-48/Texts.c | 2 +- bootstrap/windows-48/Texts.h | 2 +- bootstrap/windows-48/errors.c | 2 +- bootstrap/windows-48/errors.h | 2 +- bootstrap/windows-48/extTools.c | 3 +- bootstrap/windows-48/extTools.h | 2 +- bootstrap/windows-48/vt100.c | 190 +++++++-------- bootstrap/windows-48/vt100.h | 56 ++--- bootstrap/windows-88/Compiler.c | 14 +- bootstrap/windows-88/Configuration.c | 4 +- bootstrap/windows-88/Configuration.h | 2 +- bootstrap/windows-88/Files.c | 2 +- bootstrap/windows-88/Files.h | 2 +- bootstrap/windows-88/Heap.c | 2 +- bootstrap/windows-88/Heap.h | 2 +- bootstrap/windows-88/Modules.c | 2 +- bootstrap/windows-88/Modules.h | 2 +- bootstrap/windows-88/OPB.c | 2 +- bootstrap/windows-88/OPB.h | 2 +- bootstrap/windows-88/OPC.c | 2 +- bootstrap/windows-88/OPC.h | 2 +- bootstrap/windows-88/OPM.c | 20 +- bootstrap/windows-88/OPM.h | 2 +- bootstrap/windows-88/OPP.c | 2 +- bootstrap/windows-88/OPP.h | 2 +- bootstrap/windows-88/OPS.c | 2 +- bootstrap/windows-88/OPS.h | 2 +- bootstrap/windows-88/OPT.c | 2 +- bootstrap/windows-88/OPT.h | 2 +- bootstrap/windows-88/OPV.c | 2 +- bootstrap/windows-88/OPV.h | 2 +- bootstrap/windows-88/Out.c | 3 +- bootstrap/windows-88/Out.h | 2 +- bootstrap/windows-88/Platform.c | 2 +- bootstrap/windows-88/Platform.h | 2 +- bootstrap/windows-88/Reals.c | 2 +- bootstrap/windows-88/Reals.h | 2 +- bootstrap/windows-88/Strings.c | 2 +- bootstrap/windows-88/Strings.h | 2 +- bootstrap/windows-88/Texts.c | 2 +- bootstrap/windows-88/Texts.h | 2 +- bootstrap/windows-88/errors.c | 2 +- bootstrap/windows-88/errors.h | 2 +- bootstrap/windows-88/extTools.c | 3 +- bootstrap/windows-88/extTools.h | 2 +- bootstrap/windows-88/vt100.c | 190 +++++++-------- bootstrap/windows-88/vt100.h | 56 ++--- makefile | 13 +- src/compiler/Compiler.Mod | 10 +- src/compiler/OPM.Mod | 18 +- src/compiler/extTools.Mod | 1 + src/library/misc/crt.Mod | 107 +++++---- src/library/misc/vt100.Mod | 342 --------------------------- src/library/s3/ethReals.Mod | 2 +- src/runtime/MathL.Mod | 4 +- src/runtime/Out.Mod | 1 + src/runtime/vt100.Mod | 4 +- src/tools/make/oberon.mk | 313 ++++++++++++------------ 206 files changed, 1129 insertions(+), 1456 deletions(-) delete mode 100644 src/library/misc/vt100.Mod diff --git a/bootstrap/unix-44/Compiler.c b/bootstrap/unix-44/Compiler.c index 5ec069b8..82f1ab48 100644 --- a/bootstrap/unix-44/Compiler.c +++ b/bootstrap/unix-44/Compiler.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */ #define SHORTINT int8 #define INTEGER int16 @@ -16,8 +16,8 @@ #include "OPV.h" #include "Platform.h" #include "Strings.h" +#include "VT100.h" #include "extTools.h" -#include "vt100.h" static CHAR Compiler_mname[256]; @@ -47,20 +47,20 @@ void Compiler_Module (BOOLEAN *done) if ((__IN(10, OPM_Options, 32) && __STRCMP(OPM_modName, "SYSTEM") != 0)) { OPM_DeleteNewSym(); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogWStr((CHAR*)" Main program.", 16); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } else { if (new) { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogWStr((CHAR*)" New symbol file.", 19); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } OPM_RegisterNewSym(); } else if (ext) { @@ -175,8 +175,8 @@ export int main(int argc, char **argv) __MODULE_IMPORT(OPV); __MODULE_IMPORT(Platform); __MODULE_IMPORT(Strings); + __MODULE_IMPORT(VT100); __MODULE_IMPORT(extTools); - __MODULE_IMPORT(vt100); __REGMAIN("Compiler", 0); __REGCMD("Translate", Compiler_Translate); /* BEGIN */ diff --git a/bootstrap/unix-44/Configuration.c b/bootstrap/unix-44/Configuration.c index 0bef890f..b9310392 100644 --- a/bootstrap/unix-44/Configuration.c +++ b/bootstrap/unix-44/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -19,6 +19,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75); + __MOVE("1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75); __ENDMOD; } diff --git a/bootstrap/unix-44/Configuration.h b/bootstrap/unix-44/Configuration.h index 286f28c0..c760742c 100644 --- a/bootstrap/unix-44/Configuration.h +++ b/bootstrap/unix-44/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/unix-44/Files.c b/bootstrap/unix-44/Files.c index 4074c8b1..e46e005c 100644 --- a/bootstrap/unix-44/Files.c +++ b/bootstrap/unix-44/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/Files.h b/bootstrap/unix-44/Files.h index c38c3f26..33cfbbec 100644 --- a/bootstrap/unix-44/Files.h +++ b/bootstrap/unix-44/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #ifndef Files__h #define Files__h diff --git a/bootstrap/unix-44/Heap.c b/bootstrap/unix-44/Heap.c index cb386d17..948db354 100644 --- a/bootstrap/unix-44/Heap.c +++ b/bootstrap/unix-44/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/Heap.h b/bootstrap/unix-44/Heap.h index c6dbfb3e..7712f182 100644 --- a/bootstrap/unix-44/Heap.h +++ b/bootstrap/unix-44/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ #ifndef Heap__h #define Heap__h diff --git a/bootstrap/unix-44/Modules.c b/bootstrap/unix-44/Modules.c index e5227fba..5cdcbe9c 100644 --- a/bootstrap/unix-44/Modules.c +++ b/bootstrap/unix-44/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/Modules.h b/bootstrap/unix-44/Modules.h index 77ec53de..e6fcdbbe 100644 --- a/bootstrap/unix-44/Modules.h +++ b/bootstrap/unix-44/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Modules__h #define Modules__h diff --git a/bootstrap/unix-44/OPB.c b/bootstrap/unix-44/OPB.c index aab1b7fe..aa7126c9 100644 --- a/bootstrap/unix-44/OPB.c +++ b/bootstrap/unix-44/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/OPB.h b/bootstrap/unix-44/OPB.h index eb00fcda..b63ca81f 100644 --- a/bootstrap/unix-44/OPB.h +++ b/bootstrap/unix-44/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/unix-44/OPC.c b/bootstrap/unix-44/OPC.c index 84393696..d2a4419b 100644 --- a/bootstrap/unix-44/OPC.c +++ b/bootstrap/unix-44/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/OPC.h b/bootstrap/unix-44/OPC.h index d6a60b2e..4da49877 100644 --- a/bootstrap/unix-44/OPC.h +++ b/bootstrap/unix-44/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/unix-44/OPM.c b/bootstrap/unix-44/OPM.c index 76cc2b7c..d202f2cd 100644 --- a/bootstrap/unix-44/OPM.c +++ b/bootstrap/unix-44/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -12,8 +12,8 @@ #include "Platform.h" #include "Strings.h" #include "Texts.h" +#include "VT100.h" #include "errors.h" -#include "vt100.h" typedef CHAR OPM_FileName[32]; @@ -325,7 +325,7 @@ BOOLEAN OPM_OpenPar (void) OPM_LogWLn(); OPM_LogWStr((CHAR*)" Miscellaneous", 16); OPM_LogWLn(); - OPM_LogWStr((CHAR*)" -f Disable vt100 control characters in status output.", 60); + OPM_LogWStr((CHAR*)" -f Disable VT100 control characters in status output.", 60); OPM_LogWLn(); OPM_LogWStr((CHAR*)" -V Display compiler debugging messages.", 46); OPM_LogWLn(); @@ -555,20 +555,20 @@ static void OPM_LogErrMsg (int16 n) CHAR buf[1024]; if (n >= 0) { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"31m", 4); + VT100_SetAttr((CHAR*)"31m", 4); } OPM_LogWStr((CHAR*)" err ", 7); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } else { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"35m", 4); + VT100_SetAttr((CHAR*)"35m", 4); } OPM_LogWStr((CHAR*)" warning ", 11); n = -n; if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } OPM_LogWNum(n, 1); @@ -641,11 +641,11 @@ static void OPM_ShowLine (int64 pos) i -= 1; } if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogW('^'); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } Files_Close(f); } @@ -1079,8 +1079,8 @@ export void *OPM__init(void) __MODULE_IMPORT(Platform); __MODULE_IMPORT(Strings); __MODULE_IMPORT(Texts); + __MODULE_IMPORT(VT100); __MODULE_IMPORT(errors); - __MODULE_IMPORT(vt100); __REGMOD("OPM", EnumPtrs); __REGCMD("CloseFiles", OPM_CloseFiles); __REGCMD("CloseOldSym", OPM_CloseOldSym); diff --git a/bootstrap/unix-44/OPM.h b/bootstrap/unix-44/OPM.h index b7b19fb7..b088cc93 100644 --- a/bootstrap/unix-44/OPM.h +++ b/bootstrap/unix-44/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/unix-44/OPP.c b/bootstrap/unix-44/OPP.c index e3a26a86..63fb92b5 100644 --- a/bootstrap/unix-44/OPP.c +++ b/bootstrap/unix-44/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/OPP.h b/bootstrap/unix-44/OPP.h index 1f2ff59f..57f41cf8 100644 --- a/bootstrap/unix-44/OPP.h +++ b/bootstrap/unix-44/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/unix-44/OPS.c b/bootstrap/unix-44/OPS.c index 72800d6b..e7cd3549 100644 --- a/bootstrap/unix-44/OPS.c +++ b/bootstrap/unix-44/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/OPS.h b/bootstrap/unix-44/OPS.h index 595b3668..0a75e9c7 100644 --- a/bootstrap/unix-44/OPS.h +++ b/bootstrap/unix-44/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/unix-44/OPT.c b/bootstrap/unix-44/OPT.c index a1e67f1b..c5d47d14 100644 --- a/bootstrap/unix-44/OPT.c +++ b/bootstrap/unix-44/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/OPT.h b/bootstrap/unix-44/OPT.h index d40fcd25..d8da229b 100644 --- a/bootstrap/unix-44/OPT.h +++ b/bootstrap/unix-44/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPT__h #define OPT__h diff --git a/bootstrap/unix-44/OPV.c b/bootstrap/unix-44/OPV.c index 19522c13..fd02ab90 100644 --- a/bootstrap/unix-44/OPV.c +++ b/bootstrap/unix-44/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/OPV.h b/bootstrap/unix-44/OPV.h index fa176ddf..48195728 100644 --- a/bootstrap/unix-44/OPV.h +++ b/bootstrap/unix-44/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/unix-44/Out.c b/bootstrap/unix-44/Out.c index 944cc0e5..67b82ce9 100644 --- a/bootstrap/unix-44/Out.c +++ b/bootstrap/unix-44/Out.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -315,5 +315,6 @@ export void *Out__init(void) __REGCMD("Ln", Out_Ln); __REGCMD("Open", Out_Open); /* BEGIN */ + Out_in = 0; __ENDMOD; } diff --git a/bootstrap/unix-44/Out.h b/bootstrap/unix-44/Out.h index 418e17e2..f91ee6a4 100644 --- a/bootstrap/unix-44/Out.h +++ b/bootstrap/unix-44/Out.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Out__h #define Out__h diff --git a/bootstrap/unix-44/Platform.c b/bootstrap/unix-44/Platform.c index 4c779435..ff57e9c4 100644 --- a/bootstrap/unix-44/Platform.c +++ b/bootstrap/unix-44/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/Platform.h b/bootstrap/unix-44/Platform.h index e45b429c..5e6af8ad 100644 --- a/bootstrap/unix-44/Platform.h +++ b/bootstrap/unix-44/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Platform__h #define Platform__h diff --git a/bootstrap/unix-44/Reals.c b/bootstrap/unix-44/Reals.c index ece1bf1d..6135ec40 100644 --- a/bootstrap/unix-44/Reals.c +++ b/bootstrap/unix-44/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/Reals.h b/bootstrap/unix-44/Reals.h index 523e9f9e..86321454 100644 --- a/bootstrap/unix-44/Reals.h +++ b/bootstrap/unix-44/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/unix-44/Strings.c b/bootstrap/unix-44/Strings.c index c86ccc0e..92ce5fe0 100644 --- a/bootstrap/unix-44/Strings.c +++ b/bootstrap/unix-44/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/Strings.h b/bootstrap/unix-44/Strings.h index c12329ab..76b31eb9 100644 --- a/bootstrap/unix-44/Strings.h +++ b/bootstrap/unix-44/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/unix-44/Texts.c b/bootstrap/unix-44/Texts.c index 2a154ebf..ac65c9f1 100644 --- a/bootstrap/unix-44/Texts.c +++ b/bootstrap/unix-44/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/Texts.h b/bootstrap/unix-44/Texts.h index 5a8c9b51..60f267ed 100644 --- a/bootstrap/unix-44/Texts.h +++ b/bootstrap/unix-44/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Texts__h #define Texts__h diff --git a/bootstrap/unix-44/errors.c b/bootstrap/unix-44/errors.c index 44990c71..70424462 100644 --- a/bootstrap/unix-44/errors.c +++ b/bootstrap/unix-44/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-44/errors.h b/bootstrap/unix-44/errors.h index e0bb109d..80c4a045 100644 --- a/bootstrap/unix-44/errors.h +++ b/bootstrap/unix-44/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/unix-44/extTools.c b/bootstrap/unix-44/extTools.c index c83fd7dd..a6e5fe94 100644 --- a/bootstrap/unix-44/extTools.c +++ b/bootstrap/unix-44/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -102,6 +102,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati Strings_Append((CHAR*)"", 1, (void*)cmd, 1023); Strings_Append((CHAR*)"/lib\"", 6, (void*)cmd, 1023); Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023); + Strings_Append((CHAR*)"-O", 3, (void*)cmd, 1023); Strings_Append(OPM_Model, 10, (void*)cmd, 1023); extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023); __DEL(additionalopts); diff --git a/bootstrap/unix-44/extTools.h b/bootstrap/unix-44/extTools.h index 21016d9e..d945916e 100644 --- a/bootstrap/unix-44/extTools.h +++ b/bootstrap/unix-44/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/unix-44/vt100.c b/bootstrap/unix-44/vt100.c index afa2b377..7c1212f5 100644 --- a/bootstrap/unix-44/vt100.c +++ b/bootstrap/unix-44/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -10,40 +10,40 @@ #include "Strings.h" -export CHAR vt100_CSI[5]; -static CHAR vt100_tmpstr[32]; +export CHAR VT100_CSI[5]; +static CHAR VT100_tmpstr[32]; -export void vt100_CHA (int16 n); -export void vt100_CNL (int16 n); -export void vt100_CPL (int16 n); -export void vt100_CUB (int16 n); -export void vt100_CUD (int16 n); -export void vt100_CUF (int16 n); -export void vt100_CUP (int16 n, int16 m); -export void vt100_CUU (int16 n); -export void vt100_DECTCEMh (void); -export void vt100_DECTCEMl (void); -export void vt100_DSR (int16 n); -export void vt100_ED (int16 n); -export void vt100_EL (int16 n); -static void vt100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len); -static void vt100_EscSeq0 (CHAR *letter, LONGINT letter__len); -static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len); -static void vt100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len); -export void vt100_HVP (int16 n, int16 m); -export void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); -export void vt100_RCP (void); -static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end); -export void vt100_SCP (void); -export void vt100_SD (int16 n); -export void vt100_SGR (int16 n); -export void vt100_SGR2 (int16 n, int16 m); -export void vt100_SU (int16 n); -export void vt100_SetAttr (CHAR *attr, LONGINT attr__len); +export void VT100_CHA (int16 n); +export void VT100_CNL (int16 n); +export void VT100_CPL (int16 n); +export void VT100_CUB (int16 n); +export void VT100_CUD (int16 n); +export void VT100_CUF (int16 n); +export void VT100_CUP (int16 n, int16 m); +export void VT100_CUU (int16 n); +export void VT100_DECTCEMh (void); +export void VT100_DECTCEMl (void); +export void VT100_DSR (int16 n); +export void VT100_ED (int16 n); +export void VT100_EL (int16 n); +static void VT100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len); +static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len); +static void VT100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len); +static void VT100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len); +export void VT100_HVP (int16 n, int16 m); +export void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); +export void VT100_RCP (void); +static void VT100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end); +export void VT100_SCP (void); +export void VT100_SD (int16 n); +export void VT100_SGR (int16 n); +export void VT100_SGR2 (int16 n, int16 m); +export void VT100_SU (int16 n); +export void VT100_SetAttr (CHAR *attr, LONGINT attr__len); -static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) +static void VT100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) { CHAR h; while (start < end) { @@ -55,7 +55,7 @@ static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) } } -void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) +void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) { CHAR b[21]; int16 s, e; @@ -79,55 +79,55 @@ void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) e += 1; } while (!(int_ == 0)); b[__X(e, 21)] = 0x00; - vt100_Reverse0((void*)b, 21, s, e - 1); + VT100_Reverse0((void*)b, 21, s, e - 1); } __COPY(b, str, str__len); } -static void vt100_EscSeq0 (CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len) { CHAR cmd[9]; __DUP(letter, letter__len, CHAR); - __COPY(vt100_CSI, cmd, 9); + __COPY(VT100_CSI, cmd, 9); Strings_Append(letter, letter__len, (void*)cmd, 9); Out_String(cmd, 9); __DEL(letter); } -static void vt100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len) { CHAR nstr[2]; CHAR cmd[7]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 2); - __COPY(vt100_CSI, cmd, 7); + VT100_IntToStr(n, (void*)nstr, 2); + __COPY(VT100_CSI, cmd, 7); Strings_Append(nstr, 2, (void*)cmd, 7); Strings_Append(letter, letter__len, (void*)cmd, 7); Out_String(cmd, 7); __DEL(letter); } -static void vt100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len) { CHAR nstr[2]; CHAR cmd[7]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 2); - __COPY(vt100_CSI, cmd, 7); + VT100_IntToStr(n, (void*)nstr, 2); + __COPY(VT100_CSI, cmd, 7); Strings_Append(letter, letter__len, (void*)cmd, 7); Strings_Append(nstr, 2, (void*)cmd, 7); Out_String(cmd, 7); __DEL(letter); } -static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) { CHAR nstr[5], mstr[5]; CHAR cmd[12]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 5); - vt100_IntToStr(m, (void*)mstr, 5); - __COPY(vt100_CSI, cmd, 12); + VT100_IntToStr(n, (void*)nstr, 5); + VT100_IntToStr(m, (void*)mstr, 5); + __COPY(VT100_CSI, cmd, 12); Strings_Append(nstr, 5, (void*)cmd, 12); Strings_Append((CHAR*)";", 2, (void*)cmd, 12); Strings_Append(mstr, 5, (void*)cmd, 12); @@ -136,129 +136,129 @@ static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) __DEL(letter); } -void vt100_CUU (int16 n) +void VT100_CUU (int16 n) { - vt100_EscSeq(n, (CHAR*)"A", 2); + VT100_EscSeq(n, (CHAR*)"A", 2); } -void vt100_CUD (int16 n) +void VT100_CUD (int16 n) { - vt100_EscSeq(n, (CHAR*)"B", 2); + VT100_EscSeq(n, (CHAR*)"B", 2); } -void vt100_CUF (int16 n) +void VT100_CUF (int16 n) { - vt100_EscSeq(n, (CHAR*)"C", 2); + VT100_EscSeq(n, (CHAR*)"C", 2); } -void vt100_CUB (int16 n) +void VT100_CUB (int16 n) { - vt100_EscSeq(n, (CHAR*)"D", 2); + VT100_EscSeq(n, (CHAR*)"D", 2); } -void vt100_CNL (int16 n) +void VT100_CNL (int16 n) { - vt100_EscSeq(n, (CHAR*)"E", 2); + VT100_EscSeq(n, (CHAR*)"E", 2); } -void vt100_CPL (int16 n) +void VT100_CPL (int16 n) { - vt100_EscSeq(n, (CHAR*)"F", 2); + VT100_EscSeq(n, (CHAR*)"F", 2); } -void vt100_CHA (int16 n) +void VT100_CHA (int16 n) { - vt100_EscSeq(n, (CHAR*)"G", 2); + VT100_EscSeq(n, (CHAR*)"G", 2); } -void vt100_CUP (int16 n, int16 m) +void VT100_CUP (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"H", 2); + VT100_EscSeq2(n, m, (CHAR*)"H", 2); } -void vt100_ED (int16 n) +void VT100_ED (int16 n) { - vt100_EscSeq(n, (CHAR*)"J", 2); + VT100_EscSeq(n, (CHAR*)"J", 2); } -void vt100_EL (int16 n) +void VT100_EL (int16 n) { - vt100_EscSeq(n, (CHAR*)"K", 2); + VT100_EscSeq(n, (CHAR*)"K", 2); } -void vt100_SU (int16 n) +void VT100_SU (int16 n) { - vt100_EscSeq(n, (CHAR*)"S", 2); + VT100_EscSeq(n, (CHAR*)"S", 2); } -void vt100_SD (int16 n) +void VT100_SD (int16 n) { - vt100_EscSeq(n, (CHAR*)"T", 2); + VT100_EscSeq(n, (CHAR*)"T", 2); } -void vt100_HVP (int16 n, int16 m) +void VT100_HVP (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"f", 2); + VT100_EscSeq2(n, m, (CHAR*)"f", 2); } -void vt100_SGR (int16 n) +void VT100_SGR (int16 n) { - vt100_EscSeq(n, (CHAR*)"m", 2); + VT100_EscSeq(n, (CHAR*)"m", 2); } -void vt100_SGR2 (int16 n, int16 m) +void VT100_SGR2 (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"m", 2); + VT100_EscSeq2(n, m, (CHAR*)"m", 2); } -void vt100_DSR (int16 n) +void VT100_DSR (int16 n) { - vt100_EscSeq(6, (CHAR*)"n", 2); + VT100_EscSeq(6, (CHAR*)"n", 2); } -void vt100_SCP (void) +void VT100_SCP (void) { - vt100_EscSeq0((CHAR*)"s", 2); + VT100_EscSeq0((CHAR*)"s", 2); } -void vt100_RCP (void) +void VT100_RCP (void) { - vt100_EscSeq0((CHAR*)"u", 2); + VT100_EscSeq0((CHAR*)"u", 2); } -void vt100_DECTCEMl (void) +void VT100_DECTCEMl (void) { - vt100_EscSeq0((CHAR*)"\?25l", 5); + VT100_EscSeq0((CHAR*)"\?25l", 5); } -void vt100_DECTCEMh (void) +void VT100_DECTCEMh (void) { - vt100_EscSeq0((CHAR*)"\?25h", 5); + VT100_EscSeq0((CHAR*)"\?25h", 5); } -void vt100_SetAttr (CHAR *attr, LONGINT attr__len) +void VT100_SetAttr (CHAR *attr, LONGINT attr__len) { CHAR tmpstr[16]; __DUP(attr, attr__len, CHAR); - __COPY(vt100_CSI, tmpstr, 16); + __COPY(VT100_CSI, tmpstr, 16); Strings_Append(attr, attr__len, (void*)tmpstr, 16); Out_String(tmpstr, 16); __DEL(attr); } -export void *vt100__init(void) +export void *VT100__init(void) { __DEFMOD; __MODULE_IMPORT(Out); __MODULE_IMPORT(Strings); - __REGMOD("vt100", 0); - __REGCMD("DECTCEMh", vt100_DECTCEMh); - __REGCMD("DECTCEMl", vt100_DECTCEMl); - __REGCMD("RCP", vt100_RCP); - __REGCMD("SCP", vt100_SCP); + __REGMOD("VT100", 0); + __REGCMD("DECTCEMh", VT100_DECTCEMh); + __REGCMD("DECTCEMl", VT100_DECTCEMl); + __REGCMD("RCP", VT100_RCP); + __REGCMD("SCP", VT100_SCP); /* BEGIN */ - __COPY("\033", vt100_CSI, 5); - Strings_Append((CHAR*)"[", 2, (void*)vt100_CSI, 5); + __COPY("\033", VT100_CSI, 5); + Strings_Append((CHAR*)"[", 2, (void*)VT100_CSI, 5); __ENDMOD; } diff --git a/bootstrap/unix-44/vt100.h b/bootstrap/unix-44/vt100.h index 03038059..64913ea9 100644 --- a/bootstrap/unix-44/vt100.h +++ b/bootstrap/unix-44/vt100.h @@ -1,37 +1,37 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ -#ifndef vt100__h -#define vt100__h +#ifndef VT100__h +#define VT100__h #include "SYSTEM.h" -import CHAR vt100_CSI[5]; +import CHAR VT100_CSI[5]; -import void vt100_CHA (int16 n); -import void vt100_CNL (int16 n); -import void vt100_CPL (int16 n); -import void vt100_CUB (int16 n); -import void vt100_CUD (int16 n); -import void vt100_CUF (int16 n); -import void vt100_CUP (int16 n, int16 m); -import void vt100_CUU (int16 n); -import void vt100_DECTCEMh (void); -import void vt100_DECTCEMl (void); -import void vt100_DSR (int16 n); -import void vt100_ED (int16 n); -import void vt100_EL (int16 n); -import void vt100_HVP (int16 n, int16 m); -import void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); -import void vt100_RCP (void); -import void vt100_SCP (void); -import void vt100_SD (int16 n); -import void vt100_SGR (int16 n); -import void vt100_SGR2 (int16 n, int16 m); -import void vt100_SU (int16 n); -import void vt100_SetAttr (CHAR *attr, LONGINT attr__len); -import void *vt100__init(void); +import void VT100_CHA (int16 n); +import void VT100_CNL (int16 n); +import void VT100_CPL (int16 n); +import void VT100_CUB (int16 n); +import void VT100_CUD (int16 n); +import void VT100_CUF (int16 n); +import void VT100_CUP (int16 n, int16 m); +import void VT100_CUU (int16 n); +import void VT100_DECTCEMh (void); +import void VT100_DECTCEMl (void); +import void VT100_DSR (int16 n); +import void VT100_ED (int16 n); +import void VT100_EL (int16 n); +import void VT100_HVP (int16 n, int16 m); +import void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); +import void VT100_RCP (void); +import void VT100_SCP (void); +import void VT100_SD (int16 n); +import void VT100_SGR (int16 n); +import void VT100_SGR2 (int16 n, int16 m); +import void VT100_SU (int16 n); +import void VT100_SetAttr (CHAR *attr, LONGINT attr__len); +import void *VT100__init(void); -#endif // vt100 +#endif // VT100 diff --git a/bootstrap/unix-48/Compiler.c b/bootstrap/unix-48/Compiler.c index 5ec069b8..82f1ab48 100644 --- a/bootstrap/unix-48/Compiler.c +++ b/bootstrap/unix-48/Compiler.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */ #define SHORTINT int8 #define INTEGER int16 @@ -16,8 +16,8 @@ #include "OPV.h" #include "Platform.h" #include "Strings.h" +#include "VT100.h" #include "extTools.h" -#include "vt100.h" static CHAR Compiler_mname[256]; @@ -47,20 +47,20 @@ void Compiler_Module (BOOLEAN *done) if ((__IN(10, OPM_Options, 32) && __STRCMP(OPM_modName, "SYSTEM") != 0)) { OPM_DeleteNewSym(); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogWStr((CHAR*)" Main program.", 16); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } else { if (new) { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogWStr((CHAR*)" New symbol file.", 19); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } OPM_RegisterNewSym(); } else if (ext) { @@ -175,8 +175,8 @@ export int main(int argc, char **argv) __MODULE_IMPORT(OPV); __MODULE_IMPORT(Platform); __MODULE_IMPORT(Strings); + __MODULE_IMPORT(VT100); __MODULE_IMPORT(extTools); - __MODULE_IMPORT(vt100); __REGMAIN("Compiler", 0); __REGCMD("Translate", Compiler_Translate); /* BEGIN */ diff --git a/bootstrap/unix-48/Configuration.c b/bootstrap/unix-48/Configuration.c index 0bef890f..b9310392 100644 --- a/bootstrap/unix-48/Configuration.c +++ b/bootstrap/unix-48/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -19,6 +19,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75); + __MOVE("1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75); __ENDMOD; } diff --git a/bootstrap/unix-48/Configuration.h b/bootstrap/unix-48/Configuration.h index 286f28c0..c760742c 100644 --- a/bootstrap/unix-48/Configuration.h +++ b/bootstrap/unix-48/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/unix-48/Files.c b/bootstrap/unix-48/Files.c index 4074c8b1..e46e005c 100644 --- a/bootstrap/unix-48/Files.c +++ b/bootstrap/unix-48/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/Files.h b/bootstrap/unix-48/Files.h index c38c3f26..33cfbbec 100644 --- a/bootstrap/unix-48/Files.h +++ b/bootstrap/unix-48/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #ifndef Files__h #define Files__h diff --git a/bootstrap/unix-48/Heap.c b/bootstrap/unix-48/Heap.c index cb386d17..948db354 100644 --- a/bootstrap/unix-48/Heap.c +++ b/bootstrap/unix-48/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/Heap.h b/bootstrap/unix-48/Heap.h index c6dbfb3e..7712f182 100644 --- a/bootstrap/unix-48/Heap.h +++ b/bootstrap/unix-48/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ #ifndef Heap__h #define Heap__h diff --git a/bootstrap/unix-48/Modules.c b/bootstrap/unix-48/Modules.c index e5227fba..5cdcbe9c 100644 --- a/bootstrap/unix-48/Modules.c +++ b/bootstrap/unix-48/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/Modules.h b/bootstrap/unix-48/Modules.h index 77ec53de..e6fcdbbe 100644 --- a/bootstrap/unix-48/Modules.h +++ b/bootstrap/unix-48/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Modules__h #define Modules__h diff --git a/bootstrap/unix-48/OPB.c b/bootstrap/unix-48/OPB.c index aab1b7fe..aa7126c9 100644 --- a/bootstrap/unix-48/OPB.c +++ b/bootstrap/unix-48/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/OPB.h b/bootstrap/unix-48/OPB.h index eb00fcda..b63ca81f 100644 --- a/bootstrap/unix-48/OPB.h +++ b/bootstrap/unix-48/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/unix-48/OPC.c b/bootstrap/unix-48/OPC.c index 84393696..d2a4419b 100644 --- a/bootstrap/unix-48/OPC.c +++ b/bootstrap/unix-48/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/OPC.h b/bootstrap/unix-48/OPC.h index d6a60b2e..4da49877 100644 --- a/bootstrap/unix-48/OPC.h +++ b/bootstrap/unix-48/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/unix-48/OPM.c b/bootstrap/unix-48/OPM.c index 76cc2b7c..d202f2cd 100644 --- a/bootstrap/unix-48/OPM.c +++ b/bootstrap/unix-48/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -12,8 +12,8 @@ #include "Platform.h" #include "Strings.h" #include "Texts.h" +#include "VT100.h" #include "errors.h" -#include "vt100.h" typedef CHAR OPM_FileName[32]; @@ -325,7 +325,7 @@ BOOLEAN OPM_OpenPar (void) OPM_LogWLn(); OPM_LogWStr((CHAR*)" Miscellaneous", 16); OPM_LogWLn(); - OPM_LogWStr((CHAR*)" -f Disable vt100 control characters in status output.", 60); + OPM_LogWStr((CHAR*)" -f Disable VT100 control characters in status output.", 60); OPM_LogWLn(); OPM_LogWStr((CHAR*)" -V Display compiler debugging messages.", 46); OPM_LogWLn(); @@ -555,20 +555,20 @@ static void OPM_LogErrMsg (int16 n) CHAR buf[1024]; if (n >= 0) { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"31m", 4); + VT100_SetAttr((CHAR*)"31m", 4); } OPM_LogWStr((CHAR*)" err ", 7); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } else { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"35m", 4); + VT100_SetAttr((CHAR*)"35m", 4); } OPM_LogWStr((CHAR*)" warning ", 11); n = -n; if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } OPM_LogWNum(n, 1); @@ -641,11 +641,11 @@ static void OPM_ShowLine (int64 pos) i -= 1; } if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogW('^'); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } Files_Close(f); } @@ -1079,8 +1079,8 @@ export void *OPM__init(void) __MODULE_IMPORT(Platform); __MODULE_IMPORT(Strings); __MODULE_IMPORT(Texts); + __MODULE_IMPORT(VT100); __MODULE_IMPORT(errors); - __MODULE_IMPORT(vt100); __REGMOD("OPM", EnumPtrs); __REGCMD("CloseFiles", OPM_CloseFiles); __REGCMD("CloseOldSym", OPM_CloseOldSym); diff --git a/bootstrap/unix-48/OPM.h b/bootstrap/unix-48/OPM.h index b7b19fb7..b088cc93 100644 --- a/bootstrap/unix-48/OPM.h +++ b/bootstrap/unix-48/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/unix-48/OPP.c b/bootstrap/unix-48/OPP.c index e3a26a86..63fb92b5 100644 --- a/bootstrap/unix-48/OPP.c +++ b/bootstrap/unix-48/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/OPP.h b/bootstrap/unix-48/OPP.h index 1f2ff59f..57f41cf8 100644 --- a/bootstrap/unix-48/OPP.h +++ b/bootstrap/unix-48/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/unix-48/OPS.c b/bootstrap/unix-48/OPS.c index 72800d6b..e7cd3549 100644 --- a/bootstrap/unix-48/OPS.c +++ b/bootstrap/unix-48/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/OPS.h b/bootstrap/unix-48/OPS.h index 595b3668..0a75e9c7 100644 --- a/bootstrap/unix-48/OPS.h +++ b/bootstrap/unix-48/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/unix-48/OPT.c b/bootstrap/unix-48/OPT.c index bc22f7e2..6f466b3e 100644 --- a/bootstrap/unix-48/OPT.c +++ b/bootstrap/unix-48/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/OPT.h b/bootstrap/unix-48/OPT.h index d40fcd25..d8da229b 100644 --- a/bootstrap/unix-48/OPT.h +++ b/bootstrap/unix-48/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPT__h #define OPT__h diff --git a/bootstrap/unix-48/OPV.c b/bootstrap/unix-48/OPV.c index 19522c13..fd02ab90 100644 --- a/bootstrap/unix-48/OPV.c +++ b/bootstrap/unix-48/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/OPV.h b/bootstrap/unix-48/OPV.h index fa176ddf..48195728 100644 --- a/bootstrap/unix-48/OPV.h +++ b/bootstrap/unix-48/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/unix-48/Out.c b/bootstrap/unix-48/Out.c index 944cc0e5..67b82ce9 100644 --- a/bootstrap/unix-48/Out.c +++ b/bootstrap/unix-48/Out.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -315,5 +315,6 @@ export void *Out__init(void) __REGCMD("Ln", Out_Ln); __REGCMD("Open", Out_Open); /* BEGIN */ + Out_in = 0; __ENDMOD; } diff --git a/bootstrap/unix-48/Out.h b/bootstrap/unix-48/Out.h index 418e17e2..f91ee6a4 100644 --- a/bootstrap/unix-48/Out.h +++ b/bootstrap/unix-48/Out.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Out__h #define Out__h diff --git a/bootstrap/unix-48/Platform.c b/bootstrap/unix-48/Platform.c index 4c779435..ff57e9c4 100644 --- a/bootstrap/unix-48/Platform.c +++ b/bootstrap/unix-48/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/Platform.h b/bootstrap/unix-48/Platform.h index e45b429c..5e6af8ad 100644 --- a/bootstrap/unix-48/Platform.h +++ b/bootstrap/unix-48/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Platform__h #define Platform__h diff --git a/bootstrap/unix-48/Reals.c b/bootstrap/unix-48/Reals.c index ece1bf1d..6135ec40 100644 --- a/bootstrap/unix-48/Reals.c +++ b/bootstrap/unix-48/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/Reals.h b/bootstrap/unix-48/Reals.h index 523e9f9e..86321454 100644 --- a/bootstrap/unix-48/Reals.h +++ b/bootstrap/unix-48/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/unix-48/Strings.c b/bootstrap/unix-48/Strings.c index c86ccc0e..92ce5fe0 100644 --- a/bootstrap/unix-48/Strings.c +++ b/bootstrap/unix-48/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/Strings.h b/bootstrap/unix-48/Strings.h index c12329ab..76b31eb9 100644 --- a/bootstrap/unix-48/Strings.h +++ b/bootstrap/unix-48/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/unix-48/Texts.c b/bootstrap/unix-48/Texts.c index 672171ee..b5634f26 100644 --- a/bootstrap/unix-48/Texts.c +++ b/bootstrap/unix-48/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/Texts.h b/bootstrap/unix-48/Texts.h index 802df5a7..7709374b 100644 --- a/bootstrap/unix-48/Texts.h +++ b/bootstrap/unix-48/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Texts__h #define Texts__h diff --git a/bootstrap/unix-48/errors.c b/bootstrap/unix-48/errors.c index 44990c71..70424462 100644 --- a/bootstrap/unix-48/errors.c +++ b/bootstrap/unix-48/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-48/errors.h b/bootstrap/unix-48/errors.h index e0bb109d..80c4a045 100644 --- a/bootstrap/unix-48/errors.h +++ b/bootstrap/unix-48/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/unix-48/extTools.c b/bootstrap/unix-48/extTools.c index c83fd7dd..a6e5fe94 100644 --- a/bootstrap/unix-48/extTools.c +++ b/bootstrap/unix-48/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -102,6 +102,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati Strings_Append((CHAR*)"", 1, (void*)cmd, 1023); Strings_Append((CHAR*)"/lib\"", 6, (void*)cmd, 1023); Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023); + Strings_Append((CHAR*)"-O", 3, (void*)cmd, 1023); Strings_Append(OPM_Model, 10, (void*)cmd, 1023); extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023); __DEL(additionalopts); diff --git a/bootstrap/unix-48/extTools.h b/bootstrap/unix-48/extTools.h index 21016d9e..d945916e 100644 --- a/bootstrap/unix-48/extTools.h +++ b/bootstrap/unix-48/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/unix-48/vt100.c b/bootstrap/unix-48/vt100.c index afa2b377..7c1212f5 100644 --- a/bootstrap/unix-48/vt100.c +++ b/bootstrap/unix-48/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -10,40 +10,40 @@ #include "Strings.h" -export CHAR vt100_CSI[5]; -static CHAR vt100_tmpstr[32]; +export CHAR VT100_CSI[5]; +static CHAR VT100_tmpstr[32]; -export void vt100_CHA (int16 n); -export void vt100_CNL (int16 n); -export void vt100_CPL (int16 n); -export void vt100_CUB (int16 n); -export void vt100_CUD (int16 n); -export void vt100_CUF (int16 n); -export void vt100_CUP (int16 n, int16 m); -export void vt100_CUU (int16 n); -export void vt100_DECTCEMh (void); -export void vt100_DECTCEMl (void); -export void vt100_DSR (int16 n); -export void vt100_ED (int16 n); -export void vt100_EL (int16 n); -static void vt100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len); -static void vt100_EscSeq0 (CHAR *letter, LONGINT letter__len); -static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len); -static void vt100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len); -export void vt100_HVP (int16 n, int16 m); -export void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); -export void vt100_RCP (void); -static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end); -export void vt100_SCP (void); -export void vt100_SD (int16 n); -export void vt100_SGR (int16 n); -export void vt100_SGR2 (int16 n, int16 m); -export void vt100_SU (int16 n); -export void vt100_SetAttr (CHAR *attr, LONGINT attr__len); +export void VT100_CHA (int16 n); +export void VT100_CNL (int16 n); +export void VT100_CPL (int16 n); +export void VT100_CUB (int16 n); +export void VT100_CUD (int16 n); +export void VT100_CUF (int16 n); +export void VT100_CUP (int16 n, int16 m); +export void VT100_CUU (int16 n); +export void VT100_DECTCEMh (void); +export void VT100_DECTCEMl (void); +export void VT100_DSR (int16 n); +export void VT100_ED (int16 n); +export void VT100_EL (int16 n); +static void VT100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len); +static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len); +static void VT100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len); +static void VT100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len); +export void VT100_HVP (int16 n, int16 m); +export void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); +export void VT100_RCP (void); +static void VT100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end); +export void VT100_SCP (void); +export void VT100_SD (int16 n); +export void VT100_SGR (int16 n); +export void VT100_SGR2 (int16 n, int16 m); +export void VT100_SU (int16 n); +export void VT100_SetAttr (CHAR *attr, LONGINT attr__len); -static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) +static void VT100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) { CHAR h; while (start < end) { @@ -55,7 +55,7 @@ static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) } } -void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) +void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) { CHAR b[21]; int16 s, e; @@ -79,55 +79,55 @@ void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) e += 1; } while (!(int_ == 0)); b[__X(e, 21)] = 0x00; - vt100_Reverse0((void*)b, 21, s, e - 1); + VT100_Reverse0((void*)b, 21, s, e - 1); } __COPY(b, str, str__len); } -static void vt100_EscSeq0 (CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len) { CHAR cmd[9]; __DUP(letter, letter__len, CHAR); - __COPY(vt100_CSI, cmd, 9); + __COPY(VT100_CSI, cmd, 9); Strings_Append(letter, letter__len, (void*)cmd, 9); Out_String(cmd, 9); __DEL(letter); } -static void vt100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len) { CHAR nstr[2]; CHAR cmd[7]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 2); - __COPY(vt100_CSI, cmd, 7); + VT100_IntToStr(n, (void*)nstr, 2); + __COPY(VT100_CSI, cmd, 7); Strings_Append(nstr, 2, (void*)cmd, 7); Strings_Append(letter, letter__len, (void*)cmd, 7); Out_String(cmd, 7); __DEL(letter); } -static void vt100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len) { CHAR nstr[2]; CHAR cmd[7]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 2); - __COPY(vt100_CSI, cmd, 7); + VT100_IntToStr(n, (void*)nstr, 2); + __COPY(VT100_CSI, cmd, 7); Strings_Append(letter, letter__len, (void*)cmd, 7); Strings_Append(nstr, 2, (void*)cmd, 7); Out_String(cmd, 7); __DEL(letter); } -static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) { CHAR nstr[5], mstr[5]; CHAR cmd[12]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 5); - vt100_IntToStr(m, (void*)mstr, 5); - __COPY(vt100_CSI, cmd, 12); + VT100_IntToStr(n, (void*)nstr, 5); + VT100_IntToStr(m, (void*)mstr, 5); + __COPY(VT100_CSI, cmd, 12); Strings_Append(nstr, 5, (void*)cmd, 12); Strings_Append((CHAR*)";", 2, (void*)cmd, 12); Strings_Append(mstr, 5, (void*)cmd, 12); @@ -136,129 +136,129 @@ static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) __DEL(letter); } -void vt100_CUU (int16 n) +void VT100_CUU (int16 n) { - vt100_EscSeq(n, (CHAR*)"A", 2); + VT100_EscSeq(n, (CHAR*)"A", 2); } -void vt100_CUD (int16 n) +void VT100_CUD (int16 n) { - vt100_EscSeq(n, (CHAR*)"B", 2); + VT100_EscSeq(n, (CHAR*)"B", 2); } -void vt100_CUF (int16 n) +void VT100_CUF (int16 n) { - vt100_EscSeq(n, (CHAR*)"C", 2); + VT100_EscSeq(n, (CHAR*)"C", 2); } -void vt100_CUB (int16 n) +void VT100_CUB (int16 n) { - vt100_EscSeq(n, (CHAR*)"D", 2); + VT100_EscSeq(n, (CHAR*)"D", 2); } -void vt100_CNL (int16 n) +void VT100_CNL (int16 n) { - vt100_EscSeq(n, (CHAR*)"E", 2); + VT100_EscSeq(n, (CHAR*)"E", 2); } -void vt100_CPL (int16 n) +void VT100_CPL (int16 n) { - vt100_EscSeq(n, (CHAR*)"F", 2); + VT100_EscSeq(n, (CHAR*)"F", 2); } -void vt100_CHA (int16 n) +void VT100_CHA (int16 n) { - vt100_EscSeq(n, (CHAR*)"G", 2); + VT100_EscSeq(n, (CHAR*)"G", 2); } -void vt100_CUP (int16 n, int16 m) +void VT100_CUP (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"H", 2); + VT100_EscSeq2(n, m, (CHAR*)"H", 2); } -void vt100_ED (int16 n) +void VT100_ED (int16 n) { - vt100_EscSeq(n, (CHAR*)"J", 2); + VT100_EscSeq(n, (CHAR*)"J", 2); } -void vt100_EL (int16 n) +void VT100_EL (int16 n) { - vt100_EscSeq(n, (CHAR*)"K", 2); + VT100_EscSeq(n, (CHAR*)"K", 2); } -void vt100_SU (int16 n) +void VT100_SU (int16 n) { - vt100_EscSeq(n, (CHAR*)"S", 2); + VT100_EscSeq(n, (CHAR*)"S", 2); } -void vt100_SD (int16 n) +void VT100_SD (int16 n) { - vt100_EscSeq(n, (CHAR*)"T", 2); + VT100_EscSeq(n, (CHAR*)"T", 2); } -void vt100_HVP (int16 n, int16 m) +void VT100_HVP (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"f", 2); + VT100_EscSeq2(n, m, (CHAR*)"f", 2); } -void vt100_SGR (int16 n) +void VT100_SGR (int16 n) { - vt100_EscSeq(n, (CHAR*)"m", 2); + VT100_EscSeq(n, (CHAR*)"m", 2); } -void vt100_SGR2 (int16 n, int16 m) +void VT100_SGR2 (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"m", 2); + VT100_EscSeq2(n, m, (CHAR*)"m", 2); } -void vt100_DSR (int16 n) +void VT100_DSR (int16 n) { - vt100_EscSeq(6, (CHAR*)"n", 2); + VT100_EscSeq(6, (CHAR*)"n", 2); } -void vt100_SCP (void) +void VT100_SCP (void) { - vt100_EscSeq0((CHAR*)"s", 2); + VT100_EscSeq0((CHAR*)"s", 2); } -void vt100_RCP (void) +void VT100_RCP (void) { - vt100_EscSeq0((CHAR*)"u", 2); + VT100_EscSeq0((CHAR*)"u", 2); } -void vt100_DECTCEMl (void) +void VT100_DECTCEMl (void) { - vt100_EscSeq0((CHAR*)"\?25l", 5); + VT100_EscSeq0((CHAR*)"\?25l", 5); } -void vt100_DECTCEMh (void) +void VT100_DECTCEMh (void) { - vt100_EscSeq0((CHAR*)"\?25h", 5); + VT100_EscSeq0((CHAR*)"\?25h", 5); } -void vt100_SetAttr (CHAR *attr, LONGINT attr__len) +void VT100_SetAttr (CHAR *attr, LONGINT attr__len) { CHAR tmpstr[16]; __DUP(attr, attr__len, CHAR); - __COPY(vt100_CSI, tmpstr, 16); + __COPY(VT100_CSI, tmpstr, 16); Strings_Append(attr, attr__len, (void*)tmpstr, 16); Out_String(tmpstr, 16); __DEL(attr); } -export void *vt100__init(void) +export void *VT100__init(void) { __DEFMOD; __MODULE_IMPORT(Out); __MODULE_IMPORT(Strings); - __REGMOD("vt100", 0); - __REGCMD("DECTCEMh", vt100_DECTCEMh); - __REGCMD("DECTCEMl", vt100_DECTCEMl); - __REGCMD("RCP", vt100_RCP); - __REGCMD("SCP", vt100_SCP); + __REGMOD("VT100", 0); + __REGCMD("DECTCEMh", VT100_DECTCEMh); + __REGCMD("DECTCEMl", VT100_DECTCEMl); + __REGCMD("RCP", VT100_RCP); + __REGCMD("SCP", VT100_SCP); /* BEGIN */ - __COPY("\033", vt100_CSI, 5); - Strings_Append((CHAR*)"[", 2, (void*)vt100_CSI, 5); + __COPY("\033", VT100_CSI, 5); + Strings_Append((CHAR*)"[", 2, (void*)VT100_CSI, 5); __ENDMOD; } diff --git a/bootstrap/unix-48/vt100.h b/bootstrap/unix-48/vt100.h index 03038059..64913ea9 100644 --- a/bootstrap/unix-48/vt100.h +++ b/bootstrap/unix-48/vt100.h @@ -1,37 +1,37 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ -#ifndef vt100__h -#define vt100__h +#ifndef VT100__h +#define VT100__h #include "SYSTEM.h" -import CHAR vt100_CSI[5]; +import CHAR VT100_CSI[5]; -import void vt100_CHA (int16 n); -import void vt100_CNL (int16 n); -import void vt100_CPL (int16 n); -import void vt100_CUB (int16 n); -import void vt100_CUD (int16 n); -import void vt100_CUF (int16 n); -import void vt100_CUP (int16 n, int16 m); -import void vt100_CUU (int16 n); -import void vt100_DECTCEMh (void); -import void vt100_DECTCEMl (void); -import void vt100_DSR (int16 n); -import void vt100_ED (int16 n); -import void vt100_EL (int16 n); -import void vt100_HVP (int16 n, int16 m); -import void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); -import void vt100_RCP (void); -import void vt100_SCP (void); -import void vt100_SD (int16 n); -import void vt100_SGR (int16 n); -import void vt100_SGR2 (int16 n, int16 m); -import void vt100_SU (int16 n); -import void vt100_SetAttr (CHAR *attr, LONGINT attr__len); -import void *vt100__init(void); +import void VT100_CHA (int16 n); +import void VT100_CNL (int16 n); +import void VT100_CPL (int16 n); +import void VT100_CUB (int16 n); +import void VT100_CUD (int16 n); +import void VT100_CUF (int16 n); +import void VT100_CUP (int16 n, int16 m); +import void VT100_CUU (int16 n); +import void VT100_DECTCEMh (void); +import void VT100_DECTCEMl (void); +import void VT100_DSR (int16 n); +import void VT100_ED (int16 n); +import void VT100_EL (int16 n); +import void VT100_HVP (int16 n, int16 m); +import void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); +import void VT100_RCP (void); +import void VT100_SCP (void); +import void VT100_SD (int16 n); +import void VT100_SGR (int16 n); +import void VT100_SGR2 (int16 n, int16 m); +import void VT100_SU (int16 n); +import void VT100_SetAttr (CHAR *attr, LONGINT attr__len); +import void *VT100__init(void); -#endif // vt100 +#endif // VT100 diff --git a/bootstrap/unix-88/Compiler.c b/bootstrap/unix-88/Compiler.c index 5ec069b8..82f1ab48 100644 --- a/bootstrap/unix-88/Compiler.c +++ b/bootstrap/unix-88/Compiler.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */ #define SHORTINT int8 #define INTEGER int16 @@ -16,8 +16,8 @@ #include "OPV.h" #include "Platform.h" #include "Strings.h" +#include "VT100.h" #include "extTools.h" -#include "vt100.h" static CHAR Compiler_mname[256]; @@ -47,20 +47,20 @@ void Compiler_Module (BOOLEAN *done) if ((__IN(10, OPM_Options, 32) && __STRCMP(OPM_modName, "SYSTEM") != 0)) { OPM_DeleteNewSym(); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogWStr((CHAR*)" Main program.", 16); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } else { if (new) { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogWStr((CHAR*)" New symbol file.", 19); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } OPM_RegisterNewSym(); } else if (ext) { @@ -175,8 +175,8 @@ export int main(int argc, char **argv) __MODULE_IMPORT(OPV); __MODULE_IMPORT(Platform); __MODULE_IMPORT(Strings); + __MODULE_IMPORT(VT100); __MODULE_IMPORT(extTools); - __MODULE_IMPORT(vt100); __REGMAIN("Compiler", 0); __REGCMD("Translate", Compiler_Translate); /* BEGIN */ diff --git a/bootstrap/unix-88/Configuration.c b/bootstrap/unix-88/Configuration.c index 0bef890f..b9310392 100644 --- a/bootstrap/unix-88/Configuration.c +++ b/bootstrap/unix-88/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -19,6 +19,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75); + __MOVE("1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75); __ENDMOD; } diff --git a/bootstrap/unix-88/Configuration.h b/bootstrap/unix-88/Configuration.h index 286f28c0..c760742c 100644 --- a/bootstrap/unix-88/Configuration.h +++ b/bootstrap/unix-88/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/unix-88/Files.c b/bootstrap/unix-88/Files.c index e380bc50..22e659a7 100644 --- a/bootstrap/unix-88/Files.c +++ b/bootstrap/unix-88/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/Files.h b/bootstrap/unix-88/Files.h index 5c717742..42a47cdf 100644 --- a/bootstrap/unix-88/Files.h +++ b/bootstrap/unix-88/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #ifndef Files__h #define Files__h diff --git a/bootstrap/unix-88/Heap.c b/bootstrap/unix-88/Heap.c index 1a82d9e8..42134b68 100644 --- a/bootstrap/unix-88/Heap.c +++ b/bootstrap/unix-88/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/Heap.h b/bootstrap/unix-88/Heap.h index abcafa6a..521ccc74 100644 --- a/bootstrap/unix-88/Heap.h +++ b/bootstrap/unix-88/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ #ifndef Heap__h #define Heap__h diff --git a/bootstrap/unix-88/Modules.c b/bootstrap/unix-88/Modules.c index 5fdce638..2a860e62 100644 --- a/bootstrap/unix-88/Modules.c +++ b/bootstrap/unix-88/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/Modules.h b/bootstrap/unix-88/Modules.h index 77ec53de..e6fcdbbe 100644 --- a/bootstrap/unix-88/Modules.h +++ b/bootstrap/unix-88/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Modules__h #define Modules__h diff --git a/bootstrap/unix-88/OPB.c b/bootstrap/unix-88/OPB.c index aab1b7fe..aa7126c9 100644 --- a/bootstrap/unix-88/OPB.c +++ b/bootstrap/unix-88/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/OPB.h b/bootstrap/unix-88/OPB.h index eb00fcda..b63ca81f 100644 --- a/bootstrap/unix-88/OPB.h +++ b/bootstrap/unix-88/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/unix-88/OPC.c b/bootstrap/unix-88/OPC.c index 84393696..d2a4419b 100644 --- a/bootstrap/unix-88/OPC.c +++ b/bootstrap/unix-88/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/OPC.h b/bootstrap/unix-88/OPC.h index d6a60b2e..4da49877 100644 --- a/bootstrap/unix-88/OPC.h +++ b/bootstrap/unix-88/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/unix-88/OPM.c b/bootstrap/unix-88/OPM.c index ca25d1e6..686c674e 100644 --- a/bootstrap/unix-88/OPM.c +++ b/bootstrap/unix-88/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -12,8 +12,8 @@ #include "Platform.h" #include "Strings.h" #include "Texts.h" +#include "VT100.h" #include "errors.h" -#include "vt100.h" typedef CHAR OPM_FileName[32]; @@ -325,7 +325,7 @@ BOOLEAN OPM_OpenPar (void) OPM_LogWLn(); OPM_LogWStr((CHAR*)" Miscellaneous", 16); OPM_LogWLn(); - OPM_LogWStr((CHAR*)" -f Disable vt100 control characters in status output.", 60); + OPM_LogWStr((CHAR*)" -f Disable VT100 control characters in status output.", 60); OPM_LogWLn(); OPM_LogWStr((CHAR*)" -V Display compiler debugging messages.", 46); OPM_LogWLn(); @@ -555,20 +555,20 @@ static void OPM_LogErrMsg (int16 n) CHAR buf[1024]; if (n >= 0) { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"31m", 4); + VT100_SetAttr((CHAR*)"31m", 4); } OPM_LogWStr((CHAR*)" err ", 7); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } else { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"35m", 4); + VT100_SetAttr((CHAR*)"35m", 4); } OPM_LogWStr((CHAR*)" warning ", 11); n = -n; if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } OPM_LogWNum(n, 1); @@ -641,11 +641,11 @@ static void OPM_ShowLine (int64 pos) i -= 1; } if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogW('^'); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } Files_Close(f); } @@ -1079,8 +1079,8 @@ export void *OPM__init(void) __MODULE_IMPORT(Platform); __MODULE_IMPORT(Strings); __MODULE_IMPORT(Texts); + __MODULE_IMPORT(VT100); __MODULE_IMPORT(errors); - __MODULE_IMPORT(vt100); __REGMOD("OPM", EnumPtrs); __REGCMD("CloseFiles", OPM_CloseFiles); __REGCMD("CloseOldSym", OPM_CloseOldSym); diff --git a/bootstrap/unix-88/OPM.h b/bootstrap/unix-88/OPM.h index b7b19fb7..b088cc93 100644 --- a/bootstrap/unix-88/OPM.h +++ b/bootstrap/unix-88/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/unix-88/OPP.c b/bootstrap/unix-88/OPP.c index 64a861ac..29f9ae66 100644 --- a/bootstrap/unix-88/OPP.c +++ b/bootstrap/unix-88/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/OPP.h b/bootstrap/unix-88/OPP.h index 1f2ff59f..57f41cf8 100644 --- a/bootstrap/unix-88/OPP.h +++ b/bootstrap/unix-88/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/unix-88/OPS.c b/bootstrap/unix-88/OPS.c index 72800d6b..e7cd3549 100644 --- a/bootstrap/unix-88/OPS.c +++ b/bootstrap/unix-88/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/OPS.h b/bootstrap/unix-88/OPS.h index 595b3668..0a75e9c7 100644 --- a/bootstrap/unix-88/OPS.h +++ b/bootstrap/unix-88/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/unix-88/OPT.c b/bootstrap/unix-88/OPT.c index 7be03e0d..85221274 100644 --- a/bootstrap/unix-88/OPT.c +++ b/bootstrap/unix-88/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/OPT.h b/bootstrap/unix-88/OPT.h index d40fcd25..d8da229b 100644 --- a/bootstrap/unix-88/OPT.h +++ b/bootstrap/unix-88/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPT__h #define OPT__h diff --git a/bootstrap/unix-88/OPV.c b/bootstrap/unix-88/OPV.c index 90adf5f7..7e6d40e5 100644 --- a/bootstrap/unix-88/OPV.c +++ b/bootstrap/unix-88/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/OPV.h b/bootstrap/unix-88/OPV.h index fa176ddf..48195728 100644 --- a/bootstrap/unix-88/OPV.h +++ b/bootstrap/unix-88/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/unix-88/Out.c b/bootstrap/unix-88/Out.c index 944cc0e5..67b82ce9 100644 --- a/bootstrap/unix-88/Out.c +++ b/bootstrap/unix-88/Out.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -315,5 +315,6 @@ export void *Out__init(void) __REGCMD("Ln", Out_Ln); __REGCMD("Open", Out_Open); /* BEGIN */ + Out_in = 0; __ENDMOD; } diff --git a/bootstrap/unix-88/Out.h b/bootstrap/unix-88/Out.h index 418e17e2..f91ee6a4 100644 --- a/bootstrap/unix-88/Out.h +++ b/bootstrap/unix-88/Out.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Out__h #define Out__h diff --git a/bootstrap/unix-88/Platform.c b/bootstrap/unix-88/Platform.c index 4d742327..d58fec88 100644 --- a/bootstrap/unix-88/Platform.c +++ b/bootstrap/unix-88/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/Platform.h b/bootstrap/unix-88/Platform.h index 1df437c2..9216622f 100644 --- a/bootstrap/unix-88/Platform.h +++ b/bootstrap/unix-88/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Platform__h #define Platform__h diff --git a/bootstrap/unix-88/Reals.c b/bootstrap/unix-88/Reals.c index ece1bf1d..6135ec40 100644 --- a/bootstrap/unix-88/Reals.c +++ b/bootstrap/unix-88/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/Reals.h b/bootstrap/unix-88/Reals.h index 523e9f9e..86321454 100644 --- a/bootstrap/unix-88/Reals.h +++ b/bootstrap/unix-88/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/unix-88/Strings.c b/bootstrap/unix-88/Strings.c index c86ccc0e..92ce5fe0 100644 --- a/bootstrap/unix-88/Strings.c +++ b/bootstrap/unix-88/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/Strings.h b/bootstrap/unix-88/Strings.h index c12329ab..76b31eb9 100644 --- a/bootstrap/unix-88/Strings.h +++ b/bootstrap/unix-88/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/unix-88/Texts.c b/bootstrap/unix-88/Texts.c index 6033652e..09708beb 100644 --- a/bootstrap/unix-88/Texts.c +++ b/bootstrap/unix-88/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/Texts.h b/bootstrap/unix-88/Texts.h index 54f5d5ee..14846883 100644 --- a/bootstrap/unix-88/Texts.h +++ b/bootstrap/unix-88/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Texts__h #define Texts__h diff --git a/bootstrap/unix-88/errors.c b/bootstrap/unix-88/errors.c index 44990c71..70424462 100644 --- a/bootstrap/unix-88/errors.c +++ b/bootstrap/unix-88/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/unix-88/errors.h b/bootstrap/unix-88/errors.h index e0bb109d..80c4a045 100644 --- a/bootstrap/unix-88/errors.h +++ b/bootstrap/unix-88/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/unix-88/extTools.c b/bootstrap/unix-88/extTools.c index c83fd7dd..a6e5fe94 100644 --- a/bootstrap/unix-88/extTools.c +++ b/bootstrap/unix-88/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -102,6 +102,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati Strings_Append((CHAR*)"", 1, (void*)cmd, 1023); Strings_Append((CHAR*)"/lib\"", 6, (void*)cmd, 1023); Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023); + Strings_Append((CHAR*)"-O", 3, (void*)cmd, 1023); Strings_Append(OPM_Model, 10, (void*)cmd, 1023); extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023); __DEL(additionalopts); diff --git a/bootstrap/unix-88/extTools.h b/bootstrap/unix-88/extTools.h index 21016d9e..d945916e 100644 --- a/bootstrap/unix-88/extTools.h +++ b/bootstrap/unix-88/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/unix-88/vt100.c b/bootstrap/unix-88/vt100.c index afa2b377..7c1212f5 100644 --- a/bootstrap/unix-88/vt100.c +++ b/bootstrap/unix-88/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -10,40 +10,40 @@ #include "Strings.h" -export CHAR vt100_CSI[5]; -static CHAR vt100_tmpstr[32]; +export CHAR VT100_CSI[5]; +static CHAR VT100_tmpstr[32]; -export void vt100_CHA (int16 n); -export void vt100_CNL (int16 n); -export void vt100_CPL (int16 n); -export void vt100_CUB (int16 n); -export void vt100_CUD (int16 n); -export void vt100_CUF (int16 n); -export void vt100_CUP (int16 n, int16 m); -export void vt100_CUU (int16 n); -export void vt100_DECTCEMh (void); -export void vt100_DECTCEMl (void); -export void vt100_DSR (int16 n); -export void vt100_ED (int16 n); -export void vt100_EL (int16 n); -static void vt100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len); -static void vt100_EscSeq0 (CHAR *letter, LONGINT letter__len); -static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len); -static void vt100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len); -export void vt100_HVP (int16 n, int16 m); -export void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); -export void vt100_RCP (void); -static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end); -export void vt100_SCP (void); -export void vt100_SD (int16 n); -export void vt100_SGR (int16 n); -export void vt100_SGR2 (int16 n, int16 m); -export void vt100_SU (int16 n); -export void vt100_SetAttr (CHAR *attr, LONGINT attr__len); +export void VT100_CHA (int16 n); +export void VT100_CNL (int16 n); +export void VT100_CPL (int16 n); +export void VT100_CUB (int16 n); +export void VT100_CUD (int16 n); +export void VT100_CUF (int16 n); +export void VT100_CUP (int16 n, int16 m); +export void VT100_CUU (int16 n); +export void VT100_DECTCEMh (void); +export void VT100_DECTCEMl (void); +export void VT100_DSR (int16 n); +export void VT100_ED (int16 n); +export void VT100_EL (int16 n); +static void VT100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len); +static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len); +static void VT100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len); +static void VT100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len); +export void VT100_HVP (int16 n, int16 m); +export void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); +export void VT100_RCP (void); +static void VT100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end); +export void VT100_SCP (void); +export void VT100_SD (int16 n); +export void VT100_SGR (int16 n); +export void VT100_SGR2 (int16 n, int16 m); +export void VT100_SU (int16 n); +export void VT100_SetAttr (CHAR *attr, LONGINT attr__len); -static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) +static void VT100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) { CHAR h; while (start < end) { @@ -55,7 +55,7 @@ static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) } } -void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) +void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) { CHAR b[21]; int16 s, e; @@ -79,55 +79,55 @@ void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) e += 1; } while (!(int_ == 0)); b[__X(e, 21)] = 0x00; - vt100_Reverse0((void*)b, 21, s, e - 1); + VT100_Reverse0((void*)b, 21, s, e - 1); } __COPY(b, str, str__len); } -static void vt100_EscSeq0 (CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len) { CHAR cmd[9]; __DUP(letter, letter__len, CHAR); - __COPY(vt100_CSI, cmd, 9); + __COPY(VT100_CSI, cmd, 9); Strings_Append(letter, letter__len, (void*)cmd, 9); Out_String(cmd, 9); __DEL(letter); } -static void vt100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len) { CHAR nstr[2]; CHAR cmd[7]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 2); - __COPY(vt100_CSI, cmd, 7); + VT100_IntToStr(n, (void*)nstr, 2); + __COPY(VT100_CSI, cmd, 7); Strings_Append(nstr, 2, (void*)cmd, 7); Strings_Append(letter, letter__len, (void*)cmd, 7); Out_String(cmd, 7); __DEL(letter); } -static void vt100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len) { CHAR nstr[2]; CHAR cmd[7]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 2); - __COPY(vt100_CSI, cmd, 7); + VT100_IntToStr(n, (void*)nstr, 2); + __COPY(VT100_CSI, cmd, 7); Strings_Append(letter, letter__len, (void*)cmd, 7); Strings_Append(nstr, 2, (void*)cmd, 7); Out_String(cmd, 7); __DEL(letter); } -static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) { CHAR nstr[5], mstr[5]; CHAR cmd[12]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 5); - vt100_IntToStr(m, (void*)mstr, 5); - __COPY(vt100_CSI, cmd, 12); + VT100_IntToStr(n, (void*)nstr, 5); + VT100_IntToStr(m, (void*)mstr, 5); + __COPY(VT100_CSI, cmd, 12); Strings_Append(nstr, 5, (void*)cmd, 12); Strings_Append((CHAR*)";", 2, (void*)cmd, 12); Strings_Append(mstr, 5, (void*)cmd, 12); @@ -136,129 +136,129 @@ static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) __DEL(letter); } -void vt100_CUU (int16 n) +void VT100_CUU (int16 n) { - vt100_EscSeq(n, (CHAR*)"A", 2); + VT100_EscSeq(n, (CHAR*)"A", 2); } -void vt100_CUD (int16 n) +void VT100_CUD (int16 n) { - vt100_EscSeq(n, (CHAR*)"B", 2); + VT100_EscSeq(n, (CHAR*)"B", 2); } -void vt100_CUF (int16 n) +void VT100_CUF (int16 n) { - vt100_EscSeq(n, (CHAR*)"C", 2); + VT100_EscSeq(n, (CHAR*)"C", 2); } -void vt100_CUB (int16 n) +void VT100_CUB (int16 n) { - vt100_EscSeq(n, (CHAR*)"D", 2); + VT100_EscSeq(n, (CHAR*)"D", 2); } -void vt100_CNL (int16 n) +void VT100_CNL (int16 n) { - vt100_EscSeq(n, (CHAR*)"E", 2); + VT100_EscSeq(n, (CHAR*)"E", 2); } -void vt100_CPL (int16 n) +void VT100_CPL (int16 n) { - vt100_EscSeq(n, (CHAR*)"F", 2); + VT100_EscSeq(n, (CHAR*)"F", 2); } -void vt100_CHA (int16 n) +void VT100_CHA (int16 n) { - vt100_EscSeq(n, (CHAR*)"G", 2); + VT100_EscSeq(n, (CHAR*)"G", 2); } -void vt100_CUP (int16 n, int16 m) +void VT100_CUP (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"H", 2); + VT100_EscSeq2(n, m, (CHAR*)"H", 2); } -void vt100_ED (int16 n) +void VT100_ED (int16 n) { - vt100_EscSeq(n, (CHAR*)"J", 2); + VT100_EscSeq(n, (CHAR*)"J", 2); } -void vt100_EL (int16 n) +void VT100_EL (int16 n) { - vt100_EscSeq(n, (CHAR*)"K", 2); + VT100_EscSeq(n, (CHAR*)"K", 2); } -void vt100_SU (int16 n) +void VT100_SU (int16 n) { - vt100_EscSeq(n, (CHAR*)"S", 2); + VT100_EscSeq(n, (CHAR*)"S", 2); } -void vt100_SD (int16 n) +void VT100_SD (int16 n) { - vt100_EscSeq(n, (CHAR*)"T", 2); + VT100_EscSeq(n, (CHAR*)"T", 2); } -void vt100_HVP (int16 n, int16 m) +void VT100_HVP (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"f", 2); + VT100_EscSeq2(n, m, (CHAR*)"f", 2); } -void vt100_SGR (int16 n) +void VT100_SGR (int16 n) { - vt100_EscSeq(n, (CHAR*)"m", 2); + VT100_EscSeq(n, (CHAR*)"m", 2); } -void vt100_SGR2 (int16 n, int16 m) +void VT100_SGR2 (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"m", 2); + VT100_EscSeq2(n, m, (CHAR*)"m", 2); } -void vt100_DSR (int16 n) +void VT100_DSR (int16 n) { - vt100_EscSeq(6, (CHAR*)"n", 2); + VT100_EscSeq(6, (CHAR*)"n", 2); } -void vt100_SCP (void) +void VT100_SCP (void) { - vt100_EscSeq0((CHAR*)"s", 2); + VT100_EscSeq0((CHAR*)"s", 2); } -void vt100_RCP (void) +void VT100_RCP (void) { - vt100_EscSeq0((CHAR*)"u", 2); + VT100_EscSeq0((CHAR*)"u", 2); } -void vt100_DECTCEMl (void) +void VT100_DECTCEMl (void) { - vt100_EscSeq0((CHAR*)"\?25l", 5); + VT100_EscSeq0((CHAR*)"\?25l", 5); } -void vt100_DECTCEMh (void) +void VT100_DECTCEMh (void) { - vt100_EscSeq0((CHAR*)"\?25h", 5); + VT100_EscSeq0((CHAR*)"\?25h", 5); } -void vt100_SetAttr (CHAR *attr, LONGINT attr__len) +void VT100_SetAttr (CHAR *attr, LONGINT attr__len) { CHAR tmpstr[16]; __DUP(attr, attr__len, CHAR); - __COPY(vt100_CSI, tmpstr, 16); + __COPY(VT100_CSI, tmpstr, 16); Strings_Append(attr, attr__len, (void*)tmpstr, 16); Out_String(tmpstr, 16); __DEL(attr); } -export void *vt100__init(void) +export void *VT100__init(void) { __DEFMOD; __MODULE_IMPORT(Out); __MODULE_IMPORT(Strings); - __REGMOD("vt100", 0); - __REGCMD("DECTCEMh", vt100_DECTCEMh); - __REGCMD("DECTCEMl", vt100_DECTCEMl); - __REGCMD("RCP", vt100_RCP); - __REGCMD("SCP", vt100_SCP); + __REGMOD("VT100", 0); + __REGCMD("DECTCEMh", VT100_DECTCEMh); + __REGCMD("DECTCEMl", VT100_DECTCEMl); + __REGCMD("RCP", VT100_RCP); + __REGCMD("SCP", VT100_SCP); /* BEGIN */ - __COPY("\033", vt100_CSI, 5); - Strings_Append((CHAR*)"[", 2, (void*)vt100_CSI, 5); + __COPY("\033", VT100_CSI, 5); + Strings_Append((CHAR*)"[", 2, (void*)VT100_CSI, 5); __ENDMOD; } diff --git a/bootstrap/unix-88/vt100.h b/bootstrap/unix-88/vt100.h index 03038059..64913ea9 100644 --- a/bootstrap/unix-88/vt100.h +++ b/bootstrap/unix-88/vt100.h @@ -1,37 +1,37 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ -#ifndef vt100__h -#define vt100__h +#ifndef VT100__h +#define VT100__h #include "SYSTEM.h" -import CHAR vt100_CSI[5]; +import CHAR VT100_CSI[5]; -import void vt100_CHA (int16 n); -import void vt100_CNL (int16 n); -import void vt100_CPL (int16 n); -import void vt100_CUB (int16 n); -import void vt100_CUD (int16 n); -import void vt100_CUF (int16 n); -import void vt100_CUP (int16 n, int16 m); -import void vt100_CUU (int16 n); -import void vt100_DECTCEMh (void); -import void vt100_DECTCEMl (void); -import void vt100_DSR (int16 n); -import void vt100_ED (int16 n); -import void vt100_EL (int16 n); -import void vt100_HVP (int16 n, int16 m); -import void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); -import void vt100_RCP (void); -import void vt100_SCP (void); -import void vt100_SD (int16 n); -import void vt100_SGR (int16 n); -import void vt100_SGR2 (int16 n, int16 m); -import void vt100_SU (int16 n); -import void vt100_SetAttr (CHAR *attr, LONGINT attr__len); -import void *vt100__init(void); +import void VT100_CHA (int16 n); +import void VT100_CNL (int16 n); +import void VT100_CPL (int16 n); +import void VT100_CUB (int16 n); +import void VT100_CUD (int16 n); +import void VT100_CUF (int16 n); +import void VT100_CUP (int16 n, int16 m); +import void VT100_CUU (int16 n); +import void VT100_DECTCEMh (void); +import void VT100_DECTCEMl (void); +import void VT100_DSR (int16 n); +import void VT100_ED (int16 n); +import void VT100_EL (int16 n); +import void VT100_HVP (int16 n, int16 m); +import void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); +import void VT100_RCP (void); +import void VT100_SCP (void); +import void VT100_SD (int16 n); +import void VT100_SGR (int16 n); +import void VT100_SGR2 (int16 n, int16 m); +import void VT100_SU (int16 n); +import void VT100_SetAttr (CHAR *attr, LONGINT attr__len); +import void *VT100__init(void); -#endif // vt100 +#endif // VT100 diff --git a/bootstrap/windows-48/Compiler.c b/bootstrap/windows-48/Compiler.c index 5ec069b8..82f1ab48 100644 --- a/bootstrap/windows-48/Compiler.c +++ b/bootstrap/windows-48/Compiler.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */ #define SHORTINT int8 #define INTEGER int16 @@ -16,8 +16,8 @@ #include "OPV.h" #include "Platform.h" #include "Strings.h" +#include "VT100.h" #include "extTools.h" -#include "vt100.h" static CHAR Compiler_mname[256]; @@ -47,20 +47,20 @@ void Compiler_Module (BOOLEAN *done) if ((__IN(10, OPM_Options, 32) && __STRCMP(OPM_modName, "SYSTEM") != 0)) { OPM_DeleteNewSym(); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogWStr((CHAR*)" Main program.", 16); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } else { if (new) { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogWStr((CHAR*)" New symbol file.", 19); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } OPM_RegisterNewSym(); } else if (ext) { @@ -175,8 +175,8 @@ export int main(int argc, char **argv) __MODULE_IMPORT(OPV); __MODULE_IMPORT(Platform); __MODULE_IMPORT(Strings); + __MODULE_IMPORT(VT100); __MODULE_IMPORT(extTools); - __MODULE_IMPORT(vt100); __REGMAIN("Compiler", 0); __REGCMD("Translate", Compiler_Translate); /* BEGIN */ diff --git a/bootstrap/windows-48/Configuration.c b/bootstrap/windows-48/Configuration.c index 0bef890f..b9310392 100644 --- a/bootstrap/windows-48/Configuration.c +++ b/bootstrap/windows-48/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -19,6 +19,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75); + __MOVE("1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75); __ENDMOD; } diff --git a/bootstrap/windows-48/Configuration.h b/bootstrap/windows-48/Configuration.h index 286f28c0..c760742c 100644 --- a/bootstrap/windows-48/Configuration.h +++ b/bootstrap/windows-48/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/windows-48/Files.c b/bootstrap/windows-48/Files.c index 9b51335b..03f1e2aa 100644 --- a/bootstrap/windows-48/Files.c +++ b/bootstrap/windows-48/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/Files.h b/bootstrap/windows-48/Files.h index 3ca0b501..b5337e4a 100644 --- a/bootstrap/windows-48/Files.h +++ b/bootstrap/windows-48/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #ifndef Files__h #define Files__h diff --git a/bootstrap/windows-48/Heap.c b/bootstrap/windows-48/Heap.c index cb386d17..948db354 100644 --- a/bootstrap/windows-48/Heap.c +++ b/bootstrap/windows-48/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/Heap.h b/bootstrap/windows-48/Heap.h index c6dbfb3e..7712f182 100644 --- a/bootstrap/windows-48/Heap.h +++ b/bootstrap/windows-48/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ #ifndef Heap__h #define Heap__h diff --git a/bootstrap/windows-48/Modules.c b/bootstrap/windows-48/Modules.c index e5227fba..5cdcbe9c 100644 --- a/bootstrap/windows-48/Modules.c +++ b/bootstrap/windows-48/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/Modules.h b/bootstrap/windows-48/Modules.h index 77ec53de..e6fcdbbe 100644 --- a/bootstrap/windows-48/Modules.h +++ b/bootstrap/windows-48/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Modules__h #define Modules__h diff --git a/bootstrap/windows-48/OPB.c b/bootstrap/windows-48/OPB.c index aab1b7fe..aa7126c9 100644 --- a/bootstrap/windows-48/OPB.c +++ b/bootstrap/windows-48/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/OPB.h b/bootstrap/windows-48/OPB.h index eb00fcda..b63ca81f 100644 --- a/bootstrap/windows-48/OPB.h +++ b/bootstrap/windows-48/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/windows-48/OPC.c b/bootstrap/windows-48/OPC.c index 84393696..d2a4419b 100644 --- a/bootstrap/windows-48/OPC.c +++ b/bootstrap/windows-48/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/OPC.h b/bootstrap/windows-48/OPC.h index d6a60b2e..4da49877 100644 --- a/bootstrap/windows-48/OPC.h +++ b/bootstrap/windows-48/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/windows-48/OPM.c b/bootstrap/windows-48/OPM.c index 76cc2b7c..d202f2cd 100644 --- a/bootstrap/windows-48/OPM.c +++ b/bootstrap/windows-48/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -12,8 +12,8 @@ #include "Platform.h" #include "Strings.h" #include "Texts.h" +#include "VT100.h" #include "errors.h" -#include "vt100.h" typedef CHAR OPM_FileName[32]; @@ -325,7 +325,7 @@ BOOLEAN OPM_OpenPar (void) OPM_LogWLn(); OPM_LogWStr((CHAR*)" Miscellaneous", 16); OPM_LogWLn(); - OPM_LogWStr((CHAR*)" -f Disable vt100 control characters in status output.", 60); + OPM_LogWStr((CHAR*)" -f Disable VT100 control characters in status output.", 60); OPM_LogWLn(); OPM_LogWStr((CHAR*)" -V Display compiler debugging messages.", 46); OPM_LogWLn(); @@ -555,20 +555,20 @@ static void OPM_LogErrMsg (int16 n) CHAR buf[1024]; if (n >= 0) { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"31m", 4); + VT100_SetAttr((CHAR*)"31m", 4); } OPM_LogWStr((CHAR*)" err ", 7); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } else { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"35m", 4); + VT100_SetAttr((CHAR*)"35m", 4); } OPM_LogWStr((CHAR*)" warning ", 11); n = -n; if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } OPM_LogWNum(n, 1); @@ -641,11 +641,11 @@ static void OPM_ShowLine (int64 pos) i -= 1; } if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogW('^'); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } Files_Close(f); } @@ -1079,8 +1079,8 @@ export void *OPM__init(void) __MODULE_IMPORT(Platform); __MODULE_IMPORT(Strings); __MODULE_IMPORT(Texts); + __MODULE_IMPORT(VT100); __MODULE_IMPORT(errors); - __MODULE_IMPORT(vt100); __REGMOD("OPM", EnumPtrs); __REGCMD("CloseFiles", OPM_CloseFiles); __REGCMD("CloseOldSym", OPM_CloseOldSym); diff --git a/bootstrap/windows-48/OPM.h b/bootstrap/windows-48/OPM.h index b7b19fb7..b088cc93 100644 --- a/bootstrap/windows-48/OPM.h +++ b/bootstrap/windows-48/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/windows-48/OPP.c b/bootstrap/windows-48/OPP.c index e3a26a86..63fb92b5 100644 --- a/bootstrap/windows-48/OPP.c +++ b/bootstrap/windows-48/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/OPP.h b/bootstrap/windows-48/OPP.h index 1f2ff59f..57f41cf8 100644 --- a/bootstrap/windows-48/OPP.h +++ b/bootstrap/windows-48/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/windows-48/OPS.c b/bootstrap/windows-48/OPS.c index 72800d6b..e7cd3549 100644 --- a/bootstrap/windows-48/OPS.c +++ b/bootstrap/windows-48/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/OPS.h b/bootstrap/windows-48/OPS.h index 595b3668..0a75e9c7 100644 --- a/bootstrap/windows-48/OPS.h +++ b/bootstrap/windows-48/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/windows-48/OPT.c b/bootstrap/windows-48/OPT.c index bc22f7e2..6f466b3e 100644 --- a/bootstrap/windows-48/OPT.c +++ b/bootstrap/windows-48/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/OPT.h b/bootstrap/windows-48/OPT.h index d40fcd25..d8da229b 100644 --- a/bootstrap/windows-48/OPT.h +++ b/bootstrap/windows-48/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPT__h #define OPT__h diff --git a/bootstrap/windows-48/OPV.c b/bootstrap/windows-48/OPV.c index 19522c13..fd02ab90 100644 --- a/bootstrap/windows-48/OPV.c +++ b/bootstrap/windows-48/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/OPV.h b/bootstrap/windows-48/OPV.h index fa176ddf..48195728 100644 --- a/bootstrap/windows-48/OPV.h +++ b/bootstrap/windows-48/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/windows-48/Out.c b/bootstrap/windows-48/Out.c index 146364f1..31b8cd52 100644 --- a/bootstrap/windows-48/Out.c +++ b/bootstrap/windows-48/Out.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -315,5 +315,6 @@ export void *Out__init(void) __REGCMD("Ln", Out_Ln); __REGCMD("Open", Out_Open); /* BEGIN */ + Out_in = 0; __ENDMOD; } diff --git a/bootstrap/windows-48/Out.h b/bootstrap/windows-48/Out.h index 418e17e2..f91ee6a4 100644 --- a/bootstrap/windows-48/Out.h +++ b/bootstrap/windows-48/Out.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Out__h #define Out__h diff --git a/bootstrap/windows-48/Platform.c b/bootstrap/windows-48/Platform.c index 10094e2d..6bc9bf9f 100644 --- a/bootstrap/windows-48/Platform.c +++ b/bootstrap/windows-48/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/Platform.h b/bootstrap/windows-48/Platform.h index 76bb3755..79119240 100644 --- a/bootstrap/windows-48/Platform.h +++ b/bootstrap/windows-48/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Platform__h #define Platform__h diff --git a/bootstrap/windows-48/Reals.c b/bootstrap/windows-48/Reals.c index ece1bf1d..6135ec40 100644 --- a/bootstrap/windows-48/Reals.c +++ b/bootstrap/windows-48/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/Reals.h b/bootstrap/windows-48/Reals.h index 523e9f9e..86321454 100644 --- a/bootstrap/windows-48/Reals.h +++ b/bootstrap/windows-48/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/windows-48/Strings.c b/bootstrap/windows-48/Strings.c index c86ccc0e..92ce5fe0 100644 --- a/bootstrap/windows-48/Strings.c +++ b/bootstrap/windows-48/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/Strings.h b/bootstrap/windows-48/Strings.h index c12329ab..76b31eb9 100644 --- a/bootstrap/windows-48/Strings.h +++ b/bootstrap/windows-48/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/windows-48/Texts.c b/bootstrap/windows-48/Texts.c index 672171ee..b5634f26 100644 --- a/bootstrap/windows-48/Texts.c +++ b/bootstrap/windows-48/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/Texts.h b/bootstrap/windows-48/Texts.h index 802df5a7..7709374b 100644 --- a/bootstrap/windows-48/Texts.h +++ b/bootstrap/windows-48/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Texts__h #define Texts__h diff --git a/bootstrap/windows-48/errors.c b/bootstrap/windows-48/errors.c index 44990c71..70424462 100644 --- a/bootstrap/windows-48/errors.c +++ b/bootstrap/windows-48/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-48/errors.h b/bootstrap/windows-48/errors.h index e0bb109d..80c4a045 100644 --- a/bootstrap/windows-48/errors.h +++ b/bootstrap/windows-48/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/windows-48/extTools.c b/bootstrap/windows-48/extTools.c index c83fd7dd..a6e5fe94 100644 --- a/bootstrap/windows-48/extTools.c +++ b/bootstrap/windows-48/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -102,6 +102,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati Strings_Append((CHAR*)"", 1, (void*)cmd, 1023); Strings_Append((CHAR*)"/lib\"", 6, (void*)cmd, 1023); Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023); + Strings_Append((CHAR*)"-O", 3, (void*)cmd, 1023); Strings_Append(OPM_Model, 10, (void*)cmd, 1023); extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023); __DEL(additionalopts); diff --git a/bootstrap/windows-48/extTools.h b/bootstrap/windows-48/extTools.h index 21016d9e..d945916e 100644 --- a/bootstrap/windows-48/extTools.h +++ b/bootstrap/windows-48/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/windows-48/vt100.c b/bootstrap/windows-48/vt100.c index afa2b377..7c1212f5 100644 --- a/bootstrap/windows-48/vt100.c +++ b/bootstrap/windows-48/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -10,40 +10,40 @@ #include "Strings.h" -export CHAR vt100_CSI[5]; -static CHAR vt100_tmpstr[32]; +export CHAR VT100_CSI[5]; +static CHAR VT100_tmpstr[32]; -export void vt100_CHA (int16 n); -export void vt100_CNL (int16 n); -export void vt100_CPL (int16 n); -export void vt100_CUB (int16 n); -export void vt100_CUD (int16 n); -export void vt100_CUF (int16 n); -export void vt100_CUP (int16 n, int16 m); -export void vt100_CUU (int16 n); -export void vt100_DECTCEMh (void); -export void vt100_DECTCEMl (void); -export void vt100_DSR (int16 n); -export void vt100_ED (int16 n); -export void vt100_EL (int16 n); -static void vt100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len); -static void vt100_EscSeq0 (CHAR *letter, LONGINT letter__len); -static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len); -static void vt100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len); -export void vt100_HVP (int16 n, int16 m); -export void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); -export void vt100_RCP (void); -static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end); -export void vt100_SCP (void); -export void vt100_SD (int16 n); -export void vt100_SGR (int16 n); -export void vt100_SGR2 (int16 n, int16 m); -export void vt100_SU (int16 n); -export void vt100_SetAttr (CHAR *attr, LONGINT attr__len); +export void VT100_CHA (int16 n); +export void VT100_CNL (int16 n); +export void VT100_CPL (int16 n); +export void VT100_CUB (int16 n); +export void VT100_CUD (int16 n); +export void VT100_CUF (int16 n); +export void VT100_CUP (int16 n, int16 m); +export void VT100_CUU (int16 n); +export void VT100_DECTCEMh (void); +export void VT100_DECTCEMl (void); +export void VT100_DSR (int16 n); +export void VT100_ED (int16 n); +export void VT100_EL (int16 n); +static void VT100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len); +static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len); +static void VT100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len); +static void VT100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len); +export void VT100_HVP (int16 n, int16 m); +export void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); +export void VT100_RCP (void); +static void VT100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end); +export void VT100_SCP (void); +export void VT100_SD (int16 n); +export void VT100_SGR (int16 n); +export void VT100_SGR2 (int16 n, int16 m); +export void VT100_SU (int16 n); +export void VT100_SetAttr (CHAR *attr, LONGINT attr__len); -static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) +static void VT100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) { CHAR h; while (start < end) { @@ -55,7 +55,7 @@ static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) } } -void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) +void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) { CHAR b[21]; int16 s, e; @@ -79,55 +79,55 @@ void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) e += 1; } while (!(int_ == 0)); b[__X(e, 21)] = 0x00; - vt100_Reverse0((void*)b, 21, s, e - 1); + VT100_Reverse0((void*)b, 21, s, e - 1); } __COPY(b, str, str__len); } -static void vt100_EscSeq0 (CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len) { CHAR cmd[9]; __DUP(letter, letter__len, CHAR); - __COPY(vt100_CSI, cmd, 9); + __COPY(VT100_CSI, cmd, 9); Strings_Append(letter, letter__len, (void*)cmd, 9); Out_String(cmd, 9); __DEL(letter); } -static void vt100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len) { CHAR nstr[2]; CHAR cmd[7]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 2); - __COPY(vt100_CSI, cmd, 7); + VT100_IntToStr(n, (void*)nstr, 2); + __COPY(VT100_CSI, cmd, 7); Strings_Append(nstr, 2, (void*)cmd, 7); Strings_Append(letter, letter__len, (void*)cmd, 7); Out_String(cmd, 7); __DEL(letter); } -static void vt100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len) { CHAR nstr[2]; CHAR cmd[7]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 2); - __COPY(vt100_CSI, cmd, 7); + VT100_IntToStr(n, (void*)nstr, 2); + __COPY(VT100_CSI, cmd, 7); Strings_Append(letter, letter__len, (void*)cmd, 7); Strings_Append(nstr, 2, (void*)cmd, 7); Out_String(cmd, 7); __DEL(letter); } -static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) { CHAR nstr[5], mstr[5]; CHAR cmd[12]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 5); - vt100_IntToStr(m, (void*)mstr, 5); - __COPY(vt100_CSI, cmd, 12); + VT100_IntToStr(n, (void*)nstr, 5); + VT100_IntToStr(m, (void*)mstr, 5); + __COPY(VT100_CSI, cmd, 12); Strings_Append(nstr, 5, (void*)cmd, 12); Strings_Append((CHAR*)";", 2, (void*)cmd, 12); Strings_Append(mstr, 5, (void*)cmd, 12); @@ -136,129 +136,129 @@ static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) __DEL(letter); } -void vt100_CUU (int16 n) +void VT100_CUU (int16 n) { - vt100_EscSeq(n, (CHAR*)"A", 2); + VT100_EscSeq(n, (CHAR*)"A", 2); } -void vt100_CUD (int16 n) +void VT100_CUD (int16 n) { - vt100_EscSeq(n, (CHAR*)"B", 2); + VT100_EscSeq(n, (CHAR*)"B", 2); } -void vt100_CUF (int16 n) +void VT100_CUF (int16 n) { - vt100_EscSeq(n, (CHAR*)"C", 2); + VT100_EscSeq(n, (CHAR*)"C", 2); } -void vt100_CUB (int16 n) +void VT100_CUB (int16 n) { - vt100_EscSeq(n, (CHAR*)"D", 2); + VT100_EscSeq(n, (CHAR*)"D", 2); } -void vt100_CNL (int16 n) +void VT100_CNL (int16 n) { - vt100_EscSeq(n, (CHAR*)"E", 2); + VT100_EscSeq(n, (CHAR*)"E", 2); } -void vt100_CPL (int16 n) +void VT100_CPL (int16 n) { - vt100_EscSeq(n, (CHAR*)"F", 2); + VT100_EscSeq(n, (CHAR*)"F", 2); } -void vt100_CHA (int16 n) +void VT100_CHA (int16 n) { - vt100_EscSeq(n, (CHAR*)"G", 2); + VT100_EscSeq(n, (CHAR*)"G", 2); } -void vt100_CUP (int16 n, int16 m) +void VT100_CUP (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"H", 2); + VT100_EscSeq2(n, m, (CHAR*)"H", 2); } -void vt100_ED (int16 n) +void VT100_ED (int16 n) { - vt100_EscSeq(n, (CHAR*)"J", 2); + VT100_EscSeq(n, (CHAR*)"J", 2); } -void vt100_EL (int16 n) +void VT100_EL (int16 n) { - vt100_EscSeq(n, (CHAR*)"K", 2); + VT100_EscSeq(n, (CHAR*)"K", 2); } -void vt100_SU (int16 n) +void VT100_SU (int16 n) { - vt100_EscSeq(n, (CHAR*)"S", 2); + VT100_EscSeq(n, (CHAR*)"S", 2); } -void vt100_SD (int16 n) +void VT100_SD (int16 n) { - vt100_EscSeq(n, (CHAR*)"T", 2); + VT100_EscSeq(n, (CHAR*)"T", 2); } -void vt100_HVP (int16 n, int16 m) +void VT100_HVP (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"f", 2); + VT100_EscSeq2(n, m, (CHAR*)"f", 2); } -void vt100_SGR (int16 n) +void VT100_SGR (int16 n) { - vt100_EscSeq(n, (CHAR*)"m", 2); + VT100_EscSeq(n, (CHAR*)"m", 2); } -void vt100_SGR2 (int16 n, int16 m) +void VT100_SGR2 (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"m", 2); + VT100_EscSeq2(n, m, (CHAR*)"m", 2); } -void vt100_DSR (int16 n) +void VT100_DSR (int16 n) { - vt100_EscSeq(6, (CHAR*)"n", 2); + VT100_EscSeq(6, (CHAR*)"n", 2); } -void vt100_SCP (void) +void VT100_SCP (void) { - vt100_EscSeq0((CHAR*)"s", 2); + VT100_EscSeq0((CHAR*)"s", 2); } -void vt100_RCP (void) +void VT100_RCP (void) { - vt100_EscSeq0((CHAR*)"u", 2); + VT100_EscSeq0((CHAR*)"u", 2); } -void vt100_DECTCEMl (void) +void VT100_DECTCEMl (void) { - vt100_EscSeq0((CHAR*)"\?25l", 5); + VT100_EscSeq0((CHAR*)"\?25l", 5); } -void vt100_DECTCEMh (void) +void VT100_DECTCEMh (void) { - vt100_EscSeq0((CHAR*)"\?25h", 5); + VT100_EscSeq0((CHAR*)"\?25h", 5); } -void vt100_SetAttr (CHAR *attr, LONGINT attr__len) +void VT100_SetAttr (CHAR *attr, LONGINT attr__len) { CHAR tmpstr[16]; __DUP(attr, attr__len, CHAR); - __COPY(vt100_CSI, tmpstr, 16); + __COPY(VT100_CSI, tmpstr, 16); Strings_Append(attr, attr__len, (void*)tmpstr, 16); Out_String(tmpstr, 16); __DEL(attr); } -export void *vt100__init(void) +export void *VT100__init(void) { __DEFMOD; __MODULE_IMPORT(Out); __MODULE_IMPORT(Strings); - __REGMOD("vt100", 0); - __REGCMD("DECTCEMh", vt100_DECTCEMh); - __REGCMD("DECTCEMl", vt100_DECTCEMl); - __REGCMD("RCP", vt100_RCP); - __REGCMD("SCP", vt100_SCP); + __REGMOD("VT100", 0); + __REGCMD("DECTCEMh", VT100_DECTCEMh); + __REGCMD("DECTCEMl", VT100_DECTCEMl); + __REGCMD("RCP", VT100_RCP); + __REGCMD("SCP", VT100_SCP); /* BEGIN */ - __COPY("\033", vt100_CSI, 5); - Strings_Append((CHAR*)"[", 2, (void*)vt100_CSI, 5); + __COPY("\033", VT100_CSI, 5); + Strings_Append((CHAR*)"[", 2, (void*)VT100_CSI, 5); __ENDMOD; } diff --git a/bootstrap/windows-48/vt100.h b/bootstrap/windows-48/vt100.h index 03038059..64913ea9 100644 --- a/bootstrap/windows-48/vt100.h +++ b/bootstrap/windows-48/vt100.h @@ -1,37 +1,37 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ -#ifndef vt100__h -#define vt100__h +#ifndef VT100__h +#define VT100__h #include "SYSTEM.h" -import CHAR vt100_CSI[5]; +import CHAR VT100_CSI[5]; -import void vt100_CHA (int16 n); -import void vt100_CNL (int16 n); -import void vt100_CPL (int16 n); -import void vt100_CUB (int16 n); -import void vt100_CUD (int16 n); -import void vt100_CUF (int16 n); -import void vt100_CUP (int16 n, int16 m); -import void vt100_CUU (int16 n); -import void vt100_DECTCEMh (void); -import void vt100_DECTCEMl (void); -import void vt100_DSR (int16 n); -import void vt100_ED (int16 n); -import void vt100_EL (int16 n); -import void vt100_HVP (int16 n, int16 m); -import void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); -import void vt100_RCP (void); -import void vt100_SCP (void); -import void vt100_SD (int16 n); -import void vt100_SGR (int16 n); -import void vt100_SGR2 (int16 n, int16 m); -import void vt100_SU (int16 n); -import void vt100_SetAttr (CHAR *attr, LONGINT attr__len); -import void *vt100__init(void); +import void VT100_CHA (int16 n); +import void VT100_CNL (int16 n); +import void VT100_CPL (int16 n); +import void VT100_CUB (int16 n); +import void VT100_CUD (int16 n); +import void VT100_CUF (int16 n); +import void VT100_CUP (int16 n, int16 m); +import void VT100_CUU (int16 n); +import void VT100_DECTCEMh (void); +import void VT100_DECTCEMl (void); +import void VT100_DSR (int16 n); +import void VT100_ED (int16 n); +import void VT100_EL (int16 n); +import void VT100_HVP (int16 n, int16 m); +import void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); +import void VT100_RCP (void); +import void VT100_SCP (void); +import void VT100_SD (int16 n); +import void VT100_SGR (int16 n); +import void VT100_SGR2 (int16 n, int16 m); +import void VT100_SU (int16 n); +import void VT100_SetAttr (CHAR *attr, LONGINT attr__len); +import void *VT100__init(void); -#endif // vt100 +#endif // VT100 diff --git a/bootstrap/windows-88/Compiler.c b/bootstrap/windows-88/Compiler.c index 5ec069b8..82f1ab48 100644 --- a/bootstrap/windows-88/Compiler.c +++ b/bootstrap/windows-88/Compiler.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspamSf */ #define SHORTINT int8 #define INTEGER int16 @@ -16,8 +16,8 @@ #include "OPV.h" #include "Platform.h" #include "Strings.h" +#include "VT100.h" #include "extTools.h" -#include "vt100.h" static CHAR Compiler_mname[256]; @@ -47,20 +47,20 @@ void Compiler_Module (BOOLEAN *done) if ((__IN(10, OPM_Options, 32) && __STRCMP(OPM_modName, "SYSTEM") != 0)) { OPM_DeleteNewSym(); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogWStr((CHAR*)" Main program.", 16); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } else { if (new) { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogWStr((CHAR*)" New symbol file.", 19); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } OPM_RegisterNewSym(); } else if (ext) { @@ -175,8 +175,8 @@ export int main(int argc, char **argv) __MODULE_IMPORT(OPV); __MODULE_IMPORT(Platform); __MODULE_IMPORT(Strings); + __MODULE_IMPORT(VT100); __MODULE_IMPORT(extTools); - __MODULE_IMPORT(vt100); __REGMAIN("Compiler", 0); __REGCMD("Translate", Compiler_Translate); /* BEGIN */ diff --git a/bootstrap/windows-88/Configuration.c b/bootstrap/windows-88/Configuration.c index 0bef890f..b9310392 100644 --- a/bootstrap/windows-88/Configuration.c +++ b/bootstrap/windows-88/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -19,6 +19,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75); + __MOVE("1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75); __ENDMOD; } diff --git a/bootstrap/windows-88/Configuration.h b/bootstrap/windows-88/Configuration.h index 286f28c0..c760742c 100644 --- a/bootstrap/windows-88/Configuration.h +++ b/bootstrap/windows-88/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/windows-88/Files.c b/bootstrap/windows-88/Files.c index 98dcdccb..9986f06f 100644 --- a/bootstrap/windows-88/Files.c +++ b/bootstrap/windows-88/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/Files.h b/bootstrap/windows-88/Files.h index a643f9c2..9b8b7477 100644 --- a/bootstrap/windows-88/Files.h +++ b/bootstrap/windows-88/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #ifndef Files__h #define Files__h diff --git a/bootstrap/windows-88/Heap.c b/bootstrap/windows-88/Heap.c index 1a82d9e8..42134b68 100644 --- a/bootstrap/windows-88/Heap.c +++ b/bootstrap/windows-88/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/Heap.h b/bootstrap/windows-88/Heap.h index abcafa6a..521ccc74 100644 --- a/bootstrap/windows-88/Heap.h +++ b/bootstrap/windows-88/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tsSfF */ #ifndef Heap__h #define Heap__h diff --git a/bootstrap/windows-88/Modules.c b/bootstrap/windows-88/Modules.c index 5fdce638..2a860e62 100644 --- a/bootstrap/windows-88/Modules.c +++ b/bootstrap/windows-88/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/Modules.h b/bootstrap/windows-88/Modules.h index 77ec53de..e6fcdbbe 100644 --- a/bootstrap/windows-88/Modules.h +++ b/bootstrap/windows-88/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Modules__h #define Modules__h diff --git a/bootstrap/windows-88/OPB.c b/bootstrap/windows-88/OPB.c index aab1b7fe..aa7126c9 100644 --- a/bootstrap/windows-88/OPB.c +++ b/bootstrap/windows-88/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/OPB.h b/bootstrap/windows-88/OPB.h index eb00fcda..b63ca81f 100644 --- a/bootstrap/windows-88/OPB.h +++ b/bootstrap/windows-88/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/windows-88/OPC.c b/bootstrap/windows-88/OPC.c index 84393696..d2a4419b 100644 --- a/bootstrap/windows-88/OPC.c +++ b/bootstrap/windows-88/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/OPC.h b/bootstrap/windows-88/OPC.h index d6a60b2e..4da49877 100644 --- a/bootstrap/windows-88/OPC.h +++ b/bootstrap/windows-88/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/windows-88/OPM.c b/bootstrap/windows-88/OPM.c index ca25d1e6..686c674e 100644 --- a/bootstrap/windows-88/OPM.c +++ b/bootstrap/windows-88/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -12,8 +12,8 @@ #include "Platform.h" #include "Strings.h" #include "Texts.h" +#include "VT100.h" #include "errors.h" -#include "vt100.h" typedef CHAR OPM_FileName[32]; @@ -325,7 +325,7 @@ BOOLEAN OPM_OpenPar (void) OPM_LogWLn(); OPM_LogWStr((CHAR*)" Miscellaneous", 16); OPM_LogWLn(); - OPM_LogWStr((CHAR*)" -f Disable vt100 control characters in status output.", 60); + OPM_LogWStr((CHAR*)" -f Disable VT100 control characters in status output.", 60); OPM_LogWLn(); OPM_LogWStr((CHAR*)" -V Display compiler debugging messages.", 46); OPM_LogWLn(); @@ -555,20 +555,20 @@ static void OPM_LogErrMsg (int16 n) CHAR buf[1024]; if (n >= 0) { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"31m", 4); + VT100_SetAttr((CHAR*)"31m", 4); } OPM_LogWStr((CHAR*)" err ", 7); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } else { if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"35m", 4); + VT100_SetAttr((CHAR*)"35m", 4); } OPM_LogWStr((CHAR*)" warning ", 11); n = -n; if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } } OPM_LogWNum(n, 1); @@ -641,11 +641,11 @@ static void OPM_ShowLine (int64 pos) i -= 1; } if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"32m", 4); + VT100_SetAttr((CHAR*)"32m", 4); } OPM_LogW('^'); if (!__IN(16, OPM_Options, 32)) { - vt100_SetAttr((CHAR*)"0m", 3); + VT100_SetAttr((CHAR*)"0m", 3); } Files_Close(f); } @@ -1079,8 +1079,8 @@ export void *OPM__init(void) __MODULE_IMPORT(Platform); __MODULE_IMPORT(Strings); __MODULE_IMPORT(Texts); + __MODULE_IMPORT(VT100); __MODULE_IMPORT(errors); - __MODULE_IMPORT(vt100); __REGMOD("OPM", EnumPtrs); __REGCMD("CloseFiles", OPM_CloseFiles); __REGCMD("CloseOldSym", OPM_CloseOldSym); diff --git a/bootstrap/windows-88/OPM.h b/bootstrap/windows-88/OPM.h index b7b19fb7..b088cc93 100644 --- a/bootstrap/windows-88/OPM.h +++ b/bootstrap/windows-88/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/windows-88/OPP.c b/bootstrap/windows-88/OPP.c index 64a861ac..29f9ae66 100644 --- a/bootstrap/windows-88/OPP.c +++ b/bootstrap/windows-88/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/OPP.h b/bootstrap/windows-88/OPP.h index 1f2ff59f..57f41cf8 100644 --- a/bootstrap/windows-88/OPP.h +++ b/bootstrap/windows-88/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/windows-88/OPS.c b/bootstrap/windows-88/OPS.c index 72800d6b..e7cd3549 100644 --- a/bootstrap/windows-88/OPS.c +++ b/bootstrap/windows-88/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/OPS.h b/bootstrap/windows-88/OPS.h index 595b3668..0a75e9c7 100644 --- a/bootstrap/windows-88/OPS.h +++ b/bootstrap/windows-88/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. tspaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/windows-88/OPT.c b/bootstrap/windows-88/OPT.c index 7be03e0d..85221274 100644 --- a/bootstrap/windows-88/OPT.c +++ b/bootstrap/windows-88/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/OPT.h b/bootstrap/windows-88/OPT.h index d40fcd25..d8da229b 100644 --- a/bootstrap/windows-88/OPT.h +++ b/bootstrap/windows-88/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPT__h #define OPT__h diff --git a/bootstrap/windows-88/OPV.c b/bootstrap/windows-88/OPV.c index 90adf5f7..7e6d40e5 100644 --- a/bootstrap/windows-88/OPV.c +++ b/bootstrap/windows-88/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/OPV.h b/bootstrap/windows-88/OPV.h index fa176ddf..48195728 100644 --- a/bootstrap/windows-88/OPV.h +++ b/bootstrap/windows-88/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/windows-88/Out.c b/bootstrap/windows-88/Out.c index 146364f1..31b8cd52 100644 --- a/bootstrap/windows-88/Out.c +++ b/bootstrap/windows-88/Out.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -315,5 +315,6 @@ export void *Out__init(void) __REGCMD("Ln", Out_Ln); __REGCMD("Open", Out_Open); /* BEGIN */ + Out_in = 0; __ENDMOD; } diff --git a/bootstrap/windows-88/Out.h b/bootstrap/windows-88/Out.h index 418e17e2..f91ee6a4 100644 --- a/bootstrap/windows-88/Out.h +++ b/bootstrap/windows-88/Out.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Out__h #define Out__h diff --git a/bootstrap/windows-88/Platform.c b/bootstrap/windows-88/Platform.c index 4b4bd5d9..eed18d02 100644 --- a/bootstrap/windows-88/Platform.c +++ b/bootstrap/windows-88/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/Platform.h b/bootstrap/windows-88/Platform.h index bc2df7c8..aacc5cad 100644 --- a/bootstrap/windows-88/Platform.h +++ b/bootstrap/windows-88/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Platform__h #define Platform__h diff --git a/bootstrap/windows-88/Reals.c b/bootstrap/windows-88/Reals.c index ece1bf1d..6135ec40 100644 --- a/bootstrap/windows-88/Reals.c +++ b/bootstrap/windows-88/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/Reals.h b/bootstrap/windows-88/Reals.h index 523e9f9e..86321454 100644 --- a/bootstrap/windows-88/Reals.h +++ b/bootstrap/windows-88/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/windows-88/Strings.c b/bootstrap/windows-88/Strings.c index c86ccc0e..92ce5fe0 100644 --- a/bootstrap/windows-88/Strings.c +++ b/bootstrap/windows-88/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/Strings.h b/bootstrap/windows-88/Strings.h index c12329ab..76b31eb9 100644 --- a/bootstrap/windows-88/Strings.h +++ b/bootstrap/windows-88/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/windows-88/Texts.c b/bootstrap/windows-88/Texts.c index 6033652e..09708beb 100644 --- a/bootstrap/windows-88/Texts.c +++ b/bootstrap/windows-88/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/Texts.h b/bootstrap/windows-88/Texts.h index 54f5d5ee..14846883 100644 --- a/bootstrap/windows-88/Texts.h +++ b/bootstrap/windows-88/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef Texts__h #define Texts__h diff --git a/bootstrap/windows-88/errors.c b/bootstrap/windows-88/errors.c index 44990c71..70424462 100644 --- a/bootstrap/windows-88/errors.c +++ b/bootstrap/windows-88/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 diff --git a/bootstrap/windows-88/errors.h b/bootstrap/windows-88/errors.h index e0bb109d..80c4a045 100644 --- a/bootstrap/windows-88/errors.h +++ b/bootstrap/windows-88/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/windows-88/extTools.c b/bootstrap/windows-88/extTools.c index c83fd7dd..a6e5fe94 100644 --- a/bootstrap/windows-88/extTools.c +++ b/bootstrap/windows-88/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -102,6 +102,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati Strings_Append((CHAR*)"", 1, (void*)cmd, 1023); Strings_Append((CHAR*)"/lib\"", 6, (void*)cmd, 1023); Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023); + Strings_Append((CHAR*)"-O", 3, (void*)cmd, 1023); Strings_Append(OPM_Model, 10, (void*)cmd, 1023); extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023); __DEL(additionalopts); diff --git a/bootstrap/windows-88/extTools.h b/bootstrap/windows-88/extTools.h index 21016d9e..d945916e 100644 --- a/bootstrap/windows-88/extTools.h +++ b/bootstrap/windows-88/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/windows-88/vt100.c b/bootstrap/windows-88/vt100.c index afa2b377..7c1212f5 100644 --- a/bootstrap/windows-88/vt100.c +++ b/bootstrap/windows-88/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ #define SHORTINT int8 #define INTEGER int16 @@ -10,40 +10,40 @@ #include "Strings.h" -export CHAR vt100_CSI[5]; -static CHAR vt100_tmpstr[32]; +export CHAR VT100_CSI[5]; +static CHAR VT100_tmpstr[32]; -export void vt100_CHA (int16 n); -export void vt100_CNL (int16 n); -export void vt100_CPL (int16 n); -export void vt100_CUB (int16 n); -export void vt100_CUD (int16 n); -export void vt100_CUF (int16 n); -export void vt100_CUP (int16 n, int16 m); -export void vt100_CUU (int16 n); -export void vt100_DECTCEMh (void); -export void vt100_DECTCEMl (void); -export void vt100_DSR (int16 n); -export void vt100_ED (int16 n); -export void vt100_EL (int16 n); -static void vt100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len); -static void vt100_EscSeq0 (CHAR *letter, LONGINT letter__len); -static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len); -static void vt100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len); -export void vt100_HVP (int16 n, int16 m); -export void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); -export void vt100_RCP (void); -static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end); -export void vt100_SCP (void); -export void vt100_SD (int16 n); -export void vt100_SGR (int16 n); -export void vt100_SGR2 (int16 n, int16 m); -export void vt100_SU (int16 n); -export void vt100_SetAttr (CHAR *attr, LONGINT attr__len); +export void VT100_CHA (int16 n); +export void VT100_CNL (int16 n); +export void VT100_CPL (int16 n); +export void VT100_CUB (int16 n); +export void VT100_CUD (int16 n); +export void VT100_CUF (int16 n); +export void VT100_CUP (int16 n, int16 m); +export void VT100_CUU (int16 n); +export void VT100_DECTCEMh (void); +export void VT100_DECTCEMl (void); +export void VT100_DSR (int16 n); +export void VT100_ED (int16 n); +export void VT100_EL (int16 n); +static void VT100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len); +static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len); +static void VT100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len); +static void VT100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len); +export void VT100_HVP (int16 n, int16 m); +export void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); +export void VT100_RCP (void); +static void VT100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end); +export void VT100_SCP (void); +export void VT100_SD (int16 n); +export void VT100_SGR (int16 n); +export void VT100_SGR2 (int16 n, int16 m); +export void VT100_SU (int16 n); +export void VT100_SetAttr (CHAR *attr, LONGINT attr__len); -static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) +static void VT100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) { CHAR h; while (start < end) { @@ -55,7 +55,7 @@ static void vt100_Reverse0 (CHAR *str, LONGINT str__len, int16 start, int16 end) } } -void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) +void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) { CHAR b[21]; int16 s, e; @@ -79,55 +79,55 @@ void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len) e += 1; } while (!(int_ == 0)); b[__X(e, 21)] = 0x00; - vt100_Reverse0((void*)b, 21, s, e - 1); + VT100_Reverse0((void*)b, 21, s, e - 1); } __COPY(b, str, str__len); } -static void vt100_EscSeq0 (CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq0 (CHAR *letter, LONGINT letter__len) { CHAR cmd[9]; __DUP(letter, letter__len, CHAR); - __COPY(vt100_CSI, cmd, 9); + __COPY(VT100_CSI, cmd, 9); Strings_Append(letter, letter__len, (void*)cmd, 9); Out_String(cmd, 9); __DEL(letter); } -static void vt100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq (int16 n, CHAR *letter, LONGINT letter__len) { CHAR nstr[2]; CHAR cmd[7]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 2); - __COPY(vt100_CSI, cmd, 7); + VT100_IntToStr(n, (void*)nstr, 2); + __COPY(VT100_CSI, cmd, 7); Strings_Append(nstr, 2, (void*)cmd, 7); Strings_Append(letter, letter__len, (void*)cmd, 7); Out_String(cmd, 7); __DEL(letter); } -static void vt100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeqSwapped (int16 n, CHAR *letter, LONGINT letter__len) { CHAR nstr[2]; CHAR cmd[7]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 2); - __COPY(vt100_CSI, cmd, 7); + VT100_IntToStr(n, (void*)nstr, 2); + __COPY(VT100_CSI, cmd, 7); Strings_Append(letter, letter__len, (void*)cmd, 7); Strings_Append(nstr, 2, (void*)cmd, 7); Out_String(cmd, 7); __DEL(letter); } -static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) +static void VT100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) { CHAR nstr[5], mstr[5]; CHAR cmd[12]; __DUP(letter, letter__len, CHAR); - vt100_IntToStr(n, (void*)nstr, 5); - vt100_IntToStr(m, (void*)mstr, 5); - __COPY(vt100_CSI, cmd, 12); + VT100_IntToStr(n, (void*)nstr, 5); + VT100_IntToStr(m, (void*)mstr, 5); + __COPY(VT100_CSI, cmd, 12); Strings_Append(nstr, 5, (void*)cmd, 12); Strings_Append((CHAR*)";", 2, (void*)cmd, 12); Strings_Append(mstr, 5, (void*)cmd, 12); @@ -136,129 +136,129 @@ static void vt100_EscSeq2 (int16 n, int16 m, CHAR *letter, LONGINT letter__len) __DEL(letter); } -void vt100_CUU (int16 n) +void VT100_CUU (int16 n) { - vt100_EscSeq(n, (CHAR*)"A", 2); + VT100_EscSeq(n, (CHAR*)"A", 2); } -void vt100_CUD (int16 n) +void VT100_CUD (int16 n) { - vt100_EscSeq(n, (CHAR*)"B", 2); + VT100_EscSeq(n, (CHAR*)"B", 2); } -void vt100_CUF (int16 n) +void VT100_CUF (int16 n) { - vt100_EscSeq(n, (CHAR*)"C", 2); + VT100_EscSeq(n, (CHAR*)"C", 2); } -void vt100_CUB (int16 n) +void VT100_CUB (int16 n) { - vt100_EscSeq(n, (CHAR*)"D", 2); + VT100_EscSeq(n, (CHAR*)"D", 2); } -void vt100_CNL (int16 n) +void VT100_CNL (int16 n) { - vt100_EscSeq(n, (CHAR*)"E", 2); + VT100_EscSeq(n, (CHAR*)"E", 2); } -void vt100_CPL (int16 n) +void VT100_CPL (int16 n) { - vt100_EscSeq(n, (CHAR*)"F", 2); + VT100_EscSeq(n, (CHAR*)"F", 2); } -void vt100_CHA (int16 n) +void VT100_CHA (int16 n) { - vt100_EscSeq(n, (CHAR*)"G", 2); + VT100_EscSeq(n, (CHAR*)"G", 2); } -void vt100_CUP (int16 n, int16 m) +void VT100_CUP (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"H", 2); + VT100_EscSeq2(n, m, (CHAR*)"H", 2); } -void vt100_ED (int16 n) +void VT100_ED (int16 n) { - vt100_EscSeq(n, (CHAR*)"J", 2); + VT100_EscSeq(n, (CHAR*)"J", 2); } -void vt100_EL (int16 n) +void VT100_EL (int16 n) { - vt100_EscSeq(n, (CHAR*)"K", 2); + VT100_EscSeq(n, (CHAR*)"K", 2); } -void vt100_SU (int16 n) +void VT100_SU (int16 n) { - vt100_EscSeq(n, (CHAR*)"S", 2); + VT100_EscSeq(n, (CHAR*)"S", 2); } -void vt100_SD (int16 n) +void VT100_SD (int16 n) { - vt100_EscSeq(n, (CHAR*)"T", 2); + VT100_EscSeq(n, (CHAR*)"T", 2); } -void vt100_HVP (int16 n, int16 m) +void VT100_HVP (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"f", 2); + VT100_EscSeq2(n, m, (CHAR*)"f", 2); } -void vt100_SGR (int16 n) +void VT100_SGR (int16 n) { - vt100_EscSeq(n, (CHAR*)"m", 2); + VT100_EscSeq(n, (CHAR*)"m", 2); } -void vt100_SGR2 (int16 n, int16 m) +void VT100_SGR2 (int16 n, int16 m) { - vt100_EscSeq2(n, m, (CHAR*)"m", 2); + VT100_EscSeq2(n, m, (CHAR*)"m", 2); } -void vt100_DSR (int16 n) +void VT100_DSR (int16 n) { - vt100_EscSeq(6, (CHAR*)"n", 2); + VT100_EscSeq(6, (CHAR*)"n", 2); } -void vt100_SCP (void) +void VT100_SCP (void) { - vt100_EscSeq0((CHAR*)"s", 2); + VT100_EscSeq0((CHAR*)"s", 2); } -void vt100_RCP (void) +void VT100_RCP (void) { - vt100_EscSeq0((CHAR*)"u", 2); + VT100_EscSeq0((CHAR*)"u", 2); } -void vt100_DECTCEMl (void) +void VT100_DECTCEMl (void) { - vt100_EscSeq0((CHAR*)"\?25l", 5); + VT100_EscSeq0((CHAR*)"\?25l", 5); } -void vt100_DECTCEMh (void) +void VT100_DECTCEMh (void) { - vt100_EscSeq0((CHAR*)"\?25h", 5); + VT100_EscSeq0((CHAR*)"\?25h", 5); } -void vt100_SetAttr (CHAR *attr, LONGINT attr__len) +void VT100_SetAttr (CHAR *attr, LONGINT attr__len) { CHAR tmpstr[16]; __DUP(attr, attr__len, CHAR); - __COPY(vt100_CSI, tmpstr, 16); + __COPY(VT100_CSI, tmpstr, 16); Strings_Append(attr, attr__len, (void*)tmpstr, 16); Out_String(tmpstr, 16); __DEL(attr); } -export void *vt100__init(void) +export void *VT100__init(void) { __DEFMOD; __MODULE_IMPORT(Out); __MODULE_IMPORT(Strings); - __REGMOD("vt100", 0); - __REGCMD("DECTCEMh", vt100_DECTCEMh); - __REGCMD("DECTCEMl", vt100_DECTCEMl); - __REGCMD("RCP", vt100_RCP); - __REGCMD("SCP", vt100_SCP); + __REGMOD("VT100", 0); + __REGCMD("DECTCEMh", VT100_DECTCEMh); + __REGCMD("DECTCEMl", VT100_DECTCEMl); + __REGCMD("RCP", VT100_RCP); + __REGCMD("SCP", VT100_SCP); /* BEGIN */ - __COPY("\033", vt100_CSI, 5); - Strings_Append((CHAR*)"[", 2, (void*)vt100_CSI, 5); + __COPY("\033", VT100_CSI, 5); + Strings_Append((CHAR*)"[", 2, (void*)VT100_CSI, 5); __ENDMOD; } diff --git a/bootstrap/windows-88/vt100.h b/bootstrap/windows-88/vt100.h index 03038059..64913ea9 100644 --- a/bootstrap/windows-88/vt100.h +++ b/bootstrap/windows-88/vt100.h @@ -1,37 +1,37 @@ -/* voc 1.95 [2016/10/12]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ +/* voc 1.95 [2016/10/15]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */ -#ifndef vt100__h -#define vt100__h +#ifndef VT100__h +#define VT100__h #include "SYSTEM.h" -import CHAR vt100_CSI[5]; +import CHAR VT100_CSI[5]; -import void vt100_CHA (int16 n); -import void vt100_CNL (int16 n); -import void vt100_CPL (int16 n); -import void vt100_CUB (int16 n); -import void vt100_CUD (int16 n); -import void vt100_CUF (int16 n); -import void vt100_CUP (int16 n, int16 m); -import void vt100_CUU (int16 n); -import void vt100_DECTCEMh (void); -import void vt100_DECTCEMl (void); -import void vt100_DSR (int16 n); -import void vt100_ED (int16 n); -import void vt100_EL (int16 n); -import void vt100_HVP (int16 n, int16 m); -import void vt100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); -import void vt100_RCP (void); -import void vt100_SCP (void); -import void vt100_SD (int16 n); -import void vt100_SGR (int16 n); -import void vt100_SGR2 (int16 n, int16 m); -import void vt100_SU (int16 n); -import void vt100_SetAttr (CHAR *attr, LONGINT attr__len); -import void *vt100__init(void); +import void VT100_CHA (int16 n); +import void VT100_CNL (int16 n); +import void VT100_CPL (int16 n); +import void VT100_CUB (int16 n); +import void VT100_CUD (int16 n); +import void VT100_CUF (int16 n); +import void VT100_CUP (int16 n, int16 m); +import void VT100_CUU (int16 n); +import void VT100_DECTCEMh (void); +import void VT100_DECTCEMl (void); +import void VT100_DSR (int16 n); +import void VT100_ED (int16 n); +import void VT100_EL (int16 n); +import void VT100_HVP (int16 n, int16 m); +import void VT100_IntToStr (int32 int_, CHAR *str, LONGINT str__len); +import void VT100_RCP (void); +import void VT100_SCP (void); +import void VT100_SD (int16 n); +import void VT100_SGR (int16 n); +import void VT100_SGR2 (int16 n, int16 m); +import void VT100_SU (int16 n); +import void VT100_SetAttr (CHAR *attr, LONGINT attr__len); +import void *VT100__init(void); -#endif // vt100 +#endif // VT100 diff --git a/makefile b/makefile index b8323eea..499b5bf0 100644 --- a/makefile +++ b/makefile @@ -156,8 +156,8 @@ full: configuration @printf "\n\n--- Compiler build successfull ---\n\n" @make -f src/tools/make/oberon.mk -s browsercmd MODEL=2 @printf "\n\n--- Library build started ---\n\n" - @make -f src/tools/make/oberon.mk -s O2library - @make -f src/tools/make/oberon.mk -s runtime MODEL=C + @make -f src/tools/make/oberon.mk -s library MODEL=2 + @make -f src/tools/make/oberon.mk -s library MODEL=C @printf "\n\n--- Library build successfull ---\n\n" @make -f src/tools/make/oberon.mk -s sourcechanges @make -f src/tools/make/oberon.mk -s install @@ -190,12 +190,11 @@ browsercmd: configuration # library: build all directories under src/library -library: configuration - @make -f src/tools/make/oberon.mk -s O2library - @make -f src/tools/make/oberon.mk -s runtime MODEL=C +O2library: configuration + @make -f src/tools/make/oberon.mk -s library MODEL=2 -runtime: configuration - @make -f src/tools/make/oberon.mk -s runtime MODEL=C +OClibrary: configuration + @make -f src/tools/make/oberon.mk -s library MODEL=C diff --git a/src/compiler/Compiler.Mod b/src/compiler/Compiler.Mod index f21ef95d..d8c688a7 100644 --- a/src/compiler/Compiler.Mod +++ b/src/compiler/Compiler.Mod @@ -4,7 +4,7 @@ MODULE Compiler; (* J. Templ 3.2.95 *) SYSTEM, Heap, Platform, Configuration, OPP, OPB, OPT, OPV, OPC, OPM, - extTools, Strings, vt100; + extTools, Strings, VT100; VAR mname: ARRAY 256 OF CHAR; (* noch *) @@ -25,14 +25,14 @@ MODULE Compiler; (* J. Templ 3.2.95 *) IF OPM.noerr THEN IF (OPM.mainprog IN OPM.Options) & (OPM.modName # "SYSTEM") THEN OPM.DeleteNewSym; - IF ~(OPM.notcoloroutput IN OPM.Options) THEN vt100.SetAttr(vt100.Green) END; + IF ~(OPM.notcoloroutput IN OPM.Options) THEN VT100.SetAttr(VT100.Green) END; OPM.LogWStr(" Main program."); - IF ~(OPM.notcoloroutput IN OPM.Options) THEN vt100.SetAttr(vt100.ResetAll) END; + IF ~(OPM.notcoloroutput IN OPM.Options) THEN VT100.SetAttr(VT100.ResetAll) END; ELSE IF new THEN - IF ~(OPM.notcoloroutput IN OPM.Options) THEN vt100.SetAttr(vt100.Green) END; + IF ~(OPM.notcoloroutput IN OPM.Options) THEN VT100.SetAttr(VT100.Green) END; OPM.LogWStr(" New symbol file."); - IF ~(OPM.notcoloroutput IN OPM.Options) THEN vt100.SetAttr(vt100.ResetAll) END; + IF ~(OPM.notcoloroutput IN OPM.Options) THEN VT100.SetAttr(VT100.ResetAll) END; OPM.RegisterNewSym ELSIF ext THEN OPM.LogWStr(" Extended symbol file."); diff --git a/src/compiler/OPM.Mod b/src/compiler/OPM.Mod index 703ff236..1ecaa7e0 100644 --- a/src/compiler/OPM.Mod +++ b/src/compiler/OPM.Mod @@ -4,7 +4,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) 31.1.2007 jt synchronized with BlackBox version, in particular PromoteIntConstToLInt added *) - IMPORT SYSTEM, Texts, Files, Platform, Out, errors, Configuration, vt100, Strings; + IMPORT SYSTEM, Texts, Files, Platform, Out, errors, Configuration, VT100, Strings; CONST OptionChar* = "-"; @@ -183,7 +183,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) | "c": Options := Options / {dontlink} (* Don't link. *) (* Miscellaneous *) - | "f": Options := Options / {notcoloroutput} (* Disable vt100 control characters in status output. *) + | "f": Options := Options / {notcoloroutput} (* Disable VT100 control characters in status output. *) | "V": Options := Options / {verbose} (* Elementary type size model *) @@ -264,7 +264,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) LogWStr(" -c Don't link."); LogWLn; LogWLn; LogWStr(" Miscellaneous"); LogWLn; - LogWStr(" -f Disable vt100 control characters in status output."); LogWLn; + LogWStr(" -f Disable VT100 control characters in status output."); LogWLn; LogWStr(" -V Display compiler debugging messages."); LogWLn; LogWLn; LogWStr(" Size model for elementary types (default O2)"); LogWLn; @@ -426,13 +426,13 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) buf: ARRAY 1024 OF CHAR; BEGIN IF n >= 0 THEN - IF ~(notcoloroutput IN Options) THEN vt100.SetAttr(vt100.Red) END; + IF ~(notcoloroutput IN Options) THEN VT100.SetAttr(VT100.Red) END; LogWStr(" err "); - IF ~(notcoloroutput IN Options) THEN vt100.SetAttr(vt100.ResetAll) END; + IF ~(notcoloroutput IN Options) THEN VT100.SetAttr(VT100.ResetAll) END; ELSE - IF ~(notcoloroutput IN Options) THEN vt100.SetAttr(vt100.Magenta) END; + IF ~(notcoloroutput IN Options) THEN VT100.SetAttr(VT100.Magenta) END; LogWStr(" warning "); n := -n; - IF ~(notcoloroutput IN Options) THEN vt100.SetAttr(vt100.ResetAll) END; + IF ~(notcoloroutput IN Options) THEN VT100.SetAttr(VT100.ResetAll) END; END ; LogWNum(n, 1); LogWStr(" "); @@ -505,9 +505,9 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) i := SHORT(Longint(pos - ErrorLineStartPos)); WHILE i > 0 DO LogW(" "); DEC(i) END; - IF ~(notcoloroutput IN Options) THEN vt100.SetAttr(vt100.Green) END; + IF ~(notcoloroutput IN Options) THEN VT100.SetAttr(VT100.Green) END; LogW("^"); - IF ~(notcoloroutput IN Options) THEN vt100.SetAttr(vt100.ResetAll) END; + IF ~(notcoloroutput IN Options) THEN VT100.SetAttr(VT100.ResetAll) END; Files.Close(f); END ShowLine; diff --git a/src/compiler/extTools.Mod b/src/compiler/extTools.Mod index c241eaac..062e8014 100644 --- a/src/compiler/extTools.Mod +++ b/src/compiler/extTools.Mod @@ -70,6 +70,7 @@ PROCEDURE LinkMain*(VAR moduleName: ARRAY OF CHAR; statically: BOOLEAN; addition Strings.Append(Configuration.installdir, cmd); Strings.Append('/lib"', cmd); Strings.Append(Configuration.libspec, cmd); + Strings.Append('-O', cmd); Strings.Append(OPM.Model, cmd); execute("Assemble and link: ", cmd); END LinkMain; diff --git a/src/library/misc/crt.Mod b/src/library/misc/crt.Mod index ab6e36b9..eebc5678 100644 --- a/src/library/misc/crt.Mod +++ b/src/library/misc/crt.Mod @@ -1,7 +1,6 @@ MODULE crt; -IMPORT vt100, Platform, Console, - Strings; (* strings to remove later ? *) +IMPORT VT100, Platform, Out, Strings; CONST @@ -30,27 +29,27 @@ CONST PROCEDURE EraseDisplay*; BEGIN - vt100.ED(2); + VT100.ED(2); END EraseDisplay; PROCEDURE ClrScr*; BEGIN - vt100.ED(2); + VT100.ED(2); END ClrScr; PROCEDURE ClrEol*; BEGIN - vt100.EL(0); + VT100.EL(0); END ClrEol; PROCEDURE cursoroff*; BEGIN - vt100.DECTCEMl; + VT100.DECTCEMl; END cursoroff; PROCEDURE cursoron*; BEGIN - vt100.DECTCEMh; + VT100.DECTCEMh; END cursoron; PROCEDURE Delay*(ms: INTEGER); @@ -58,116 +57,116 @@ CONST PROCEDURE GotoXY* (x, y: INTEGER); BEGIN - vt100.CUP (y, x); + VT100.CUP (y, x); END GotoXY; PROCEDURE HighVideo*; VAR tmpstr: ARRAY 5 OF CHAR; BEGIN - COPY (vt100.CSI, tmpstr); - Strings.Append(vt100.Bold, tmpstr); - Console.String(tmpstr); + COPY (VT100.CSI, tmpstr); + Strings.Append(VT100.Bold, tmpstr); + Out.String(tmpstr); END HighVideo; - + PROCEDURE DelLine*; BEGIN - vt100.EL(2); + VT100.EL(2); END DelLine; PROCEDURE InsLine*; BEGIN - vt100.SCP; - Console.Ln; - vt100.RCP; + VT100.SCP; + Out.Ln; + VT100.RCP; END InsLine; PROCEDURE LowVideo*; VAR tmpstr : ARRAY 7 OF CHAR; BEGIN - COPY (vt100.CSI, tmpstr); - Strings.Append(vt100.ResetBold, tmpstr); - Console.String(tmpstr); + COPY (VT100.CSI, tmpstr); + Strings.Append(VT100.ResetBold, tmpstr); + Out.String(tmpstr); END LowVideo; PROCEDURE NormVideo*; VAR tmpstr : ARRAY 7 OF CHAR; BEGIN - COPY(vt100.CSI, tmpstr); - Strings.Append(vt100.ResetAll, tmpstr); - Console.String(tmpstr); + COPY(VT100.CSI, tmpstr); + Strings.Append(VT100.ResetAll, tmpstr); + Out.String(tmpstr); END NormVideo; PROCEDURE TextBackground*(color : SHORTINT); BEGIN IF color = Black THEN - vt100.SetAttr(vt100.BBlack) + VT100.SetAttr(VT100.BBlack) ELSIF color = Blue THEN - vt100.SetAttr(vt100.BBlue) + VT100.SetAttr(VT100.BBlue) ELSIF color = Green THEN - vt100.SetAttr(vt100.BGreen) + VT100.SetAttr(VT100.BGreen) ELSIF color = Cyan THEN - vt100.SetAttr(vt100.BCyan) + VT100.SetAttr(VT100.BCyan) ELSIF color = Red THEN - vt100.SetAttr(vt100.BRed) + VT100.SetAttr(VT100.BRed) ELSIF color = Magenta THEN - vt100.SetAttr(vt100.BMagenta) + VT100.SetAttr(VT100.BMagenta) ELSIF color = Brown THEN - vt100.SetAttr(vt100.BYellow) + VT100.SetAttr(VT100.BYellow) ELSIF color = LightGray THEN - vt100.SetAttr(vt100.BLightGray) + VT100.SetAttr(VT100.BLightGray) ELSIF color = DarkGray THEN - vt100.SetAttr(vt100.BDarkGray) + VT100.SetAttr(VT100.BDarkGray) ELSIF color = LightBlue THEN - vt100.SetAttr(vt100.BLightBlue) + VT100.SetAttr(VT100.BLightBlue) ELSIF color = LightGreen THEN - vt100.SetAttr(vt100.BLightBlue) + VT100.SetAttr(VT100.BLightBlue) ELSIF color = LightCyan THEN - vt100.SetAttr(vt100.BLightCyan) + VT100.SetAttr(VT100.BLightCyan) ELSIF color = LightRed THEN - vt100.SetAttr(vt100.BLightRed) + VT100.SetAttr(VT100.BLightRed) ELSIF color = LightMagenta THEN - vt100.SetAttr(vt100.BLightMagenta) + VT100.SetAttr(VT100.BLightMagenta) ELSIF color = Yellow THEN - vt100.SetAttr(vt100.BLightYellow) + VT100.SetAttr(VT100.BLightYellow) ELSIF color = White THEN - vt100.SetAttr(vt100.BWhite) + VT100.SetAttr(VT100.BWhite) END; END TextBackground; PROCEDURE TextColor*(color : SHORTINT); BEGIN IF color = Black THEN - vt100.SetAttr(vt100.Black) + VT100.SetAttr(VT100.Black) ELSIF color = Blue THEN - vt100.SetAttr(vt100.Blue) + VT100.SetAttr(VT100.Blue) ELSIF color = Green THEN - vt100.SetAttr(vt100.Green) + VT100.SetAttr(VT100.Green) ELSIF color = Cyan THEN - vt100.SetAttr(vt100.Cyan) + VT100.SetAttr(VT100.Cyan) ELSIF color = Red THEN - vt100.SetAttr(vt100.Red) + VT100.SetAttr(VT100.Red) ELSIF color = Magenta THEN - vt100.SetAttr(vt100.Magenta) + VT100.SetAttr(VT100.Magenta) ELSIF color = Brown THEN - vt100.SetAttr(vt100.Yellow) + VT100.SetAttr(VT100.Yellow) ELSIF color = LightGray THEN - vt100.SetAttr(vt100.LightGray) + VT100.SetAttr(VT100.LightGray) ELSIF color = DarkGray THEN - vt100.SetAttr(vt100.DarkGray) + VT100.SetAttr(VT100.DarkGray) ELSIF color = LightBlue THEN - vt100.SetAttr(vt100.LightBlue) + VT100.SetAttr(VT100.LightBlue) ELSIF color = LightGreen THEN - vt100.SetAttr(vt100.LightBlue) + VT100.SetAttr(VT100.LightBlue) ELSIF color = LightCyan THEN - vt100.SetAttr(vt100.LightCyan) + VT100.SetAttr(VT100.LightCyan) ELSIF color = LightRed THEN - vt100.SetAttr(vt100.LightRed) + VT100.SetAttr(VT100.LightRed) ELSIF color = LightMagenta THEN - vt100.SetAttr(vt100.LightMagenta) + VT100.SetAttr(VT100.LightMagenta) ELSIF color = Yellow THEN - vt100.SetAttr(vt100.LightYellow) + VT100.SetAttr(VT100.LightYellow) ELSIF color = White THEN - vt100.SetAttr(vt100.White) + VT100.SetAttr(VT100.White) END; END TextColor; diff --git a/src/library/misc/vt100.Mod b/src/library/misc/vt100.Mod deleted file mode 100644 index 37ab5895..00000000 --- a/src/library/misc/vt100.Mod +++ /dev/null @@ -1,342 +0,0 @@ -MODULE vt100; - -IMPORT Console, Strings; - (* reference http://en.wikipedia.org/wiki/ANSI_escape_code - & http://misc.flogisoft.com/bash/tip_colors_and_formatting - *) -CONST - - Escape* = 1BX; - SynchronousIdle* = 16X; - LeftCrotchet* = '['; - - (* formatting *) - Bold* = "1m"; - Dim* = "2m"; - Underlined* = "4m"; - Blink* = "5m"; (* does not work with most emulators, works in tty and xterm *) - Reverse* = "7m"; (* invert the foreground and background colors *) - Hidden* = "8m"; (* useful for passwords *) - - (* reset *) - ResetAll* = "0m"; - ResetBold* = "21m"; - ResetDim* = "22m"; - ResetUnderlined* = "24m"; - ResetBlink* = "25m"; - ResetReverse* = "27m"; - ResetHidden* = "28m"; - - (* foreground colors *) - Black* = "30m"; - Red* = "31m"; - Green* = "32m"; - Yellow* = "33m"; - Blue* = "34m"; - Magenta* = "35m"; - Cyan* = "36m"; - LightGray* = "37m"; - Default* = "39m"; - DarkGray* = "90m"; - LightRed* = "91m"; - LightGreen* = "92m"; - LightYellow* = "93m"; - LightBlue* = "94m"; - LightMagenta* = "95m"; - LightCyan* = "96m"; - White* = "97m"; - - (* background colors *) - BBlack* = "40m"; - BRed* = "41m"; - BGreen* = "42m"; - BYellow* = "43m"; - BBlue* = "44m"; - BMagenta* = "45m"; - BCyan* = "46m"; - BLightGray* = "47m"; - BDefault* = "49m"; - BDarkGray* = "100m"; - BLightRed* = "101m"; - BLightGreen* = "102m"; - BLightYellow* = "103m"; - BLightBlue* = "104m"; - BLightMagenta*= "105m"; - BLightCyan* = "106m"; - BWhite* = "107m"; - - VAR - CSI* : ARRAY 5 OF CHAR; - tmpstr : ARRAY 32 OF CHAR; - - (* IntToStr routine taken from - https://github.com/romiras/Oberon-F-components/blob/master/Ott/Mod/IntStr.cp - and modified to work on 64bit system, - in order to avoid using oocIntStr, which has many dependencies *) - PROCEDURE Reverse0 (VAR str : ARRAY OF CHAR; start, end : INTEGER); - (* Reverses order of characters in the interval [start..end]. *) - VAR - h : CHAR; - BEGIN - WHILE start < end DO - h := str[start]; str[start] := str[end]; str[end] := h; - INC(start); DEC(end) - END - END Reverse0; - - PROCEDURE IntToStr*(int: LONGINT; VAR str: ARRAY OF CHAR); - (* Converts the value of `int' to string form and copies the possibly truncated - result to `str'. *) - VAR - b : ARRAY 21 OF CHAR; - s, e: INTEGER; - maxLength : SHORTINT; (* maximum number of digits representing a LONGINT value *) - BEGIN - IF SIZE(LONGINT) = 4 THEN maxLength := 11 END; - IF SIZE(LONGINT) = 8 THEN maxLength := 20 END; - (* build representation in string 'b' *) - IF int = MIN(LONGINT) THEN (* smallest LONGINT, -int is an overflow *) - IF SIZE(LONGINT) = 4 THEN - b := "-2147483648"; - e := 11 - ELSE (* SIZE(LONGINT) = 8 *) - b := "-9223372036854775808"; - e := 20 - END - ELSE - IF int < 0 THEN (* negative sign *) - b[0] := "-"; int := -int; s := 1 - ELSE (* no sign *) - s := 0 - END; - e := s; (* 's' holds starting position of string *) - REPEAT - b[e] := CHR(int MOD 10+ORD("0")); - int := int DIV 10; - INC(e) - UNTIL int = 0; - b[e] := 0X; - Reverse0(b, s, e-1); - END; - COPY(b, str) (* truncate output if necessary *) - END IntToStr; - - PROCEDURE EscSeq0 (letter : ARRAY OF CHAR); - VAR - cmd : ARRAY 9 OF CHAR; - BEGIN - COPY(CSI, cmd); - Strings.Append (letter, cmd); - Console.String (cmd); - END EscSeq0; - - PROCEDURE EscSeq (n : INTEGER; letter : ARRAY OF CHAR); - VAR nstr : ARRAY 2 OF CHAR; - cmd : ARRAY 7 OF CHAR; - BEGIN - IntToStr (n, nstr); - COPY(CSI, cmd); - Strings.Append (nstr, cmd); - Strings.Append (letter, cmd); - Console.String (cmd); - END EscSeq; - - PROCEDURE EscSeqSwapped (n : INTEGER; letter : ARRAY OF CHAR); - VAR nstr : ARRAY 2 OF CHAR; - cmd : ARRAY 7 OF CHAR; - BEGIN - IntToStr (n, nstr); - COPY(CSI, cmd); - Strings.Append (letter, cmd); - Strings.Append (nstr, cmd); - Console.String (cmd); - END EscSeqSwapped; - - PROCEDURE EscSeq2(n, m : INTEGER; letter : ARRAY OF CHAR); - VAR nstr, mstr : ARRAY 5 OF CHAR; - cmd : ARRAY 12 OF CHAR; - BEGIN - IntToStr(n, nstr); - IntToStr(m, mstr); - - COPY (CSI, cmd); - Strings.Append (nstr, cmd); - Strings.Append (';', cmd); - Strings.Append (mstr, cmd); - Strings.Append (letter, cmd); - Console.String (cmd); - - END EscSeq2; - - - -(* Cursor up - moves cursor n cells in the given direction. if the cursor is already at the edge of the screen, this has no effect *) - - PROCEDURE CUU*(n : INTEGER); - BEGIN - EscSeq (n, 'A'); - END CUU; - -(* Cursor down - moves cursor n cells in the given direction. if the cursor is already at the edge of the screen, this has no effect *) - - PROCEDURE CUD*(n : INTEGER); - BEGIN - EscSeq (n, 'B'); - END CUD; - - -(* Cursor forward - moves cursor n cells in the given direction. if the cursor is already at the edge of the screen, this has no effect *) - - PROCEDURE CUF*(n : INTEGER); - BEGIN - EscSeq (n, 'C'); - END CUF; - -(* Cursor back - moves cursor n cells in the given direction. if the cursor is already at the edge of the screen, this has no effect *) - - PROCEDURE CUB*(n : INTEGER); - BEGIN - EscSeq (n, 'D'); - END CUB; - -(* Curnser Next Line - moves cursor to beginning of the line n lines down *) - - PROCEDURE CNL*( n: INTEGER); - BEGIN - EscSeq (n, 'E'); - END CNL; - - -(* Cursor Previous Line - Moves cursor to beginning of the line n lines down *) - - PROCEDURE CPL*( n : INTEGER); - BEGIN - EscSeq (n, 'F'); - END CPL; - -(* Cursor Horizontal Absolute - Moves the cursor to column n *) - - PROCEDURE CHA*( n : INTEGER); - BEGIN - EscSeq (n, 'G'); - END CHA; - - (* Cursor position, moves cursor to row n, column m *) - PROCEDURE CUP*(n, m : INTEGER); - BEGIN - EscSeq2 (n, m, 'H'); - END CUP; - - (* Erase Display - if n = 0 then clears from cursor to end of the screen - if n = 1 then clears from cursor to beginning of the screen - if n = 2 then clears entire screen *) - - PROCEDURE ED* (n : INTEGER); - BEGIN - EscSeq(n, 'J'); - END ED; - - (* Erase in Line - Erases part of the line. If n is zero, clear from cursor to the end of the line. If n is one, clear from cursor to beginning of the line. If n is two, clear entire line. Cursor position does not change *) - PROCEDURE EL*( n : INTEGER); - BEGIN - EscSeq(n, 'K'); - END EL; - -(* Scroll Up - Scroll whole page up by n lines. New lines are added at the bottom *) - PROCEDURE SU*( n : INTEGER); - BEGIN - EscSeq(n, 'S') - END SU; - -(* Scroll Down - Scroll whole page down by n (default 1) lines. New lines are added at the top *) - PROCEDURE SD*( n : INTEGER); - BEGIN - EscSeq(n, 'T'); - END SD; - -(* Horizontal and Vertical Position, - Moves the cursor to row n, column m. Both default to 1 if omitted. Same as CUP *) - PROCEDURE HVP*(n, m : INTEGER); - BEGIN - EscSeq2 (n, m, 'f'); - END HVP; - -(* Select Graphic Rendition - Sets SGR parameters, including text color. After CSI can be zero or more parameters separated with ;. With no parameters, CSI m is treated as CSI 0 m (reset / normal), which is typical of most of the ANSI escape sequences *) - - PROCEDURE SGR*( n : INTEGER); - BEGIN - EscSeq(n, 'm'); - END SGR; - - PROCEDURE SGR2*( n, m : INTEGER); - BEGIN - EscSeq2(n, m, 'm'); - END SGR2; - -(* Device Status Report - Reports the cursor position (CPR) to the application as (as though typed at the keyboard) ESC[n;mR, where n is the row and m is the column.) *) - - PROCEDURE DSR*(n : INTEGER); - BEGIN - EscSeq(6, 'n'); - END DSR; - -(* Save Cursor Position *) - - PROCEDURE SCP*; - BEGIN - EscSeq0('s'); - END SCP; - -(* Restore Cursor Position *) - - PROCEDURE RCP*; - BEGIN - EscSeq0('u'); - END RCP; - -(* Hide the cursor *) - PROCEDURE DECTCEMl*; - BEGIN - EscSeq0("?25l") - END DECTCEMl; - -(* shows the cursor *) - PROCEDURE DECTCEMh*; - BEGIN - EscSeq0("?25h") - END DECTCEMh; - - PROCEDURE SetAttr*(attr : ARRAY OF CHAR); - VAR tmpstr : ARRAY 16 OF CHAR; - BEGIN - COPY(CSI, tmpstr); - Strings.Append(attr, tmpstr); - Console.String(tmpstr); - END SetAttr; - - BEGIN - (* init CSI sequence *) - COPY(Escape, CSI); - Strings.Append(LeftCrotchet, CSI); -(* - EraseDisplay; - GotoXY (0, 0); - COPY(CSI, tmpstr); - Strings.Append(Green, tmpstr); - Strings.Append("hello", tmpstr); - Console.String(tmpstr); Console.Ln; -*) - END vt100. diff --git a/src/library/s3/ethReals.Mod b/src/library/s3/ethReals.Mod index 5851cd17..ea2d9d9f 100644 --- a/src/library/s3/ethReals.Mod +++ b/src/library/s3/ethReals.Mod @@ -10,7 +10,7 @@ Implemented by Bernd Moesli, Seminar for Applied Mathematics, Swiss Federal Institute of Technology Z…rich. *) -IMPORT SYSTEM, Platform, Configuration; +IMPORT SYSTEM, Platform; (* Bernd Moesli Seminar for Applied Mathematics diff --git a/src/runtime/MathL.Mod b/src/runtime/MathL.Mod index 69f994bb..3b26e498 100644 --- a/src/runtime/MathL.Mod +++ b/src/runtime/MathL.Mod @@ -131,7 +131,7 @@ PROCEDURE fraction*(x: LONGREAL): LONGREAL; significant) part of `x'. Hence the following relationship shall hold: x = scale(fraction(x), exponent(x)). *) - VAR s: SET; + VAR s: SYSTEM.SET64; BEGIN IF x = ZERO THEN RETURN ZERO ELSE @@ -170,7 +170,7 @@ PROCEDURE scale*(x: LONGREAL; n: INTEGER): LONGREAL; The value of the call scale(x,n) shall be the value x*radix^n if such a value exists; otherwise an execption shall occur and may be raised. *) - VAR exp: LONGINT; lexp: SYSTEM.SET64; + VAR exp: HUGEINT; lexp: SYSTEM.SET64; BEGIN IF x = ZERO THEN RETURN ZERO END; exp := exponent(x) + n; (* new exponent *) diff --git a/src/runtime/Out.Mod b/src/runtime/Out.Mod index 6ba07c09..1de04671 100644 --- a/src/runtime/Out.Mod +++ b/src/runtime/Out.Mod @@ -199,4 +199,5 @@ PROCEDURE LongReal*(x: LONGREAL; n: INTEGER); BEGIN RealP(x, n, TRUE); END LongReal; +BEGIN in := 0 END Out. diff --git a/src/runtime/vt100.Mod b/src/runtime/vt100.Mod index f21df4a6..03cc1d2c 100644 --- a/src/runtime/vt100.Mod +++ b/src/runtime/vt100.Mod @@ -1,4 +1,4 @@ -MODULE vt100; +MODULE VT100; IMPORT Out, Strings; (* reference http://en.wikipedia.org/wiki/ANSI_escape_code @@ -339,4 +339,4 @@ CONST Strings.Append("hello", tmpstr); Out.String(tmpstr); Out.Ln; *) - END vt100. + END VT100. diff --git a/src/tools/make/oberon.mk b/src/tools/make/oberon.mk index d8a8dd6b..8e581356 100644 --- a/src/tools/make/oberon.mk +++ b/src/tools/make/oberon.mk @@ -110,7 +110,7 @@ translate: cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -SsfFx -A$(ADRSIZE)$(ALIGNMENT) -O$(MODEL) ../../src/runtime/Files.Mod cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -SsfF -A$(ADRSIZE)$(ALIGNMENT) -O$(MODEL) ../../src/runtime/Reals.Mod cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -SsfF -A$(ADRSIZE)$(ALIGNMENT) -O$(MODEL) ../../src/runtime/Texts.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -SsfF -A$(ADRSIZE)$(ALIGNMENT) -O$(MODEL) ../../src/runtime/vt100.Mod + cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -SsfF -A$(ADRSIZE)$(ALIGNMENT) -O$(MODEL) ../../src/runtime/VT100.Mod cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -SsfF -A$(ADRSIZE)$(ALIGNMENT) -O$(MODEL) ../../src/compiler/errors.Mod cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -SsfF -A$(ADRSIZE)$(ALIGNMENT) -O$(MODEL) ../../src/compiler/OPM.Mod cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -SsfF -A$(ADRSIZE)$(ALIGNMENT) -O$(MODEL) ../../src/compiler/extTools.Mod @@ -161,17 +161,19 @@ install: @cp $(OBECOMP) "$(INSTALLDIR)/bin/$(OBECOMP)" @-cp $(BUILDDIR)/showdef$(BINEXT) "$(INSTALLDIR)/bin" - @mkdir -p "$(INSTALLDIR)/2/include" && cp $(BUILDDIR)/*.h "$(INSTALLDIR)/2/include/" - @mkdir -p "$(INSTALLDIR)/2/sym" && cp $(BUILDDIR)/*.sym "$(INSTALLDIR)/2/sym/" + @mkdir -p "$(INSTALLDIR)/2/include" && cp $(BUILDDIR)/2/*.h "$(INSTALLDIR)/2/include/" + @mkdir -p "$(INSTALLDIR)/2/sym" && cp $(BUILDDIR)/2/*.sym "$(INSTALLDIR)/2/sym/" @mkdir -p "$(INSTALLDIR)/C/include" && cp $(BUILDDIR)/C/*.h "$(INSTALLDIR)/C/include/" @mkdir -p "$(INSTALLDIR)/C/sym" && cp $(BUILDDIR)/C/*.sym "$(INSTALLDIR)/C/sym/" @mkdir -p "$(INSTALLDIR)/lib" - @cp $(BUILDDIR)/lib$(ONAME)* "$(INSTALLDIR)/lib/" + @cp $(BUILDDIR)/2/lib$(ONAME)* "$(INSTALLDIR)/lib/" @cp $(BUILDDIR)/C/lib$(ONAME)* "$(INSTALLDIR)/lib/" @if which ldconfig >/dev/null 2>&1; then $(LDCONFIG); fi + + # showpath: Describe how to set the PATH variable showpath: @printf "\nNow add $(INSTALLDIR)/bin to your path, for example with the command:\n" @@ -190,190 +192,193 @@ uninstall: runtime: @printf "\nMaking run time library for -O$(MODEL)\n" - mkdir -p $(BUILDDIR)/$(MODEL) - cp src/runtime/*.[ch] $(BUILDDIR)/$(MODEL) - cd $(BUILDDIR)/$(MODEL) && $(COMPILE) -c SYSTEM.c cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/Platform$(PLATFORM).Mod cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/Heap.Mod cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/Modules.Mod cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/Strings.Mod cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/Out.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/VT100.Mod cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/Files.Mod cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/Math.Mod cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/MathL.Mod cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/Reals.Mod cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/Texts.Mod cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/runtime/Oberon.Mod - @printf "\nMaking lib$(ONAME)$(MODEL)\n" - ar rcs "$(BUILDDIR)/$(MODEL)/lib$(ONAME)$(MODEL).a" $(BUILDDIR)/$(MODEL)/*.o - @cd $(BUILDDIR)/$(MODEL) && $(COMPILE) -shared -o lib$(ONAME)$(MODEL).so *.o - v4: - @printf "\nMaking v4 library\n" - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/v4/Args.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/v4/Console.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/v4/Printer.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/v4/Sets.Mod + @printf "\nMaking v4 library for -O$(MODEL)\n" + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/v4/Args.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/v4/Console.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/v4/Printer.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/v4/Sets.Mod ooc2: - @printf "\nMaking ooc2 library\n" - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc2/ooc2Strings.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc2/ooc2Ascii.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc2/ooc2CharClass.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc2/ooc2ConvTypes.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc2/ooc2IntConv.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc2/ooc2IntStr.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc2/ooc2Real0.Mod - - -TODO: Comment disabled lines contain use of VAL that reads beyond source variable + @printf "\nMaking ooc2 library for -O$(MODEL)\n" + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc2/ooc2Strings.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc2/ooc2Ascii.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc2/ooc2CharClass.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc2/ooc2ConvTypes.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc2/ooc2IntConv.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc2/ooc2IntStr.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc2/ooc2Real0.Mod ooc: - @printf "\nMaking ooc library\n" - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocLowReal.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocLowLReal.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocRealMath.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocOakMath.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocLRealMath.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocLongInts.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocComplexMath.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocLComplexMath.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocAscii.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocCharClass.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocStrings.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocConvTypes.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocLRealConv.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocLRealStr.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocRealConv.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocRealStr.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocIntConv.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocIntStr.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocMsg.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocSysClock.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocTime.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocChannel.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocStrings2.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocRts.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocFilenames.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocTextRider.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocBinaryRider.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocJulianDay.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocFilenames.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocwrapperlibc.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ooc/oocC$(DATAMODEL).Mod + @printf "\nMaking ooc library for -O$(MODEL)\n" + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocLowReal.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocLowLReal.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocRealMath.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocOakMath.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocLRealMath.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocLongInts.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocComplexMath.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocLComplexMath.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocAscii.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocCharClass.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocStrings.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocConvTypes.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocLRealConv.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocLRealStr.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocRealConv.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocRealStr.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocIntConv.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocIntStr.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocMsg.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocSysClock.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocTime.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocChannel.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocStrings2.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocRts.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocFilenames.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocTextRider.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocBinaryRider.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocJulianDay.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocFilenames.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocwrapperlibc.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocC$(DATAMODEL).Mod oocX11: - @printf "\nMaking oocX11 library\n" - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/oocX11/oocX11.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/oocX11/oocXutil.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/oocX11/oocXYplane.Mod + @printf "\nMaking oocX11 library for -O$(MODEL)\n" + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/oocX11/oocX11.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/oocX11/oocXutil.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/oocX11/oocXYplane.Mod ulm: - @printf "\nMaking ulm library\n" - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmObjects.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmPriorities.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmDisciplines.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmServices.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmSys.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmSYSTEM.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmEvents.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmProcess.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmResources.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmForwarders.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmRelatedEvents.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmTypes.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmStreams.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmStrings.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmSysTypes.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmTexts.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmSysConversions.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmErrors.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmSysErrors.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmSysStat.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmASCII.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmSets.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmIO.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmAssertions.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmIndirectDisciplines.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmStreamDisciplines.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmIEEE.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmMC68881.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmReals.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmPrint.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmWrite.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmConstStrings.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmPlotters.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmSysIO.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmLoader.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmNetIO.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmPersistentObjects.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmPersistentDisciplines.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmOperations.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmScales.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmTimes.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmClocks.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmTimers.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmConditions.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmStreamConditions.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmTimeConditions.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmCiphers.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmCipherOps.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmBlockCiphers.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmAsymmetricCiphers.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmConclusions.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmRandomGenerators.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmTCrypt.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/ulm/ulmIntOperations.Mod + @printf "\nMaking ulm library for -O$(MODEL)\n" + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmObjects.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmPriorities.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmDisciplines.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmServices.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmSys.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmSYSTEM.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmEvents.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmProcess.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmResources.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmForwarders.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmRelatedEvents.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmTypes.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmStreams.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmStrings.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmSysTypes.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmTexts.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmSysConversions.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmErrors.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmSysErrors.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmSysStat.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmASCII.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmSets.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmIO.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmAssertions.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmIndirectDisciplines.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmStreamDisciplines.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmIEEE.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmMC68881.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmReals.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmPrint.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmWrite.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmConstStrings.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmPlotters.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmSysIO.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmLoader.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmNetIO.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmPersistentObjects.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmPersistentDisciplines.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmOperations.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmScales.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmTimes.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmClocks.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmTimers.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmConditions.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmStreamConditions.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmTimeConditions.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmCiphers.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmCipherOps.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmBlockCiphers.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmAsymmetricCiphers.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmConclusions.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmRandomGenerators.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmTCrypt.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ulm/ulmIntOperations.Mod pow32: - @printf "\nMaking pow library\n" - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/pow/powStrings.Mod + @printf "\nMaking pow library for -O$(MODEL)\n" + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/pow/powStrings.Mod misc: - @printf "\nMaking misc library\n" - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/runtime/Oberon.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/misc/crt.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/misc/Listen.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/misc/MersenneTwister.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/misc/MultiArrays.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/misc/MultiArrayRiders.Mod + @printf "\nMaking misc library for -O$(MODEL)\n" + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/misc/crt.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/misc/Listen.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/misc/MersenneTwister.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/misc/MultiArrays.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/misc/MultiArrayRiders.Mod s3: - @printf "\nMaking s3 library\n" - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethBTrees.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethMD5.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethSets.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethZlib.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethZlibBuffers.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethZlibInflate.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethZlibDeflate.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethZlibReaders.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethZlibWriters.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethZip.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethRandomNumbers.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethGZReaders.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethGZWriters.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethUnicode.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethDates.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethReals.Mod - cd $(BUILDDIR); $(ROOTDIR)/$(OBECOMP) -Ffs -O2 ../../src/library/s3/ethStrings.Mod + @printf "\nMaking s3 library for -O$(MODEL)\n" + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethBTrees.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethMD5.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethSets.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethZlib.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethZlibBuffers.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethZlibInflate.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethZlibDeflate.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethZlibReaders.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethZlibWriters.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethZip.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethRandomNumbers.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethGZReaders.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethGZWriters.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethUnicode.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethDates.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethReals.Mod + cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/s3/ethStrings.Mod -O2library: v4 ooc2 ooc ulm pow32 misc s3 - @printf "\nMaking lib$(ONAME)2\n" - rm -f $(BUILDDIR)/Compiler.o -# Note: remining compiler files are retained in the library allowing the building -# of utilities like BrowserCmd.Mod (aka showdef). -# Make static library - ar rcs "$(BUILDDIR)/lib$(ONAME)2.a" $(BUILDDIR)/*.o -# Make shared library - @cd $(BUILDDIR) && $(COMPILE) -shared -o lib$(ONAME)2.so *.o +# O2library: v4 ooc2 ooc ulm pow32 misc s3 runtime +# @printf "\nMaking lib$(ONAME)2\n" +# rm -f $(BUILDDIR)/Compiler.o +# # Note: remining compiler files are retained in the library allowing the building +# # of utilities like BrowserCmd.Mod (aka showdef). +# # Make static library +# ar rcs "$(BUILDDIR)/lib$(ONAME)2.a" $(BUILDDIR)/*.o +# # Make shared library +# @cd $(BUILDDIR) && $(COMPILE) -shared -o lib$(ONAME)2.so *.o +O2library: runtime v4 ooc2 ooc ulm pow32 misc s3 +OClibrary: runtime + +library: + @printf "\nCompiling lib$(ONAME)-O$(MODEL) sources\n" + rm -rf $(BUILDDIR)/$(MODEL) + mkdir -p $(BUILDDIR)/$(MODEL) + cp src/runtime/*.[ch] $(BUILDDIR)/$(MODEL) + cd $(BUILDDIR)/$(MODEL) && $(COMPILE) -c SYSTEM.c + @make -f src/tools/make/oberon.mk -s O$(MODEL)library MODEL=$(MODEL) + @printf "\nMaking lib$(ONAME)-O$(MODEL) .a and .so\n" + ar rcs "$(BUILDDIR)/$(MODEL)/lib$(ONAME)-O$(MODEL).a" $(BUILDDIR)/$(MODEL)/*.o + @cd $(BUILDDIR)/$(MODEL) && $(COMPILE) -shared -o lib$(ONAME)-O$(MODEL).so *.o