vishapoberon/compiler
1
0
Fork 0
mirror of https://github.com/vishapoberon/compiler.git synced 2026-04-06 14:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Force git rename of VT100 in bootstrap, make SYSTEM.* mdel independent.

Browse source
This commit is contained in:
David Brown 2016-10-15 19:05:08 +01:00
parent 80de6dc216
commit 1507d9cb0a
34 changed files with 152 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/runtime/Platformunix.Mod
View file

@ -7,8 +7,8 @@ CONST
StdErr- = 2;
TYPE
HaltProcedure = PROCEDURE(n: LONGINT);
SignalHandler = PROCEDURE(signal: INTEGER);
HaltProcedure = PROCEDURE(n: SYSTEM.INT32);
SignalHandler = PROCEDURE(signal: SYSTEM.INT32);
ErrorCode* = INTEGER;
FileHandle* = LONGINT;
@ -124,11 +124,11 @@ PROCEDURE OSFree*(address: SYSTEM.ADDRESS); BEGIN free(address) END OSFree;
PROCEDURE -ExternInitHeap "extern void Heap_InitHeap();";
PROCEDURE -HeapInitHeap() "Heap_InitHeap()";
PROCEDURE Init*(argc: INTEGER; argvadr: SYSTEM.ADDRESS);
PROCEDURE Init*(argc: SYSTEM.INT32; argvadr: SYSTEM.ADDRESS);
VAR av: ArgVecPtr;
BEGIN
MainStackFrame := argvadr;
ArgCount := argc;
ArgCount := SYSTEM.VAL(INTEGER, argc);
av := SYSTEM.VAL(ArgVecPtr, argvadr);
ArgVector := av[0];
HaltCode := -128;
@ -502,7 +502,7 @@ BEGIN
END
END DisplayHaltCode;
PROCEDURE Halt*(code: LONGINT);
PROCEDURE Halt*(code: SYSTEM.INT32);
BEGIN
HaltCode := code;
IF HaltHandler # NIL THEN HaltHandler(code) END;
@ -512,7 +512,7 @@ BEGIN
exit(SYSTEM.VAL(INTEGER,code));
END Halt;
PROCEDURE AssertFail*(code: LONGINT);
PROCEDURE AssertFail*(code: SYSTEM.INT32);
BEGIN
errstring("Assertion failure.");
IF code # 0 THEN errstring(" ASSERT code "); errint(code); errstring("."); END;

8
src/runtime/Platformwindows.Mod
View file

@ -8,8 +8,8 @@ IMPORT SYSTEM;
TYPE
HaltProcedure = PROCEDURE(n: LONGINT);
SignalHandler = PROCEDURE(signal: INTEGER);
HaltProcedure = PROCEDURE(n: SYSTEM.INT32);
SignalHandler = PROCEDURE(signal: SYSTEM.INT32);
ErrorCode* = INTEGER;
FileHandle* = LONGINT;
@ -122,11 +122,11 @@ PROCEDURE OSFree*(address: SYSTEM.ADDRESS); BEGIN free(address) END OSFree;
PROCEDURE -ExternInitHeap "extern void Heap_InitHeap();";
PROCEDURE -HeapInitHeap() "Heap_InitHeap()";
PROCEDURE Init*(argc: INTEGER; argvadr: SYSTEM.ADDRESS);
PROCEDURE Init*(argc: SYSTEM.INT32; argvadr: SYSTEM.ADDRESS);
VAR av: ArgVecPtr;
BEGIN
MainStackFrame := argvadr;
ArgCount := argc;
ArgCount := SYSTEM.VAL(INTEGER, argc);
av := SYSTEM.VAL(ArgVecPtr, argvadr);
ArgVector := av[0];
HaltCode := -128;

22
src/runtime/SYSTEM.c
View file

@ -46,20 +46,30 @@ int64 SYSTEM_MOD(int64 x, int64 y)
else {return -((-x) % (-y));}
}
LONGINT SYSTEM_ENTIER(double x)
// LONGINT SYSTEM_ENTIER(double x)
// {
// LONGINT y;
// if (x >= 0)
// return (LONGINT)x;
// else {
// y = (LONGINT)x;
// if (y <= x) return y; else return y - 1;
// }
// }
int64 SYSTEM_ENTIER(double x)
{
LONGINT y;
int64 y;
if (x >= 0)
return (LONGINT)x;
return (int64)x;
else {
y = (LONGINT)x;
y = (int64)x;
if (y <= x) return y; else return y - 1;
}
}
void SYSTEM_INHERIT(address *t, address *t0)
{
t -= __TPROC0OFF;
@ -155,7 +165,7 @@ SYSTEM_PTR SYSTEM_NEWARR(address *typ, address elemsz, int elemalgn, int nofdim,
typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
typedef void (*SystemSignalHandler)(int32); // = Platform_SignalHandler
#ifndef _WIN32

45
src/runtime/SYSTEM.h
View file

@ -8,20 +8,19 @@
#define __o_64
#endif
// Temporary while bootstrapping and clearing up SYSTEM.c.
#ifndef LONGINT
#if defined (__o_64)
#define INTEGER int32
#define LONGINT int64
#define SET uint64
#else
#define INTEGER int16
#define LONGINT int32
#define SET uint32
#endif
#endif
// // Temporary while bootstrapping and clearing up SYSTEM.c.
//
// #ifndef LONGINT
// #if defined (__o_64)
// #define INTEGER int32
// #define LONGINT int64
// #define SET uint64
// #else
// #define INTEGER int16
// #define LONGINT int32
// #define SET uint32
// #endif
// #endif
@ -119,11 +118,11 @@ extern void Platform_OSFree (address addr);
// Assertions and Halts
extern void Platform_Halt(LONGINT x);
extern void Platform_AssertFail(LONGINT x);
extern void Platform_Halt(int32 x);
extern void Platform_AssertFail(int32 x);
#define __HALT(x) Platform_Halt(x)
#define __ASSERT(cond, x) if (!(cond)) Platform_AssertFail((LONGINT)(x))
#define __ASSERT(cond, x) if (!(cond)) Platform_AssertFail((int32)(x))
// Index checking
@ -136,7 +135,7 @@ static inline int64 __XF(uint64 i, uint64 ub) {if (i >= ub) {__HALT(-2);} return
static inline int64 __RF(uint64 i, uint64 ub) {if (i >= ub) {__HALT(-8);} return i;}
#define __R(i, ub) (((i)<(ub))?i:(__HALT(-8),0))
#define __SHORT(x, ub) ((int)((uLONGINT)(x)+(ub)<(ub)+(ub)?(x):(__HALT(-8),0)))
#define __SHORT(x, ub) ((int)((uint64)(x)+(ub)<(ub)+(ub)?(x):(__HALT(-8),0)))
#define __SHORTF(x, ub) ((int)(__RF((x)+(ub),(ub)+(ub))-(ub)))
#define __CHR(x) ((CHAR)__R(x, 256))
#define __CHRF(x) ((CHAR)__RF(x, 256))
@ -157,7 +156,7 @@ static inline int64 __RF(uint64 i, uint64 ub) {if (i >= ub) {__HALT(-8);} return
// String comparison
static inline int __str_cmp(CHAR *x, CHAR *y){
LONGINT i = 0;
int64 i = 0;
CHAR ch1, ch2;
do {ch1 = x[i]; ch2 = y[i]; i++;
if (!ch1) return -(int)ch2;
@ -212,7 +211,7 @@ extern int64 SYSTEM_MOD(int64 x, int64 y);
#define __MOD(x, y) (((x)>0 && (y)>0) ? (x)%(y) : __MODF(x, y))
extern LONGINT SYSTEM_ENTIER (double x);
extern int64 SYSTEM_ENTIER (double x);
#define __ENTIER(x) SYSTEM_ENTIER(x)
@ -275,10 +274,10 @@ extern void Heap_INCREF();
// Main module initialisation, registration and finalisation
extern void Platform_Init(INTEGER argc, address argv);
extern void Platform_Init(int32 argc, address argv);
extern void Heap_FINALL();
#define __INIT(argc, argv) static void *m; Platform_Init((INTEGER)argc, (address)&argv);
#define __INIT(argc, argv) static void *m; Platform_Init(argc, (address)&argv);
#define __REGMAIN(name, enum) m = Heap_REGMOD((CHAR*)name,enum)
#define __FINI Heap_FINALL(); return 0
@ -287,7 +286,7 @@ extern void Heap_FINALL();
extern SYSTEM_PTR Heap_NEWBLK (address size);
extern SYSTEM_PTR Heap_NEWREC (address tag);
extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
extern SYSTEM_PTR SYSTEM_NEWARR(address*, address, int, int, int, ...);
#define __SYSNEW(p, len) p = Heap_NEWBLK((address)(len))
#define __NEW(p, t) p = Heap_NEWREC((address)t##__typ)