mirror of
https://github.com/vishapoberon/compiler.git
synced 2026-04-05 23:22:25 +00:00
Update bootstrap C sources.
This commit is contained in:
parent
1ae3a2ff32
commit
a6049e7b82
185 changed files with 1215 additions and 345 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -19,6 +19,6 @@ export void *Configuration__init(void)
|
|||
__DEFMOD;
|
||||
__REGMOD("Configuration", 0);
|
||||
/* BEGIN */
|
||||
__MOVE("2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
|
||||
__MOVE("2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
|
||||
__ENDMOD;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Configuration__h
|
||||
#define Configuration__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#ifndef Files__h
|
||||
#define Files__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
|
||||
#ifndef Heap__h
|
||||
#define Heap__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -46,21 +46,31 @@ export Modules_ModuleName Modules_imported, Modules_importing;
|
|||
export INT32 Modules_MainStackFrame;
|
||||
export INT16 Modules_ArgCount;
|
||||
export INT32 Modules_ArgVector;
|
||||
export CHAR Modules_BinaryDir[1024];
|
||||
|
||||
export ADDRESS *Modules_ModuleDesc__typ;
|
||||
export ADDRESS *Modules_CmdDesc__typ;
|
||||
|
||||
static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len);
|
||||
static void Modules_Append (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
static void Modules_AppendPart (CHAR c, CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
export INT16 Modules_ArgPos (CHAR *s, ADDRESS s__len);
|
||||
export void Modules_AssertFail (INT32 code);
|
||||
static void Modules_Canonify (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
static INT16 Modules_CharCount (CHAR *s, ADDRESS s__len);
|
||||
static void Modules_DisplayHaltCode (INT32 code);
|
||||
static void Modules_ExtractPart (CHAR *s, ADDRESS s__len, INT16 *i, CHAR *p, ADDRESS p__len, CHAR *d, ADDRESS d__len);
|
||||
static void Modules_FindBinaryDir (CHAR *d, ADDRESS d__len);
|
||||
export void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
|
||||
export void Modules_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
|
||||
export void Modules_GetIntArg (INT16 n, INT32 *val);
|
||||
export void Modules_Halt (INT32 code);
|
||||
export void Modules_Init (INT32 argc, INT32 argvadr);
|
||||
static BOOLEAN Modules_IsAbsolute (CHAR *d, ADDRESS d__len);
|
||||
static BOOLEAN Modules_IsFilePresent (CHAR *s, ADDRESS s__len);
|
||||
static BOOLEAN Modules_IsOneOf (CHAR c, CHAR *s, ADDRESS s__len);
|
||||
export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
|
||||
export Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
|
||||
static void Modules_Trim (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
static void Modules_errch (CHAR c);
|
||||
static void Modules_errint (INT32 l);
|
||||
static void Modules_errstring (CHAR *s, ADDRESS s__len);
|
||||
|
|
@ -72,32 +82,24 @@ extern void *Modules__init(void);
|
|||
#define Modules_modules() (Modules_Module)Heap_modules
|
||||
#define Modules_setmodules(m) Heap_modules = m
|
||||
|
||||
typedef
|
||||
INT32 (*ArgVecPtr__14)[1];
|
||||
|
||||
void Modules_Init (INT32 argc, INT32 argvadr)
|
||||
{
|
||||
ArgVecPtr__14 av = NIL;
|
||||
Modules_MainStackFrame = argvadr;
|
||||
Modules_ArgCount = __VAL(INT16, argc);
|
||||
av = (ArgVecPtr__14)(ADDRESS)argvadr;
|
||||
Modules_ArgVector = (*av)[0];
|
||||
__GET(argvadr, Modules_ArgVector, INT32);
|
||||
Modules_InitHeap();
|
||||
Modules_ModulesInit();
|
||||
}
|
||||
|
||||
typedef
|
||||
CHAR (*ArgPtr__9)[1024];
|
||||
|
||||
typedef
|
||||
ArgPtr__9 (*ArgVec__10)[1024];
|
||||
CHAR (*argptr__15)[1024];
|
||||
|
||||
void Modules_GetArg (INT16 n, CHAR *val, ADDRESS val__len)
|
||||
{
|
||||
ArgVec__10 av = NIL;
|
||||
argptr__15 arg = NIL;
|
||||
if (n < Modules_ArgCount) {
|
||||
av = (ArgVec__10)(ADDRESS)Modules_ArgVector;
|
||||
__COPY(*(*av)[__X(n, 1024)], val, val__len);
|
||||
__GET(Modules_ArgVector + __ASHL(n, 2), arg, argptr__15);
|
||||
__COPY(*arg, val, val__len);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -142,22 +144,188 @@ INT16 Modules_ArgPos (CHAR *s, ADDRESS s__len)
|
|||
return i;
|
||||
}
|
||||
|
||||
static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len)
|
||||
static INT16 Modules_CharCount (CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
__DUP(b, b__len, CHAR);
|
||||
INT16 i;
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
while (a[__X(i, a__len)] != 0x00) {
|
||||
while ((i < s__len && s[__X(i, s__len)] != 0x00)) {
|
||||
i += 1;
|
||||
}
|
||||
j = 0;
|
||||
while (b[__X(j, b__len)] != 0x00) {
|
||||
a[__X(i, a__len)] = b[__X(j, b__len)];
|
||||
__DEL(s);
|
||||
return i;
|
||||
}
|
||||
|
||||
static void Modules_Append (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
j = Modules_CharCount(d, d__len);
|
||||
while (s[__X(i, s__len)] != 0x00) {
|
||||
d[__X(j, d__len)] = s[__X(i, s__len)];
|
||||
i += 1;
|
||||
j += 1;
|
||||
}
|
||||
a[__X(i, a__len)] = 0x00;
|
||||
__DEL(b);
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
static void Modules_AppendPart (CHAR c, CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
j = Modules_CharCount(d, d__len);
|
||||
if ((j > 0 && d[__X(j - 1, d__len)] != c)) {
|
||||
d[__X(j, d__len)] = c;
|
||||
j += 1;
|
||||
}
|
||||
while (s[__X(i, s__len)] != 0x00) {
|
||||
d[__X(j, d__len)] = s[__X(i, s__len)];
|
||||
i += 1;
|
||||
j += 1;
|
||||
}
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
static BOOLEAN Modules_IsOneOf (CHAR c, CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
INT16 i;
|
||||
__DUP(s, s__len, CHAR);
|
||||
if (c == 0x00) {
|
||||
__DEL(s);
|
||||
return 0;
|
||||
}
|
||||
i = 0;
|
||||
while ((s[__X(i, s__len)] != c && s[__X(i, s__len)] != 0x00)) {
|
||||
i += 1;
|
||||
}
|
||||
__DEL(s);
|
||||
return s[__X(i, s__len)] == c;
|
||||
}
|
||||
|
||||
static BOOLEAN Modules_IsAbsolute (CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
__DUP(d, d__len, CHAR);
|
||||
if (d[0] == 0x00) {
|
||||
__DEL(d);
|
||||
return 0;
|
||||
}
|
||||
if (Modules_IsOneOf(d[0], (CHAR*)"/\\", 3)) {
|
||||
__DEL(d);
|
||||
return 1;
|
||||
}
|
||||
if (d[__X(1, d__len)] == ':') {
|
||||
__DEL(d);
|
||||
return 1;
|
||||
}
|
||||
__DEL(d);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void Modules_Canonify (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
__DUP(s, s__len, CHAR);
|
||||
if (Modules_IsAbsolute(s, s__len)) {
|
||||
__COPY(s, d, d__len);
|
||||
} else {
|
||||
__COPY(Platform_CWD, d, d__len);
|
||||
Modules_AppendPart('/', s, s__len, (void*)d, d__len);
|
||||
}
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
static BOOLEAN Modules_IsFilePresent (CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
Platform_FileIdentity identity;
|
||||
__DUP(s, s__len, CHAR);
|
||||
__DEL(s);
|
||||
return Platform_IdentifyByName(s, s__len, &identity, Platform_FileIdentity__typ) == 0;
|
||||
}
|
||||
|
||||
static void Modules_ExtractPart (CHAR *s, ADDRESS s__len, INT16 *i, CHAR *p, ADDRESS p__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 j;
|
||||
__DUP(s, s__len, CHAR);
|
||||
__DUP(p, p__len, CHAR);
|
||||
j = 0;
|
||||
while ((s[__X(*i, s__len)] != 0x00 && !Modules_IsOneOf(s[__X(*i, s__len)], p, p__len))) {
|
||||
d[__X(j, d__len)] = s[__X(*i, s__len)];
|
||||
*i += 1;
|
||||
j += 1;
|
||||
}
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
while (Modules_IsOneOf(s[__X(*i, s__len)], p, p__len)) {
|
||||
*i += 1;
|
||||
}
|
||||
__DEL(s);
|
||||
__DEL(p);
|
||||
}
|
||||
|
||||
static void Modules_Trim (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
CHAR part[1024];
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
j = 0;
|
||||
while ((i < 2 && Modules_IsOneOf(s[__X(i, s__len)], (CHAR*)"/\\", 3))) {
|
||||
i += 1;
|
||||
d[__X(j, d__len)] = '/';
|
||||
j += 1;
|
||||
}
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
while (s[__X(i, s__len)] != 0x00) {
|
||||
Modules_ExtractPart(s, s__len, &i, (CHAR*)"/\\", 3, (void*)part, 1024);
|
||||
if ((part[0] != 0x00 && __STRCMP(part, ".") != 0)) {
|
||||
Modules_AppendPart('/', part, 1024, (void*)d, d__len);
|
||||
}
|
||||
}
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
typedef
|
||||
CHAR pathstring__12[4096];
|
||||
|
||||
static void Modules_FindBinaryDir (CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
pathstring__12 executable, dir, testpath, pathlist;
|
||||
INT16 i, j, k;
|
||||
BOOLEAN present;
|
||||
if (Modules_ArgCount < 1) {
|
||||
d[0] = 0x00;
|
||||
return;
|
||||
}
|
||||
Modules_GetArg(0, (void*)testpath, 4096);
|
||||
Modules_Trim(testpath, 4096, (void*)executable, 4096);
|
||||
Modules_Canonify(executable, 4096, (void*)d, d__len);
|
||||
present = Modules_IsFilePresent(d, d__len);
|
||||
if ((!present && !Modules_IsAbsolute(testpath, 4096))) {
|
||||
Platform_GetEnv((CHAR*)"PATH", 5, (void*)pathlist, 4096);
|
||||
i = 0;
|
||||
while ((!present && pathlist[__X(i, 4096)] != 0x00)) {
|
||||
Modules_ExtractPart(pathlist, 4096, &i, (CHAR*)":;", 3, (void*)dir, 4096);
|
||||
Modules_Trim(dir, 4096, (void*)testpath, 4096);
|
||||
Modules_AppendPart('/', executable, 4096, (void*)testpath, 4096);
|
||||
Modules_Canonify(testpath, 4096, (void*)d, d__len);
|
||||
present = Modules_IsFilePresent(d, d__len);
|
||||
}
|
||||
}
|
||||
if (present) {
|
||||
k = Modules_CharCount(d, d__len);
|
||||
while ((k > 0 && !Modules_IsOneOf(d[__X(k - 1, d__len)], (CHAR*)"/\\", 3))) {
|
||||
k -= 1;
|
||||
}
|
||||
if (k == 0) {
|
||||
d[__X(k, d__len)] = 0x00;
|
||||
} else {
|
||||
d[__X(k - 1, d__len)] = 0x00;
|
||||
}
|
||||
} else {
|
||||
d[0] = 0x00;
|
||||
}
|
||||
}
|
||||
|
||||
Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
|
||||
|
|
@ -177,8 +345,8 @@ Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
|
|||
Modules_res = 1;
|
||||
__COPY(name, Modules_importing, 20);
|
||||
__MOVE(" module \"", Modules_resMsg, 10);
|
||||
Modules_Append((void*)Modules_resMsg, 256, name, name__len);
|
||||
Modules_Append((void*)Modules_resMsg, 256, (CHAR*)"\" not found", 12);
|
||||
Modules_Append(name, name__len, (void*)Modules_resMsg, 256);
|
||||
Modules_Append((CHAR*)"\" not found", 12, (void*)Modules_resMsg, 256);
|
||||
}
|
||||
__DEL(name);
|
||||
return m;
|
||||
|
|
@ -201,10 +369,10 @@ Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS nam
|
|||
Modules_res = 2;
|
||||
__MOVE(" command \"", Modules_resMsg, 11);
|
||||
__COPY(name, Modules_importing, 20);
|
||||
Modules_Append((void*)Modules_resMsg, 256, mod->name, 20);
|
||||
Modules_Append((void*)Modules_resMsg, 256, (CHAR*)".", 2);
|
||||
Modules_Append((void*)Modules_resMsg, 256, name, name__len);
|
||||
Modules_Append((void*)Modules_resMsg, 256, (CHAR*)"\" not found", 12);
|
||||
Modules_Append(mod->name, 20, (void*)Modules_resMsg, 256);
|
||||
Modules_Append((CHAR*)".", 2, (void*)Modules_resMsg, 256);
|
||||
Modules_Append(name, name__len, (void*)Modules_resMsg, 256);
|
||||
Modules_Append((CHAR*)"\" not found", 12, (void*)Modules_resMsg, 256);
|
||||
__DEL(name);
|
||||
return NIL;
|
||||
}
|
||||
|
|
@ -371,5 +539,6 @@ export void *Modules__init(void)
|
|||
__INITYP(Modules_ModuleDesc, Modules_ModuleDesc, 0);
|
||||
__INITYP(Modules_CmdDesc, Modules_CmdDesc, 0);
|
||||
/* BEGIN */
|
||||
Modules_FindBinaryDir((void*)Modules_BinaryDir, 1024);
|
||||
__ENDMOD;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Modules__h
|
||||
#define Modules__h
|
||||
|
|
@ -42,6 +42,7 @@ import Modules_ModuleName Modules_imported, Modules_importing;
|
|||
import INT32 Modules_MainStackFrame;
|
||||
import INT16 Modules_ArgCount;
|
||||
import INT32 Modules_ArgVector;
|
||||
import CHAR Modules_BinaryDir[1024];
|
||||
|
||||
import ADDRESS *Modules_ModuleDesc__typ;
|
||||
import ADDRESS *Modules_CmdDesc__typ;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPB__h
|
||||
#define OPB__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPC__h
|
||||
#define OPC__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -267,6 +267,10 @@ static void OPM_ScanOptions (CHAR *s, ADDRESS s__len)
|
|||
BOOLEAN OPM_OpenPar (void)
|
||||
{
|
||||
CHAR s[256];
|
||||
Out_String((CHAR*)"Testing. Binary directory is: '", 32);
|
||||
Out_String(Modules_BinaryDir, 1024);
|
||||
Out_String((CHAR*)"'.", 3);
|
||||
Out_Ln();
|
||||
if (Modules_ArgCount == 1) {
|
||||
OPM_LogWLn();
|
||||
OPM_LogWStr((CHAR*)"Oberon-2 compiler v", 20);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPM__h
|
||||
#define OPM__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPP__h
|
||||
#define OPP__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#ifndef OPS__h
|
||||
#define OPS__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPT__h
|
||||
#define OPT__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPV__h
|
||||
#define OPV__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Out__h
|
||||
#define Out__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Platform__h
|
||||
#define Platform__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Reals__h
|
||||
#define Reals__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Strings__h
|
||||
#define Strings__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Texts__h
|
||||
#define Texts__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef VT100__h
|
||||
#define VT100__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -65,7 +65,7 @@ static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRES
|
|||
|
||||
static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
__COPY("x86_64-w64-mingw32-gcc -g", s, s__len);
|
||||
__COPY("gcc -g", s, s__len);
|
||||
Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
|
||||
Strings_Append(OPM_ResourceDir, 1024, (void*)s, s__len);
|
||||
Strings_Append((CHAR*)"/include\" ", 11, (void*)s, s__len);
|
||||
|
|
@ -95,7 +95,7 @@ void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN stati
|
|||
Strings_Append((CHAR*)".c ", 4, (void*)cmd, 1023);
|
||||
Strings_Append(additionalopts, additionalopts__len, (void*)cmd, 1023);
|
||||
if (statically) {
|
||||
Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
|
||||
Strings_Append((CHAR*)"-static", 8, (void*)cmd, 1023);
|
||||
}
|
||||
Strings_Append((CHAR*)" -o ", 5, (void*)cmd, 1023);
|
||||
Strings_Append(moduleName, moduleName__len, (void*)cmd, 1023);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef extTools__h
|
||||
#define extTools__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -19,6 +19,6 @@ export void *Configuration__init(void)
|
|||
__DEFMOD;
|
||||
__REGMOD("Configuration", 0);
|
||||
/* BEGIN */
|
||||
__MOVE("2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
|
||||
__MOVE("2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
|
||||
__ENDMOD;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Configuration__h
|
||||
#define Configuration__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#ifndef Files__h
|
||||
#define Files__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
|
||||
#ifndef Heap__h
|
||||
#define Heap__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -46,21 +46,31 @@ export Modules_ModuleName Modules_imported, Modules_importing;
|
|||
export INT32 Modules_MainStackFrame;
|
||||
export INT16 Modules_ArgCount;
|
||||
export INT32 Modules_ArgVector;
|
||||
export CHAR Modules_BinaryDir[1024];
|
||||
|
||||
export ADDRESS *Modules_ModuleDesc__typ;
|
||||
export ADDRESS *Modules_CmdDesc__typ;
|
||||
|
||||
static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len);
|
||||
static void Modules_Append (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
static void Modules_AppendPart (CHAR c, CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
export INT16 Modules_ArgPos (CHAR *s, ADDRESS s__len);
|
||||
export void Modules_AssertFail (INT32 code);
|
||||
static void Modules_Canonify (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
static INT16 Modules_CharCount (CHAR *s, ADDRESS s__len);
|
||||
static void Modules_DisplayHaltCode (INT32 code);
|
||||
static void Modules_ExtractPart (CHAR *s, ADDRESS s__len, INT16 *i, CHAR *p, ADDRESS p__len, CHAR *d, ADDRESS d__len);
|
||||
static void Modules_FindBinaryDir (CHAR *d, ADDRESS d__len);
|
||||
export void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
|
||||
export void Modules_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
|
||||
export void Modules_GetIntArg (INT16 n, INT32 *val);
|
||||
export void Modules_Halt (INT32 code);
|
||||
export void Modules_Init (INT32 argc, INT32 argvadr);
|
||||
static BOOLEAN Modules_IsAbsolute (CHAR *d, ADDRESS d__len);
|
||||
static BOOLEAN Modules_IsFilePresent (CHAR *s, ADDRESS s__len);
|
||||
static BOOLEAN Modules_IsOneOf (CHAR c, CHAR *s, ADDRESS s__len);
|
||||
export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
|
||||
export Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
|
||||
static void Modules_Trim (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
static void Modules_errch (CHAR c);
|
||||
static void Modules_errint (INT32 l);
|
||||
static void Modules_errstring (CHAR *s, ADDRESS s__len);
|
||||
|
|
@ -72,32 +82,24 @@ extern void *Modules__init(void);
|
|||
#define Modules_modules() (Modules_Module)Heap_modules
|
||||
#define Modules_setmodules(m) Heap_modules = m
|
||||
|
||||
typedef
|
||||
INT32 (*ArgVecPtr__14)[1];
|
||||
|
||||
void Modules_Init (INT32 argc, INT32 argvadr)
|
||||
{
|
||||
ArgVecPtr__14 av = NIL;
|
||||
Modules_MainStackFrame = argvadr;
|
||||
Modules_ArgCount = __VAL(INT16, argc);
|
||||
av = (ArgVecPtr__14)(ADDRESS)argvadr;
|
||||
Modules_ArgVector = (*av)[0];
|
||||
__GET(argvadr, Modules_ArgVector, INT32);
|
||||
Modules_InitHeap();
|
||||
Modules_ModulesInit();
|
||||
}
|
||||
|
||||
typedef
|
||||
CHAR (*ArgPtr__9)[1024];
|
||||
|
||||
typedef
|
||||
ArgPtr__9 (*ArgVec__10)[1024];
|
||||
CHAR (*argptr__15)[1024];
|
||||
|
||||
void Modules_GetArg (INT16 n, CHAR *val, ADDRESS val__len)
|
||||
{
|
||||
ArgVec__10 av = NIL;
|
||||
argptr__15 arg = NIL;
|
||||
if (n < Modules_ArgCount) {
|
||||
av = (ArgVec__10)(ADDRESS)Modules_ArgVector;
|
||||
__COPY(*(*av)[__X(n, 1024)], val, val__len);
|
||||
__GET(Modules_ArgVector + __ASHL(n, 2), arg, argptr__15);
|
||||
__COPY(*arg, val, val__len);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -142,22 +144,188 @@ INT16 Modules_ArgPos (CHAR *s, ADDRESS s__len)
|
|||
return i;
|
||||
}
|
||||
|
||||
static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len)
|
||||
static INT16 Modules_CharCount (CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
__DUP(b, b__len, CHAR);
|
||||
INT16 i;
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
while (a[__X(i, a__len)] != 0x00) {
|
||||
while ((i < s__len && s[__X(i, s__len)] != 0x00)) {
|
||||
i += 1;
|
||||
}
|
||||
j = 0;
|
||||
while (b[__X(j, b__len)] != 0x00) {
|
||||
a[__X(i, a__len)] = b[__X(j, b__len)];
|
||||
__DEL(s);
|
||||
return i;
|
||||
}
|
||||
|
||||
static void Modules_Append (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
j = Modules_CharCount(d, d__len);
|
||||
while (s[__X(i, s__len)] != 0x00) {
|
||||
d[__X(j, d__len)] = s[__X(i, s__len)];
|
||||
i += 1;
|
||||
j += 1;
|
||||
}
|
||||
a[__X(i, a__len)] = 0x00;
|
||||
__DEL(b);
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
static void Modules_AppendPart (CHAR c, CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
j = Modules_CharCount(d, d__len);
|
||||
if ((j > 0 && d[__X(j - 1, d__len)] != c)) {
|
||||
d[__X(j, d__len)] = c;
|
||||
j += 1;
|
||||
}
|
||||
while (s[__X(i, s__len)] != 0x00) {
|
||||
d[__X(j, d__len)] = s[__X(i, s__len)];
|
||||
i += 1;
|
||||
j += 1;
|
||||
}
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
static BOOLEAN Modules_IsOneOf (CHAR c, CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
INT16 i;
|
||||
__DUP(s, s__len, CHAR);
|
||||
if (c == 0x00) {
|
||||
__DEL(s);
|
||||
return 0;
|
||||
}
|
||||
i = 0;
|
||||
while ((s[__X(i, s__len)] != c && s[__X(i, s__len)] != 0x00)) {
|
||||
i += 1;
|
||||
}
|
||||
__DEL(s);
|
||||
return s[__X(i, s__len)] == c;
|
||||
}
|
||||
|
||||
static BOOLEAN Modules_IsAbsolute (CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
__DUP(d, d__len, CHAR);
|
||||
if (d[0] == 0x00) {
|
||||
__DEL(d);
|
||||
return 0;
|
||||
}
|
||||
if (Modules_IsOneOf(d[0], (CHAR*)"/\\", 3)) {
|
||||
__DEL(d);
|
||||
return 1;
|
||||
}
|
||||
if (d[__X(1, d__len)] == ':') {
|
||||
__DEL(d);
|
||||
return 1;
|
||||
}
|
||||
__DEL(d);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void Modules_Canonify (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
__DUP(s, s__len, CHAR);
|
||||
if (Modules_IsAbsolute(s, s__len)) {
|
||||
__COPY(s, d, d__len);
|
||||
} else {
|
||||
__COPY(Platform_CWD, d, d__len);
|
||||
Modules_AppendPart('/', s, s__len, (void*)d, d__len);
|
||||
}
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
static BOOLEAN Modules_IsFilePresent (CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
Platform_FileIdentity identity;
|
||||
__DUP(s, s__len, CHAR);
|
||||
__DEL(s);
|
||||
return Platform_IdentifyByName(s, s__len, &identity, Platform_FileIdentity__typ) == 0;
|
||||
}
|
||||
|
||||
static void Modules_ExtractPart (CHAR *s, ADDRESS s__len, INT16 *i, CHAR *p, ADDRESS p__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 j;
|
||||
__DUP(s, s__len, CHAR);
|
||||
__DUP(p, p__len, CHAR);
|
||||
j = 0;
|
||||
while ((s[__X(*i, s__len)] != 0x00 && !Modules_IsOneOf(s[__X(*i, s__len)], p, p__len))) {
|
||||
d[__X(j, d__len)] = s[__X(*i, s__len)];
|
||||
*i += 1;
|
||||
j += 1;
|
||||
}
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
while (Modules_IsOneOf(s[__X(*i, s__len)], p, p__len)) {
|
||||
*i += 1;
|
||||
}
|
||||
__DEL(s);
|
||||
__DEL(p);
|
||||
}
|
||||
|
||||
static void Modules_Trim (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
CHAR part[1024];
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
j = 0;
|
||||
while ((i < 2 && Modules_IsOneOf(s[__X(i, s__len)], (CHAR*)"/\\", 3))) {
|
||||
i += 1;
|
||||
d[__X(j, d__len)] = '/';
|
||||
j += 1;
|
||||
}
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
while (s[__X(i, s__len)] != 0x00) {
|
||||
Modules_ExtractPart(s, s__len, &i, (CHAR*)"/\\", 3, (void*)part, 1024);
|
||||
if ((part[0] != 0x00 && __STRCMP(part, ".") != 0)) {
|
||||
Modules_AppendPart('/', part, 1024, (void*)d, d__len);
|
||||
}
|
||||
}
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
typedef
|
||||
CHAR pathstring__12[4096];
|
||||
|
||||
static void Modules_FindBinaryDir (CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
pathstring__12 executable, dir, testpath, pathlist;
|
||||
INT16 i, j, k;
|
||||
BOOLEAN present;
|
||||
if (Modules_ArgCount < 1) {
|
||||
d[0] = 0x00;
|
||||
return;
|
||||
}
|
||||
Modules_GetArg(0, (void*)testpath, 4096);
|
||||
Modules_Trim(testpath, 4096, (void*)executable, 4096);
|
||||
Modules_Canonify(executable, 4096, (void*)d, d__len);
|
||||
present = Modules_IsFilePresent(d, d__len);
|
||||
if ((!present && !Modules_IsAbsolute(testpath, 4096))) {
|
||||
Platform_GetEnv((CHAR*)"PATH", 5, (void*)pathlist, 4096);
|
||||
i = 0;
|
||||
while ((!present && pathlist[__X(i, 4096)] != 0x00)) {
|
||||
Modules_ExtractPart(pathlist, 4096, &i, (CHAR*)":;", 3, (void*)dir, 4096);
|
||||
Modules_Trim(dir, 4096, (void*)testpath, 4096);
|
||||
Modules_AppendPart('/', executable, 4096, (void*)testpath, 4096);
|
||||
Modules_Canonify(testpath, 4096, (void*)d, d__len);
|
||||
present = Modules_IsFilePresent(d, d__len);
|
||||
}
|
||||
}
|
||||
if (present) {
|
||||
k = Modules_CharCount(d, d__len);
|
||||
while ((k > 0 && !Modules_IsOneOf(d[__X(k - 1, d__len)], (CHAR*)"/\\", 3))) {
|
||||
k -= 1;
|
||||
}
|
||||
if (k == 0) {
|
||||
d[__X(k, d__len)] = 0x00;
|
||||
} else {
|
||||
d[__X(k - 1, d__len)] = 0x00;
|
||||
}
|
||||
} else {
|
||||
d[0] = 0x00;
|
||||
}
|
||||
}
|
||||
|
||||
Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
|
||||
|
|
@ -177,8 +345,8 @@ Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
|
|||
Modules_res = 1;
|
||||
__COPY(name, Modules_importing, 20);
|
||||
__MOVE(" module \"", Modules_resMsg, 10);
|
||||
Modules_Append((void*)Modules_resMsg, 256, name, name__len);
|
||||
Modules_Append((void*)Modules_resMsg, 256, (CHAR*)"\" not found", 12);
|
||||
Modules_Append(name, name__len, (void*)Modules_resMsg, 256);
|
||||
Modules_Append((CHAR*)"\" not found", 12, (void*)Modules_resMsg, 256);
|
||||
}
|
||||
__DEL(name);
|
||||
return m;
|
||||
|
|
@ -201,10 +369,10 @@ Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS nam
|
|||
Modules_res = 2;
|
||||
__MOVE(" command \"", Modules_resMsg, 11);
|
||||
__COPY(name, Modules_importing, 20);
|
||||
Modules_Append((void*)Modules_resMsg, 256, mod->name, 20);
|
||||
Modules_Append((void*)Modules_resMsg, 256, (CHAR*)".", 2);
|
||||
Modules_Append((void*)Modules_resMsg, 256, name, name__len);
|
||||
Modules_Append((void*)Modules_resMsg, 256, (CHAR*)"\" not found", 12);
|
||||
Modules_Append(mod->name, 20, (void*)Modules_resMsg, 256);
|
||||
Modules_Append((CHAR*)".", 2, (void*)Modules_resMsg, 256);
|
||||
Modules_Append(name, name__len, (void*)Modules_resMsg, 256);
|
||||
Modules_Append((CHAR*)"\" not found", 12, (void*)Modules_resMsg, 256);
|
||||
__DEL(name);
|
||||
return NIL;
|
||||
}
|
||||
|
|
@ -371,5 +539,6 @@ export void *Modules__init(void)
|
|||
__INITYP(Modules_ModuleDesc, Modules_ModuleDesc, 0);
|
||||
__INITYP(Modules_CmdDesc, Modules_CmdDesc, 0);
|
||||
/* BEGIN */
|
||||
Modules_FindBinaryDir((void*)Modules_BinaryDir, 1024);
|
||||
__ENDMOD;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Modules__h
|
||||
#define Modules__h
|
||||
|
|
@ -42,6 +42,7 @@ import Modules_ModuleName Modules_imported, Modules_importing;
|
|||
import INT32 Modules_MainStackFrame;
|
||||
import INT16 Modules_ArgCount;
|
||||
import INT32 Modules_ArgVector;
|
||||
import CHAR Modules_BinaryDir[1024];
|
||||
|
||||
import ADDRESS *Modules_ModuleDesc__typ;
|
||||
import ADDRESS *Modules_CmdDesc__typ;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPB__h
|
||||
#define OPB__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPC__h
|
||||
#define OPC__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -267,6 +267,10 @@ static void OPM_ScanOptions (CHAR *s, ADDRESS s__len)
|
|||
BOOLEAN OPM_OpenPar (void)
|
||||
{
|
||||
CHAR s[256];
|
||||
Out_String((CHAR*)"Testing. Binary directory is: '", 32);
|
||||
Out_String(Modules_BinaryDir, 1024);
|
||||
Out_String((CHAR*)"'.", 3);
|
||||
Out_Ln();
|
||||
if (Modules_ArgCount == 1) {
|
||||
OPM_LogWLn();
|
||||
OPM_LogWStr((CHAR*)"Oberon-2 compiler v", 20);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPM__h
|
||||
#define OPM__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPP__h
|
||||
#define OPP__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#ifndef OPS__h
|
||||
#define OPS__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPT__h
|
||||
#define OPT__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPV__h
|
||||
#define OPV__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Out__h
|
||||
#define Out__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Platform__h
|
||||
#define Platform__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Reals__h
|
||||
#define Reals__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Strings__h
|
||||
#define Strings__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Texts__h
|
||||
#define Texts__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef VT100__h
|
||||
#define VT100__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -65,7 +65,7 @@ static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRES
|
|||
|
||||
static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
__COPY("x86_64-w64-mingw32-gcc -g", s, s__len);
|
||||
__COPY("gcc -g", s, s__len);
|
||||
Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
|
||||
Strings_Append(OPM_ResourceDir, 1024, (void*)s, s__len);
|
||||
Strings_Append((CHAR*)"/include\" ", 11, (void*)s, s__len);
|
||||
|
|
@ -95,7 +95,7 @@ void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN stati
|
|||
Strings_Append((CHAR*)".c ", 4, (void*)cmd, 1023);
|
||||
Strings_Append(additionalopts, additionalopts__len, (void*)cmd, 1023);
|
||||
if (statically) {
|
||||
Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
|
||||
Strings_Append((CHAR*)"-static", 8, (void*)cmd, 1023);
|
||||
}
|
||||
Strings_Append((CHAR*)" -o ", 5, (void*)cmd, 1023);
|
||||
Strings_Append(moduleName, moduleName__len, (void*)cmd, 1023);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef extTools__h
|
||||
#define extTools__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -19,6 +19,6 @@ export void *Configuration__init(void)
|
|||
__DEFMOD;
|
||||
__REGMOD("Configuration", 0);
|
||||
/* BEGIN */
|
||||
__MOVE("2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
|
||||
__MOVE("2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
|
||||
__ENDMOD;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Configuration__h
|
||||
#define Configuration__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#ifndef Files__h
|
||||
#define Files__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
|
||||
|
||||
#ifndef Heap__h
|
||||
#define Heap__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -46,21 +46,31 @@ export Modules_ModuleName Modules_imported, Modules_importing;
|
|||
export INT64 Modules_MainStackFrame;
|
||||
export INT16 Modules_ArgCount;
|
||||
export INT64 Modules_ArgVector;
|
||||
export CHAR Modules_BinaryDir[1024];
|
||||
|
||||
export ADDRESS *Modules_ModuleDesc__typ;
|
||||
export ADDRESS *Modules_CmdDesc__typ;
|
||||
|
||||
static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len);
|
||||
static void Modules_Append (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
static void Modules_AppendPart (CHAR c, CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
export INT16 Modules_ArgPos (CHAR *s, ADDRESS s__len);
|
||||
export void Modules_AssertFail (INT32 code);
|
||||
static void Modules_Canonify (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
static INT16 Modules_CharCount (CHAR *s, ADDRESS s__len);
|
||||
static void Modules_DisplayHaltCode (INT32 code);
|
||||
static void Modules_ExtractPart (CHAR *s, ADDRESS s__len, INT16 *i, CHAR *p, ADDRESS p__len, CHAR *d, ADDRESS d__len);
|
||||
static void Modules_FindBinaryDir (CHAR *d, ADDRESS d__len);
|
||||
export void Modules_Free (CHAR *name, ADDRESS name__len, BOOLEAN all);
|
||||
export void Modules_GetArg (INT16 n, CHAR *val, ADDRESS val__len);
|
||||
export void Modules_GetIntArg (INT16 n, INT32 *val);
|
||||
export void Modules_Halt (INT32 code);
|
||||
export void Modules_Init (INT32 argc, INT64 argvadr);
|
||||
static BOOLEAN Modules_IsAbsolute (CHAR *d, ADDRESS d__len);
|
||||
static BOOLEAN Modules_IsFilePresent (CHAR *s, ADDRESS s__len);
|
||||
static BOOLEAN Modules_IsOneOf (CHAR c, CHAR *s, ADDRESS s__len);
|
||||
export Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS name__len);
|
||||
export Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len);
|
||||
static void Modules_Trim (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len);
|
||||
static void Modules_errch (CHAR c);
|
||||
static void Modules_errint (INT32 l);
|
||||
static void Modules_errstring (CHAR *s, ADDRESS s__len);
|
||||
|
|
@ -72,32 +82,24 @@ extern void *Modules__init(void);
|
|||
#define Modules_modules() (Modules_Module)Heap_modules
|
||||
#define Modules_setmodules(m) Heap_modules = m
|
||||
|
||||
typedef
|
||||
INT64 (*ArgVecPtr__14)[1];
|
||||
|
||||
void Modules_Init (INT32 argc, INT64 argvadr)
|
||||
{
|
||||
ArgVecPtr__14 av = NIL;
|
||||
Modules_MainStackFrame = argvadr;
|
||||
Modules_ArgCount = __VAL(INT16, argc);
|
||||
av = (ArgVecPtr__14)(ADDRESS)argvadr;
|
||||
Modules_ArgVector = (*av)[0];
|
||||
__GET(argvadr, Modules_ArgVector, INT64);
|
||||
Modules_InitHeap();
|
||||
Modules_ModulesInit();
|
||||
}
|
||||
|
||||
typedef
|
||||
CHAR (*ArgPtr__9)[1024];
|
||||
|
||||
typedef
|
||||
ArgPtr__9 (*ArgVec__10)[1024];
|
||||
CHAR (*argptr__15)[1024];
|
||||
|
||||
void Modules_GetArg (INT16 n, CHAR *val, ADDRESS val__len)
|
||||
{
|
||||
ArgVec__10 av = NIL;
|
||||
argptr__15 arg = NIL;
|
||||
if (n < Modules_ArgCount) {
|
||||
av = (ArgVec__10)(ADDRESS)Modules_ArgVector;
|
||||
__COPY(*(*av)[__X(n, 1024)], val, val__len);
|
||||
__GET(Modules_ArgVector + (INT64)__ASHL(n, 3), arg, argptr__15);
|
||||
__COPY(*arg, val, val__len);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -142,22 +144,188 @@ INT16 Modules_ArgPos (CHAR *s, ADDRESS s__len)
|
|||
return i;
|
||||
}
|
||||
|
||||
static void Modules_Append (CHAR *a, ADDRESS a__len, CHAR *b, ADDRESS b__len)
|
||||
static INT16 Modules_CharCount (CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
__DUP(b, b__len, CHAR);
|
||||
INT16 i;
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
while (a[__X(i, a__len)] != 0x00) {
|
||||
while ((i < s__len && s[__X(i, s__len)] != 0x00)) {
|
||||
i += 1;
|
||||
}
|
||||
j = 0;
|
||||
while (b[__X(j, b__len)] != 0x00) {
|
||||
a[__X(i, a__len)] = b[__X(j, b__len)];
|
||||
__DEL(s);
|
||||
return i;
|
||||
}
|
||||
|
||||
static void Modules_Append (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
j = Modules_CharCount(d, d__len);
|
||||
while (s[__X(i, s__len)] != 0x00) {
|
||||
d[__X(j, d__len)] = s[__X(i, s__len)];
|
||||
i += 1;
|
||||
j += 1;
|
||||
}
|
||||
a[__X(i, a__len)] = 0x00;
|
||||
__DEL(b);
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
static void Modules_AppendPart (CHAR c, CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
j = Modules_CharCount(d, d__len);
|
||||
if ((j > 0 && d[__X(j - 1, d__len)] != c)) {
|
||||
d[__X(j, d__len)] = c;
|
||||
j += 1;
|
||||
}
|
||||
while (s[__X(i, s__len)] != 0x00) {
|
||||
d[__X(j, d__len)] = s[__X(i, s__len)];
|
||||
i += 1;
|
||||
j += 1;
|
||||
}
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
static BOOLEAN Modules_IsOneOf (CHAR c, CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
INT16 i;
|
||||
__DUP(s, s__len, CHAR);
|
||||
if (c == 0x00) {
|
||||
__DEL(s);
|
||||
return 0;
|
||||
}
|
||||
i = 0;
|
||||
while ((s[__X(i, s__len)] != c && s[__X(i, s__len)] != 0x00)) {
|
||||
i += 1;
|
||||
}
|
||||
__DEL(s);
|
||||
return s[__X(i, s__len)] == c;
|
||||
}
|
||||
|
||||
static BOOLEAN Modules_IsAbsolute (CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
__DUP(d, d__len, CHAR);
|
||||
if (d[0] == 0x00) {
|
||||
__DEL(d);
|
||||
return 0;
|
||||
}
|
||||
if (Modules_IsOneOf(d[0], (CHAR*)"/\\", 3)) {
|
||||
__DEL(d);
|
||||
return 1;
|
||||
}
|
||||
if (d[__X(1, d__len)] == ':') {
|
||||
__DEL(d);
|
||||
return 1;
|
||||
}
|
||||
__DEL(d);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void Modules_Canonify (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
__DUP(s, s__len, CHAR);
|
||||
if (Modules_IsAbsolute(s, s__len)) {
|
||||
__COPY(s, d, d__len);
|
||||
} else {
|
||||
__COPY(Platform_CWD, d, d__len);
|
||||
Modules_AppendPart('/', s, s__len, (void*)d, d__len);
|
||||
}
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
static BOOLEAN Modules_IsFilePresent (CHAR *s, ADDRESS s__len)
|
||||
{
|
||||
Platform_FileIdentity identity;
|
||||
__DUP(s, s__len, CHAR);
|
||||
__DEL(s);
|
||||
return Platform_IdentifyByName(s, s__len, &identity, Platform_FileIdentity__typ) == 0;
|
||||
}
|
||||
|
||||
static void Modules_ExtractPart (CHAR *s, ADDRESS s__len, INT16 *i, CHAR *p, ADDRESS p__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 j;
|
||||
__DUP(s, s__len, CHAR);
|
||||
__DUP(p, p__len, CHAR);
|
||||
j = 0;
|
||||
while ((s[__X(*i, s__len)] != 0x00 && !Modules_IsOneOf(s[__X(*i, s__len)], p, p__len))) {
|
||||
d[__X(j, d__len)] = s[__X(*i, s__len)];
|
||||
*i += 1;
|
||||
j += 1;
|
||||
}
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
while (Modules_IsOneOf(s[__X(*i, s__len)], p, p__len)) {
|
||||
*i += 1;
|
||||
}
|
||||
__DEL(s);
|
||||
__DEL(p);
|
||||
}
|
||||
|
||||
static void Modules_Trim (CHAR *s, ADDRESS s__len, CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
INT16 i, j;
|
||||
CHAR part[1024];
|
||||
__DUP(s, s__len, CHAR);
|
||||
i = 0;
|
||||
j = 0;
|
||||
while ((i < 2 && Modules_IsOneOf(s[__X(i, s__len)], (CHAR*)"/\\", 3))) {
|
||||
i += 1;
|
||||
d[__X(j, d__len)] = '/';
|
||||
j += 1;
|
||||
}
|
||||
d[__X(j, d__len)] = 0x00;
|
||||
while (s[__X(i, s__len)] != 0x00) {
|
||||
Modules_ExtractPart(s, s__len, &i, (CHAR*)"/\\", 3, (void*)part, 1024);
|
||||
if ((part[0] != 0x00 && __STRCMP(part, ".") != 0)) {
|
||||
Modules_AppendPart('/', part, 1024, (void*)d, d__len);
|
||||
}
|
||||
}
|
||||
__DEL(s);
|
||||
}
|
||||
|
||||
typedef
|
||||
CHAR pathstring__12[4096];
|
||||
|
||||
static void Modules_FindBinaryDir (CHAR *d, ADDRESS d__len)
|
||||
{
|
||||
pathstring__12 executable, dir, testpath, pathlist;
|
||||
INT16 i, j, k;
|
||||
BOOLEAN present;
|
||||
if (Modules_ArgCount < 1) {
|
||||
d[0] = 0x00;
|
||||
return;
|
||||
}
|
||||
Modules_GetArg(0, (void*)testpath, 4096);
|
||||
Modules_Trim(testpath, 4096, (void*)executable, 4096);
|
||||
Modules_Canonify(executable, 4096, (void*)d, d__len);
|
||||
present = Modules_IsFilePresent(d, d__len);
|
||||
if ((!present && !Modules_IsAbsolute(testpath, 4096))) {
|
||||
Platform_GetEnv((CHAR*)"PATH", 5, (void*)pathlist, 4096);
|
||||
i = 0;
|
||||
while ((!present && pathlist[__X(i, 4096)] != 0x00)) {
|
||||
Modules_ExtractPart(pathlist, 4096, &i, (CHAR*)":;", 3, (void*)dir, 4096);
|
||||
Modules_Trim(dir, 4096, (void*)testpath, 4096);
|
||||
Modules_AppendPart('/', executable, 4096, (void*)testpath, 4096);
|
||||
Modules_Canonify(testpath, 4096, (void*)d, d__len);
|
||||
present = Modules_IsFilePresent(d, d__len);
|
||||
}
|
||||
}
|
||||
if (present) {
|
||||
k = Modules_CharCount(d, d__len);
|
||||
while ((k > 0 && !Modules_IsOneOf(d[__X(k - 1, d__len)], (CHAR*)"/\\", 3))) {
|
||||
k -= 1;
|
||||
}
|
||||
if (k == 0) {
|
||||
d[__X(k, d__len)] = 0x00;
|
||||
} else {
|
||||
d[__X(k - 1, d__len)] = 0x00;
|
||||
}
|
||||
} else {
|
||||
d[0] = 0x00;
|
||||
}
|
||||
}
|
||||
|
||||
Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
|
||||
|
|
@ -177,8 +345,8 @@ Modules_Module Modules_ThisMod (CHAR *name, ADDRESS name__len)
|
|||
Modules_res = 1;
|
||||
__COPY(name, Modules_importing, 20);
|
||||
__MOVE(" module \"", Modules_resMsg, 10);
|
||||
Modules_Append((void*)Modules_resMsg, 256, name, name__len);
|
||||
Modules_Append((void*)Modules_resMsg, 256, (CHAR*)"\" not found", 12);
|
||||
Modules_Append(name, name__len, (void*)Modules_resMsg, 256);
|
||||
Modules_Append((CHAR*)"\" not found", 12, (void*)Modules_resMsg, 256);
|
||||
}
|
||||
__DEL(name);
|
||||
return m;
|
||||
|
|
@ -201,10 +369,10 @@ Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, ADDRESS nam
|
|||
Modules_res = 2;
|
||||
__MOVE(" command \"", Modules_resMsg, 11);
|
||||
__COPY(name, Modules_importing, 20);
|
||||
Modules_Append((void*)Modules_resMsg, 256, mod->name, 20);
|
||||
Modules_Append((void*)Modules_resMsg, 256, (CHAR*)".", 2);
|
||||
Modules_Append((void*)Modules_resMsg, 256, name, name__len);
|
||||
Modules_Append((void*)Modules_resMsg, 256, (CHAR*)"\" not found", 12);
|
||||
Modules_Append(mod->name, 20, (void*)Modules_resMsg, 256);
|
||||
Modules_Append((CHAR*)".", 2, (void*)Modules_resMsg, 256);
|
||||
Modules_Append(name, name__len, (void*)Modules_resMsg, 256);
|
||||
Modules_Append((CHAR*)"\" not found", 12, (void*)Modules_resMsg, 256);
|
||||
__DEL(name);
|
||||
return NIL;
|
||||
}
|
||||
|
|
@ -371,5 +539,6 @@ export void *Modules__init(void)
|
|||
__INITYP(Modules_ModuleDesc, Modules_ModuleDesc, 0);
|
||||
__INITYP(Modules_CmdDesc, Modules_CmdDesc, 0);
|
||||
/* BEGIN */
|
||||
Modules_FindBinaryDir((void*)Modules_BinaryDir, 1024);
|
||||
__ENDMOD;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Modules__h
|
||||
#define Modules__h
|
||||
|
|
@ -42,6 +42,7 @@ import Modules_ModuleName Modules_imported, Modules_importing;
|
|||
import INT64 Modules_MainStackFrame;
|
||||
import INT16 Modules_ArgCount;
|
||||
import INT64 Modules_ArgVector;
|
||||
import CHAR Modules_BinaryDir[1024];
|
||||
|
||||
import ADDRESS *Modules_ModuleDesc__typ;
|
||||
import ADDRESS *Modules_CmdDesc__typ;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPB__h
|
||||
#define OPB__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPC__h
|
||||
#define OPC__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
@ -267,6 +267,10 @@ static void OPM_ScanOptions (CHAR *s, ADDRESS s__len)
|
|||
BOOLEAN OPM_OpenPar (void)
|
||||
{
|
||||
CHAR s[256];
|
||||
Out_String((CHAR*)"Testing. Binary directory is: '", 32);
|
||||
Out_String(Modules_BinaryDir, 1024);
|
||||
Out_String((CHAR*)"'.", 3);
|
||||
Out_Ln();
|
||||
if (Modules_ArgCount == 1) {
|
||||
OPM_LogWLn();
|
||||
OPM_LogWStr((CHAR*)"Oberon-2 compiler v", 20);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPM__h
|
||||
#define OPM__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPP__h
|
||||
#define OPP__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
|
||||
|
||||
#ifndef OPS__h
|
||||
#define OPS__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPT__h
|
||||
#define OPT__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef OPV__h
|
||||
#define OPV__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#ifndef Out__h
|
||||
#define Out__h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
/* voc 2.00 [2016/12/03]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
|
||||
|
||||
#define SHORTINT INT8
|
||||
#define INTEGER INT16
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue