From cca132d7842840bfdd0703693e14fcf9955c6751 Mon Sep 17 00:00:00 2001 From: David Brown Date: Fri, 23 Sep 2016 10:53:24 +0100 Subject: [PATCH] More adjustments to ADDRESS vs LONGINT. An -O2 on 64 bit compiler has worked once! --- bootstrap/SYSTEM.h | 10 +- bootstrap/unix-44/Configuration.c | 4 +- bootstrap/unix-44/Configuration.h | 2 +- bootstrap/unix-44/Console.c | 6 +- bootstrap/unix-44/Console.h | 2 +- bootstrap/unix-44/Files.c | 116 ++++++++++---------- bootstrap/unix-44/Files.h | 60 +++++------ bootstrap/unix-44/Heap.c | 10 +- bootstrap/unix-44/Heap.h | 4 +- bootstrap/unix-44/Modules.c | 6 +- bootstrap/unix-44/Modules.h | 6 +- bootstrap/unix-44/OPB.c | 2 +- bootstrap/unix-44/OPB.h | 2 +- bootstrap/unix-44/OPC.c | 8 +- bootstrap/unix-44/OPC.h | 2 +- bootstrap/unix-44/OPM.c | 14 +-- bootstrap/unix-44/OPM.h | 2 +- bootstrap/unix-44/OPP.c | 4 +- bootstrap/unix-44/OPP.h | 2 +- bootstrap/unix-44/OPS.c | 2 +- bootstrap/unix-44/OPS.h | 2 +- bootstrap/unix-44/OPT.c | 14 +-- bootstrap/unix-44/OPT.h | 10 +- bootstrap/unix-44/OPV.c | 4 +- bootstrap/unix-44/OPV.h | 2 +- bootstrap/unix-44/Platform.c | 28 ++--- bootstrap/unix-44/Platform.h | 16 +-- 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 | 154 +++++++++++++-------------- bootstrap/unix-44/Texts.h | 78 +++++++------- bootstrap/unix-44/Vishap.c | 2 +- bootstrap/unix-44/errors.c | 2 +- bootstrap/unix-44/errors.h | 2 +- bootstrap/unix-44/extTools.c | 2 +- bootstrap/unix-44/extTools.h | 2 +- bootstrap/unix-44/vt100.c | 2 +- bootstrap/unix-44/vt100.h | 2 +- bootstrap/unix-48/Configuration.c | 4 +- bootstrap/unix-48/Configuration.h | 2 +- bootstrap/unix-48/Console.c | 6 +- bootstrap/unix-48/Console.h | 2 +- bootstrap/unix-48/Files.c | 116 ++++++++++---------- bootstrap/unix-48/Files.h | 60 +++++------ bootstrap/unix-48/Heap.c | 10 +- bootstrap/unix-48/Heap.h | 4 +- bootstrap/unix-48/Modules.c | 6 +- bootstrap/unix-48/Modules.h | 6 +- bootstrap/unix-48/OPB.c | 2 +- bootstrap/unix-48/OPB.h | 2 +- bootstrap/unix-48/OPC.c | 8 +- bootstrap/unix-48/OPC.h | 2 +- bootstrap/unix-48/OPM.c | 14 +-- bootstrap/unix-48/OPM.h | 2 +- bootstrap/unix-48/OPP.c | 4 +- bootstrap/unix-48/OPP.h | 2 +- bootstrap/unix-48/OPS.c | 2 +- bootstrap/unix-48/OPS.h | 2 +- bootstrap/unix-48/OPT.c | 14 +-- bootstrap/unix-48/OPT.h | 10 +- bootstrap/unix-48/OPV.c | 4 +- bootstrap/unix-48/OPV.h | 2 +- bootstrap/unix-48/Platform.c | 28 ++--- bootstrap/unix-48/Platform.h | 16 +-- 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 | 154 +++++++++++++-------------- bootstrap/unix-48/Texts.h | 78 +++++++------- bootstrap/unix-48/Vishap.c | 2 +- bootstrap/unix-48/errors.c | 2 +- bootstrap/unix-48/errors.h | 2 +- bootstrap/unix-48/extTools.c | 2 +- bootstrap/unix-48/extTools.h | 2 +- bootstrap/unix-48/vt100.c | 2 +- bootstrap/unix-48/vt100.h | 2 +- bootstrap/unix-88/Configuration.c | 4 +- bootstrap/unix-88/Configuration.h | 2 +- bootstrap/unix-88/Console.c | 6 +- bootstrap/unix-88/Console.h | 2 +- bootstrap/unix-88/Files.c | 116 ++++++++++---------- bootstrap/unix-88/Files.h | 60 +++++------ bootstrap/unix-88/Heap.c | 10 +- bootstrap/unix-88/Heap.h | 4 +- bootstrap/unix-88/Modules.c | 6 +- bootstrap/unix-88/Modules.h | 6 +- bootstrap/unix-88/OPB.c | 2 +- bootstrap/unix-88/OPB.h | 2 +- bootstrap/unix-88/OPC.c | 8 +- bootstrap/unix-88/OPC.h | 2 +- bootstrap/unix-88/OPM.c | 14 +-- bootstrap/unix-88/OPM.h | 2 +- bootstrap/unix-88/OPP.c | 4 +- bootstrap/unix-88/OPP.h | 2 +- bootstrap/unix-88/OPS.c | 2 +- bootstrap/unix-88/OPS.h | 2 +- bootstrap/unix-88/OPT.c | 14 +-- bootstrap/unix-88/OPT.h | 10 +- bootstrap/unix-88/OPV.c | 4 +- bootstrap/unix-88/OPV.h | 2 +- bootstrap/unix-88/Platform.c | 28 ++--- bootstrap/unix-88/Platform.h | 16 +-- 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 | 154 +++++++++++++-------------- bootstrap/unix-88/Texts.h | 78 +++++++------- bootstrap/unix-88/Vishap.c | 2 +- bootstrap/unix-88/errors.c | 2 +- bootstrap/unix-88/errors.h | 2 +- bootstrap/unix-88/extTools.c | 2 +- bootstrap/unix-88/extTools.h | 2 +- bootstrap/unix-88/vt100.c | 2 +- bootstrap/unix-88/vt100.h | 2 +- bootstrap/windows-48/Configuration.c | 4 +- bootstrap/windows-48/Configuration.h | 2 +- bootstrap/windows-48/Console.c | 6 +- bootstrap/windows-48/Console.h | 2 +- bootstrap/windows-48/Files.c | 116 ++++++++++---------- bootstrap/windows-48/Files.h | 60 +++++------ bootstrap/windows-48/Heap.c | 10 +- bootstrap/windows-48/Heap.h | 4 +- bootstrap/windows-48/Modules.c | 6 +- bootstrap/windows-48/Modules.h | 6 +- bootstrap/windows-48/OPB.c | 2 +- bootstrap/windows-48/OPB.h | 2 +- bootstrap/windows-48/OPC.c | 8 +- bootstrap/windows-48/OPC.h | 2 +- bootstrap/windows-48/OPM.c | 14 +-- bootstrap/windows-48/OPM.h | 2 +- bootstrap/windows-48/OPP.c | 4 +- bootstrap/windows-48/OPP.h | 2 +- bootstrap/windows-48/OPS.c | 2 +- bootstrap/windows-48/OPS.h | 2 +- bootstrap/windows-48/OPT.c | 14 +-- bootstrap/windows-48/OPT.h | 10 +- bootstrap/windows-48/OPV.c | 4 +- bootstrap/windows-48/OPV.h | 2 +- bootstrap/windows-48/Platform.c | 16 +-- bootstrap/windows-48/Platform.h | 10 +- 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 | 154 +++++++++++++-------------- bootstrap/windows-48/Texts.h | 78 +++++++------- bootstrap/windows-48/Vishap.c | 2 +- bootstrap/windows-48/errors.c | 2 +- bootstrap/windows-48/errors.h | 2 +- bootstrap/windows-48/extTools.c | 2 +- bootstrap/windows-48/extTools.h | 2 +- bootstrap/windows-48/vt100.c | 2 +- bootstrap/windows-48/vt100.h | 2 +- bootstrap/windows-88/Configuration.c | 4 +- bootstrap/windows-88/Configuration.h | 2 +- bootstrap/windows-88/Console.c | 6 +- bootstrap/windows-88/Console.h | 2 +- bootstrap/windows-88/Files.c | 116 ++++++++++---------- bootstrap/windows-88/Files.h | 60 +++++------ bootstrap/windows-88/Heap.c | 10 +- bootstrap/windows-88/Heap.h | 4 +- bootstrap/windows-88/Modules.c | 6 +- bootstrap/windows-88/Modules.h | 6 +- bootstrap/windows-88/OPB.c | 2 +- bootstrap/windows-88/OPB.h | 2 +- bootstrap/windows-88/OPC.c | 8 +- bootstrap/windows-88/OPC.h | 2 +- bootstrap/windows-88/OPM.c | 14 +-- bootstrap/windows-88/OPM.h | 2 +- bootstrap/windows-88/OPP.c | 4 +- bootstrap/windows-88/OPP.h | 2 +- bootstrap/windows-88/OPS.c | 2 +- bootstrap/windows-88/OPS.h | 2 +- bootstrap/windows-88/OPT.c | 14 +-- bootstrap/windows-88/OPT.h | 10 +- bootstrap/windows-88/OPV.c | 4 +- bootstrap/windows-88/OPV.h | 2 +- bootstrap/windows-88/Platform.c | 16 +-- bootstrap/windows-88/Platform.h | 10 +- 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 | 154 +++++++++++++-------------- bootstrap/windows-88/Texts.h | 78 +++++++------- bootstrap/windows-88/Vishap.c | 2 +- bootstrap/windows-88/errors.c | 2 +- bootstrap/windows-88/errors.h | 2 +- bootstrap/windows-88/extTools.c | 2 +- bootstrap/windows-88/extTools.h | 2 +- bootstrap/windows-88/vt100.c | 2 +- bootstrap/windows-88/vt100.h | 2 +- src/compiler/OPC.Mod | 6 +- src/system/Console.Mod | 2 +- src/system/Platformunix.Mod | 10 +- src/system/SYSTEM.h | 10 +- src/tools/make/vishap.make | 2 +- 201 files changed, 1468 insertions(+), 1456 deletions(-) diff --git a/bootstrap/SYSTEM.h b/bootstrap/SYSTEM.h index ddd85144..6ddf909a 100644 --- a/bootstrap/SYSTEM.h +++ b/bootstrap/SYSTEM.h @@ -243,10 +243,16 @@ static inline double SYSTEM_ABSD(double i) {return i >= 0.0 ? i : -i;} #define __CASECHK __HALT(-4) #define __WITHCHK __HALT(-7) -#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(address)typ##__typ) -#define __TYPEOF(p) ((LONGINT*)(address)(*(((LONGINT*)(p))-1))) + +//#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(address)typ##__typ) +//#define __TYPEOF(p) ((address*)(address)(*(((LONGINT*)(p))-1))) +//#define __ISP(p, typ, level) __IS(__TYPEOF(p),typ,level) + +#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(address)typ##__typ) +#define __TYPEOF(p) ((address*)(address)(*(((address*)(p))-1))) #define __ISP(p, typ, level) __IS(__TYPEOF(p),typ,level) + #define __GUARDP(p, typ, level) ((typ*)(__ISP(p,typ,level)?p:(__HALT(-5),p))) #define __GUARDR(r, typ, level) (*((typ*)(__IS(r##__typ,typ,level)?r:(__HALT(-5),r)))) #define __GUARDA(p, typ, level) ((struct typ*)(__IS(__TYPEOF(p),typ,level)?p:(__HALT(-5),p))) diff --git a/bootstrap/unix-44/Configuration.c b/bootstrap/unix-44/Configuration.c index b17dc344..abdf151b 100644 --- a/bootstrap/unix-44/Configuration.c +++ b/bootstrap/unix-44/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -18,6 +18,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/09/22] for gcc LP64 on cygwin", Configuration_versionLong, 41); + __MOVE("1.95 [2016/09/23] for gcc LP64 on cygwin", Configuration_versionLong, 41); __ENDMOD; } diff --git a/bootstrap/unix-44/Configuration.h b/bootstrap/unix-44/Configuration.h index dca477a6..f51f63f2 100644 --- a/bootstrap/unix-44/Configuration.h +++ b/bootstrap/unix-44/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/unix-44/Console.c b/bootstrap/unix-44/Console.c index 3f691a07..115e60f5 100644 --- a/bootstrap/unix-44/Console.c +++ b/bootstrap/unix-44/Console.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -118,10 +118,10 @@ void Console_Hex (int32 i) void Console_Read (CHAR *ch) { - address n; + int32 n; int16 error; Console_Flush(); - error = Platform_ReadBuf(0, (void*)&*ch, 1, (void*)&n); + error = Platform_ReadBuf(0, (void*)&*ch, 1, &n); if (n != 1) { *ch = 0x00; } diff --git a/bootstrap/unix-44/Console.h b/bootstrap/unix-44/Console.h index 6837ab77..b08c93ea 100644 --- a/bootstrap/unix-44/Console.h +++ b/bootstrap/unix-44/Console.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Console__h #define Console__h diff --git a/bootstrap/unix-44/Files.c b/bootstrap/unix-44/Files.c index 3ff2fa83..0a7ac692 100644 --- a/bootstrap/unix-44/Files.c +++ b/bootstrap/unix-44/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -56,11 +56,11 @@ static struct { CHAR data[1]; } *Files_SearchPath; -export LONGINT *Files_FileDesc__typ; -export LONGINT *Files_BufDesc__typ; -export LONGINT *Files_Rider__typ; +export address *Files_FileDesc__typ; +export address *Files_BufDesc__typ; +export address *Files_Rider__typ; -export Files_File Files_Base (Files_Rider *r, LONGINT *r__typ); +export Files_File Files_Base (Files_Rider *r, address *r__typ); static Files_File Files_CacheEntry (Platform_FileIdentity identity); export void Files_ChangeDirectory (CHAR *path, LONGINT path__len, int16 *res); export void Files_Close (Files_File f); @@ -79,37 +79,37 @@ export int32 Files_Length (Files_File f); static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len); export Files_File Files_New (CHAR *name, LONGINT name__len); export Files_File Files_Old (CHAR *name, LONGINT name__len); -export int32 Files_Pos (Files_Rider *r, LONGINT *r__typ); +export int32 Files_Pos (Files_Rider *r, address *r__typ); export void Files_Purge (Files_File f); -export void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x); -export void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x); -export void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len); -export void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -export void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int16 *x); -export void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int32 *x); -export void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x); -export void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); -export void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x); -export void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x); -export void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x); -export void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x); -export void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +export void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x); +export void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x); +export void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len); +export void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +export void Files_ReadInt (Files_Rider *R, address *R__typ, int16 *x); +export void Files_ReadLInt (Files_Rider *R, address *R__typ, int32 *x); +export void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x); +export void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); +export void Files_ReadNum (Files_Rider *R, address *R__typ, int32 *x); +export void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x); +export void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x); +export void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x); +export void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); export void Files_Register (Files_File f); export void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, int16 *res); static void Files_ScanPath (int16 *pos, CHAR *dir, LONGINT dir__len); -export void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos); +export void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int32 pos); export void Files_SetSearchPath (CHAR *path, LONGINT path__len); -export void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x); -export void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x); -export void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -export void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x); -export void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x); -export void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x); -export void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x); -export void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x); -export void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x); -export void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x); -export void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +export void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x); +export void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x); +export void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +export void Files_WriteInt (Files_Rider *R, address *R__typ, int16 x); +export void Files_WriteLInt (Files_Rider *R, address *R__typ, int32 x); +export void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x); +export void Files_WriteNum (Files_Rider *R, address *R__typ, int32 x); +export void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x); +export void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x); +export void Files_WriteSet (Files_Rider *R, address *R__typ, SET x); +export void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); #define Files_IdxTrap() __HALT(-1) @@ -544,14 +544,14 @@ void Files_GetDate (Files_File f, int32 *t, int32 *d) Platform_MTimeAsClock(identity, &*t, &*d); } -int32 Files_Pos (Files_Rider *r, LONGINT *r__typ) +int32 Files_Pos (Files_Rider *r, address *r__typ) { int32 _o_result; _o_result = (*r).org + (*r).offset; return _o_result; } -void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos) +void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int32 pos) { int32 org, offset, i, n; Files_Buffer buf = NIL; @@ -613,7 +613,7 @@ void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos) (*r).res = 0; } -void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x) +void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x) { int32 offset; Files_Buffer buf = NIL; @@ -637,7 +637,7 @@ void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x) } } -void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) +void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) { int32 xpos, min, restInBuf, offset; Files_Buffer buf = NIL; @@ -673,19 +673,19 @@ void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x (*r).eof = 0; } -void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len) +void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len) { Files_ReadBytes(&*r, r__typ, (void*)x, x__len * 1, 1); } -Files_File Files_Base (Files_Rider *r, LONGINT *r__typ) +Files_File Files_Base (Files_Rider *r, address *r__typ) { Files_File _o_result; _o_result = (*r).buf->f; return _o_result; } -void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x) +void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x) { Files_Buffer buf = NIL; int32 offset; @@ -706,7 +706,7 @@ void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x) (*r).res = 0; } -void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) +void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) { int32 xpos, min, restInBuf, offset; Files_Buffer buf = NIL; @@ -849,26 +849,26 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *de } } -void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x) +void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x) { Files_Read(&*R, R__typ, (CHAR*)(void*)&*x); } -void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int16 *x) +void Files_ReadInt (Files_Rider *R, address *R__typ, int16 *x) { CHAR b[2]; Files_ReadBytes(&*R, R__typ, (void*)b, 2, 2); *x = (int16)b[0] + __ASHL((int16)b[1], 8); } -void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int32 *x) +void Files_ReadLInt (Files_Rider *R, address *R__typ, int32 *x) { CHAR b[4]; Files_ReadBytes(&*R, R__typ, (void*)b, 4, 4); *x = (((int16)b[0] + __ASHL((int16)b[1], 8)) + __ASHL(b[2], 16)) + __ASHL(b[3], 24); } -void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x) +void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x) { CHAR b[4]; int32 l; @@ -877,21 +877,21 @@ void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x) *x = (SET)l; } -void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x) +void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x) { CHAR b[4]; Files_ReadBytes(&*R, R__typ, (void*)b, 4, 4); Files_FlipBytes((void*)b, 4, (void*)&*x, 4); } -void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x) +void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x) { CHAR b[8]; Files_ReadBytes(&*R, R__typ, (void*)b, 8, 8); Files_FlipBytes((void*)b, 8, (void*)&*x, 8); } -void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int16 i; CHAR ch; @@ -903,7 +903,7 @@ void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) } while (!(ch == 0x00)); } -void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int16 i; CHAR ch; @@ -921,7 +921,7 @@ void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) } while (!b); } -void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x) +void Files_ReadNum (Files_Rider *R, address *R__typ, int32 *x) { int8 s; CHAR ch; @@ -938,19 +938,19 @@ void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x) *x = n; } -void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x) +void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x) { int32 n; Files_ReadNum(&*R, R__typ, &n); *x = n; } -void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x) +void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x) { Files_Write(&*R, R__typ, __VAL(CHAR, x)); } -void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x) +void Files_WriteInt (Files_Rider *R, address *R__typ, int16 x) { CHAR b[2]; b[0] = (CHAR)x; @@ -958,7 +958,7 @@ void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x) Files_WriteBytes(&*R, R__typ, (void*)b, 2, 2); } -void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x) +void Files_WriteLInt (Files_Rider *R, address *R__typ, int32 x) { CHAR b[4]; b[0] = (CHAR)x; @@ -968,7 +968,7 @@ void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x) Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x) +void Files_WriteSet (Files_Rider *R, address *R__typ, SET x) { CHAR b[4]; int32 i; @@ -980,21 +980,21 @@ void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x) Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x) +void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x) { CHAR b[4]; Files_FlipBytes((void*)&x, 4, (void*)b, 4); Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x) +void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x) { CHAR b[8]; Files_FlipBytes((void*)&x, 8, (void*)b, 8); Files_WriteBytes(&*R, R__typ, (void*)b, 8, 8); } -void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int16 i; i = 0; @@ -1004,7 +1004,7 @@ void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len Files_WriteBytes(&*R, R__typ, (void*)x, x__len * 1, i + 1); } -void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x) +void Files_WriteNum (Files_Rider *R, address *R__typ, int32 x) { while (x < -64 || x > 63) { Files_Write(&*R, R__typ, (CHAR)(__MASK(x, -128) + 128)); @@ -1013,7 +1013,7 @@ void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x) Files_Write(&*R, R__typ, (CHAR)__MASK(x, -128)); } -void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x) +void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x) { while (x < -64 || x > 63) { Files_Write(&*R, R__typ, (CHAR)(__MASK(x, -128) + 128)); diff --git a/bootstrap/unix-44/Files.h b/bootstrap/unix-44/Files.h index 4fd2efd8..e2b7a3bb 100644 --- a/bootstrap/unix-44/Files.h +++ b/bootstrap/unix-44/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #ifndef Files__h #define Files__h @@ -24,10 +24,10 @@ typedef -import LONGINT *Files_FileDesc__typ; -import LONGINT *Files_Rider__typ; +import address *Files_FileDesc__typ; +import address *Files_Rider__typ; -import Files_File Files_Base (Files_Rider *r, LONGINT *r__typ); +import Files_File Files_Base (Files_Rider *r, address *r__typ); import void Files_ChangeDirectory (CHAR *path, LONGINT path__len, int16 *res); import void Files_Close (Files_File f); import void Files_Delete (CHAR *name, LONGINT name__len, int16 *res); @@ -36,36 +36,36 @@ import void Files_GetName (Files_File f, CHAR *name, LONGINT name__len); import int32 Files_Length (Files_File f); import Files_File Files_New (CHAR *name, LONGINT name__len); import Files_File Files_Old (CHAR *name, LONGINT name__len); -import int32 Files_Pos (Files_Rider *r, LONGINT *r__typ); +import int32 Files_Pos (Files_Rider *r, address *r__typ); import void Files_Purge (Files_File f); -import void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x); -import void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x); -import void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len); -import void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -import void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int16 *x); -import void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int32 *x); -import void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x); -import void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); -import void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x); -import void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x); -import void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x); -import void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x); -import void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +import void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x); +import void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x); +import void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len); +import void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +import void Files_ReadInt (Files_Rider *R, address *R__typ, int16 *x); +import void Files_ReadLInt (Files_Rider *R, address *R__typ, int32 *x); +import void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x); +import void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); +import void Files_ReadNum (Files_Rider *R, address *R__typ, int32 *x); +import void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x); +import void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x); +import void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x); +import void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); import void Files_Register (Files_File f); import void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, int16 *res); -import void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos); +import void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int32 pos); import void Files_SetSearchPath (CHAR *path, LONGINT path__len); -import void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x); -import void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x); -import void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -import void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x); -import void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x); -import void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x); -import void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x); -import void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x); -import void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x); -import void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x); -import void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +import void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x); +import void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x); +import void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +import void Files_WriteInt (Files_Rider *R, address *R__typ, int16 x); +import void Files_WriteLInt (Files_Rider *R, address *R__typ, int32 x); +import void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x); +import void Files_WriteNum (Files_Rider *R, address *R__typ, int32 x); +import void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x); +import void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x); +import void Files_WriteSet (Files_Rider *R, address *R__typ, SET x); +import void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); import void *Files__init(void); diff --git a/bootstrap/unix-44/Heap.c b/bootstrap/unix-44/Heap.c index 17784d67..b7c8c827 100644 --- a/bootstrap/unix-44/Heap.c +++ b/bootstrap/unix-44/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tsSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tsSfF */ #define INTEGER int16 #define LONGINT int32 @@ -74,10 +74,10 @@ static int16 Heap_lockdepth; static BOOLEAN Heap_interrupted; export int16 Heap_FileCount; -export LONGINT *Heap_ModuleDesc__typ; -export LONGINT *Heap_CmdDesc__typ; -export LONGINT *Heap_FinDesc__typ; -export LONGINT *Heap__1__typ; +export address *Heap_ModuleDesc__typ; +export address *Heap_CmdDesc__typ; +export address *Heap_FinDesc__typ; +export address *Heap__1__typ; static void Heap_CheckFin (void); static void Heap_ExtendHeap (address blksz); diff --git a/bootstrap/unix-44/Heap.h b/bootstrap/unix-44/Heap.h index b1c745df..6ad4813e 100644 --- a/bootstrap/unix-44/Heap.h +++ b/bootstrap/unix-44/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tsSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tsSfF */ #ifndef Heap__h #define Heap__h @@ -34,7 +34,7 @@ import SYSTEM_PTR Heap_modules; import address Heap_allocated, Heap_heapsize; import int16 Heap_FileCount; -import LONGINT *Heap_ModuleDesc__typ; +import address *Heap_ModuleDesc__typ; import void Heap_FINALL (void); import void Heap_GC (BOOLEAN markStack); diff --git a/bootstrap/unix-44/Modules.c b/bootstrap/unix-44/Modules.c index 1564f5e0..7704f005 100644 --- a/bootstrap/unix-44/Modules.c +++ b/bootstrap/unix-44/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -43,8 +43,8 @@ export int16 Modules_res; export CHAR Modules_resMsg[256]; export Modules_ModuleName Modules_imported, Modules_importing; -export LONGINT *Modules_ModuleDesc__typ; -export LONGINT *Modules_CmdDesc__typ; +export address *Modules_ModuleDesc__typ; +export address *Modules_CmdDesc__typ; static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len); export void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all); diff --git a/bootstrap/unix-44/Modules.h b/bootstrap/unix-44/Modules.h index dbc243c8..060208c6 100644 --- a/bootstrap/unix-44/Modules.h +++ b/bootstrap/unix-44/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Modules__h #define Modules__h @@ -40,8 +40,8 @@ import int16 Modules_res; import CHAR Modules_resMsg[256]; import Modules_ModuleName Modules_imported, Modules_importing; -import LONGINT *Modules_ModuleDesc__typ; -import LONGINT *Modules_CmdDesc__typ; +import address *Modules_ModuleDesc__typ; +import address *Modules_CmdDesc__typ; import void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all); import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len); diff --git a/bootstrap/unix-44/OPB.c b/bootstrap/unix-44/OPB.c index d0336349..af4f4fc4 100644 --- a/bootstrap/unix-44/OPB.c +++ b/bootstrap/unix-44/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-44/OPB.h b/bootstrap/unix-44/OPB.h index 434172a2..dc0085af 100644 --- a/bootstrap/unix-44/OPB.h +++ b/bootstrap/unix-44/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/unix-44/OPC.c b/bootstrap/unix-44/OPC.c index 11f64b59..99353400 100644 --- a/bootstrap/unix-44/OPC.c +++ b/bootstrap/unix-44/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -1041,7 +1041,7 @@ static void OPC_IdentList (OPT_Object obj, int16 vis) } else if ((obj->mode == 2 && obj->typ->comp == 4)) { OPC_EndStat(); OPC_BegStat(); - OPM_WriteString((CHAR*)"LONGINT *", 10); + OPM_WriteString((CHAR*)"address *", 10); OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); base = NIL; @@ -1078,7 +1078,7 @@ static void OPC_AnsiParamList (OPT_Object obj, BOOLEAN showParamNames) OPM_WriteString((CHAR*)", LONGINT ", 11); OPC_LenList(obj, 1, showParamNames); } else if ((obj->mode == 2 && obj->typ->comp == 4)) { - OPM_WriteString((CHAR*)", LONGINT *", 12); + OPM_WriteString((CHAR*)", address *", 12); if (showParamNames) { OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); @@ -1166,7 +1166,7 @@ static void OPC_GenDynTypes (OPT_Node n, int16 vis) } else { OPM_WriteString((CHAR*)"export ", 8); } - OPM_WriteString((CHAR*)"LONGINT *", 10); + OPM_WriteString((CHAR*)"address *", 10); OPC_Andent(typ); OPM_WriteString((CHAR*)"__typ", 6); OPC_EndStat(); diff --git a/bootstrap/unix-44/OPC.h b/bootstrap/unix-44/OPC.h index 09952648..4215947f 100644 --- a/bootstrap/unix-44/OPC.h +++ b/bootstrap/unix-44/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/unix-44/OPM.c b/bootstrap/unix-44/OPM.c index 2122bed9..039d1c77 100644 --- a/bootstrap/unix-44/OPM.c +++ b/bootstrap/unix-44/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -41,7 +41,7 @@ static CHAR OPM_OBERON[1024]; static CHAR OPM_MODULES[1024]; -static void OPM_Append (Files_Rider *R, LONGINT *R__typ, Files_File F); +static void OPM_Append (Files_Rider *R, address *R__typ, Files_File F); export void OPM_CloseFiles (void); export void OPM_CloseOldSym (void); export void OPM_DeleteNewSym (void); @@ -49,10 +49,10 @@ export void OPM_FPrint (int32 *fp, int64 val); export void OPM_FPrintLReal (int32 *fp, LONGREAL lr); export void OPM_FPrintReal (int32 *fp, REAL real); export void OPM_FPrintSet (int32 *fp, SET set); -static void OPM_FindLine (Files_File f, Files_Rider *r, LONGINT *r__typ, int64 pos); +static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos); export void OPM_Get (CHAR *ch); static void OPM_GetProperties (void); -static void OPM_GetProperty (Texts_Scanner *S, LONGINT *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align); +static void OPM_GetProperty (Texts_Scanner *S, address *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align); export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); export void OPM_InitOptions (void); export int16 OPM_Integer (int64 n); @@ -496,7 +496,7 @@ static void OPM_LogErrMsg (int16 n) OPM_LogWStr(errors_errors[__X(n, 350)], 128); } -static void OPM_FindLine (Files_File f, Files_Rider *r, LONGINT *r__typ, int64 pos) +static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos) { CHAR ch, cheol; if (pos < (int64)OPM_ErrorLineStartPos) { @@ -654,7 +654,7 @@ void OPM_FPrintLReal (int32 *fp, LONGREAL lr) OPM_FPrint(&*fp, h); } -static void OPM_GetProperty (Texts_Scanner *S, LONGINT *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align) +static void OPM_GetProperty (Texts_Scanner *S, address *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align) { __DUP(name, name__len, CHAR); if (((*S).class == 1 && __STRCMP((*S).s, name) == 0)) { @@ -996,7 +996,7 @@ void OPM_WriteLn (void) Files_Write(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, 0x0a); } -static void OPM_Append (Files_Rider *R, LONGINT *R__typ, Files_File F) +static void OPM_Append (Files_Rider *R, address *R__typ, Files_File F) { Files_Rider R1; CHAR buffer[4096]; diff --git a/bootstrap/unix-44/OPM.h b/bootstrap/unix-44/OPM.h index 8ca21351..a6b7990c 100644 --- a/bootstrap/unix-44/OPM.h +++ b/bootstrap/unix-44/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/unix-44/OPP.c b/bootstrap/unix-44/OPP.c index d2b3e83f..a3ab1dd3 100644 --- a/bootstrap/unix-44/OPP.c +++ b/bootstrap/unix-44/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -24,7 +24,7 @@ static OPT_Node OPP_TDinit, OPP_lastTDinit; static int16 OPP_nofFwdPtr; static OPT_Struct OPP_FwdPtr[64]; -export LONGINT *OPP__1__typ; +export address *OPP__1__typ; static void OPP_ActualParameters (OPT_Node *aparlist, OPT_Object fpar); static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned); diff --git a/bootstrap/unix-44/OPP.h b/bootstrap/unix-44/OPP.h index 28045a86..e5a59f6c 100644 --- a/bootstrap/unix-44/OPP.h +++ b/bootstrap/unix-44/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/unix-44/OPS.c b/bootstrap/unix-44/OPS.c index 99aba006..0cac83bd 100644 --- a/bootstrap/unix-44/OPS.c +++ b/bootstrap/unix-44/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-44/OPS.h b/bootstrap/unix-44/OPS.h index f7dd1d10..caef45f4 100644 --- a/bootstrap/unix-44/OPS.h +++ b/bootstrap/unix-44/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/unix-44/OPT.c b/bootstrap/unix-44/OPT.c index bd7bde13..8e7d9b8d 100644 --- a/bootstrap/unix-44/OPT.c +++ b/bootstrap/unix-44/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -101,12 +101,12 @@ static OPT_ExpCtxt OPT_expCtxt; static int32 OPT_nofhdfld; static BOOLEAN OPT_newsf, OPT_findpc, OPT_extsf, OPT_sfpresent, OPT_symExtended, OPT_symNew; -export LONGINT *OPT_ConstDesc__typ; -export LONGINT *OPT_ObjDesc__typ; -export LONGINT *OPT_StrDesc__typ; -export LONGINT *OPT_NodeDesc__typ; -export LONGINT *OPT_ImpCtxt__typ; -export LONGINT *OPT_ExpCtxt__typ; +export address *OPT_ConstDesc__typ; +export address *OPT_ObjDesc__typ; +export address *OPT_StrDesc__typ; +export address *OPT_NodeDesc__typ; +export address *OPT_ImpCtxt__typ; +export address *OPT_ExpCtxt__typ; export void OPT_Close (void); export void OPT_CloseScope (void); diff --git a/bootstrap/unix-44/OPT.h b/bootstrap/unix-44/OPT.h index 5de02c8b..0bd1f189 100644 --- a/bootstrap/unix-44/OPT.h +++ b/bootstrap/unix-44/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPT__h #define OPT__h @@ -75,10 +75,10 @@ import OPT_Object OPT_GlbMod[64]; import OPS_Name OPT_SelfName; import BOOLEAN OPT_SYSimported; -import LONGINT *OPT_ConstDesc__typ; -import LONGINT *OPT_ObjDesc__typ; -import LONGINT *OPT_StrDesc__typ; -import LONGINT *OPT_NodeDesc__typ; +import address *OPT_ConstDesc__typ; +import address *OPT_ObjDesc__typ; +import address *OPT_StrDesc__typ; +import address *OPT_NodeDesc__typ; import void OPT_Close (void); import void OPT_CloseScope (void); diff --git a/bootstrap/unix-44/OPV.c b/bootstrap/unix-44/OPV.c index efddd202..8bb5ec32 100644 --- a/bootstrap/unix-44/OPV.c +++ b/bootstrap/unix-44/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -21,7 +21,7 @@ static int32 OPV_recno; static OPV_ExitInfo OPV_exit; static int16 OPV_nofExitLabels; -export LONGINT *OPV_ExitInfo__typ; +export address *OPV_ExitInfo__typ; static void OPV_ActualPar (OPT_Node n, OPT_Object fp); export void OPV_AdrAndSize (OPT_Object topScope); diff --git a/bootstrap/unix-44/OPV.h b/bootstrap/unix-44/OPV.h index 4a3f9d07..c309d63c 100644 --- a/bootstrap/unix-44/OPV.h +++ b/bootstrap/unix-44/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/unix-44/Platform.c b/bootstrap/unix-44/Platform.c index e2eb0c80..9de57a27 100644 --- a/bootstrap/unix-44/Platform.c +++ b/bootstrap/unix-44/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -42,7 +42,7 @@ static int32 Platform_TimeStart; export int16 Platform_SeekSet, Platform_SeekCur, Platform_SeekEnd; export CHAR Platform_nl[3]; -export LONGINT *Platform_FileIdentity__typ; +export address *Platform_FileIdentity__typ; export BOOLEAN Platform_Absent (int16 e); export int16 Platform_ArgPos (CHAR *s, LONGINT s__len); @@ -61,8 +61,8 @@ export void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val export void Platform_GetIntArg (int16 n, int32 *val); export void Platform_GetTimeOfDay (int32 *sec, int32 *usec); export void Platform_Halt (int32 code); -export int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *identity__typ); -export int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ); +export int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, address *identity__typ); +export int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ); export BOOLEAN Platform_Inaccessible (int16 e); export void Platform_Init (int16 argc, address argvadr); export void Platform_MTimeAsClock (Platform_FileIdentity i, int32 *t, int32 *d); @@ -72,8 +72,8 @@ export address Platform_OSAllocate (address size); export void Platform_OSFree (address address); export int16 Platform_OldRO (CHAR *n, LONGINT n__len, int32 *h); export int16 Platform_OldRW (CHAR *n, LONGINT n__len, int32 *h); -export int16 Platform_Read (int32 h, address p, address l, address *n); -export int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, address *n); +export int16 Platform_Read (int32 h, address p, int32 l, int32 *n); +export int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, int32 *n); export int16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len); export BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2); export BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2); @@ -81,9 +81,9 @@ export int16 Platform_Seek (int32 h, int32 offset, int16 whence); export void Platform_SetBadInstructionHandler (Platform_SignalHandler handler); export void Platform_SetHalt (Platform_HaltProcedure p); export void Platform_SetInterruptHandler (Platform_SignalHandler handler); -export void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source); +export void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source); export void Platform_SetQuitHandler (Platform_SignalHandler handler); -export int16 Platform_Size (int32 h, address *l); +export int16 Platform_Size (int32 h, int32 *l); export int16 Platform_Sync (int32 h); export int16 Platform_System (CHAR *cmd, LONGINT cmd__len); static void Platform_TestLittleEndian (void); @@ -446,7 +446,7 @@ int16 Platform_Close (int32 h) __RETCHK; } -int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *identity__typ) +int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, address *identity__typ) { int16 _o_result; Platform_structstats(); @@ -461,7 +461,7 @@ int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *iden return _o_result; } -int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ) +int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ) { int16 _o_result; __DUP(n, n__len, CHAR); @@ -493,7 +493,7 @@ BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i return _o_result; } -void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source) +void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source) { (*target).mtime = source.mtime; } @@ -504,7 +504,7 @@ void Platform_MTimeAsClock (Platform_FileIdentity i, int32 *t, int32 *d) Platform_YMDHMStoClock(Platform_tmyear(), Platform_tmmon(), Platform_tmmday(), Platform_tmhour(), Platform_tmmin(), Platform_tmsec(), &*t, &*d); } -int16 Platform_Size (int32 h, address *l) +int16 Platform_Size (int32 h, int32 *l) { int16 _o_result; Platform_structstats(); @@ -517,7 +517,7 @@ int16 Platform_Size (int32 h, address *l) return _o_result; } -int16 Platform_Read (int32 h, address p, address l, address *n) +int16 Platform_Read (int32 h, address p, int32 l, int32 *n) { int16 _o_result; *n = Platform_readfile(h, p, l); @@ -532,7 +532,7 @@ int16 Platform_Read (int32 h, address p, address l, address *n) __RETCHK; } -int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, address *n) +int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, int32 *n) { int16 _o_result; *n = Platform_readfile(h, (address)b, b__len); diff --git a/bootstrap/unix-44/Platform.h b/bootstrap/unix-44/Platform.h index d024c4ed..bc487769 100644 --- a/bootstrap/unix-44/Platform.h +++ b/bootstrap/unix-44/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Platform__h #define Platform__h @@ -27,7 +27,7 @@ import address Platform_ArgVector; import int16 Platform_SeekSet, Platform_SeekCur, Platform_SeekEnd; import CHAR Platform_nl[3]; -import LONGINT *Platform_FileIdentity__typ; +import address *Platform_FileIdentity__typ; import BOOLEAN Platform_Absent (int16 e); import int16 Platform_ArgPos (CHAR *s, LONGINT s__len); @@ -45,8 +45,8 @@ import void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val import void Platform_GetIntArg (int16 n, int32 *val); import void Platform_GetTimeOfDay (int32 *sec, int32 *usec); import void Platform_Halt (int32 code); -import int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *identity__typ); -import int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ); +import int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, address *identity__typ); +import int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ); import BOOLEAN Platform_Inaccessible (int16 e); import void Platform_Init (int16 argc, address argvadr); import void Platform_MTimeAsClock (Platform_FileIdentity i, int32 *t, int32 *d); @@ -56,8 +56,8 @@ import address Platform_OSAllocate (address size); import void Platform_OSFree (address address); import int16 Platform_OldRO (CHAR *n, LONGINT n__len, int32 *h); import int16 Platform_OldRW (CHAR *n, LONGINT n__len, int32 *h); -import int16 Platform_Read (int32 h, address p, address l, address *n); -import int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, address *n); +import int16 Platform_Read (int32 h, address p, int32 l, int32 *n); +import int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, int32 *n); import int16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len); import BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2); import BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2); @@ -65,9 +65,9 @@ import int16 Platform_Seek (int32 h, int32 offset, int16 whence); import void Platform_SetBadInstructionHandler (Platform_SignalHandler handler); import void Platform_SetHalt (Platform_HaltProcedure p); import void Platform_SetInterruptHandler (Platform_SignalHandler handler); -import void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source); +import void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source); import void Platform_SetQuitHandler (Platform_SignalHandler handler); -import int16 Platform_Size (int32 h, address *l); +import int16 Platform_Size (int32 h, int32 *l); import int16 Platform_Sync (int32 h); import int16 Platform_System (CHAR *cmd, LONGINT cmd__len); import int32 Platform_Time (void); diff --git a/bootstrap/unix-44/Reals.c b/bootstrap/unix-44/Reals.c index c1ffff0a..fe93e8be 100644 --- a/bootstrap/unix-44/Reals.c +++ b/bootstrap/unix-44/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-44/Reals.h b/bootstrap/unix-44/Reals.h index 0ccc7989..e7cba0d8 100644 --- a/bootstrap/unix-44/Reals.h +++ b/bootstrap/unix-44/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/unix-44/Strings.c b/bootstrap/unix-44/Strings.c index 0f221fe7..427a0cc4 100644 --- a/bootstrap/unix-44/Strings.c +++ b/bootstrap/unix-44/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-44/Strings.h b/bootstrap/unix-44/Strings.h index 9fdb55fb..44c51b2a 100644 --- a/bootstrap/unix-44/Strings.h +++ b/bootstrap/unix-44/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/unix-44/Texts.c b/bootstrap/unix-44/Texts.c index b29595be..f63a7cb6 100644 --- a/bootstrap/unix-44/Texts.c +++ b/bootstrap/unix-44/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -33,7 +33,7 @@ typedef } Texts_ElemMsg; typedef - void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, LONGINT *); + void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, address *); typedef struct Texts_TextDesc *Texts_Text; @@ -167,20 +167,20 @@ export Texts_Elem Texts_new; static Texts_Buffer Texts_del; static Texts_FontsFont Texts_FontsDefault; -export LONGINT *Texts_FontDesc__typ; -export LONGINT *Texts_RunDesc__typ; -export LONGINT *Texts_PieceDesc__typ; -export LONGINT *Texts_ElemMsg__typ; -export LONGINT *Texts_ElemDesc__typ; -export LONGINT *Texts_FileMsg__typ; -export LONGINT *Texts_CopyMsg__typ; -export LONGINT *Texts_IdentifyMsg__typ; -export LONGINT *Texts_BufDesc__typ; -export LONGINT *Texts_TextDesc__typ; -export LONGINT *Texts_Reader__typ; -export LONGINT *Texts_Scanner__typ; -export LONGINT *Texts_Writer__typ; -export LONGINT *Texts__1__typ; +export address *Texts_FontDesc__typ; +export address *Texts_RunDesc__typ; +export address *Texts_PieceDesc__typ; +export address *Texts_ElemMsg__typ; +export address *Texts_ElemDesc__typ; +export address *Texts_FileMsg__typ; +export address *Texts_CopyMsg__typ; +export address *Texts_IdentifyMsg__typ; +export address *Texts_BufDesc__typ; +export address *Texts_TextDesc__typ; +export address *Texts_Reader__typ; +export address *Texts_Scanner__typ; +export address *Texts_Writer__typ; +export address *Texts__1__typ; export void Texts_Append (Texts_Text T, Texts_Buffer B); export void Texts_ChangeLooks (Texts_Text T, int32 beg, int32 end, SET sel, Texts_FontsFont fnt, int8 col, int8 voff); @@ -194,41 +194,41 @@ export Texts_Text Texts_ElemBase (Texts_Elem E); export int32 Texts_ElemPos (Texts_Elem E); static void Texts_Find (Texts_Text T, int32 *pos, Texts_Run *u, int32 *org, int32 *off); static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len); -static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, LONGINT *msg__typ); +static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, address *msg__typ); export void Texts_Insert (Texts_Text T, int32 pos, Texts_Buffer B); -export void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T); +export void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T); +static void Texts_Load0 (Files_Rider *r, address *r__typ, Texts_Text T); static void Texts_Merge (Texts_Text T, Texts_Run u, Texts_Run *v); export void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len); export void Texts_OpenBuf (Texts_Buffer B); -export void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos); -export void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 pos); -export void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ); -export int32 Texts_Pos (Texts_Reader *R, LONGINT *R__typ); -export void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch); -export void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ); -export void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ); +export void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int32 pos); +export void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int32 pos); +export void Texts_OpenWriter (Texts_Writer *W, address *W__typ); +export int32 Texts_Pos (Texts_Reader *R, address *R__typ); +export void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch); +export void Texts_ReadElem (Texts_Reader *R, address *R__typ); +export void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ); export void Texts_Recall (Texts_Buffer *B); export void Texts_Save (Texts_Text T, int32 beg, int32 end, Texts_Buffer B); -export void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ); -export void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col); -export void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt); -export void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff); +export void Texts_Scan (Texts_Scanner *S, address *S__typ); +export void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col); +export void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt); +export void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff); static void Texts_Splice (Texts_Run un, Texts_Run v, Texts_Run w, Texts_Text base); static void Texts_Split (int32 off, Texts_Run *u, Texts_Run *un); -export void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -export void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch); -export void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int32 t, int32 d); -export void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e); -export void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x); -export void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n); -export void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ); -export void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n); -export void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x); -export void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n); -export void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int16 k); -export void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x); -export void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len); +export void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T); +export void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch); +export void Texts_WriteDate (Texts_Writer *W, address *W__typ, int32 t, int32 d); +export void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e); +export void Texts_WriteHex (Texts_Writer *W, address *W__typ, int32 x); +export void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n); +export void Texts_WriteLn (Texts_Writer *W, address *W__typ); +export void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int16 n); +export void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x); +export void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int16 n); +export void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int16 n, int16 k); +export void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x); +export void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len); static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len) @@ -388,7 +388,7 @@ int32 Texts_ElemPos (Texts_Elem E) return _o_result; } -static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, LONGINT *msg__typ) +static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, address *msg__typ) { Texts_Alien e = NIL; Files_Rider r; @@ -604,7 +604,7 @@ void Texts_ChangeLooks (Texts_Text T, int32 beg, int32 end, SET sel, Texts_Fonts } } -void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos) +void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int32 pos) { Texts_Run u = NIL; if (pos >= T->len) { @@ -618,7 +618,7 @@ void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos } } -void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch) +void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch) { Texts_Run u = NIL; int32 pos; @@ -663,7 +663,7 @@ void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch) } } -void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ) +void Texts_ReadElem (Texts_Reader *R, address *R__typ) { Texts_Run u = NIL, un = NIL; u = (*R).run; @@ -691,7 +691,7 @@ void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ) } } -void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ) +void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ) { Texts_Run u = NIL; u = (*R).run->prev; @@ -713,14 +713,14 @@ void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ) } } -int32 Texts_Pos (Texts_Reader *R, LONGINT *R__typ) +int32 Texts_Pos (Texts_Reader *R, address *R__typ) { int32 _o_result; _o_result = (*R).org + (*R).off; return _o_result; } -void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 pos) +void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int32 pos) { Texts_OpenReader((void*)&*S, S__typ, T, pos); (*S).line = 0; @@ -729,7 +729,7 @@ void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 p static struct Scan__31 { Texts_Scanner *S; - LONGINT *S__typ; + address *S__typ; CHAR *ch; BOOLEAN *negE; int16 *e; @@ -756,7 +756,7 @@ static void ReadScaleFactor__32 (void) } } -void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ) +void Texts_Scan (Texts_Scanner *S, address *S__typ) { CHAR ch, term; BOOLEAN neg, negE, hex; @@ -962,7 +962,7 @@ void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ) Scan__31_s = _s.lnk; } -void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ) +void Texts_OpenWriter (Texts_Writer *W, address *W__typ) { __NEW((*W).buf, Texts_BufDesc); Texts_OpenBuf((*W).buf); @@ -973,22 +973,22 @@ void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ) Files_Set(&(*W).rider, Files_Rider__typ, (*W).file, 0); } -void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt) +void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt) { (*W).fnt = fnt; } -void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col) +void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col) { (*W).col = col; } -void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff) +void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff) { (*W).voff = voff; } -void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch) +void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch) { Texts_Run u = NIL, un = NIL; Texts_Piece p = NIL; @@ -1014,7 +1014,7 @@ void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch) } } -void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e) +void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e) { Texts_Run u = NIL, un = NIL; if (e->base != NIL) { @@ -1033,12 +1033,12 @@ void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e) un->prev = (Texts_Run)e; } -void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ) +void Texts_WriteLn (Texts_Writer *W, address *W__typ) { Texts_Write(&*W, W__typ, 0x0d); } -void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len) +void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len) { int16 i; __DUP(s, s__len, CHAR); @@ -1050,7 +1050,7 @@ void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__le __DEL(s); } -void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n) +void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n) { int16 i; int64 x0; @@ -1085,7 +1085,7 @@ void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n) } while (!(i == 0)); } -void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x) +void Texts_WriteHex (Texts_Writer *W, address *W__typ, int32 x) { int16 i; int32 y; @@ -1108,7 +1108,7 @@ void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x) } while (!(i == 0)); } -void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n) +void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int16 n) { int16 e; REAL x0; @@ -1180,7 +1180,7 @@ void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n) static struct WriteRealFix__53 { Texts_Writer *W; - LONGINT *W__typ; + address *W__typ; int16 *i; CHAR (*d)[9]; struct WriteRealFix__53 *lnk; @@ -1206,7 +1206,7 @@ static void dig__54 (int16 n) } } -void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int16 k) +void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int16 n, int16 k) { int16 e, i; CHAR sign; @@ -1278,7 +1278,7 @@ void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int1 WriteRealFix__53_s = _s.lnk; } -void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x) +void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x) { int16 i; CHAR d[8]; @@ -1290,7 +1290,7 @@ void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x) } while (!(i == 8)); } -void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n) +void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int16 n) { int16 e; LONGREAL x0; @@ -1362,7 +1362,7 @@ void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n) } } -void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x) +void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x) { int16 i; CHAR d[16]; @@ -1376,7 +1376,7 @@ void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x) static struct WriteDate__43 { Texts_Writer *W; - LONGINT *W__typ; + address *W__typ; struct WriteDate__43 *lnk; } *WriteDate__43_s; @@ -1389,7 +1389,7 @@ static void WritePair__44 (CHAR ch, int32 x) Texts_Write(&*WriteDate__43_s->W, WriteDate__43_s->W__typ, (CHAR)((int)__MOD(x, 10) + 48)); } -void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int32 t, int32 d) +void Texts_WriteDate (Texts_Writer *W, address *W__typ, int32 t, int32 d) { struct WriteDate__43 _s; _s.W = W; _s.W__typ = W__typ; @@ -1413,9 +1413,9 @@ static struct Load0__16 { struct Load0__16 *lnk; } *Load0__16_s; -static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int32 pos, int32 span, Texts_Elem *e); +static void LoadElem__17 (Files_Rider *r, address *r__typ, int32 pos, int32 span, Texts_Elem *e); -static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int32 pos, int32 span, Texts_Elem *e) +static void LoadElem__17 (Files_Rider *r, address *r__typ, int32 pos, int32 span, Texts_Elem *e) { Modules_Module M = NIL; Modules_Command Cmd; @@ -1466,7 +1466,7 @@ static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int32 pos, int32 span } } -static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +static void Texts_Load0 (Files_Rider *r, address *r__typ, Texts_Text T) { Texts_Run u = NIL, un = NIL; Texts_Piece p = NIL; @@ -1540,7 +1540,7 @@ static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T) Load0__16_s = _s.lnk; } -void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T) { int16 tag; Files_ReadInt(&*r, r__typ, &tag); @@ -1614,9 +1614,9 @@ static struct Store__39 { struct Store__39 *lnk; } *Store__39_s; -static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int32 pos, Texts_Elem e); +static void StoreElem__40 (Files_Rider *r, address *r__typ, int32 pos, Texts_Elem e); -static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int32 pos, Texts_Elem e) +static void StoreElem__40 (Files_Rider *r, address *r__typ, int32 pos, Texts_Elem e) { Files_Rider r1; int32 org, span; @@ -1646,7 +1646,7 @@ static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int32 pos, Texts_Ele Files_WriteLInt(&r1, Files_Rider__typ, e->H); } -void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T) { Files_Rider r1; Texts_Run u = NIL, un = NIL; diff --git a/bootstrap/unix-44/Texts.h b/bootstrap/unix-44/Texts.h index 59498ab9..1a87761b 100644 --- a/bootstrap/unix-44/Texts.h +++ b/bootstrap/unix-44/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Texts__h #define Texts__h @@ -35,7 +35,7 @@ typedef } Texts_RunDesc; typedef - void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, LONGINT *); + void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, address *); typedef struct Texts_ElemDesc { @@ -115,18 +115,18 @@ typedef import Texts_Elem Texts_new; -import LONGINT *Texts_FontDesc__typ; -import LONGINT *Texts_RunDesc__typ; -import LONGINT *Texts_ElemMsg__typ; -import LONGINT *Texts_ElemDesc__typ; -import LONGINT *Texts_FileMsg__typ; -import LONGINT *Texts_CopyMsg__typ; -import LONGINT *Texts_IdentifyMsg__typ; -import LONGINT *Texts_BufDesc__typ; -import LONGINT *Texts_TextDesc__typ; -import LONGINT *Texts_Reader__typ; -import LONGINT *Texts_Scanner__typ; -import LONGINT *Texts_Writer__typ; +import address *Texts_FontDesc__typ; +import address *Texts_RunDesc__typ; +import address *Texts_ElemMsg__typ; +import address *Texts_ElemDesc__typ; +import address *Texts_FileMsg__typ; +import address *Texts_CopyMsg__typ; +import address *Texts_IdentifyMsg__typ; +import address *Texts_BufDesc__typ; +import address *Texts_TextDesc__typ; +import address *Texts_Reader__typ; +import address *Texts_Scanner__typ; +import address *Texts_Writer__typ; import void Texts_Append (Texts_Text T, Texts_Buffer B); import void Texts_ChangeLooks (Texts_Text T, int32 beg, int32 end, SET sel, Texts_FontsFont fnt, int8 col, int8 voff); @@ -137,35 +137,35 @@ import void Texts_Delete (Texts_Text T, int32 beg, int32 end); import Texts_Text Texts_ElemBase (Texts_Elem E); import int32 Texts_ElemPos (Texts_Elem E); import void Texts_Insert (Texts_Text T, int32 pos, Texts_Buffer B); -import void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T); +import void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T); import void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len); import void Texts_OpenBuf (Texts_Buffer B); -import void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos); -import void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 pos); -import void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ); -import int32 Texts_Pos (Texts_Reader *R, LONGINT *R__typ); -import void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch); -import void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ); -import void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ); +import void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int32 pos); +import void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int32 pos); +import void Texts_OpenWriter (Texts_Writer *W, address *W__typ); +import int32 Texts_Pos (Texts_Reader *R, address *R__typ); +import void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch); +import void Texts_ReadElem (Texts_Reader *R, address *R__typ); +import void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ); import void Texts_Recall (Texts_Buffer *B); import void Texts_Save (Texts_Text T, int32 beg, int32 end, Texts_Buffer B); -import void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ); -import void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col); -import void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt); -import void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff); -import void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -import void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch); -import void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int32 t, int32 d); -import void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e); -import void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x); -import void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n); -import void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ); -import void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n); -import void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x); -import void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n); -import void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int16 k); -import void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x); -import void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len); +import void Texts_Scan (Texts_Scanner *S, address *S__typ); +import void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col); +import void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt); +import void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff); +import void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T); +import void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch); +import void Texts_WriteDate (Texts_Writer *W, address *W__typ, int32 t, int32 d); +import void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e); +import void Texts_WriteHex (Texts_Writer *W, address *W__typ, int32 x); +import void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n); +import void Texts_WriteLn (Texts_Writer *W, address *W__typ); +import void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int16 n); +import void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x); +import void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int16 n); +import void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int16 n, int16 k); +import void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x); +import void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len); import void *Texts__init(void); diff --git a/bootstrap/unix-44/Vishap.c b/bootstrap/unix-44/Vishap.c index 7b2dcd23..1ec89e33 100644 --- a/bootstrap/unix-44/Vishap.c +++ b/bootstrap/unix-44/Vishap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspamSf */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspamSf */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-44/errors.c b/bootstrap/unix-44/errors.c index 3a4b1ce7..0a40d5e9 100644 --- a/bootstrap/unix-44/errors.c +++ b/bootstrap/unix-44/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-44/errors.h b/bootstrap/unix-44/errors.h index 6ca6c961..759b613e 100644 --- a/bootstrap/unix-44/errors.h +++ b/bootstrap/unix-44/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/unix-44/extTools.c b/bootstrap/unix-44/extTools.c index 2167c7f8..8be0b63d 100644 --- a/bootstrap/unix-44/extTools.c +++ b/bootstrap/unix-44/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-44/extTools.h b/bootstrap/unix-44/extTools.h index 0b905427..bff1c62c 100644 --- a/bootstrap/unix-44/extTools.h +++ b/bootstrap/unix-44/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/unix-44/vt100.c b/bootstrap/unix-44/vt100.c index c337a9e2..4f6a6c9d 100644 --- a/bootstrap/unix-44/vt100.c +++ b/bootstrap/unix-44/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-44/vt100.h b/bootstrap/unix-44/vt100.h index 2428fce4..94f8add4 100644 --- a/bootstrap/unix-44/vt100.h +++ b/bootstrap/unix-44/vt100.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef vt100__h #define vt100__h diff --git a/bootstrap/unix-48/Configuration.c b/bootstrap/unix-48/Configuration.c index b17dc344..abdf151b 100644 --- a/bootstrap/unix-48/Configuration.c +++ b/bootstrap/unix-48/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -18,6 +18,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/09/22] for gcc LP64 on cygwin", Configuration_versionLong, 41); + __MOVE("1.95 [2016/09/23] for gcc LP64 on cygwin", Configuration_versionLong, 41); __ENDMOD; } diff --git a/bootstrap/unix-48/Configuration.h b/bootstrap/unix-48/Configuration.h index dca477a6..f51f63f2 100644 --- a/bootstrap/unix-48/Configuration.h +++ b/bootstrap/unix-48/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/unix-48/Console.c b/bootstrap/unix-48/Console.c index 3f691a07..115e60f5 100644 --- a/bootstrap/unix-48/Console.c +++ b/bootstrap/unix-48/Console.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -118,10 +118,10 @@ void Console_Hex (int32 i) void Console_Read (CHAR *ch) { - address n; + int32 n; int16 error; Console_Flush(); - error = Platform_ReadBuf(0, (void*)&*ch, 1, (void*)&n); + error = Platform_ReadBuf(0, (void*)&*ch, 1, &n); if (n != 1) { *ch = 0x00; } diff --git a/bootstrap/unix-48/Console.h b/bootstrap/unix-48/Console.h index 6837ab77..b08c93ea 100644 --- a/bootstrap/unix-48/Console.h +++ b/bootstrap/unix-48/Console.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Console__h #define Console__h diff --git a/bootstrap/unix-48/Files.c b/bootstrap/unix-48/Files.c index 3ff2fa83..0a7ac692 100644 --- a/bootstrap/unix-48/Files.c +++ b/bootstrap/unix-48/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -56,11 +56,11 @@ static struct { CHAR data[1]; } *Files_SearchPath; -export LONGINT *Files_FileDesc__typ; -export LONGINT *Files_BufDesc__typ; -export LONGINT *Files_Rider__typ; +export address *Files_FileDesc__typ; +export address *Files_BufDesc__typ; +export address *Files_Rider__typ; -export Files_File Files_Base (Files_Rider *r, LONGINT *r__typ); +export Files_File Files_Base (Files_Rider *r, address *r__typ); static Files_File Files_CacheEntry (Platform_FileIdentity identity); export void Files_ChangeDirectory (CHAR *path, LONGINT path__len, int16 *res); export void Files_Close (Files_File f); @@ -79,37 +79,37 @@ export int32 Files_Length (Files_File f); static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len); export Files_File Files_New (CHAR *name, LONGINT name__len); export Files_File Files_Old (CHAR *name, LONGINT name__len); -export int32 Files_Pos (Files_Rider *r, LONGINT *r__typ); +export int32 Files_Pos (Files_Rider *r, address *r__typ); export void Files_Purge (Files_File f); -export void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x); -export void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x); -export void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len); -export void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -export void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int16 *x); -export void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int32 *x); -export void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x); -export void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); -export void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x); -export void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x); -export void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x); -export void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x); -export void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +export void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x); +export void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x); +export void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len); +export void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +export void Files_ReadInt (Files_Rider *R, address *R__typ, int16 *x); +export void Files_ReadLInt (Files_Rider *R, address *R__typ, int32 *x); +export void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x); +export void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); +export void Files_ReadNum (Files_Rider *R, address *R__typ, int32 *x); +export void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x); +export void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x); +export void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x); +export void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); export void Files_Register (Files_File f); export void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, int16 *res); static void Files_ScanPath (int16 *pos, CHAR *dir, LONGINT dir__len); -export void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos); +export void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int32 pos); export void Files_SetSearchPath (CHAR *path, LONGINT path__len); -export void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x); -export void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x); -export void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -export void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x); -export void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x); -export void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x); -export void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x); -export void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x); -export void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x); -export void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x); -export void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +export void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x); +export void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x); +export void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +export void Files_WriteInt (Files_Rider *R, address *R__typ, int16 x); +export void Files_WriteLInt (Files_Rider *R, address *R__typ, int32 x); +export void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x); +export void Files_WriteNum (Files_Rider *R, address *R__typ, int32 x); +export void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x); +export void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x); +export void Files_WriteSet (Files_Rider *R, address *R__typ, SET x); +export void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); #define Files_IdxTrap() __HALT(-1) @@ -544,14 +544,14 @@ void Files_GetDate (Files_File f, int32 *t, int32 *d) Platform_MTimeAsClock(identity, &*t, &*d); } -int32 Files_Pos (Files_Rider *r, LONGINT *r__typ) +int32 Files_Pos (Files_Rider *r, address *r__typ) { int32 _o_result; _o_result = (*r).org + (*r).offset; return _o_result; } -void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos) +void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int32 pos) { int32 org, offset, i, n; Files_Buffer buf = NIL; @@ -613,7 +613,7 @@ void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos) (*r).res = 0; } -void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x) +void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x) { int32 offset; Files_Buffer buf = NIL; @@ -637,7 +637,7 @@ void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x) } } -void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) +void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) { int32 xpos, min, restInBuf, offset; Files_Buffer buf = NIL; @@ -673,19 +673,19 @@ void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x (*r).eof = 0; } -void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len) +void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len) { Files_ReadBytes(&*r, r__typ, (void*)x, x__len * 1, 1); } -Files_File Files_Base (Files_Rider *r, LONGINT *r__typ) +Files_File Files_Base (Files_Rider *r, address *r__typ) { Files_File _o_result; _o_result = (*r).buf->f; return _o_result; } -void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x) +void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x) { Files_Buffer buf = NIL; int32 offset; @@ -706,7 +706,7 @@ void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x) (*r).res = 0; } -void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) +void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) { int32 xpos, min, restInBuf, offset; Files_Buffer buf = NIL; @@ -849,26 +849,26 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *de } } -void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x) +void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x) { Files_Read(&*R, R__typ, (CHAR*)(void*)&*x); } -void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int16 *x) +void Files_ReadInt (Files_Rider *R, address *R__typ, int16 *x) { CHAR b[2]; Files_ReadBytes(&*R, R__typ, (void*)b, 2, 2); *x = (int16)b[0] + __ASHL((int16)b[1], 8); } -void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int32 *x) +void Files_ReadLInt (Files_Rider *R, address *R__typ, int32 *x) { CHAR b[4]; Files_ReadBytes(&*R, R__typ, (void*)b, 4, 4); *x = (((int16)b[0] + __ASHL((int16)b[1], 8)) + __ASHL(b[2], 16)) + __ASHL(b[3], 24); } -void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x) +void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x) { CHAR b[4]; int32 l; @@ -877,21 +877,21 @@ void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x) *x = (SET)l; } -void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x) +void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x) { CHAR b[4]; Files_ReadBytes(&*R, R__typ, (void*)b, 4, 4); Files_FlipBytes((void*)b, 4, (void*)&*x, 4); } -void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x) +void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x) { CHAR b[8]; Files_ReadBytes(&*R, R__typ, (void*)b, 8, 8); Files_FlipBytes((void*)b, 8, (void*)&*x, 8); } -void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int16 i; CHAR ch; @@ -903,7 +903,7 @@ void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) } while (!(ch == 0x00)); } -void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int16 i; CHAR ch; @@ -921,7 +921,7 @@ void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) } while (!b); } -void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x) +void Files_ReadNum (Files_Rider *R, address *R__typ, int32 *x) { int8 s; CHAR ch; @@ -938,19 +938,19 @@ void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x) *x = n; } -void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x) +void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x) { int32 n; Files_ReadNum(&*R, R__typ, &n); *x = n; } -void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x) +void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x) { Files_Write(&*R, R__typ, __VAL(CHAR, x)); } -void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x) +void Files_WriteInt (Files_Rider *R, address *R__typ, int16 x) { CHAR b[2]; b[0] = (CHAR)x; @@ -958,7 +958,7 @@ void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x) Files_WriteBytes(&*R, R__typ, (void*)b, 2, 2); } -void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x) +void Files_WriteLInt (Files_Rider *R, address *R__typ, int32 x) { CHAR b[4]; b[0] = (CHAR)x; @@ -968,7 +968,7 @@ void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x) Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x) +void Files_WriteSet (Files_Rider *R, address *R__typ, SET x) { CHAR b[4]; int32 i; @@ -980,21 +980,21 @@ void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x) Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x) +void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x) { CHAR b[4]; Files_FlipBytes((void*)&x, 4, (void*)b, 4); Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x) +void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x) { CHAR b[8]; Files_FlipBytes((void*)&x, 8, (void*)b, 8); Files_WriteBytes(&*R, R__typ, (void*)b, 8, 8); } -void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int16 i; i = 0; @@ -1004,7 +1004,7 @@ void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len Files_WriteBytes(&*R, R__typ, (void*)x, x__len * 1, i + 1); } -void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x) +void Files_WriteNum (Files_Rider *R, address *R__typ, int32 x) { while (x < -64 || x > 63) { Files_Write(&*R, R__typ, (CHAR)(__MASK(x, -128) + 128)); @@ -1013,7 +1013,7 @@ void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x) Files_Write(&*R, R__typ, (CHAR)__MASK(x, -128)); } -void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x) +void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x) { while (x < -64 || x > 63) { Files_Write(&*R, R__typ, (CHAR)(__MASK(x, -128) + 128)); diff --git a/bootstrap/unix-48/Files.h b/bootstrap/unix-48/Files.h index 4fd2efd8..e2b7a3bb 100644 --- a/bootstrap/unix-48/Files.h +++ b/bootstrap/unix-48/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #ifndef Files__h #define Files__h @@ -24,10 +24,10 @@ typedef -import LONGINT *Files_FileDesc__typ; -import LONGINT *Files_Rider__typ; +import address *Files_FileDesc__typ; +import address *Files_Rider__typ; -import Files_File Files_Base (Files_Rider *r, LONGINT *r__typ); +import Files_File Files_Base (Files_Rider *r, address *r__typ); import void Files_ChangeDirectory (CHAR *path, LONGINT path__len, int16 *res); import void Files_Close (Files_File f); import void Files_Delete (CHAR *name, LONGINT name__len, int16 *res); @@ -36,36 +36,36 @@ import void Files_GetName (Files_File f, CHAR *name, LONGINT name__len); import int32 Files_Length (Files_File f); import Files_File Files_New (CHAR *name, LONGINT name__len); import Files_File Files_Old (CHAR *name, LONGINT name__len); -import int32 Files_Pos (Files_Rider *r, LONGINT *r__typ); +import int32 Files_Pos (Files_Rider *r, address *r__typ); import void Files_Purge (Files_File f); -import void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x); -import void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x); -import void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len); -import void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -import void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int16 *x); -import void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int32 *x); -import void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x); -import void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); -import void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x); -import void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x); -import void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x); -import void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x); -import void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +import void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x); +import void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x); +import void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len); +import void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +import void Files_ReadInt (Files_Rider *R, address *R__typ, int16 *x); +import void Files_ReadLInt (Files_Rider *R, address *R__typ, int32 *x); +import void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x); +import void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); +import void Files_ReadNum (Files_Rider *R, address *R__typ, int32 *x); +import void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x); +import void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x); +import void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x); +import void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); import void Files_Register (Files_File f); import void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, int16 *res); -import void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos); +import void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int32 pos); import void Files_SetSearchPath (CHAR *path, LONGINT path__len); -import void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x); -import void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x); -import void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -import void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x); -import void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x); -import void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x); -import void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x); -import void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x); -import void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x); -import void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x); -import void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +import void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x); +import void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x); +import void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +import void Files_WriteInt (Files_Rider *R, address *R__typ, int16 x); +import void Files_WriteLInt (Files_Rider *R, address *R__typ, int32 x); +import void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x); +import void Files_WriteNum (Files_Rider *R, address *R__typ, int32 x); +import void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x); +import void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x); +import void Files_WriteSet (Files_Rider *R, address *R__typ, SET x); +import void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); import void *Files__init(void); diff --git a/bootstrap/unix-48/Heap.c b/bootstrap/unix-48/Heap.c index 17784d67..b7c8c827 100644 --- a/bootstrap/unix-48/Heap.c +++ b/bootstrap/unix-48/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tsSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tsSfF */ #define INTEGER int16 #define LONGINT int32 @@ -74,10 +74,10 @@ static int16 Heap_lockdepth; static BOOLEAN Heap_interrupted; export int16 Heap_FileCount; -export LONGINT *Heap_ModuleDesc__typ; -export LONGINT *Heap_CmdDesc__typ; -export LONGINT *Heap_FinDesc__typ; -export LONGINT *Heap__1__typ; +export address *Heap_ModuleDesc__typ; +export address *Heap_CmdDesc__typ; +export address *Heap_FinDesc__typ; +export address *Heap__1__typ; static void Heap_CheckFin (void); static void Heap_ExtendHeap (address blksz); diff --git a/bootstrap/unix-48/Heap.h b/bootstrap/unix-48/Heap.h index b1c745df..6ad4813e 100644 --- a/bootstrap/unix-48/Heap.h +++ b/bootstrap/unix-48/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tsSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tsSfF */ #ifndef Heap__h #define Heap__h @@ -34,7 +34,7 @@ import SYSTEM_PTR Heap_modules; import address Heap_allocated, Heap_heapsize; import int16 Heap_FileCount; -import LONGINT *Heap_ModuleDesc__typ; +import address *Heap_ModuleDesc__typ; import void Heap_FINALL (void); import void Heap_GC (BOOLEAN markStack); diff --git a/bootstrap/unix-48/Modules.c b/bootstrap/unix-48/Modules.c index 1564f5e0..7704f005 100644 --- a/bootstrap/unix-48/Modules.c +++ b/bootstrap/unix-48/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -43,8 +43,8 @@ export int16 Modules_res; export CHAR Modules_resMsg[256]; export Modules_ModuleName Modules_imported, Modules_importing; -export LONGINT *Modules_ModuleDesc__typ; -export LONGINT *Modules_CmdDesc__typ; +export address *Modules_ModuleDesc__typ; +export address *Modules_CmdDesc__typ; static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len); export void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all); diff --git a/bootstrap/unix-48/Modules.h b/bootstrap/unix-48/Modules.h index dbc243c8..060208c6 100644 --- a/bootstrap/unix-48/Modules.h +++ b/bootstrap/unix-48/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Modules__h #define Modules__h @@ -40,8 +40,8 @@ import int16 Modules_res; import CHAR Modules_resMsg[256]; import Modules_ModuleName Modules_imported, Modules_importing; -import LONGINT *Modules_ModuleDesc__typ; -import LONGINT *Modules_CmdDesc__typ; +import address *Modules_ModuleDesc__typ; +import address *Modules_CmdDesc__typ; import void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all); import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len); diff --git a/bootstrap/unix-48/OPB.c b/bootstrap/unix-48/OPB.c index d0336349..af4f4fc4 100644 --- a/bootstrap/unix-48/OPB.c +++ b/bootstrap/unix-48/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-48/OPB.h b/bootstrap/unix-48/OPB.h index 434172a2..dc0085af 100644 --- a/bootstrap/unix-48/OPB.h +++ b/bootstrap/unix-48/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/unix-48/OPC.c b/bootstrap/unix-48/OPC.c index 11f64b59..99353400 100644 --- a/bootstrap/unix-48/OPC.c +++ b/bootstrap/unix-48/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -1041,7 +1041,7 @@ static void OPC_IdentList (OPT_Object obj, int16 vis) } else if ((obj->mode == 2 && obj->typ->comp == 4)) { OPC_EndStat(); OPC_BegStat(); - OPM_WriteString((CHAR*)"LONGINT *", 10); + OPM_WriteString((CHAR*)"address *", 10); OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); base = NIL; @@ -1078,7 +1078,7 @@ static void OPC_AnsiParamList (OPT_Object obj, BOOLEAN showParamNames) OPM_WriteString((CHAR*)", LONGINT ", 11); OPC_LenList(obj, 1, showParamNames); } else if ((obj->mode == 2 && obj->typ->comp == 4)) { - OPM_WriteString((CHAR*)", LONGINT *", 12); + OPM_WriteString((CHAR*)", address *", 12); if (showParamNames) { OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); @@ -1166,7 +1166,7 @@ static void OPC_GenDynTypes (OPT_Node n, int16 vis) } else { OPM_WriteString((CHAR*)"export ", 8); } - OPM_WriteString((CHAR*)"LONGINT *", 10); + OPM_WriteString((CHAR*)"address *", 10); OPC_Andent(typ); OPM_WriteString((CHAR*)"__typ", 6); OPC_EndStat(); diff --git a/bootstrap/unix-48/OPC.h b/bootstrap/unix-48/OPC.h index 09952648..4215947f 100644 --- a/bootstrap/unix-48/OPC.h +++ b/bootstrap/unix-48/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/unix-48/OPM.c b/bootstrap/unix-48/OPM.c index 2122bed9..039d1c77 100644 --- a/bootstrap/unix-48/OPM.c +++ b/bootstrap/unix-48/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -41,7 +41,7 @@ static CHAR OPM_OBERON[1024]; static CHAR OPM_MODULES[1024]; -static void OPM_Append (Files_Rider *R, LONGINT *R__typ, Files_File F); +static void OPM_Append (Files_Rider *R, address *R__typ, Files_File F); export void OPM_CloseFiles (void); export void OPM_CloseOldSym (void); export void OPM_DeleteNewSym (void); @@ -49,10 +49,10 @@ export void OPM_FPrint (int32 *fp, int64 val); export void OPM_FPrintLReal (int32 *fp, LONGREAL lr); export void OPM_FPrintReal (int32 *fp, REAL real); export void OPM_FPrintSet (int32 *fp, SET set); -static void OPM_FindLine (Files_File f, Files_Rider *r, LONGINT *r__typ, int64 pos); +static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos); export void OPM_Get (CHAR *ch); static void OPM_GetProperties (void); -static void OPM_GetProperty (Texts_Scanner *S, LONGINT *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align); +static void OPM_GetProperty (Texts_Scanner *S, address *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align); export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); export void OPM_InitOptions (void); export int16 OPM_Integer (int64 n); @@ -496,7 +496,7 @@ static void OPM_LogErrMsg (int16 n) OPM_LogWStr(errors_errors[__X(n, 350)], 128); } -static void OPM_FindLine (Files_File f, Files_Rider *r, LONGINT *r__typ, int64 pos) +static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos) { CHAR ch, cheol; if (pos < (int64)OPM_ErrorLineStartPos) { @@ -654,7 +654,7 @@ void OPM_FPrintLReal (int32 *fp, LONGREAL lr) OPM_FPrint(&*fp, h); } -static void OPM_GetProperty (Texts_Scanner *S, LONGINT *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align) +static void OPM_GetProperty (Texts_Scanner *S, address *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align) { __DUP(name, name__len, CHAR); if (((*S).class == 1 && __STRCMP((*S).s, name) == 0)) { @@ -996,7 +996,7 @@ void OPM_WriteLn (void) Files_Write(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, 0x0a); } -static void OPM_Append (Files_Rider *R, LONGINT *R__typ, Files_File F) +static void OPM_Append (Files_Rider *R, address *R__typ, Files_File F) { Files_Rider R1; CHAR buffer[4096]; diff --git a/bootstrap/unix-48/OPM.h b/bootstrap/unix-48/OPM.h index 8ca21351..a6b7990c 100644 --- a/bootstrap/unix-48/OPM.h +++ b/bootstrap/unix-48/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/unix-48/OPP.c b/bootstrap/unix-48/OPP.c index d2b3e83f..a3ab1dd3 100644 --- a/bootstrap/unix-48/OPP.c +++ b/bootstrap/unix-48/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -24,7 +24,7 @@ static OPT_Node OPP_TDinit, OPP_lastTDinit; static int16 OPP_nofFwdPtr; static OPT_Struct OPP_FwdPtr[64]; -export LONGINT *OPP__1__typ; +export address *OPP__1__typ; static void OPP_ActualParameters (OPT_Node *aparlist, OPT_Object fpar); static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned); diff --git a/bootstrap/unix-48/OPP.h b/bootstrap/unix-48/OPP.h index 28045a86..e5a59f6c 100644 --- a/bootstrap/unix-48/OPP.h +++ b/bootstrap/unix-48/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/unix-48/OPS.c b/bootstrap/unix-48/OPS.c index 99aba006..0cac83bd 100644 --- a/bootstrap/unix-48/OPS.c +++ b/bootstrap/unix-48/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-48/OPS.h b/bootstrap/unix-48/OPS.h index f7dd1d10..caef45f4 100644 --- a/bootstrap/unix-48/OPS.h +++ b/bootstrap/unix-48/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/unix-48/OPT.c b/bootstrap/unix-48/OPT.c index abd3934b..c52efac6 100644 --- a/bootstrap/unix-48/OPT.c +++ b/bootstrap/unix-48/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -101,12 +101,12 @@ static OPT_ExpCtxt OPT_expCtxt; static int32 OPT_nofhdfld; static BOOLEAN OPT_newsf, OPT_findpc, OPT_extsf, OPT_sfpresent, OPT_symExtended, OPT_symNew; -export LONGINT *OPT_ConstDesc__typ; -export LONGINT *OPT_ObjDesc__typ; -export LONGINT *OPT_StrDesc__typ; -export LONGINT *OPT_NodeDesc__typ; -export LONGINT *OPT_ImpCtxt__typ; -export LONGINT *OPT_ExpCtxt__typ; +export address *OPT_ConstDesc__typ; +export address *OPT_ObjDesc__typ; +export address *OPT_StrDesc__typ; +export address *OPT_NodeDesc__typ; +export address *OPT_ImpCtxt__typ; +export address *OPT_ExpCtxt__typ; export void OPT_Close (void); export void OPT_CloseScope (void); diff --git a/bootstrap/unix-48/OPT.h b/bootstrap/unix-48/OPT.h index 5de02c8b..0bd1f189 100644 --- a/bootstrap/unix-48/OPT.h +++ b/bootstrap/unix-48/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPT__h #define OPT__h @@ -75,10 +75,10 @@ import OPT_Object OPT_GlbMod[64]; import OPS_Name OPT_SelfName; import BOOLEAN OPT_SYSimported; -import LONGINT *OPT_ConstDesc__typ; -import LONGINT *OPT_ObjDesc__typ; -import LONGINT *OPT_StrDesc__typ; -import LONGINT *OPT_NodeDesc__typ; +import address *OPT_ConstDesc__typ; +import address *OPT_ObjDesc__typ; +import address *OPT_StrDesc__typ; +import address *OPT_NodeDesc__typ; import void OPT_Close (void); import void OPT_CloseScope (void); diff --git a/bootstrap/unix-48/OPV.c b/bootstrap/unix-48/OPV.c index efddd202..8bb5ec32 100644 --- a/bootstrap/unix-48/OPV.c +++ b/bootstrap/unix-48/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -21,7 +21,7 @@ static int32 OPV_recno; static OPV_ExitInfo OPV_exit; static int16 OPV_nofExitLabels; -export LONGINT *OPV_ExitInfo__typ; +export address *OPV_ExitInfo__typ; static void OPV_ActualPar (OPT_Node n, OPT_Object fp); export void OPV_AdrAndSize (OPT_Object topScope); diff --git a/bootstrap/unix-48/OPV.h b/bootstrap/unix-48/OPV.h index 4a3f9d07..c309d63c 100644 --- a/bootstrap/unix-48/OPV.h +++ b/bootstrap/unix-48/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/unix-48/Platform.c b/bootstrap/unix-48/Platform.c index e2eb0c80..9de57a27 100644 --- a/bootstrap/unix-48/Platform.c +++ b/bootstrap/unix-48/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -42,7 +42,7 @@ static int32 Platform_TimeStart; export int16 Platform_SeekSet, Platform_SeekCur, Platform_SeekEnd; export CHAR Platform_nl[3]; -export LONGINT *Platform_FileIdentity__typ; +export address *Platform_FileIdentity__typ; export BOOLEAN Platform_Absent (int16 e); export int16 Platform_ArgPos (CHAR *s, LONGINT s__len); @@ -61,8 +61,8 @@ export void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val export void Platform_GetIntArg (int16 n, int32 *val); export void Platform_GetTimeOfDay (int32 *sec, int32 *usec); export void Platform_Halt (int32 code); -export int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *identity__typ); -export int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ); +export int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, address *identity__typ); +export int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ); export BOOLEAN Platform_Inaccessible (int16 e); export void Platform_Init (int16 argc, address argvadr); export void Platform_MTimeAsClock (Platform_FileIdentity i, int32 *t, int32 *d); @@ -72,8 +72,8 @@ export address Platform_OSAllocate (address size); export void Platform_OSFree (address address); export int16 Platform_OldRO (CHAR *n, LONGINT n__len, int32 *h); export int16 Platform_OldRW (CHAR *n, LONGINT n__len, int32 *h); -export int16 Platform_Read (int32 h, address p, address l, address *n); -export int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, address *n); +export int16 Platform_Read (int32 h, address p, int32 l, int32 *n); +export int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, int32 *n); export int16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len); export BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2); export BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2); @@ -81,9 +81,9 @@ export int16 Platform_Seek (int32 h, int32 offset, int16 whence); export void Platform_SetBadInstructionHandler (Platform_SignalHandler handler); export void Platform_SetHalt (Platform_HaltProcedure p); export void Platform_SetInterruptHandler (Platform_SignalHandler handler); -export void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source); +export void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source); export void Platform_SetQuitHandler (Platform_SignalHandler handler); -export int16 Platform_Size (int32 h, address *l); +export int16 Platform_Size (int32 h, int32 *l); export int16 Platform_Sync (int32 h); export int16 Platform_System (CHAR *cmd, LONGINT cmd__len); static void Platform_TestLittleEndian (void); @@ -446,7 +446,7 @@ int16 Platform_Close (int32 h) __RETCHK; } -int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *identity__typ) +int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, address *identity__typ) { int16 _o_result; Platform_structstats(); @@ -461,7 +461,7 @@ int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *iden return _o_result; } -int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ) +int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ) { int16 _o_result; __DUP(n, n__len, CHAR); @@ -493,7 +493,7 @@ BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i return _o_result; } -void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source) +void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source) { (*target).mtime = source.mtime; } @@ -504,7 +504,7 @@ void Platform_MTimeAsClock (Platform_FileIdentity i, int32 *t, int32 *d) Platform_YMDHMStoClock(Platform_tmyear(), Platform_tmmon(), Platform_tmmday(), Platform_tmhour(), Platform_tmmin(), Platform_tmsec(), &*t, &*d); } -int16 Platform_Size (int32 h, address *l) +int16 Platform_Size (int32 h, int32 *l) { int16 _o_result; Platform_structstats(); @@ -517,7 +517,7 @@ int16 Platform_Size (int32 h, address *l) return _o_result; } -int16 Platform_Read (int32 h, address p, address l, address *n) +int16 Platform_Read (int32 h, address p, int32 l, int32 *n) { int16 _o_result; *n = Platform_readfile(h, p, l); @@ -532,7 +532,7 @@ int16 Platform_Read (int32 h, address p, address l, address *n) __RETCHK; } -int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, address *n) +int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, int32 *n) { int16 _o_result; *n = Platform_readfile(h, (address)b, b__len); diff --git a/bootstrap/unix-48/Platform.h b/bootstrap/unix-48/Platform.h index d024c4ed..bc487769 100644 --- a/bootstrap/unix-48/Platform.h +++ b/bootstrap/unix-48/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Platform__h #define Platform__h @@ -27,7 +27,7 @@ import address Platform_ArgVector; import int16 Platform_SeekSet, Platform_SeekCur, Platform_SeekEnd; import CHAR Platform_nl[3]; -import LONGINT *Platform_FileIdentity__typ; +import address *Platform_FileIdentity__typ; import BOOLEAN Platform_Absent (int16 e); import int16 Platform_ArgPos (CHAR *s, LONGINT s__len); @@ -45,8 +45,8 @@ import void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val import void Platform_GetIntArg (int16 n, int32 *val); import void Platform_GetTimeOfDay (int32 *sec, int32 *usec); import void Platform_Halt (int32 code); -import int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *identity__typ); -import int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ); +import int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, address *identity__typ); +import int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ); import BOOLEAN Platform_Inaccessible (int16 e); import void Platform_Init (int16 argc, address argvadr); import void Platform_MTimeAsClock (Platform_FileIdentity i, int32 *t, int32 *d); @@ -56,8 +56,8 @@ import address Platform_OSAllocate (address size); import void Platform_OSFree (address address); import int16 Platform_OldRO (CHAR *n, LONGINT n__len, int32 *h); import int16 Platform_OldRW (CHAR *n, LONGINT n__len, int32 *h); -import int16 Platform_Read (int32 h, address p, address l, address *n); -import int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, address *n); +import int16 Platform_Read (int32 h, address p, int32 l, int32 *n); +import int16 Platform_ReadBuf (int32 h, SYSTEM_BYTE *b, LONGINT b__len, int32 *n); import int16 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len); import BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2); import BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2); @@ -65,9 +65,9 @@ import int16 Platform_Seek (int32 h, int32 offset, int16 whence); import void Platform_SetBadInstructionHandler (Platform_SignalHandler handler); import void Platform_SetHalt (Platform_HaltProcedure p); import void Platform_SetInterruptHandler (Platform_SignalHandler handler); -import void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source); +import void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source); import void Platform_SetQuitHandler (Platform_SignalHandler handler); -import int16 Platform_Size (int32 h, address *l); +import int16 Platform_Size (int32 h, int32 *l); import int16 Platform_Sync (int32 h); import int16 Platform_System (CHAR *cmd, LONGINT cmd__len); import int32 Platform_Time (void); diff --git a/bootstrap/unix-48/Reals.c b/bootstrap/unix-48/Reals.c index c1ffff0a..fe93e8be 100644 --- a/bootstrap/unix-48/Reals.c +++ b/bootstrap/unix-48/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-48/Reals.h b/bootstrap/unix-48/Reals.h index 0ccc7989..e7cba0d8 100644 --- a/bootstrap/unix-48/Reals.h +++ b/bootstrap/unix-48/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/unix-48/Strings.c b/bootstrap/unix-48/Strings.c index 0f221fe7..427a0cc4 100644 --- a/bootstrap/unix-48/Strings.c +++ b/bootstrap/unix-48/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-48/Strings.h b/bootstrap/unix-48/Strings.h index 9fdb55fb..44c51b2a 100644 --- a/bootstrap/unix-48/Strings.h +++ b/bootstrap/unix-48/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/unix-48/Texts.c b/bootstrap/unix-48/Texts.c index f69de03d..60a7ea7a 100644 --- a/bootstrap/unix-48/Texts.c +++ b/bootstrap/unix-48/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -33,7 +33,7 @@ typedef } Texts_ElemMsg; typedef - void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, LONGINT *); + void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, address *); typedef struct Texts_TextDesc *Texts_Text; @@ -167,20 +167,20 @@ export Texts_Elem Texts_new; static Texts_Buffer Texts_del; static Texts_FontsFont Texts_FontsDefault; -export LONGINT *Texts_FontDesc__typ; -export LONGINT *Texts_RunDesc__typ; -export LONGINT *Texts_PieceDesc__typ; -export LONGINT *Texts_ElemMsg__typ; -export LONGINT *Texts_ElemDesc__typ; -export LONGINT *Texts_FileMsg__typ; -export LONGINT *Texts_CopyMsg__typ; -export LONGINT *Texts_IdentifyMsg__typ; -export LONGINT *Texts_BufDesc__typ; -export LONGINT *Texts_TextDesc__typ; -export LONGINT *Texts_Reader__typ; -export LONGINT *Texts_Scanner__typ; -export LONGINT *Texts_Writer__typ; -export LONGINT *Texts__1__typ; +export address *Texts_FontDesc__typ; +export address *Texts_RunDesc__typ; +export address *Texts_PieceDesc__typ; +export address *Texts_ElemMsg__typ; +export address *Texts_ElemDesc__typ; +export address *Texts_FileMsg__typ; +export address *Texts_CopyMsg__typ; +export address *Texts_IdentifyMsg__typ; +export address *Texts_BufDesc__typ; +export address *Texts_TextDesc__typ; +export address *Texts_Reader__typ; +export address *Texts_Scanner__typ; +export address *Texts_Writer__typ; +export address *Texts__1__typ; export void Texts_Append (Texts_Text T, Texts_Buffer B); export void Texts_ChangeLooks (Texts_Text T, int32 beg, int32 end, SET sel, Texts_FontsFont fnt, int8 col, int8 voff); @@ -194,41 +194,41 @@ export Texts_Text Texts_ElemBase (Texts_Elem E); export int32 Texts_ElemPos (Texts_Elem E); static void Texts_Find (Texts_Text T, int32 *pos, Texts_Run *u, int32 *org, int32 *off); static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len); -static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, LONGINT *msg__typ); +static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, address *msg__typ); export void Texts_Insert (Texts_Text T, int32 pos, Texts_Buffer B); -export void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T); +export void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T); +static void Texts_Load0 (Files_Rider *r, address *r__typ, Texts_Text T); static void Texts_Merge (Texts_Text T, Texts_Run u, Texts_Run *v); export void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len); export void Texts_OpenBuf (Texts_Buffer B); -export void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos); -export void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 pos); -export void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ); -export int32 Texts_Pos (Texts_Reader *R, LONGINT *R__typ); -export void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch); -export void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ); -export void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ); +export void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int32 pos); +export void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int32 pos); +export void Texts_OpenWriter (Texts_Writer *W, address *W__typ); +export int32 Texts_Pos (Texts_Reader *R, address *R__typ); +export void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch); +export void Texts_ReadElem (Texts_Reader *R, address *R__typ); +export void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ); export void Texts_Recall (Texts_Buffer *B); export void Texts_Save (Texts_Text T, int32 beg, int32 end, Texts_Buffer B); -export void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ); -export void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col); -export void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt); -export void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff); +export void Texts_Scan (Texts_Scanner *S, address *S__typ); +export void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col); +export void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt); +export void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff); static void Texts_Splice (Texts_Run un, Texts_Run v, Texts_Run w, Texts_Text base); static void Texts_Split (int32 off, Texts_Run *u, Texts_Run *un); -export void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -export void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch); -export void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int32 t, int32 d); -export void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e); -export void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x); -export void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n); -export void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ); -export void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n); -export void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x); -export void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n); -export void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int16 k); -export void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x); -export void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len); +export void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T); +export void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch); +export void Texts_WriteDate (Texts_Writer *W, address *W__typ, int32 t, int32 d); +export void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e); +export void Texts_WriteHex (Texts_Writer *W, address *W__typ, int32 x); +export void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n); +export void Texts_WriteLn (Texts_Writer *W, address *W__typ); +export void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int16 n); +export void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x); +export void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int16 n); +export void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int16 n, int16 k); +export void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x); +export void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len); static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len) @@ -388,7 +388,7 @@ int32 Texts_ElemPos (Texts_Elem E) return _o_result; } -static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, LONGINT *msg__typ) +static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, address *msg__typ) { Texts_Alien e = NIL; Files_Rider r; @@ -604,7 +604,7 @@ void Texts_ChangeLooks (Texts_Text T, int32 beg, int32 end, SET sel, Texts_Fonts } } -void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos) +void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int32 pos) { Texts_Run u = NIL; if (pos >= T->len) { @@ -618,7 +618,7 @@ void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos } } -void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch) +void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch) { Texts_Run u = NIL; int32 pos; @@ -663,7 +663,7 @@ void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch) } } -void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ) +void Texts_ReadElem (Texts_Reader *R, address *R__typ) { Texts_Run u = NIL, un = NIL; u = (*R).run; @@ -691,7 +691,7 @@ void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ) } } -void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ) +void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ) { Texts_Run u = NIL; u = (*R).run->prev; @@ -713,14 +713,14 @@ void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ) } } -int32 Texts_Pos (Texts_Reader *R, LONGINT *R__typ) +int32 Texts_Pos (Texts_Reader *R, address *R__typ) { int32 _o_result; _o_result = (*R).org + (*R).off; return _o_result; } -void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 pos) +void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int32 pos) { Texts_OpenReader((void*)&*S, S__typ, T, pos); (*S).line = 0; @@ -729,7 +729,7 @@ void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 p static struct Scan__31 { Texts_Scanner *S; - LONGINT *S__typ; + address *S__typ; CHAR *ch; BOOLEAN *negE; int16 *e; @@ -756,7 +756,7 @@ static void ReadScaleFactor__32 (void) } } -void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ) +void Texts_Scan (Texts_Scanner *S, address *S__typ) { CHAR ch, term; BOOLEAN neg, negE, hex; @@ -962,7 +962,7 @@ void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ) Scan__31_s = _s.lnk; } -void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ) +void Texts_OpenWriter (Texts_Writer *W, address *W__typ) { __NEW((*W).buf, Texts_BufDesc); Texts_OpenBuf((*W).buf); @@ -973,22 +973,22 @@ void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ) Files_Set(&(*W).rider, Files_Rider__typ, (*W).file, 0); } -void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt) +void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt) { (*W).fnt = fnt; } -void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col) +void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col) { (*W).col = col; } -void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff) +void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff) { (*W).voff = voff; } -void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch) +void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch) { Texts_Run u = NIL, un = NIL; Texts_Piece p = NIL; @@ -1014,7 +1014,7 @@ void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch) } } -void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e) +void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e) { Texts_Run u = NIL, un = NIL; if (e->base != NIL) { @@ -1033,12 +1033,12 @@ void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e) un->prev = (Texts_Run)e; } -void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ) +void Texts_WriteLn (Texts_Writer *W, address *W__typ) { Texts_Write(&*W, W__typ, 0x0d); } -void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len) +void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len) { int16 i; __DUP(s, s__len, CHAR); @@ -1050,7 +1050,7 @@ void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__le __DEL(s); } -void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n) +void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n) { int16 i; int64 x0; @@ -1085,7 +1085,7 @@ void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n) } while (!(i == 0)); } -void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x) +void Texts_WriteHex (Texts_Writer *W, address *W__typ, int32 x) { int16 i; int32 y; @@ -1108,7 +1108,7 @@ void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x) } while (!(i == 0)); } -void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n) +void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int16 n) { int16 e; REAL x0; @@ -1180,7 +1180,7 @@ void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n) static struct WriteRealFix__53 { Texts_Writer *W; - LONGINT *W__typ; + address *W__typ; int16 *i; CHAR (*d)[9]; struct WriteRealFix__53 *lnk; @@ -1206,7 +1206,7 @@ static void dig__54 (int16 n) } } -void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int16 k) +void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int16 n, int16 k) { int16 e, i; CHAR sign; @@ -1278,7 +1278,7 @@ void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int1 WriteRealFix__53_s = _s.lnk; } -void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x) +void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x) { int16 i; CHAR d[8]; @@ -1290,7 +1290,7 @@ void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x) } while (!(i == 8)); } -void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n) +void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int16 n) { int16 e; LONGREAL x0; @@ -1362,7 +1362,7 @@ void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n) } } -void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x) +void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x) { int16 i; CHAR d[16]; @@ -1376,7 +1376,7 @@ void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x) static struct WriteDate__43 { Texts_Writer *W; - LONGINT *W__typ; + address *W__typ; struct WriteDate__43 *lnk; } *WriteDate__43_s; @@ -1389,7 +1389,7 @@ static void WritePair__44 (CHAR ch, int32 x) Texts_Write(&*WriteDate__43_s->W, WriteDate__43_s->W__typ, (CHAR)((int)__MOD(x, 10) + 48)); } -void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int32 t, int32 d) +void Texts_WriteDate (Texts_Writer *W, address *W__typ, int32 t, int32 d) { struct WriteDate__43 _s; _s.W = W; _s.W__typ = W__typ; @@ -1413,9 +1413,9 @@ static struct Load0__16 { struct Load0__16 *lnk; } *Load0__16_s; -static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int32 pos, int32 span, Texts_Elem *e); +static void LoadElem__17 (Files_Rider *r, address *r__typ, int32 pos, int32 span, Texts_Elem *e); -static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int32 pos, int32 span, Texts_Elem *e) +static void LoadElem__17 (Files_Rider *r, address *r__typ, int32 pos, int32 span, Texts_Elem *e) { Modules_Module M = NIL; Modules_Command Cmd; @@ -1466,7 +1466,7 @@ static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int32 pos, int32 span } } -static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +static void Texts_Load0 (Files_Rider *r, address *r__typ, Texts_Text T) { Texts_Run u = NIL, un = NIL; Texts_Piece p = NIL; @@ -1540,7 +1540,7 @@ static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T) Load0__16_s = _s.lnk; } -void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T) { int16 tag; Files_ReadInt(&*r, r__typ, &tag); @@ -1614,9 +1614,9 @@ static struct Store__39 { struct Store__39 *lnk; } *Store__39_s; -static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int32 pos, Texts_Elem e); +static void StoreElem__40 (Files_Rider *r, address *r__typ, int32 pos, Texts_Elem e); -static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int32 pos, Texts_Elem e) +static void StoreElem__40 (Files_Rider *r, address *r__typ, int32 pos, Texts_Elem e) { Files_Rider r1; int32 org, span; @@ -1646,7 +1646,7 @@ static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int32 pos, Texts_Ele Files_WriteLInt(&r1, Files_Rider__typ, e->H); } -void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T) { Files_Rider r1; Texts_Run u = NIL, un = NIL; diff --git a/bootstrap/unix-48/Texts.h b/bootstrap/unix-48/Texts.h index e3ed3241..df86e814 100644 --- a/bootstrap/unix-48/Texts.h +++ b/bootstrap/unix-48/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Texts__h #define Texts__h @@ -35,7 +35,7 @@ typedef } Texts_RunDesc; typedef - void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, LONGINT *); + void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, address *); typedef struct Texts_ElemDesc { @@ -116,18 +116,18 @@ typedef import Texts_Elem Texts_new; -import LONGINT *Texts_FontDesc__typ; -import LONGINT *Texts_RunDesc__typ; -import LONGINT *Texts_ElemMsg__typ; -import LONGINT *Texts_ElemDesc__typ; -import LONGINT *Texts_FileMsg__typ; -import LONGINT *Texts_CopyMsg__typ; -import LONGINT *Texts_IdentifyMsg__typ; -import LONGINT *Texts_BufDesc__typ; -import LONGINT *Texts_TextDesc__typ; -import LONGINT *Texts_Reader__typ; -import LONGINT *Texts_Scanner__typ; -import LONGINT *Texts_Writer__typ; +import address *Texts_FontDesc__typ; +import address *Texts_RunDesc__typ; +import address *Texts_ElemMsg__typ; +import address *Texts_ElemDesc__typ; +import address *Texts_FileMsg__typ; +import address *Texts_CopyMsg__typ; +import address *Texts_IdentifyMsg__typ; +import address *Texts_BufDesc__typ; +import address *Texts_TextDesc__typ; +import address *Texts_Reader__typ; +import address *Texts_Scanner__typ; +import address *Texts_Writer__typ; import void Texts_Append (Texts_Text T, Texts_Buffer B); import void Texts_ChangeLooks (Texts_Text T, int32 beg, int32 end, SET sel, Texts_FontsFont fnt, int8 col, int8 voff); @@ -138,35 +138,35 @@ import void Texts_Delete (Texts_Text T, int32 beg, int32 end); import Texts_Text Texts_ElemBase (Texts_Elem E); import int32 Texts_ElemPos (Texts_Elem E); import void Texts_Insert (Texts_Text T, int32 pos, Texts_Buffer B); -import void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T); +import void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T); import void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len); import void Texts_OpenBuf (Texts_Buffer B); -import void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos); -import void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 pos); -import void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ); -import int32 Texts_Pos (Texts_Reader *R, LONGINT *R__typ); -import void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch); -import void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ); -import void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ); +import void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int32 pos); +import void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int32 pos); +import void Texts_OpenWriter (Texts_Writer *W, address *W__typ); +import int32 Texts_Pos (Texts_Reader *R, address *R__typ); +import void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch); +import void Texts_ReadElem (Texts_Reader *R, address *R__typ); +import void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ); import void Texts_Recall (Texts_Buffer *B); import void Texts_Save (Texts_Text T, int32 beg, int32 end, Texts_Buffer B); -import void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ); -import void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col); -import void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt); -import void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff); -import void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -import void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch); -import void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int32 t, int32 d); -import void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e); -import void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x); -import void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n); -import void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ); -import void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n); -import void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x); -import void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n); -import void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int16 k); -import void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x); -import void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len); +import void Texts_Scan (Texts_Scanner *S, address *S__typ); +import void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col); +import void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt); +import void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff); +import void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T); +import void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch); +import void Texts_WriteDate (Texts_Writer *W, address *W__typ, int32 t, int32 d); +import void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e); +import void Texts_WriteHex (Texts_Writer *W, address *W__typ, int32 x); +import void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n); +import void Texts_WriteLn (Texts_Writer *W, address *W__typ); +import void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int16 n); +import void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x); +import void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int16 n); +import void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int16 n, int16 k); +import void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x); +import void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len); import void *Texts__init(void); diff --git a/bootstrap/unix-48/Vishap.c b/bootstrap/unix-48/Vishap.c index 7b2dcd23..1ec89e33 100644 --- a/bootstrap/unix-48/Vishap.c +++ b/bootstrap/unix-48/Vishap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspamSf */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspamSf */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-48/errors.c b/bootstrap/unix-48/errors.c index 3a4b1ce7..0a40d5e9 100644 --- a/bootstrap/unix-48/errors.c +++ b/bootstrap/unix-48/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-48/errors.h b/bootstrap/unix-48/errors.h index 6ca6c961..759b613e 100644 --- a/bootstrap/unix-48/errors.h +++ b/bootstrap/unix-48/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/unix-48/extTools.c b/bootstrap/unix-48/extTools.c index 2167c7f8..8be0b63d 100644 --- a/bootstrap/unix-48/extTools.c +++ b/bootstrap/unix-48/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-48/extTools.h b/bootstrap/unix-48/extTools.h index 0b905427..bff1c62c 100644 --- a/bootstrap/unix-48/extTools.h +++ b/bootstrap/unix-48/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/unix-48/vt100.c b/bootstrap/unix-48/vt100.c index c337a9e2..4f6a6c9d 100644 --- a/bootstrap/unix-48/vt100.c +++ b/bootstrap/unix-48/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/unix-48/vt100.h b/bootstrap/unix-48/vt100.h index 2428fce4..94f8add4 100644 --- a/bootstrap/unix-48/vt100.h +++ b/bootstrap/unix-48/vt100.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef vt100__h #define vt100__h diff --git a/bootstrap/unix-88/Configuration.c b/bootstrap/unix-88/Configuration.c index 8945bf88..fa5765f3 100644 --- a/bootstrap/unix-88/Configuration.c +++ b/bootstrap/unix-88/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -18,6 +18,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/09/22] for gcc LP64 on cygwin", Configuration_versionLong, 41); + __MOVE("1.95 [2016/09/23] for gcc LP64 on cygwin", Configuration_versionLong, 41); __ENDMOD; } diff --git a/bootstrap/unix-88/Configuration.h b/bootstrap/unix-88/Configuration.h index dca477a6..f51f63f2 100644 --- a/bootstrap/unix-88/Configuration.h +++ b/bootstrap/unix-88/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/unix-88/Console.c b/bootstrap/unix-88/Console.c index e86ee126..9d23b9fd 100644 --- a/bootstrap/unix-88/Console.c +++ b/bootstrap/unix-88/Console.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -118,10 +118,10 @@ void Console_Hex (int64 i) void Console_Read (CHAR *ch) { - address n; + int64 n; int32 error; Console_Flush(); - error = Platform_ReadBuf(0, (void*)&*ch, 1, (void*)&n); + error = Platform_ReadBuf(0, (void*)&*ch, 1, &n); if (n != 1) { *ch = 0x00; } diff --git a/bootstrap/unix-88/Console.h b/bootstrap/unix-88/Console.h index 02fad3c1..64d39044 100644 --- a/bootstrap/unix-88/Console.h +++ b/bootstrap/unix-88/Console.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Console__h #define Console__h diff --git a/bootstrap/unix-88/Files.c b/bootstrap/unix-88/Files.c index 076eb5a8..c63ea9c4 100644 --- a/bootstrap/unix-88/Files.c +++ b/bootstrap/unix-88/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -56,11 +56,11 @@ static struct { CHAR data[1]; } *Files_SearchPath; -export LONGINT *Files_FileDesc__typ; -export LONGINT *Files_BufDesc__typ; -export LONGINT *Files_Rider__typ; +export address *Files_FileDesc__typ; +export address *Files_BufDesc__typ; +export address *Files_Rider__typ; -export Files_File Files_Base (Files_Rider *r, LONGINT *r__typ); +export Files_File Files_Base (Files_Rider *r, address *r__typ); static Files_File Files_CacheEntry (Platform_FileIdentity identity); export void Files_ChangeDirectory (CHAR *path, LONGINT path__len, int32 *res); export void Files_Close (Files_File f); @@ -79,37 +79,37 @@ export int64 Files_Length (Files_File f); static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len); export Files_File Files_New (CHAR *name, LONGINT name__len); export Files_File Files_Old (CHAR *name, LONGINT name__len); -export int64 Files_Pos (Files_Rider *r, LONGINT *r__typ); +export int64 Files_Pos (Files_Rider *r, address *r__typ); export void Files_Purge (Files_File f); -export void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x); -export void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x); -export void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len); -export void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); -export void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int32 *x); -export void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int64 *x); -export void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x); -export void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); -export void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int64 *x); -export void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x); -export void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x); -export void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x); -export void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +export void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x); +export void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x); +export void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len); +export void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); +export void Files_ReadInt (Files_Rider *R, address *R__typ, int32 *x); +export void Files_ReadLInt (Files_Rider *R, address *R__typ, int64 *x); +export void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x); +export void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); +export void Files_ReadNum (Files_Rider *R, address *R__typ, int64 *x); +export void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x); +export void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x); +export void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x); +export void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); export void Files_Register (Files_File f); export void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, int32 *res); static void Files_ScanPath (int32 *pos, CHAR *dir, LONGINT dir__len); -export void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int64 pos); +export void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int64 pos); export void Files_SetSearchPath (CHAR *path, LONGINT path__len); -export void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x); -export void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x); -export void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); -export void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int32 x); -export void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int64 x); -export void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x); -export void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int64 x); -export void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x); -export void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x); -export void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x); -export void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +export void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x); +export void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x); +export void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); +export void Files_WriteInt (Files_Rider *R, address *R__typ, int32 x); +export void Files_WriteLInt (Files_Rider *R, address *R__typ, int64 x); +export void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x); +export void Files_WriteNum (Files_Rider *R, address *R__typ, int64 x); +export void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x); +export void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x); +export void Files_WriteSet (Files_Rider *R, address *R__typ, SET x); +export void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); #define Files_IdxTrap() __HALT(-1) @@ -544,14 +544,14 @@ void Files_GetDate (Files_File f, int64 *t, int64 *d) Platform_MTimeAsClock(identity, &*t, &*d); } -int64 Files_Pos (Files_Rider *r, LONGINT *r__typ) +int64 Files_Pos (Files_Rider *r, address *r__typ) { int64 _o_result; _o_result = (*r).org + (*r).offset; return _o_result; } -void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int64 pos) +void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int64 pos) { int64 org, offset, i, n; Files_Buffer buf = NIL; @@ -613,7 +613,7 @@ void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int64 pos) (*r).res = 0; } -void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x) +void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x) { int64 offset; Files_Buffer buf = NIL; @@ -637,7 +637,7 @@ void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x) } } -void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n) +void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n) { int64 xpos, min, restInBuf, offset; Files_Buffer buf = NIL; @@ -673,19 +673,19 @@ void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x (*r).eof = 0; } -void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len) +void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len) { Files_ReadBytes(&*r, r__typ, (void*)x, x__len * 1, 1); } -Files_File Files_Base (Files_Rider *r, LONGINT *r__typ) +Files_File Files_Base (Files_Rider *r, address *r__typ) { Files_File _o_result; _o_result = (*r).buf->f; return _o_result; } -void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x) +void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x) { Files_Buffer buf = NIL; int64 offset; @@ -706,7 +706,7 @@ void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x) (*r).res = 0; } -void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n) +void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n) { int64 xpos, min, restInBuf, offset; Files_Buffer buf = NIL; @@ -849,26 +849,26 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *de } } -void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x) +void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x) { Files_Read(&*R, R__typ, (CHAR*)(void*)&*x); } -void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int32 *x) +void Files_ReadInt (Files_Rider *R, address *R__typ, int32 *x) { CHAR b[2]; Files_ReadBytes(&*R, R__typ, (void*)b, 2, 2); *x = b[0] + __ASHL(b[1], 8); } -void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int64 *x) +void Files_ReadLInt (Files_Rider *R, address *R__typ, int64 *x) { CHAR b[4]; Files_ReadBytes(&*R, R__typ, (void*)b, 4, 4); *x = ((b[0] + __ASHL(b[1], 8)) + __ASHL(b[2], 16)) + __ASHL(b[3], 24); } -void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x) +void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x) { CHAR b[4]; int64 l; @@ -877,21 +877,21 @@ void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x) *x = (SET)l; } -void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x) +void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x) { CHAR b[4]; Files_ReadBytes(&*R, R__typ, (void*)b, 4, 4); Files_FlipBytes((void*)b, 4, (void*)&*x, 4); } -void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x) +void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x) { CHAR b[8]; Files_ReadBytes(&*R, R__typ, (void*)b, 8, 8); Files_FlipBytes((void*)b, 8, (void*)&*x, 8); } -void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int32 i; CHAR ch; @@ -903,7 +903,7 @@ void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) } while (!(ch == 0x00)); } -void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int32 i; CHAR ch; @@ -921,7 +921,7 @@ void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) } while (!b); } -void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int64 *x) +void Files_ReadNum (Files_Rider *R, address *R__typ, int64 *x) { int8 s; CHAR ch; @@ -938,19 +938,19 @@ void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int64 *x) *x = n; } -void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x) +void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x) { int64 n; Files_ReadNum(&*R, R__typ, &n); *x = n; } -void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x) +void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x) { Files_Write(&*R, R__typ, __VAL(CHAR, x)); } -void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int32 x) +void Files_WriteInt (Files_Rider *R, address *R__typ, int32 x) { CHAR b[2]; b[0] = (CHAR)x; @@ -958,7 +958,7 @@ void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int32 x) Files_WriteBytes(&*R, R__typ, (void*)b, 2, 2); } -void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int64 x) +void Files_WriteLInt (Files_Rider *R, address *R__typ, int64 x) { CHAR b[4]; b[0] = (CHAR)x; @@ -968,7 +968,7 @@ void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int64 x) Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x) +void Files_WriteSet (Files_Rider *R, address *R__typ, SET x) { CHAR b[4]; int64 i; @@ -980,21 +980,21 @@ void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x) Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x) +void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x) { CHAR b[4]; Files_FlipBytes((void*)&x, 4, (void*)b, 4); Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x) +void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x) { CHAR b[8]; Files_FlipBytes((void*)&x, 8, (void*)b, 8); Files_WriteBytes(&*R, R__typ, (void*)b, 8, 8); } -void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int32 i; i = 0; @@ -1004,7 +1004,7 @@ void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len Files_WriteBytes(&*R, R__typ, (void*)x, x__len * 1, i + 1); } -void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int64 x) +void Files_WriteNum (Files_Rider *R, address *R__typ, int64 x) { while (x < -64 || x > 63) { Files_Write(&*R, R__typ, (CHAR)(__MASK(x, -128) + 128)); @@ -1013,7 +1013,7 @@ void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int64 x) Files_Write(&*R, R__typ, (CHAR)__MASK(x, -128)); } -void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x) +void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x) { while (x < -64 || x > 63) { Files_Write(&*R, R__typ, (CHAR)(__MASK(x, -128) + 128)); diff --git a/bootstrap/unix-88/Files.h b/bootstrap/unix-88/Files.h index c2270808..645bc846 100644 --- a/bootstrap/unix-88/Files.h +++ b/bootstrap/unix-88/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #ifndef Files__h #define Files__h @@ -24,10 +24,10 @@ typedef -import LONGINT *Files_FileDesc__typ; -import LONGINT *Files_Rider__typ; +import address *Files_FileDesc__typ; +import address *Files_Rider__typ; -import Files_File Files_Base (Files_Rider *r, LONGINT *r__typ); +import Files_File Files_Base (Files_Rider *r, address *r__typ); import void Files_ChangeDirectory (CHAR *path, LONGINT path__len, int32 *res); import void Files_Close (Files_File f); import void Files_Delete (CHAR *name, LONGINT name__len, int32 *res); @@ -36,36 +36,36 @@ import void Files_GetName (Files_File f, CHAR *name, LONGINT name__len); import int64 Files_Length (Files_File f); import Files_File Files_New (CHAR *name, LONGINT name__len); import Files_File Files_Old (CHAR *name, LONGINT name__len); -import int64 Files_Pos (Files_Rider *r, LONGINT *r__typ); +import int64 Files_Pos (Files_Rider *r, address *r__typ); import void Files_Purge (Files_File f); -import void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x); -import void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x); -import void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len); -import void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); -import void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int32 *x); -import void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int64 *x); -import void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x); -import void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); -import void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int64 *x); -import void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x); -import void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x); -import void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x); -import void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +import void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x); +import void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x); +import void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len); +import void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); +import void Files_ReadInt (Files_Rider *R, address *R__typ, int32 *x); +import void Files_ReadLInt (Files_Rider *R, address *R__typ, int64 *x); +import void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x); +import void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); +import void Files_ReadNum (Files_Rider *R, address *R__typ, int64 *x); +import void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x); +import void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x); +import void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x); +import void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); import void Files_Register (Files_File f); import void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, int32 *res); -import void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int64 pos); +import void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int64 pos); import void Files_SetSearchPath (CHAR *path, LONGINT path__len); -import void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x); -import void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x); -import void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); -import void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int32 x); -import void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int64 x); -import void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x); -import void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int64 x); -import void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x); -import void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x); -import void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x); -import void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +import void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x); +import void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x); +import void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); +import void Files_WriteInt (Files_Rider *R, address *R__typ, int32 x); +import void Files_WriteLInt (Files_Rider *R, address *R__typ, int64 x); +import void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x); +import void Files_WriteNum (Files_Rider *R, address *R__typ, int64 x); +import void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x); +import void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x); +import void Files_WriteSet (Files_Rider *R, address *R__typ, SET x); +import void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); import void *Files__init(void); diff --git a/bootstrap/unix-88/Heap.c b/bootstrap/unix-88/Heap.c index 8d65bb87..c87cfd6d 100644 --- a/bootstrap/unix-88/Heap.c +++ b/bootstrap/unix-88/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tsSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tsSfF */ #define INTEGER int32 #define LONGINT int64 @@ -74,10 +74,10 @@ static int32 Heap_lockdepth; static BOOLEAN Heap_interrupted; export int32 Heap_FileCount; -export LONGINT *Heap_ModuleDesc__typ; -export LONGINT *Heap_CmdDesc__typ; -export LONGINT *Heap_FinDesc__typ; -export LONGINT *Heap__1__typ; +export address *Heap_ModuleDesc__typ; +export address *Heap_CmdDesc__typ; +export address *Heap_FinDesc__typ; +export address *Heap__1__typ; static void Heap_CheckFin (void); static void Heap_ExtendHeap (address blksz); diff --git a/bootstrap/unix-88/Heap.h b/bootstrap/unix-88/Heap.h index 516a3aca..b4829f2f 100644 --- a/bootstrap/unix-88/Heap.h +++ b/bootstrap/unix-88/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tsSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tsSfF */ #ifndef Heap__h #define Heap__h @@ -34,7 +34,7 @@ import SYSTEM_PTR Heap_modules; import address Heap_allocated, Heap_heapsize; import int32 Heap_FileCount; -import LONGINT *Heap_ModuleDesc__typ; +import address *Heap_ModuleDesc__typ; import void Heap_FINALL (void); import void Heap_GC (BOOLEAN markStack); diff --git a/bootstrap/unix-88/Modules.c b/bootstrap/unix-88/Modules.c index 3d3d4700..23fec310 100644 --- a/bootstrap/unix-88/Modules.c +++ b/bootstrap/unix-88/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -43,8 +43,8 @@ export int32 Modules_res; export CHAR Modules_resMsg[256]; export Modules_ModuleName Modules_imported, Modules_importing; -export LONGINT *Modules_ModuleDesc__typ; -export LONGINT *Modules_CmdDesc__typ; +export address *Modules_ModuleDesc__typ; +export address *Modules_CmdDesc__typ; static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len); export void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all); diff --git a/bootstrap/unix-88/Modules.h b/bootstrap/unix-88/Modules.h index 46624045..7cafac5f 100644 --- a/bootstrap/unix-88/Modules.h +++ b/bootstrap/unix-88/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Modules__h #define Modules__h @@ -40,8 +40,8 @@ import int32 Modules_res; import CHAR Modules_resMsg[256]; import Modules_ModuleName Modules_imported, Modules_importing; -import LONGINT *Modules_ModuleDesc__typ; -import LONGINT *Modules_CmdDesc__typ; +import address *Modules_ModuleDesc__typ; +import address *Modules_CmdDesc__typ; import void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all); import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len); diff --git a/bootstrap/unix-88/OPB.c b/bootstrap/unix-88/OPB.c index 5cea943a..81077606 100644 --- a/bootstrap/unix-88/OPB.c +++ b/bootstrap/unix-88/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/unix-88/OPB.h b/bootstrap/unix-88/OPB.h index 66bdcc6c..6863fee8 100644 --- a/bootstrap/unix-88/OPB.h +++ b/bootstrap/unix-88/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/unix-88/OPC.c b/bootstrap/unix-88/OPC.c index a01fcde9..ee7f4baa 100644 --- a/bootstrap/unix-88/OPC.c +++ b/bootstrap/unix-88/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -1041,7 +1041,7 @@ static void OPC_IdentList (OPT_Object obj, int32 vis) } else if ((obj->mode == 2 && obj->typ->comp == 4)) { OPC_EndStat(); OPC_BegStat(); - OPM_WriteString((CHAR*)"LONGINT *", 10); + OPM_WriteString((CHAR*)"address *", 10); OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); base = NIL; @@ -1078,7 +1078,7 @@ static void OPC_AnsiParamList (OPT_Object obj, BOOLEAN showParamNames) OPM_WriteString((CHAR*)", LONGINT ", 11); OPC_LenList(obj, 1, showParamNames); } else if ((obj->mode == 2 && obj->typ->comp == 4)) { - OPM_WriteString((CHAR*)", LONGINT *", 12); + OPM_WriteString((CHAR*)", address *", 12); if (showParamNames) { OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); @@ -1166,7 +1166,7 @@ static void OPC_GenDynTypes (OPT_Node n, int32 vis) } else { OPM_WriteString((CHAR*)"export ", 8); } - OPM_WriteString((CHAR*)"LONGINT *", 10); + OPM_WriteString((CHAR*)"address *", 10); OPC_Andent(typ); OPM_WriteString((CHAR*)"__typ", 6); OPC_EndStat(); diff --git a/bootstrap/unix-88/OPC.h b/bootstrap/unix-88/OPC.h index 4a7c8523..6fe30a31 100644 --- a/bootstrap/unix-88/OPC.h +++ b/bootstrap/unix-88/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/unix-88/OPM.c b/bootstrap/unix-88/OPM.c index 22131ab9..3f07341b 100644 --- a/bootstrap/unix-88/OPM.c +++ b/bootstrap/unix-88/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -40,7 +40,7 @@ static CHAR OPM_OBERON[1024]; static CHAR OPM_MODULES[1024]; -static void OPM_Append (Files_Rider *R, LONGINT *R__typ, Files_File F); +static void OPM_Append (Files_Rider *R, address *R__typ, Files_File F); export void OPM_CloseFiles (void); export void OPM_CloseOldSym (void); export void OPM_DeleteNewSym (void); @@ -48,10 +48,10 @@ export void OPM_FPrint (int64 *fp, int64 val); export void OPM_FPrintLReal (int64 *fp, LONGREAL lr); export void OPM_FPrintReal (int64 *fp, REAL real); export void OPM_FPrintSet (int64 *fp, SET set); -static void OPM_FindLine (Files_File f, Files_Rider *r, LONGINT *r__typ, int64 pos); +static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos); export void OPM_Get (CHAR *ch); static void OPM_GetProperties (void); -static void OPM_GetProperty (Texts_Scanner *S, LONGINT *S__typ, CHAR *name, LONGINT name__len, int32 *size, int32 *align); +static void OPM_GetProperty (Texts_Scanner *S, address *S__typ, CHAR *name, LONGINT name__len, int32 *size, int32 *align); export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); export void OPM_InitOptions (void); export int32 OPM_Integer (int64 n); @@ -495,7 +495,7 @@ static void OPM_LogErrMsg (int32 n) OPM_LogWStr(errors_errors[__X(n, 350)], 128); } -static void OPM_FindLine (Files_File f, Files_Rider *r, LONGINT *r__typ, int64 pos) +static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos) { CHAR ch, cheol; if (pos < OPM_ErrorLineStartPos) { @@ -651,7 +651,7 @@ void OPM_FPrintLReal (int64 *fp, LONGREAL lr) OPM_FPrint(&*fp, __VAL(int64, lr)); } -static void OPM_GetProperty (Texts_Scanner *S, LONGINT *S__typ, CHAR *name, LONGINT name__len, int32 *size, int32 *align) +static void OPM_GetProperty (Texts_Scanner *S, address *S__typ, CHAR *name, LONGINT name__len, int32 *size, int32 *align) { __DUP(name, name__len, CHAR); if (((*S).class == 1 && __STRCMP((*S).s, name) == 0)) { @@ -993,7 +993,7 @@ void OPM_WriteLn (void) Files_Write(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, 0x0a); } -static void OPM_Append (Files_Rider *R, LONGINT *R__typ, Files_File F) +static void OPM_Append (Files_Rider *R, address *R__typ, Files_File F) { Files_Rider R1; CHAR buffer[4096]; diff --git a/bootstrap/unix-88/OPM.h b/bootstrap/unix-88/OPM.h index b1fab659..765b9680 100644 --- a/bootstrap/unix-88/OPM.h +++ b/bootstrap/unix-88/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/unix-88/OPP.c b/bootstrap/unix-88/OPP.c index 8c85929d..9b25c35f 100644 --- a/bootstrap/unix-88/OPP.c +++ b/bootstrap/unix-88/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -24,7 +24,7 @@ static OPT_Node OPP_TDinit, OPP_lastTDinit; static int32 OPP_nofFwdPtr; static OPT_Struct OPP_FwdPtr[64]; -export LONGINT *OPP__1__typ; +export address *OPP__1__typ; static void OPP_ActualParameters (OPT_Node *aparlist, OPT_Object fpar); static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned); diff --git a/bootstrap/unix-88/OPP.h b/bootstrap/unix-88/OPP.h index 28045a86..e5a59f6c 100644 --- a/bootstrap/unix-88/OPP.h +++ b/bootstrap/unix-88/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/unix-88/OPS.c b/bootstrap/unix-88/OPS.c index 869dfa4b..cd24b8ee 100644 --- a/bootstrap/unix-88/OPS.c +++ b/bootstrap/unix-88/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/unix-88/OPS.h b/bootstrap/unix-88/OPS.h index 7de91cb4..bcc2ae4d 100644 --- a/bootstrap/unix-88/OPS.h +++ b/bootstrap/unix-88/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/unix-88/OPT.c b/bootstrap/unix-88/OPT.c index 2dd48c74..41686385 100644 --- a/bootstrap/unix-88/OPT.c +++ b/bootstrap/unix-88/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -100,12 +100,12 @@ static OPT_ExpCtxt OPT_expCtxt; static int64 OPT_nofhdfld; static BOOLEAN OPT_newsf, OPT_findpc, OPT_extsf, OPT_sfpresent, OPT_symExtended, OPT_symNew; -export LONGINT *OPT_ConstDesc__typ; -export LONGINT *OPT_ObjDesc__typ; -export LONGINT *OPT_StrDesc__typ; -export LONGINT *OPT_NodeDesc__typ; -export LONGINT *OPT_ImpCtxt__typ; -export LONGINT *OPT_ExpCtxt__typ; +export address *OPT_ConstDesc__typ; +export address *OPT_ObjDesc__typ; +export address *OPT_StrDesc__typ; +export address *OPT_NodeDesc__typ; +export address *OPT_ImpCtxt__typ; +export address *OPT_ExpCtxt__typ; export void OPT_Close (void); export void OPT_CloseScope (void); diff --git a/bootstrap/unix-88/OPT.h b/bootstrap/unix-88/OPT.h index a1956589..697eb2c9 100644 --- a/bootstrap/unix-88/OPT.h +++ b/bootstrap/unix-88/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPT__h #define OPT__h @@ -74,10 +74,10 @@ import OPT_Object OPT_GlbMod[64]; import OPS_Name OPT_SelfName; import BOOLEAN OPT_SYSimported; -import LONGINT *OPT_ConstDesc__typ; -import LONGINT *OPT_ObjDesc__typ; -import LONGINT *OPT_StrDesc__typ; -import LONGINT *OPT_NodeDesc__typ; +import address *OPT_ConstDesc__typ; +import address *OPT_ObjDesc__typ; +import address *OPT_StrDesc__typ; +import address *OPT_NodeDesc__typ; import void OPT_Close (void); import void OPT_CloseScope (void); diff --git a/bootstrap/unix-88/OPV.c b/bootstrap/unix-88/OPV.c index 22d0def4..b57b2868 100644 --- a/bootstrap/unix-88/OPV.c +++ b/bootstrap/unix-88/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -21,7 +21,7 @@ static int64 OPV_recno; static OPV_ExitInfo OPV_exit; static int32 OPV_nofExitLabels; -export LONGINT *OPV_ExitInfo__typ; +export address *OPV_ExitInfo__typ; static void OPV_ActualPar (OPT_Node n, OPT_Object fp); export void OPV_AdrAndSize (OPT_Object topScope); diff --git a/bootstrap/unix-88/OPV.h b/bootstrap/unix-88/OPV.h index 4a3f9d07..c309d63c 100644 --- a/bootstrap/unix-88/OPV.h +++ b/bootstrap/unix-88/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/unix-88/Platform.c b/bootstrap/unix-88/Platform.c index 733b53ef..27df644a 100644 --- a/bootstrap/unix-88/Platform.c +++ b/bootstrap/unix-88/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -42,7 +42,7 @@ static int64 Platform_TimeStart; export int32 Platform_SeekSet, Platform_SeekCur, Platform_SeekEnd; export CHAR Platform_nl[3]; -export LONGINT *Platform_FileIdentity__typ; +export address *Platform_FileIdentity__typ; export BOOLEAN Platform_Absent (int32 e); export int32 Platform_ArgPos (CHAR *s, LONGINT s__len); @@ -61,8 +61,8 @@ export void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val export void Platform_GetIntArg (int32 n, int64 *val); export void Platform_GetTimeOfDay (int64 *sec, int64 *usec); export void Platform_Halt (int64 code); -export int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, LONGINT *identity__typ); -export int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ); +export int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, address *identity__typ); +export int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ); export BOOLEAN Platform_Inaccessible (int32 e); export void Platform_Init (int32 argc, address argvadr); export void Platform_MTimeAsClock (Platform_FileIdentity i, int64 *t, int64 *d); @@ -72,8 +72,8 @@ export address Platform_OSAllocate (address size); export void Platform_OSFree (address address); export int32 Platform_OldRO (CHAR *n, LONGINT n__len, int64 *h); export int32 Platform_OldRW (CHAR *n, LONGINT n__len, int64 *h); -export int32 Platform_Read (int64 h, address p, address l, address *n); -export int32 Platform_ReadBuf (int64 h, SYSTEM_BYTE *b, LONGINT b__len, address *n); +export int32 Platform_Read (int64 h, address p, int64 l, int64 *n); +export int32 Platform_ReadBuf (int64 h, SYSTEM_BYTE *b, LONGINT b__len, int64 *n); export int32 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len); export BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2); export BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2); @@ -81,9 +81,9 @@ export int32 Platform_Seek (int64 h, int64 offset, int32 whence); export void Platform_SetBadInstructionHandler (Platform_SignalHandler handler); export void Platform_SetHalt (Platform_HaltProcedure p); export void Platform_SetInterruptHandler (Platform_SignalHandler handler); -export void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source); +export void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source); export void Platform_SetQuitHandler (Platform_SignalHandler handler); -export int32 Platform_Size (int64 h, address *l); +export int32 Platform_Size (int64 h, int64 *l); export int32 Platform_Sync (int64 h); export int32 Platform_System (CHAR *cmd, LONGINT cmd__len); static void Platform_TestLittleEndian (void); @@ -446,7 +446,7 @@ int32 Platform_Close (int64 h) __RETCHK; } -int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, LONGINT *identity__typ) +int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, address *identity__typ) { int32 _o_result; Platform_structstats(); @@ -461,7 +461,7 @@ int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, LONGINT *iden return _o_result; } -int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ) +int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ) { int32 _o_result; __DUP(n, n__len, CHAR); @@ -493,7 +493,7 @@ BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i return _o_result; } -void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source) +void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source) { (*target).mtime = source.mtime; } @@ -504,7 +504,7 @@ void Platform_MTimeAsClock (Platform_FileIdentity i, int64 *t, int64 *d) Platform_YMDHMStoClock(Platform_tmyear(), Platform_tmmon(), Platform_tmmday(), Platform_tmhour(), Platform_tmmin(), Platform_tmsec(), &*t, &*d); } -int32 Platform_Size (int64 h, address *l) +int32 Platform_Size (int64 h, int64 *l) { int32 _o_result; Platform_structstats(); @@ -517,7 +517,7 @@ int32 Platform_Size (int64 h, address *l) return _o_result; } -int32 Platform_Read (int64 h, address p, address l, address *n) +int32 Platform_Read (int64 h, address p, int64 l, int64 *n) { int32 _o_result; *n = Platform_readfile(h, p, l); @@ -532,7 +532,7 @@ int32 Platform_Read (int64 h, address p, address l, address *n) __RETCHK; } -int32 Platform_ReadBuf (int64 h, SYSTEM_BYTE *b, LONGINT b__len, address *n) +int32 Platform_ReadBuf (int64 h, SYSTEM_BYTE *b, LONGINT b__len, int64 *n) { int32 _o_result; *n = Platform_readfile(h, (address)b, b__len); diff --git a/bootstrap/unix-88/Platform.h b/bootstrap/unix-88/Platform.h index 97c6cb2a..f44cd9e8 100644 --- a/bootstrap/unix-88/Platform.h +++ b/bootstrap/unix-88/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Platform__h #define Platform__h @@ -27,7 +27,7 @@ import address Platform_ArgVector; import int32 Platform_SeekSet, Platform_SeekCur, Platform_SeekEnd; import CHAR Platform_nl[3]; -import LONGINT *Platform_FileIdentity__typ; +import address *Platform_FileIdentity__typ; import BOOLEAN Platform_Absent (int32 e); import int32 Platform_ArgPos (CHAR *s, LONGINT s__len); @@ -45,8 +45,8 @@ import void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val import void Platform_GetIntArg (int32 n, int64 *val); import void Platform_GetTimeOfDay (int64 *sec, int64 *usec); import void Platform_Halt (int64 code); -import int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, LONGINT *identity__typ); -import int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ); +import int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, address *identity__typ); +import int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ); import BOOLEAN Platform_Inaccessible (int32 e); import void Platform_Init (int32 argc, address argvadr); import void Platform_MTimeAsClock (Platform_FileIdentity i, int64 *t, int64 *d); @@ -56,8 +56,8 @@ import address Platform_OSAllocate (address size); import void Platform_OSFree (address address); import int32 Platform_OldRO (CHAR *n, LONGINT n__len, int64 *h); import int32 Platform_OldRW (CHAR *n, LONGINT n__len, int64 *h); -import int32 Platform_Read (int64 h, address p, address l, address *n); -import int32 Platform_ReadBuf (int64 h, SYSTEM_BYTE *b, LONGINT b__len, address *n); +import int32 Platform_Read (int64 h, address p, int64 l, int64 *n); +import int32 Platform_ReadBuf (int64 h, SYSTEM_BYTE *b, LONGINT b__len, int64 *n); import int32 Platform_Rename (CHAR *o, LONGINT o__len, CHAR *n, LONGINT n__len); import BOOLEAN Platform_SameFile (Platform_FileIdentity i1, Platform_FileIdentity i2); import BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i2); @@ -65,9 +65,9 @@ import int32 Platform_Seek (int64 h, int64 offset, int32 whence); import void Platform_SetBadInstructionHandler (Platform_SignalHandler handler); import void Platform_SetHalt (Platform_HaltProcedure p); import void Platform_SetInterruptHandler (Platform_SignalHandler handler); -import void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source); +import void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source); import void Platform_SetQuitHandler (Platform_SignalHandler handler); -import int32 Platform_Size (int64 h, address *l); +import int32 Platform_Size (int64 h, int64 *l); import int32 Platform_Sync (int64 h); import int32 Platform_System (CHAR *cmd, LONGINT cmd__len); import int64 Platform_Time (void); diff --git a/bootstrap/unix-88/Reals.c b/bootstrap/unix-88/Reals.c index 039a3b6d..7678a81e 100644 --- a/bootstrap/unix-88/Reals.c +++ b/bootstrap/unix-88/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/unix-88/Reals.h b/bootstrap/unix-88/Reals.h index e27d5dca..4de192c6 100644 --- a/bootstrap/unix-88/Reals.h +++ b/bootstrap/unix-88/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/unix-88/Strings.c b/bootstrap/unix-88/Strings.c index 2f1a7062..49fbdd21 100644 --- a/bootstrap/unix-88/Strings.c +++ b/bootstrap/unix-88/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/unix-88/Strings.h b/bootstrap/unix-88/Strings.h index 90baacae..4dd0d2c3 100644 --- a/bootstrap/unix-88/Strings.h +++ b/bootstrap/unix-88/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/unix-88/Texts.c b/bootstrap/unix-88/Texts.c index ee371c4e..6403ce33 100644 --- a/bootstrap/unix-88/Texts.c +++ b/bootstrap/unix-88/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -33,7 +33,7 @@ typedef } Texts_ElemMsg; typedef - void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, LONGINT *); + void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, address *); typedef struct Texts_TextDesc *Texts_Text; @@ -167,20 +167,20 @@ export Texts_Elem Texts_new; static Texts_Buffer Texts_del; static Texts_FontsFont Texts_FontsDefault; -export LONGINT *Texts_FontDesc__typ; -export LONGINT *Texts_RunDesc__typ; -export LONGINT *Texts_PieceDesc__typ; -export LONGINT *Texts_ElemMsg__typ; -export LONGINT *Texts_ElemDesc__typ; -export LONGINT *Texts_FileMsg__typ; -export LONGINT *Texts_CopyMsg__typ; -export LONGINT *Texts_IdentifyMsg__typ; -export LONGINT *Texts_BufDesc__typ; -export LONGINT *Texts_TextDesc__typ; -export LONGINT *Texts_Reader__typ; -export LONGINT *Texts_Scanner__typ; -export LONGINT *Texts_Writer__typ; -export LONGINT *Texts__1__typ; +export address *Texts_FontDesc__typ; +export address *Texts_RunDesc__typ; +export address *Texts_PieceDesc__typ; +export address *Texts_ElemMsg__typ; +export address *Texts_ElemDesc__typ; +export address *Texts_FileMsg__typ; +export address *Texts_CopyMsg__typ; +export address *Texts_IdentifyMsg__typ; +export address *Texts_BufDesc__typ; +export address *Texts_TextDesc__typ; +export address *Texts_Reader__typ; +export address *Texts_Scanner__typ; +export address *Texts_Writer__typ; +export address *Texts__1__typ; export void Texts_Append (Texts_Text T, Texts_Buffer B); export void Texts_ChangeLooks (Texts_Text T, int64 beg, int64 end, SET sel, Texts_FontsFont fnt, int8 col, int8 voff); @@ -194,41 +194,41 @@ export Texts_Text Texts_ElemBase (Texts_Elem E); export int64 Texts_ElemPos (Texts_Elem E); static void Texts_Find (Texts_Text T, int64 *pos, Texts_Run *u, int64 *org, int64 *off); static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len); -static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, LONGINT *msg__typ); +static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, address *msg__typ); export void Texts_Insert (Texts_Text T, int64 pos, Texts_Buffer B); -export void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T); +export void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T); +static void Texts_Load0 (Files_Rider *r, address *r__typ, Texts_Text T); static void Texts_Merge (Texts_Text T, Texts_Run u, Texts_Run *v); export void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len); export void Texts_OpenBuf (Texts_Buffer B); -export void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int64 pos); -export void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int64 pos); -export void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ); -export int64 Texts_Pos (Texts_Reader *R, LONGINT *R__typ); -export void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch); -export void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ); -export void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ); +export void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int64 pos); +export void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int64 pos); +export void Texts_OpenWriter (Texts_Writer *W, address *W__typ); +export int64 Texts_Pos (Texts_Reader *R, address *R__typ); +export void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch); +export void Texts_ReadElem (Texts_Reader *R, address *R__typ); +export void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ); export void Texts_Recall (Texts_Buffer *B); export void Texts_Save (Texts_Text T, int64 beg, int64 end, Texts_Buffer B); -export void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ); -export void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col); -export void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt); -export void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff); +export void Texts_Scan (Texts_Scanner *S, address *S__typ); +export void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col); +export void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt); +export void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff); static void Texts_Splice (Texts_Run un, Texts_Run v, Texts_Run w, Texts_Text base); static void Texts_Split (int64 off, Texts_Run *u, Texts_Run *un); -export void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -export void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch); -export void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int64 t, int64 d); -export void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e); -export void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int64 x); -export void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n); -export void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ); -export void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int32 n); -export void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x); -export void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n); -export void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n, int32 k); -export void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x); -export void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len); +export void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T); +export void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch); +export void Texts_WriteDate (Texts_Writer *W, address *W__typ, int64 t, int64 d); +export void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e); +export void Texts_WriteHex (Texts_Writer *W, address *W__typ, int64 x); +export void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n); +export void Texts_WriteLn (Texts_Writer *W, address *W__typ); +export void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int32 n); +export void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x); +export void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int32 n); +export void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int32 n, int32 k); +export void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x); +export void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len); static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len) @@ -388,7 +388,7 @@ int64 Texts_ElemPos (Texts_Elem E) return _o_result; } -static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, LONGINT *msg__typ) +static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, address *msg__typ) { Texts_Alien e = NIL; Files_Rider r; @@ -604,7 +604,7 @@ void Texts_ChangeLooks (Texts_Text T, int64 beg, int64 end, SET sel, Texts_Fonts } } -void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int64 pos) +void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int64 pos) { Texts_Run u = NIL; if (pos >= T->len) { @@ -618,7 +618,7 @@ void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int64 pos } } -void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch) +void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch) { Texts_Run u = NIL; int64 pos; @@ -663,7 +663,7 @@ void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch) } } -void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ) +void Texts_ReadElem (Texts_Reader *R, address *R__typ) { Texts_Run u = NIL, un = NIL; u = (*R).run; @@ -691,7 +691,7 @@ void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ) } } -void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ) +void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ) { Texts_Run u = NIL; u = (*R).run->prev; @@ -713,14 +713,14 @@ void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ) } } -int64 Texts_Pos (Texts_Reader *R, LONGINT *R__typ) +int64 Texts_Pos (Texts_Reader *R, address *R__typ) { int64 _o_result; _o_result = (*R).org + (*R).off; return _o_result; } -void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int64 pos) +void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int64 pos) { Texts_OpenReader((void*)&*S, S__typ, T, pos); (*S).line = 0; @@ -729,7 +729,7 @@ void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int64 p static struct Scan__31 { Texts_Scanner *S; - LONGINT *S__typ; + address *S__typ; CHAR *ch; BOOLEAN *negE; int32 *e; @@ -756,7 +756,7 @@ static void ReadScaleFactor__32 (void) } } -void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ) +void Texts_Scan (Texts_Scanner *S, address *S__typ) { CHAR ch, term; BOOLEAN neg, negE, hex; @@ -962,7 +962,7 @@ void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ) Scan__31_s = _s.lnk; } -void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ) +void Texts_OpenWriter (Texts_Writer *W, address *W__typ) { __NEW((*W).buf, Texts_BufDesc); Texts_OpenBuf((*W).buf); @@ -973,22 +973,22 @@ void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ) Files_Set(&(*W).rider, Files_Rider__typ, (*W).file, 0); } -void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt) +void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt) { (*W).fnt = fnt; } -void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col) +void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col) { (*W).col = col; } -void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff) +void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff) { (*W).voff = voff; } -void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch) +void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch) { Texts_Run u = NIL, un = NIL; Texts_Piece p = NIL; @@ -1014,7 +1014,7 @@ void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch) } } -void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e) +void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e) { Texts_Run u = NIL, un = NIL; if (e->base != NIL) { @@ -1033,12 +1033,12 @@ void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e) un->prev = (Texts_Run)e; } -void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ) +void Texts_WriteLn (Texts_Writer *W, address *W__typ) { Texts_Write(&*W, W__typ, 0x0d); } -void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len) +void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len) { int32 i; __DUP(s, s__len, CHAR); @@ -1050,7 +1050,7 @@ void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__le __DEL(s); } -void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n) +void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n) { int32 i; int64 x0; @@ -1085,7 +1085,7 @@ void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n) } while (!(i == 0)); } -void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int64 x) +void Texts_WriteHex (Texts_Writer *W, address *W__typ, int64 x) { int32 i; int64 y; @@ -1108,7 +1108,7 @@ void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int64 x) } while (!(i == 0)); } -void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n) +void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int32 n) { int32 e; REAL x0; @@ -1180,7 +1180,7 @@ void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n) static struct WriteRealFix__53 { Texts_Writer *W; - LONGINT *W__typ; + address *W__typ; int32 *i; CHAR (*d)[9]; struct WriteRealFix__53 *lnk; @@ -1206,7 +1206,7 @@ static void dig__54 (int32 n) } } -void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n, int32 k) +void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int32 n, int32 k) { int32 e, i; CHAR sign; @@ -1278,7 +1278,7 @@ void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n, int3 WriteRealFix__53_s = _s.lnk; } -void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x) +void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x) { int32 i; CHAR d[8]; @@ -1290,7 +1290,7 @@ void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x) } while (!(i == 8)); } -void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int32 n) +void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int32 n) { int32 e; LONGREAL x0; @@ -1362,7 +1362,7 @@ void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int32 n) } } -void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x) +void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x) { int32 i; CHAR d[16]; @@ -1376,7 +1376,7 @@ void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x) static struct WriteDate__43 { Texts_Writer *W; - LONGINT *W__typ; + address *W__typ; struct WriteDate__43 *lnk; } *WriteDate__43_s; @@ -1389,7 +1389,7 @@ static void WritePair__44 (CHAR ch, int64 x) Texts_Write(&*WriteDate__43_s->W, WriteDate__43_s->W__typ, (CHAR)(__MOD(x, 10) + 48)); } -void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int64 t, int64 d) +void Texts_WriteDate (Texts_Writer *W, address *W__typ, int64 t, int64 d) { struct WriteDate__43 _s; _s.W = W; _s.W__typ = W__typ; @@ -1413,9 +1413,9 @@ static struct Load0__16 { struct Load0__16 *lnk; } *Load0__16_s; -static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int64 pos, int64 span, Texts_Elem *e); +static void LoadElem__17 (Files_Rider *r, address *r__typ, int64 pos, int64 span, Texts_Elem *e); -static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int64 pos, int64 span, Texts_Elem *e) +static void LoadElem__17 (Files_Rider *r, address *r__typ, int64 pos, int64 span, Texts_Elem *e) { Modules_Module M = NIL; Modules_Command Cmd; @@ -1466,7 +1466,7 @@ static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int64 pos, int64 span } } -static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +static void Texts_Load0 (Files_Rider *r, address *r__typ, Texts_Text T) { Texts_Run u = NIL, un = NIL; Texts_Piece p = NIL; @@ -1540,7 +1540,7 @@ static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T) Load0__16_s = _s.lnk; } -void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T) { int32 tag; Files_ReadInt(&*r, r__typ, &tag); @@ -1614,9 +1614,9 @@ static struct Store__39 { struct Store__39 *lnk; } *Store__39_s; -static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int64 pos, Texts_Elem e); +static void StoreElem__40 (Files_Rider *r, address *r__typ, int64 pos, Texts_Elem e); -static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int64 pos, Texts_Elem e) +static void StoreElem__40 (Files_Rider *r, address *r__typ, int64 pos, Texts_Elem e) { Files_Rider r1; int64 org, span; @@ -1646,7 +1646,7 @@ static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int64 pos, Texts_Ele Files_WriteLInt(&r1, Files_Rider__typ, e->H); } -void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T) { Files_Rider r1; Texts_Run u = NIL, un = NIL; diff --git a/bootstrap/unix-88/Texts.h b/bootstrap/unix-88/Texts.h index 32047663..e85157ed 100644 --- a/bootstrap/unix-88/Texts.h +++ b/bootstrap/unix-88/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Texts__h #define Texts__h @@ -35,7 +35,7 @@ typedef } Texts_RunDesc; typedef - void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, LONGINT *); + void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, address *); typedef struct Texts_ElemDesc { @@ -115,18 +115,18 @@ typedef import Texts_Elem Texts_new; -import LONGINT *Texts_FontDesc__typ; -import LONGINT *Texts_RunDesc__typ; -import LONGINT *Texts_ElemMsg__typ; -import LONGINT *Texts_ElemDesc__typ; -import LONGINT *Texts_FileMsg__typ; -import LONGINT *Texts_CopyMsg__typ; -import LONGINT *Texts_IdentifyMsg__typ; -import LONGINT *Texts_BufDesc__typ; -import LONGINT *Texts_TextDesc__typ; -import LONGINT *Texts_Reader__typ; -import LONGINT *Texts_Scanner__typ; -import LONGINT *Texts_Writer__typ; +import address *Texts_FontDesc__typ; +import address *Texts_RunDesc__typ; +import address *Texts_ElemMsg__typ; +import address *Texts_ElemDesc__typ; +import address *Texts_FileMsg__typ; +import address *Texts_CopyMsg__typ; +import address *Texts_IdentifyMsg__typ; +import address *Texts_BufDesc__typ; +import address *Texts_TextDesc__typ; +import address *Texts_Reader__typ; +import address *Texts_Scanner__typ; +import address *Texts_Writer__typ; import void Texts_Append (Texts_Text T, Texts_Buffer B); import void Texts_ChangeLooks (Texts_Text T, int64 beg, int64 end, SET sel, Texts_FontsFont fnt, int8 col, int8 voff); @@ -137,35 +137,35 @@ import void Texts_Delete (Texts_Text T, int64 beg, int64 end); import Texts_Text Texts_ElemBase (Texts_Elem E); import int64 Texts_ElemPos (Texts_Elem E); import void Texts_Insert (Texts_Text T, int64 pos, Texts_Buffer B); -import void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T); +import void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T); import void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len); import void Texts_OpenBuf (Texts_Buffer B); -import void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int64 pos); -import void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int64 pos); -import void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ); -import int64 Texts_Pos (Texts_Reader *R, LONGINT *R__typ); -import void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch); -import void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ); -import void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ); +import void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int64 pos); +import void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int64 pos); +import void Texts_OpenWriter (Texts_Writer *W, address *W__typ); +import int64 Texts_Pos (Texts_Reader *R, address *R__typ); +import void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch); +import void Texts_ReadElem (Texts_Reader *R, address *R__typ); +import void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ); import void Texts_Recall (Texts_Buffer *B); import void Texts_Save (Texts_Text T, int64 beg, int64 end, Texts_Buffer B); -import void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ); -import void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col); -import void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt); -import void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff); -import void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -import void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch); -import void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int64 t, int64 d); -import void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e); -import void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int64 x); -import void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n); -import void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ); -import void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int32 n); -import void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x); -import void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n); -import void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n, int32 k); -import void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x); -import void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len); +import void Texts_Scan (Texts_Scanner *S, address *S__typ); +import void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col); +import void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt); +import void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff); +import void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T); +import void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch); +import void Texts_WriteDate (Texts_Writer *W, address *W__typ, int64 t, int64 d); +import void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e); +import void Texts_WriteHex (Texts_Writer *W, address *W__typ, int64 x); +import void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n); +import void Texts_WriteLn (Texts_Writer *W, address *W__typ); +import void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int32 n); +import void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x); +import void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int32 n); +import void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int32 n, int32 k); +import void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x); +import void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len); import void *Texts__init(void); diff --git a/bootstrap/unix-88/Vishap.c b/bootstrap/unix-88/Vishap.c index 87812cc2..5c6cada1 100644 --- a/bootstrap/unix-88/Vishap.c +++ b/bootstrap/unix-88/Vishap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspamSf */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspamSf */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/unix-88/errors.c b/bootstrap/unix-88/errors.c index 897999f4..4bb09433 100644 --- a/bootstrap/unix-88/errors.c +++ b/bootstrap/unix-88/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/unix-88/errors.h b/bootstrap/unix-88/errors.h index 6ca6c961..759b613e 100644 --- a/bootstrap/unix-88/errors.h +++ b/bootstrap/unix-88/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/unix-88/extTools.c b/bootstrap/unix-88/extTools.c index 1647c4fe..d6bc2194 100644 --- a/bootstrap/unix-88/extTools.c +++ b/bootstrap/unix-88/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/unix-88/extTools.h b/bootstrap/unix-88/extTools.h index 0b905427..bff1c62c 100644 --- a/bootstrap/unix-88/extTools.h +++ b/bootstrap/unix-88/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/unix-88/vt100.c b/bootstrap/unix-88/vt100.c index 8b57066f..bb55d599 100644 --- a/bootstrap/unix-88/vt100.c +++ b/bootstrap/unix-88/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/unix-88/vt100.h b/bootstrap/unix-88/vt100.h index e8809371..2bc7d18f 100644 --- a/bootstrap/unix-88/vt100.h +++ b/bootstrap/unix-88/vt100.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef vt100__h #define vt100__h diff --git a/bootstrap/windows-48/Configuration.c b/bootstrap/windows-48/Configuration.c index b17dc344..abdf151b 100644 --- a/bootstrap/windows-48/Configuration.c +++ b/bootstrap/windows-48/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -18,6 +18,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/09/22] for gcc LP64 on cygwin", Configuration_versionLong, 41); + __MOVE("1.95 [2016/09/23] for gcc LP64 on cygwin", Configuration_versionLong, 41); __ENDMOD; } diff --git a/bootstrap/windows-48/Configuration.h b/bootstrap/windows-48/Configuration.h index dca477a6..f51f63f2 100644 --- a/bootstrap/windows-48/Configuration.h +++ b/bootstrap/windows-48/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/windows-48/Console.c b/bootstrap/windows-48/Console.c index 2e0565e9..7b492ced 100644 --- a/bootstrap/windows-48/Console.c +++ b/bootstrap/windows-48/Console.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -118,10 +118,10 @@ void Console_Hex (int32 i) void Console_Read (CHAR *ch) { - address n; + int32 n; int16 error; Console_Flush(); - error = Platform_ReadBuf(Platform_StdIn, (void*)&*ch, 1, (void*)&n); + error = Platform_ReadBuf(Platform_StdIn, (void*)&*ch, 1, &n); if (n != 1) { *ch = 0x00; } diff --git a/bootstrap/windows-48/Console.h b/bootstrap/windows-48/Console.h index 6837ab77..b08c93ea 100644 --- a/bootstrap/windows-48/Console.h +++ b/bootstrap/windows-48/Console.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Console__h #define Console__h diff --git a/bootstrap/windows-48/Files.c b/bootstrap/windows-48/Files.c index 4b2bb492..98974743 100644 --- a/bootstrap/windows-48/Files.c +++ b/bootstrap/windows-48/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -56,11 +56,11 @@ static struct { CHAR data[1]; } *Files_SearchPath; -export LONGINT *Files_FileDesc__typ; -export LONGINT *Files_BufDesc__typ; -export LONGINT *Files_Rider__typ; +export address *Files_FileDesc__typ; +export address *Files_BufDesc__typ; +export address *Files_Rider__typ; -export Files_File Files_Base (Files_Rider *r, LONGINT *r__typ); +export Files_File Files_Base (Files_Rider *r, address *r__typ); static Files_File Files_CacheEntry (Platform_FileIdentity identity); export void Files_ChangeDirectory (CHAR *path, LONGINT path__len, int16 *res); export void Files_Close (Files_File f); @@ -79,37 +79,37 @@ export int32 Files_Length (Files_File f); static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len); export Files_File Files_New (CHAR *name, LONGINT name__len); export Files_File Files_Old (CHAR *name, LONGINT name__len); -export int32 Files_Pos (Files_Rider *r, LONGINT *r__typ); +export int32 Files_Pos (Files_Rider *r, address *r__typ); export void Files_Purge (Files_File f); -export void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x); -export void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x); -export void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len); -export void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -export void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int16 *x); -export void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int32 *x); -export void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x); -export void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); -export void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x); -export void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x); -export void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x); -export void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x); -export void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +export void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x); +export void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x); +export void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len); +export void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +export void Files_ReadInt (Files_Rider *R, address *R__typ, int16 *x); +export void Files_ReadLInt (Files_Rider *R, address *R__typ, int32 *x); +export void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x); +export void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); +export void Files_ReadNum (Files_Rider *R, address *R__typ, int32 *x); +export void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x); +export void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x); +export void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x); +export void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); export void Files_Register (Files_File f); export void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, int16 *res); static void Files_ScanPath (int16 *pos, CHAR *dir, LONGINT dir__len); -export void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos); +export void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int32 pos); export void Files_SetSearchPath (CHAR *path, LONGINT path__len); -export void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x); -export void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x); -export void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -export void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x); -export void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x); -export void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x); -export void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x); -export void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x); -export void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x); -export void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x); -export void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +export void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x); +export void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x); +export void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +export void Files_WriteInt (Files_Rider *R, address *R__typ, int16 x); +export void Files_WriteLInt (Files_Rider *R, address *R__typ, int32 x); +export void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x); +export void Files_WriteNum (Files_Rider *R, address *R__typ, int32 x); +export void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x); +export void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x); +export void Files_WriteSet (Files_Rider *R, address *R__typ, SET x); +export void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); #define Files_IdxTrap() __HALT(-1) @@ -544,14 +544,14 @@ void Files_GetDate (Files_File f, int32 *t, int32 *d) Platform_MTimeAsClock(identity, &*t, &*d); } -int32 Files_Pos (Files_Rider *r, LONGINT *r__typ) +int32 Files_Pos (Files_Rider *r, address *r__typ) { int32 _o_result; _o_result = (*r).org + (*r).offset; return _o_result; } -void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos) +void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int32 pos) { int32 org, offset, i, n; Files_Buffer buf = NIL; @@ -613,7 +613,7 @@ void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos) (*r).res = 0; } -void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x) +void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x) { int32 offset; Files_Buffer buf = NIL; @@ -637,7 +637,7 @@ void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x) } } -void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) +void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) { int32 xpos, min, restInBuf, offset; Files_Buffer buf = NIL; @@ -673,19 +673,19 @@ void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x (*r).eof = 0; } -void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len) +void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len) { Files_ReadBytes(&*r, r__typ, (void*)x, x__len * 1, 1); } -Files_File Files_Base (Files_Rider *r, LONGINT *r__typ) +Files_File Files_Base (Files_Rider *r, address *r__typ) { Files_File _o_result; _o_result = (*r).buf->f; return _o_result; } -void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x) +void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x) { Files_Buffer buf = NIL; int32 offset; @@ -706,7 +706,7 @@ void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x) (*r).res = 0; } -void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) +void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n) { int32 xpos, min, restInBuf, offset; Files_Buffer buf = NIL; @@ -849,26 +849,26 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *de } } -void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x) +void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x) { Files_Read(&*R, R__typ, (CHAR*)(void*)&*x); } -void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int16 *x) +void Files_ReadInt (Files_Rider *R, address *R__typ, int16 *x) { CHAR b[2]; Files_ReadBytes(&*R, R__typ, (void*)b, 2, 2); *x = (int16)b[0] + __ASHL((int16)b[1], 8); } -void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int32 *x) +void Files_ReadLInt (Files_Rider *R, address *R__typ, int32 *x) { CHAR b[4]; Files_ReadBytes(&*R, R__typ, (void*)b, 4, 4); *x = (((int16)b[0] + __ASHL((int16)b[1], 8)) + __ASHL(b[2], 16)) + __ASHL(b[3], 24); } -void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x) +void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x) { CHAR b[4]; int32 l; @@ -877,21 +877,21 @@ void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x) *x = (SET)l; } -void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x) +void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x) { CHAR b[4]; Files_ReadBytes(&*R, R__typ, (void*)b, 4, 4); Files_FlipBytes((void*)b, 4, (void*)&*x, 4); } -void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x) +void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x) { CHAR b[8]; Files_ReadBytes(&*R, R__typ, (void*)b, 8, 8); Files_FlipBytes((void*)b, 8, (void*)&*x, 8); } -void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int16 i; CHAR ch; @@ -903,7 +903,7 @@ void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) } while (!(ch == 0x00)); } -void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int16 i; CHAR ch; @@ -921,7 +921,7 @@ void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) } while (!b); } -void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x) +void Files_ReadNum (Files_Rider *R, address *R__typ, int32 *x) { int8 s; CHAR ch; @@ -938,19 +938,19 @@ void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x) *x = n; } -void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x) +void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x) { int32 n; Files_ReadNum(&*R, R__typ, &n); *x = n; } -void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x) +void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x) { Files_Write(&*R, R__typ, __VAL(CHAR, x)); } -void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x) +void Files_WriteInt (Files_Rider *R, address *R__typ, int16 x) { CHAR b[2]; b[0] = (CHAR)x; @@ -958,7 +958,7 @@ void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x) Files_WriteBytes(&*R, R__typ, (void*)b, 2, 2); } -void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x) +void Files_WriteLInt (Files_Rider *R, address *R__typ, int32 x) { CHAR b[4]; b[0] = (CHAR)x; @@ -968,7 +968,7 @@ void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x) Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x) +void Files_WriteSet (Files_Rider *R, address *R__typ, SET x) { CHAR b[4]; int32 i; @@ -980,21 +980,21 @@ void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x) Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x) +void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x) { CHAR b[4]; Files_FlipBytes((void*)&x, 4, (void*)b, 4); Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x) +void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x) { CHAR b[8]; Files_FlipBytes((void*)&x, 8, (void*)b, 8); Files_WriteBytes(&*R, R__typ, (void*)b, 8, 8); } -void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int16 i; i = 0; @@ -1004,7 +1004,7 @@ void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len Files_WriteBytes(&*R, R__typ, (void*)x, x__len * 1, i + 1); } -void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x) +void Files_WriteNum (Files_Rider *R, address *R__typ, int32 x) { while (x < -64 || x > 63) { Files_Write(&*R, R__typ, (CHAR)(__MASK(x, -128) + 128)); @@ -1013,7 +1013,7 @@ void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x) Files_Write(&*R, R__typ, (CHAR)__MASK(x, -128)); } -void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x) +void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x) { while (x < -64 || x > 63) { Files_Write(&*R, R__typ, (CHAR)(__MASK(x, -128) + 128)); diff --git a/bootstrap/windows-48/Files.h b/bootstrap/windows-48/Files.h index 1e8c0d89..80684752 100644 --- a/bootstrap/windows-48/Files.h +++ b/bootstrap/windows-48/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #ifndef Files__h #define Files__h @@ -24,10 +24,10 @@ typedef -import LONGINT *Files_FileDesc__typ; -import LONGINT *Files_Rider__typ; +import address *Files_FileDesc__typ; +import address *Files_Rider__typ; -import Files_File Files_Base (Files_Rider *r, LONGINT *r__typ); +import Files_File Files_Base (Files_Rider *r, address *r__typ); import void Files_ChangeDirectory (CHAR *path, LONGINT path__len, int16 *res); import void Files_Close (Files_File f); import void Files_Delete (CHAR *name, LONGINT name__len, int16 *res); @@ -36,36 +36,36 @@ import void Files_GetName (Files_File f, CHAR *name, LONGINT name__len); import int32 Files_Length (Files_File f); import Files_File Files_New (CHAR *name, LONGINT name__len); import Files_File Files_Old (CHAR *name, LONGINT name__len); -import int32 Files_Pos (Files_Rider *r, LONGINT *r__typ); +import int32 Files_Pos (Files_Rider *r, address *r__typ); import void Files_Purge (Files_File f); -import void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x); -import void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x); -import void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len); -import void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -import void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int16 *x); -import void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int32 *x); -import void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x); -import void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); -import void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int32 *x); -import void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x); -import void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x); -import void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x); -import void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +import void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x); +import void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x); +import void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len); +import void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +import void Files_ReadInt (Files_Rider *R, address *R__typ, int16 *x); +import void Files_ReadLInt (Files_Rider *R, address *R__typ, int32 *x); +import void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x); +import void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); +import void Files_ReadNum (Files_Rider *R, address *R__typ, int32 *x); +import void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x); +import void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x); +import void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x); +import void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); import void Files_Register (Files_File f); import void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, int16 *res); -import void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int32 pos); +import void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int32 pos); import void Files_SetSearchPath (CHAR *path, LONGINT path__len); -import void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x); -import void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x); -import void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); -import void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int16 x); -import void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int32 x); -import void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x); -import void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int32 x); -import void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x); -import void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x); -import void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x); -import void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +import void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x); +import void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x); +import void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int32 n); +import void Files_WriteInt (Files_Rider *R, address *R__typ, int16 x); +import void Files_WriteLInt (Files_Rider *R, address *R__typ, int32 x); +import void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x); +import void Files_WriteNum (Files_Rider *R, address *R__typ, int32 x); +import void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x); +import void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x); +import void Files_WriteSet (Files_Rider *R, address *R__typ, SET x); +import void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); import void *Files__init(void); diff --git a/bootstrap/windows-48/Heap.c b/bootstrap/windows-48/Heap.c index 17784d67..b7c8c827 100644 --- a/bootstrap/windows-48/Heap.c +++ b/bootstrap/windows-48/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tsSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tsSfF */ #define INTEGER int16 #define LONGINT int32 @@ -74,10 +74,10 @@ static int16 Heap_lockdepth; static BOOLEAN Heap_interrupted; export int16 Heap_FileCount; -export LONGINT *Heap_ModuleDesc__typ; -export LONGINT *Heap_CmdDesc__typ; -export LONGINT *Heap_FinDesc__typ; -export LONGINT *Heap__1__typ; +export address *Heap_ModuleDesc__typ; +export address *Heap_CmdDesc__typ; +export address *Heap_FinDesc__typ; +export address *Heap__1__typ; static void Heap_CheckFin (void); static void Heap_ExtendHeap (address blksz); diff --git a/bootstrap/windows-48/Heap.h b/bootstrap/windows-48/Heap.h index b1c745df..6ad4813e 100644 --- a/bootstrap/windows-48/Heap.h +++ b/bootstrap/windows-48/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tsSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tsSfF */ #ifndef Heap__h #define Heap__h @@ -34,7 +34,7 @@ import SYSTEM_PTR Heap_modules; import address Heap_allocated, Heap_heapsize; import int16 Heap_FileCount; -import LONGINT *Heap_ModuleDesc__typ; +import address *Heap_ModuleDesc__typ; import void Heap_FINALL (void); import void Heap_GC (BOOLEAN markStack); diff --git a/bootstrap/windows-48/Modules.c b/bootstrap/windows-48/Modules.c index 1564f5e0..7704f005 100644 --- a/bootstrap/windows-48/Modules.c +++ b/bootstrap/windows-48/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -43,8 +43,8 @@ export int16 Modules_res; export CHAR Modules_resMsg[256]; export Modules_ModuleName Modules_imported, Modules_importing; -export LONGINT *Modules_ModuleDesc__typ; -export LONGINT *Modules_CmdDesc__typ; +export address *Modules_ModuleDesc__typ; +export address *Modules_CmdDesc__typ; static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len); export void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all); diff --git a/bootstrap/windows-48/Modules.h b/bootstrap/windows-48/Modules.h index dbc243c8..060208c6 100644 --- a/bootstrap/windows-48/Modules.h +++ b/bootstrap/windows-48/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Modules__h #define Modules__h @@ -40,8 +40,8 @@ import int16 Modules_res; import CHAR Modules_resMsg[256]; import Modules_ModuleName Modules_imported, Modules_importing; -import LONGINT *Modules_ModuleDesc__typ; -import LONGINT *Modules_CmdDesc__typ; +import address *Modules_ModuleDesc__typ; +import address *Modules_CmdDesc__typ; import void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all); import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len); diff --git a/bootstrap/windows-48/OPB.c b/bootstrap/windows-48/OPB.c index d0336349..af4f4fc4 100644 --- a/bootstrap/windows-48/OPB.c +++ b/bootstrap/windows-48/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/windows-48/OPB.h b/bootstrap/windows-48/OPB.h index 434172a2..dc0085af 100644 --- a/bootstrap/windows-48/OPB.h +++ b/bootstrap/windows-48/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/windows-48/OPC.c b/bootstrap/windows-48/OPC.c index 11f64b59..99353400 100644 --- a/bootstrap/windows-48/OPC.c +++ b/bootstrap/windows-48/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -1041,7 +1041,7 @@ static void OPC_IdentList (OPT_Object obj, int16 vis) } else if ((obj->mode == 2 && obj->typ->comp == 4)) { OPC_EndStat(); OPC_BegStat(); - OPM_WriteString((CHAR*)"LONGINT *", 10); + OPM_WriteString((CHAR*)"address *", 10); OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); base = NIL; @@ -1078,7 +1078,7 @@ static void OPC_AnsiParamList (OPT_Object obj, BOOLEAN showParamNames) OPM_WriteString((CHAR*)", LONGINT ", 11); OPC_LenList(obj, 1, showParamNames); } else if ((obj->mode == 2 && obj->typ->comp == 4)) { - OPM_WriteString((CHAR*)", LONGINT *", 12); + OPM_WriteString((CHAR*)", address *", 12); if (showParamNames) { OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); @@ -1166,7 +1166,7 @@ static void OPC_GenDynTypes (OPT_Node n, int16 vis) } else { OPM_WriteString((CHAR*)"export ", 8); } - OPM_WriteString((CHAR*)"LONGINT *", 10); + OPM_WriteString((CHAR*)"address *", 10); OPC_Andent(typ); OPM_WriteString((CHAR*)"__typ", 6); OPC_EndStat(); diff --git a/bootstrap/windows-48/OPC.h b/bootstrap/windows-48/OPC.h index 09952648..4215947f 100644 --- a/bootstrap/windows-48/OPC.h +++ b/bootstrap/windows-48/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/windows-48/OPM.c b/bootstrap/windows-48/OPM.c index 2122bed9..039d1c77 100644 --- a/bootstrap/windows-48/OPM.c +++ b/bootstrap/windows-48/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -41,7 +41,7 @@ static CHAR OPM_OBERON[1024]; static CHAR OPM_MODULES[1024]; -static void OPM_Append (Files_Rider *R, LONGINT *R__typ, Files_File F); +static void OPM_Append (Files_Rider *R, address *R__typ, Files_File F); export void OPM_CloseFiles (void); export void OPM_CloseOldSym (void); export void OPM_DeleteNewSym (void); @@ -49,10 +49,10 @@ export void OPM_FPrint (int32 *fp, int64 val); export void OPM_FPrintLReal (int32 *fp, LONGREAL lr); export void OPM_FPrintReal (int32 *fp, REAL real); export void OPM_FPrintSet (int32 *fp, SET set); -static void OPM_FindLine (Files_File f, Files_Rider *r, LONGINT *r__typ, int64 pos); +static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos); export void OPM_Get (CHAR *ch); static void OPM_GetProperties (void); -static void OPM_GetProperty (Texts_Scanner *S, LONGINT *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align); +static void OPM_GetProperty (Texts_Scanner *S, address *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align); export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); export void OPM_InitOptions (void); export int16 OPM_Integer (int64 n); @@ -496,7 +496,7 @@ static void OPM_LogErrMsg (int16 n) OPM_LogWStr(errors_errors[__X(n, 350)], 128); } -static void OPM_FindLine (Files_File f, Files_Rider *r, LONGINT *r__typ, int64 pos) +static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos) { CHAR ch, cheol; if (pos < (int64)OPM_ErrorLineStartPos) { @@ -654,7 +654,7 @@ void OPM_FPrintLReal (int32 *fp, LONGREAL lr) OPM_FPrint(&*fp, h); } -static void OPM_GetProperty (Texts_Scanner *S, LONGINT *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align) +static void OPM_GetProperty (Texts_Scanner *S, address *S__typ, CHAR *name, LONGINT name__len, int16 *size, int16 *align) { __DUP(name, name__len, CHAR); if (((*S).class == 1 && __STRCMP((*S).s, name) == 0)) { @@ -996,7 +996,7 @@ void OPM_WriteLn (void) Files_Write(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, 0x0a); } -static void OPM_Append (Files_Rider *R, LONGINT *R__typ, Files_File F) +static void OPM_Append (Files_Rider *R, address *R__typ, Files_File F) { Files_Rider R1; CHAR buffer[4096]; diff --git a/bootstrap/windows-48/OPM.h b/bootstrap/windows-48/OPM.h index 8ca21351..a6b7990c 100644 --- a/bootstrap/windows-48/OPM.h +++ b/bootstrap/windows-48/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/windows-48/OPP.c b/bootstrap/windows-48/OPP.c index d2b3e83f..a3ab1dd3 100644 --- a/bootstrap/windows-48/OPP.c +++ b/bootstrap/windows-48/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -24,7 +24,7 @@ static OPT_Node OPP_TDinit, OPP_lastTDinit; static int16 OPP_nofFwdPtr; static OPT_Struct OPP_FwdPtr[64]; -export LONGINT *OPP__1__typ; +export address *OPP__1__typ; static void OPP_ActualParameters (OPT_Node *aparlist, OPT_Object fpar); static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned); diff --git a/bootstrap/windows-48/OPP.h b/bootstrap/windows-48/OPP.h index 28045a86..e5a59f6c 100644 --- a/bootstrap/windows-48/OPP.h +++ b/bootstrap/windows-48/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/windows-48/OPS.c b/bootstrap/windows-48/OPS.c index 99aba006..0cac83bd 100644 --- a/bootstrap/windows-48/OPS.c +++ b/bootstrap/windows-48/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/windows-48/OPS.h b/bootstrap/windows-48/OPS.h index f7dd1d10..caef45f4 100644 --- a/bootstrap/windows-48/OPS.h +++ b/bootstrap/windows-48/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/windows-48/OPT.c b/bootstrap/windows-48/OPT.c index abd3934b..c52efac6 100644 --- a/bootstrap/windows-48/OPT.c +++ b/bootstrap/windows-48/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -101,12 +101,12 @@ static OPT_ExpCtxt OPT_expCtxt; static int32 OPT_nofhdfld; static BOOLEAN OPT_newsf, OPT_findpc, OPT_extsf, OPT_sfpresent, OPT_symExtended, OPT_symNew; -export LONGINT *OPT_ConstDesc__typ; -export LONGINT *OPT_ObjDesc__typ; -export LONGINT *OPT_StrDesc__typ; -export LONGINT *OPT_NodeDesc__typ; -export LONGINT *OPT_ImpCtxt__typ; -export LONGINT *OPT_ExpCtxt__typ; +export address *OPT_ConstDesc__typ; +export address *OPT_ObjDesc__typ; +export address *OPT_StrDesc__typ; +export address *OPT_NodeDesc__typ; +export address *OPT_ImpCtxt__typ; +export address *OPT_ExpCtxt__typ; export void OPT_Close (void); export void OPT_CloseScope (void); diff --git a/bootstrap/windows-48/OPT.h b/bootstrap/windows-48/OPT.h index 5de02c8b..0bd1f189 100644 --- a/bootstrap/windows-48/OPT.h +++ b/bootstrap/windows-48/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPT__h #define OPT__h @@ -75,10 +75,10 @@ import OPT_Object OPT_GlbMod[64]; import OPS_Name OPT_SelfName; import BOOLEAN OPT_SYSimported; -import LONGINT *OPT_ConstDesc__typ; -import LONGINT *OPT_ObjDesc__typ; -import LONGINT *OPT_StrDesc__typ; -import LONGINT *OPT_NodeDesc__typ; +import address *OPT_ConstDesc__typ; +import address *OPT_ObjDesc__typ; +import address *OPT_StrDesc__typ; +import address *OPT_NodeDesc__typ; import void OPT_Close (void); import void OPT_CloseScope (void); diff --git a/bootstrap/windows-48/OPV.c b/bootstrap/windows-48/OPV.c index efddd202..8bb5ec32 100644 --- a/bootstrap/windows-48/OPV.c +++ b/bootstrap/windows-48/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -21,7 +21,7 @@ static int32 OPV_recno; static OPV_ExitInfo OPV_exit; static int16 OPV_nofExitLabels; -export LONGINT *OPV_ExitInfo__typ; +export address *OPV_ExitInfo__typ; static void OPV_ActualPar (OPT_Node n, OPT_Object fp); export void OPV_AdrAndSize (OPT_Object topScope); diff --git a/bootstrap/windows-48/OPV.h b/bootstrap/windows-48/OPV.h index 4a3f9d07..c309d63c 100644 --- a/bootstrap/windows-48/OPV.h +++ b/bootstrap/windows-48/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/windows-48/Platform.c b/bootstrap/windows-48/Platform.c index f8d3f76c..54a94ae8 100644 --- a/bootstrap/windows-48/Platform.c +++ b/bootstrap/windows-48/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -44,7 +44,7 @@ export int32 Platform_StdIn, Platform_StdOut, Platform_StdErr; static Platform_SignalHandler Platform_InterruptHandler; export CHAR Platform_nl[3]; -export LONGINT *Platform_FileIdentity__typ; +export address *Platform_FileIdentity__typ; export BOOLEAN Platform_Absent (int16 e); export int16 Platform_ArgPos (CHAR *s, LONGINT s__len); @@ -63,8 +63,8 @@ export void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val export void Platform_GetIntArg (int16 n, int32 *val); export void Platform_GetTimeOfDay (int32 *sec, int32 *usec); export void Platform_Halt (int32 code); -export int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *identity__typ); -export int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ); +export int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, address *identity__typ); +export int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ); export BOOLEAN Platform_Inaccessible (int16 e); export void Platform_Init (int16 argc, address argvadr); export void Platform_MTimeAsClock (Platform_FileIdentity i, int32 *t, int32 *d); @@ -82,7 +82,7 @@ export BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIde export int16 Platform_Seek (int32 h, int32 o, int16 r); export void Platform_SetBadInstructionHandler (Platform_SignalHandler handler); export void Platform_SetHalt (Platform_HaltProcedure p); -export void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source); +export void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source); export int16 Platform_Size (int32 h, int32 *l); export int16 Platform_Sync (int32 h); export int16 Platform_System (CHAR *cmd, LONGINT cmd__len); @@ -467,7 +467,7 @@ int16 Platform_Close (int32 h) __RETCHK; } -int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *identity__typ) +int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, address *identity__typ) { int16 _o_result; Platform_byHandleFileInformation(); @@ -484,7 +484,7 @@ int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *iden return _o_result; } -int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ) +int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ) { int16 _o_result; int32 h; @@ -517,7 +517,7 @@ BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i return _o_result; } -void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source) +void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source) { (*target).mtimehigh = source.mtimehigh; (*target).mtimelow = source.mtimelow; diff --git a/bootstrap/windows-48/Platform.h b/bootstrap/windows-48/Platform.h index c93c79ce..18ca5267 100644 --- a/bootstrap/windows-48/Platform.h +++ b/bootstrap/windows-48/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Platform__h #define Platform__h @@ -29,7 +29,7 @@ import int16 Platform_SeekSet, Platform_SeekCur, Platform_SeekEnd; import int32 Platform_StdIn, Platform_StdOut, Platform_StdErr; import CHAR Platform_nl[3]; -import LONGINT *Platform_FileIdentity__typ; +import address *Platform_FileIdentity__typ; import BOOLEAN Platform_Absent (int16 e); import int16 Platform_ArgPos (CHAR *s, LONGINT s__len); @@ -47,8 +47,8 @@ import void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val import void Platform_GetIntArg (int16 n, int32 *val); import void Platform_GetTimeOfDay (int32 *sec, int32 *usec); import void Platform_Halt (int32 code); -import int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, LONGINT *identity__typ); -import int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ); +import int16 Platform_Identify (int32 h, Platform_FileIdentity *identity, address *identity__typ); +import int16 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ); import BOOLEAN Platform_Inaccessible (int16 e); import void Platform_Init (int16 argc, address argvadr); import void Platform_MTimeAsClock (Platform_FileIdentity i, int32 *t, int32 *d); @@ -66,7 +66,7 @@ import BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIde import int16 Platform_Seek (int32 h, int32 o, int16 r); import void Platform_SetBadInstructionHandler (Platform_SignalHandler handler); import void Platform_SetHalt (Platform_HaltProcedure p); -import void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source); +import void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source); import int16 Platform_Size (int32 h, int32 *l); import int16 Platform_Sync (int32 h); import int16 Platform_System (CHAR *cmd, LONGINT cmd__len); diff --git a/bootstrap/windows-48/Reals.c b/bootstrap/windows-48/Reals.c index c1ffff0a..fe93e8be 100644 --- a/bootstrap/windows-48/Reals.c +++ b/bootstrap/windows-48/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/windows-48/Reals.h b/bootstrap/windows-48/Reals.h index 0ccc7989..e7cba0d8 100644 --- a/bootstrap/windows-48/Reals.h +++ b/bootstrap/windows-48/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/windows-48/Strings.c b/bootstrap/windows-48/Strings.c index 0f221fe7..427a0cc4 100644 --- a/bootstrap/windows-48/Strings.c +++ b/bootstrap/windows-48/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/windows-48/Strings.h b/bootstrap/windows-48/Strings.h index 9fdb55fb..44c51b2a 100644 --- a/bootstrap/windows-48/Strings.h +++ b/bootstrap/windows-48/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/windows-48/Texts.c b/bootstrap/windows-48/Texts.c index f69de03d..60a7ea7a 100644 --- a/bootstrap/windows-48/Texts.c +++ b/bootstrap/windows-48/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 @@ -33,7 +33,7 @@ typedef } Texts_ElemMsg; typedef - void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, LONGINT *); + void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, address *); typedef struct Texts_TextDesc *Texts_Text; @@ -167,20 +167,20 @@ export Texts_Elem Texts_new; static Texts_Buffer Texts_del; static Texts_FontsFont Texts_FontsDefault; -export LONGINT *Texts_FontDesc__typ; -export LONGINT *Texts_RunDesc__typ; -export LONGINT *Texts_PieceDesc__typ; -export LONGINT *Texts_ElemMsg__typ; -export LONGINT *Texts_ElemDesc__typ; -export LONGINT *Texts_FileMsg__typ; -export LONGINT *Texts_CopyMsg__typ; -export LONGINT *Texts_IdentifyMsg__typ; -export LONGINT *Texts_BufDesc__typ; -export LONGINT *Texts_TextDesc__typ; -export LONGINT *Texts_Reader__typ; -export LONGINT *Texts_Scanner__typ; -export LONGINT *Texts_Writer__typ; -export LONGINT *Texts__1__typ; +export address *Texts_FontDesc__typ; +export address *Texts_RunDesc__typ; +export address *Texts_PieceDesc__typ; +export address *Texts_ElemMsg__typ; +export address *Texts_ElemDesc__typ; +export address *Texts_FileMsg__typ; +export address *Texts_CopyMsg__typ; +export address *Texts_IdentifyMsg__typ; +export address *Texts_BufDesc__typ; +export address *Texts_TextDesc__typ; +export address *Texts_Reader__typ; +export address *Texts_Scanner__typ; +export address *Texts_Writer__typ; +export address *Texts__1__typ; export void Texts_Append (Texts_Text T, Texts_Buffer B); export void Texts_ChangeLooks (Texts_Text T, int32 beg, int32 end, SET sel, Texts_FontsFont fnt, int8 col, int8 voff); @@ -194,41 +194,41 @@ export Texts_Text Texts_ElemBase (Texts_Elem E); export int32 Texts_ElemPos (Texts_Elem E); static void Texts_Find (Texts_Text T, int32 *pos, Texts_Run *u, int32 *org, int32 *off); static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len); -static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, LONGINT *msg__typ); +static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, address *msg__typ); export void Texts_Insert (Texts_Text T, int32 pos, Texts_Buffer B); -export void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T); +export void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T); +static void Texts_Load0 (Files_Rider *r, address *r__typ, Texts_Text T); static void Texts_Merge (Texts_Text T, Texts_Run u, Texts_Run *v); export void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len); export void Texts_OpenBuf (Texts_Buffer B); -export void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos); -export void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 pos); -export void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ); -export int32 Texts_Pos (Texts_Reader *R, LONGINT *R__typ); -export void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch); -export void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ); -export void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ); +export void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int32 pos); +export void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int32 pos); +export void Texts_OpenWriter (Texts_Writer *W, address *W__typ); +export int32 Texts_Pos (Texts_Reader *R, address *R__typ); +export void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch); +export void Texts_ReadElem (Texts_Reader *R, address *R__typ); +export void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ); export void Texts_Recall (Texts_Buffer *B); export void Texts_Save (Texts_Text T, int32 beg, int32 end, Texts_Buffer B); -export void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ); -export void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col); -export void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt); -export void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff); +export void Texts_Scan (Texts_Scanner *S, address *S__typ); +export void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col); +export void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt); +export void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff); static void Texts_Splice (Texts_Run un, Texts_Run v, Texts_Run w, Texts_Text base); static void Texts_Split (int32 off, Texts_Run *u, Texts_Run *un); -export void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -export void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch); -export void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int32 t, int32 d); -export void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e); -export void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x); -export void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n); -export void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ); -export void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n); -export void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x); -export void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n); -export void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int16 k); -export void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x); -export void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len); +export void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T); +export void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch); +export void Texts_WriteDate (Texts_Writer *W, address *W__typ, int32 t, int32 d); +export void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e); +export void Texts_WriteHex (Texts_Writer *W, address *W__typ, int32 x); +export void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n); +export void Texts_WriteLn (Texts_Writer *W, address *W__typ); +export void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int16 n); +export void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x); +export void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int16 n); +export void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int16 n, int16 k); +export void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x); +export void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len); static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len) @@ -388,7 +388,7 @@ int32 Texts_ElemPos (Texts_Elem E) return _o_result; } -static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, LONGINT *msg__typ) +static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, address *msg__typ) { Texts_Alien e = NIL; Files_Rider r; @@ -604,7 +604,7 @@ void Texts_ChangeLooks (Texts_Text T, int32 beg, int32 end, SET sel, Texts_Fonts } } -void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos) +void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int32 pos) { Texts_Run u = NIL; if (pos >= T->len) { @@ -618,7 +618,7 @@ void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos } } -void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch) +void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch) { Texts_Run u = NIL; int32 pos; @@ -663,7 +663,7 @@ void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch) } } -void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ) +void Texts_ReadElem (Texts_Reader *R, address *R__typ) { Texts_Run u = NIL, un = NIL; u = (*R).run; @@ -691,7 +691,7 @@ void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ) } } -void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ) +void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ) { Texts_Run u = NIL; u = (*R).run->prev; @@ -713,14 +713,14 @@ void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ) } } -int32 Texts_Pos (Texts_Reader *R, LONGINT *R__typ) +int32 Texts_Pos (Texts_Reader *R, address *R__typ) { int32 _o_result; _o_result = (*R).org + (*R).off; return _o_result; } -void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 pos) +void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int32 pos) { Texts_OpenReader((void*)&*S, S__typ, T, pos); (*S).line = 0; @@ -729,7 +729,7 @@ void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 p static struct Scan__31 { Texts_Scanner *S; - LONGINT *S__typ; + address *S__typ; CHAR *ch; BOOLEAN *negE; int16 *e; @@ -756,7 +756,7 @@ static void ReadScaleFactor__32 (void) } } -void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ) +void Texts_Scan (Texts_Scanner *S, address *S__typ) { CHAR ch, term; BOOLEAN neg, negE, hex; @@ -962,7 +962,7 @@ void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ) Scan__31_s = _s.lnk; } -void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ) +void Texts_OpenWriter (Texts_Writer *W, address *W__typ) { __NEW((*W).buf, Texts_BufDesc); Texts_OpenBuf((*W).buf); @@ -973,22 +973,22 @@ void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ) Files_Set(&(*W).rider, Files_Rider__typ, (*W).file, 0); } -void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt) +void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt) { (*W).fnt = fnt; } -void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col) +void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col) { (*W).col = col; } -void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff) +void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff) { (*W).voff = voff; } -void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch) +void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch) { Texts_Run u = NIL, un = NIL; Texts_Piece p = NIL; @@ -1014,7 +1014,7 @@ void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch) } } -void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e) +void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e) { Texts_Run u = NIL, un = NIL; if (e->base != NIL) { @@ -1033,12 +1033,12 @@ void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e) un->prev = (Texts_Run)e; } -void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ) +void Texts_WriteLn (Texts_Writer *W, address *W__typ) { Texts_Write(&*W, W__typ, 0x0d); } -void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len) +void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len) { int16 i; __DUP(s, s__len, CHAR); @@ -1050,7 +1050,7 @@ void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__le __DEL(s); } -void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n) +void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n) { int16 i; int64 x0; @@ -1085,7 +1085,7 @@ void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n) } while (!(i == 0)); } -void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x) +void Texts_WriteHex (Texts_Writer *W, address *W__typ, int32 x) { int16 i; int32 y; @@ -1108,7 +1108,7 @@ void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x) } while (!(i == 0)); } -void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n) +void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int16 n) { int16 e; REAL x0; @@ -1180,7 +1180,7 @@ void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n) static struct WriteRealFix__53 { Texts_Writer *W; - LONGINT *W__typ; + address *W__typ; int16 *i; CHAR (*d)[9]; struct WriteRealFix__53 *lnk; @@ -1206,7 +1206,7 @@ static void dig__54 (int16 n) } } -void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int16 k) +void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int16 n, int16 k) { int16 e, i; CHAR sign; @@ -1278,7 +1278,7 @@ void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int1 WriteRealFix__53_s = _s.lnk; } -void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x) +void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x) { int16 i; CHAR d[8]; @@ -1290,7 +1290,7 @@ void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x) } while (!(i == 8)); } -void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n) +void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int16 n) { int16 e; LONGREAL x0; @@ -1362,7 +1362,7 @@ void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n) } } -void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x) +void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x) { int16 i; CHAR d[16]; @@ -1376,7 +1376,7 @@ void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x) static struct WriteDate__43 { Texts_Writer *W; - LONGINT *W__typ; + address *W__typ; struct WriteDate__43 *lnk; } *WriteDate__43_s; @@ -1389,7 +1389,7 @@ static void WritePair__44 (CHAR ch, int32 x) Texts_Write(&*WriteDate__43_s->W, WriteDate__43_s->W__typ, (CHAR)((int)__MOD(x, 10) + 48)); } -void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int32 t, int32 d) +void Texts_WriteDate (Texts_Writer *W, address *W__typ, int32 t, int32 d) { struct WriteDate__43 _s; _s.W = W; _s.W__typ = W__typ; @@ -1413,9 +1413,9 @@ static struct Load0__16 { struct Load0__16 *lnk; } *Load0__16_s; -static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int32 pos, int32 span, Texts_Elem *e); +static void LoadElem__17 (Files_Rider *r, address *r__typ, int32 pos, int32 span, Texts_Elem *e); -static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int32 pos, int32 span, Texts_Elem *e) +static void LoadElem__17 (Files_Rider *r, address *r__typ, int32 pos, int32 span, Texts_Elem *e) { Modules_Module M = NIL; Modules_Command Cmd; @@ -1466,7 +1466,7 @@ static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int32 pos, int32 span } } -static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +static void Texts_Load0 (Files_Rider *r, address *r__typ, Texts_Text T) { Texts_Run u = NIL, un = NIL; Texts_Piece p = NIL; @@ -1540,7 +1540,7 @@ static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T) Load0__16_s = _s.lnk; } -void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T) { int16 tag; Files_ReadInt(&*r, r__typ, &tag); @@ -1614,9 +1614,9 @@ static struct Store__39 { struct Store__39 *lnk; } *Store__39_s; -static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int32 pos, Texts_Elem e); +static void StoreElem__40 (Files_Rider *r, address *r__typ, int32 pos, Texts_Elem e); -static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int32 pos, Texts_Elem e) +static void StoreElem__40 (Files_Rider *r, address *r__typ, int32 pos, Texts_Elem e) { Files_Rider r1; int32 org, span; @@ -1646,7 +1646,7 @@ static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int32 pos, Texts_Ele Files_WriteLInt(&r1, Files_Rider__typ, e->H); } -void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T) { Files_Rider r1; Texts_Run u = NIL, un = NIL; diff --git a/bootstrap/windows-48/Texts.h b/bootstrap/windows-48/Texts.h index e3ed3241..df86e814 100644 --- a/bootstrap/windows-48/Texts.h +++ b/bootstrap/windows-48/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Texts__h #define Texts__h @@ -35,7 +35,7 @@ typedef } Texts_RunDesc; typedef - void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, LONGINT *); + void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, address *); typedef struct Texts_ElemDesc { @@ -116,18 +116,18 @@ typedef import Texts_Elem Texts_new; -import LONGINT *Texts_FontDesc__typ; -import LONGINT *Texts_RunDesc__typ; -import LONGINT *Texts_ElemMsg__typ; -import LONGINT *Texts_ElemDesc__typ; -import LONGINT *Texts_FileMsg__typ; -import LONGINT *Texts_CopyMsg__typ; -import LONGINT *Texts_IdentifyMsg__typ; -import LONGINT *Texts_BufDesc__typ; -import LONGINT *Texts_TextDesc__typ; -import LONGINT *Texts_Reader__typ; -import LONGINT *Texts_Scanner__typ; -import LONGINT *Texts_Writer__typ; +import address *Texts_FontDesc__typ; +import address *Texts_RunDesc__typ; +import address *Texts_ElemMsg__typ; +import address *Texts_ElemDesc__typ; +import address *Texts_FileMsg__typ; +import address *Texts_CopyMsg__typ; +import address *Texts_IdentifyMsg__typ; +import address *Texts_BufDesc__typ; +import address *Texts_TextDesc__typ; +import address *Texts_Reader__typ; +import address *Texts_Scanner__typ; +import address *Texts_Writer__typ; import void Texts_Append (Texts_Text T, Texts_Buffer B); import void Texts_ChangeLooks (Texts_Text T, int32 beg, int32 end, SET sel, Texts_FontsFont fnt, int8 col, int8 voff); @@ -138,35 +138,35 @@ import void Texts_Delete (Texts_Text T, int32 beg, int32 end); import Texts_Text Texts_ElemBase (Texts_Elem E); import int32 Texts_ElemPos (Texts_Elem E); import void Texts_Insert (Texts_Text T, int32 pos, Texts_Buffer B); -import void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T); +import void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T); import void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len); import void Texts_OpenBuf (Texts_Buffer B); -import void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int32 pos); -import void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int32 pos); -import void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ); -import int32 Texts_Pos (Texts_Reader *R, LONGINT *R__typ); -import void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch); -import void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ); -import void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ); +import void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int32 pos); +import void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int32 pos); +import void Texts_OpenWriter (Texts_Writer *W, address *W__typ); +import int32 Texts_Pos (Texts_Reader *R, address *R__typ); +import void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch); +import void Texts_ReadElem (Texts_Reader *R, address *R__typ); +import void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ); import void Texts_Recall (Texts_Buffer *B); import void Texts_Save (Texts_Text T, int32 beg, int32 end, Texts_Buffer B); -import void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ); -import void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col); -import void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt); -import void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff); -import void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -import void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch); -import void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int32 t, int32 d); -import void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e); -import void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int32 x); -import void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n); -import void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ); -import void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int16 n); -import void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x); -import void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n); -import void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int16 n, int16 k); -import void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x); -import void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len); +import void Texts_Scan (Texts_Scanner *S, address *S__typ); +import void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col); +import void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt); +import void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff); +import void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T); +import void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch); +import void Texts_WriteDate (Texts_Writer *W, address *W__typ, int32 t, int32 d); +import void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e); +import void Texts_WriteHex (Texts_Writer *W, address *W__typ, int32 x); +import void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n); +import void Texts_WriteLn (Texts_Writer *W, address *W__typ); +import void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int16 n); +import void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x); +import void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int16 n); +import void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int16 n, int16 k); +import void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x); +import void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len); import void *Texts__init(void); diff --git a/bootstrap/windows-48/Vishap.c b/bootstrap/windows-48/Vishap.c index 7b2dcd23..1ec89e33 100644 --- a/bootstrap/windows-48/Vishap.c +++ b/bootstrap/windows-48/Vishap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspamSf */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspamSf */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/windows-48/errors.c b/bootstrap/windows-48/errors.c index 3a4b1ce7..0a40d5e9 100644 --- a/bootstrap/windows-48/errors.c +++ b/bootstrap/windows-48/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/windows-48/errors.h b/bootstrap/windows-48/errors.h index 6ca6c961..759b613e 100644 --- a/bootstrap/windows-48/errors.h +++ b/bootstrap/windows-48/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/windows-48/extTools.c b/bootstrap/windows-48/extTools.c index 2167c7f8..8be0b63d 100644 --- a/bootstrap/windows-48/extTools.c +++ b/bootstrap/windows-48/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/windows-48/extTools.h b/bootstrap/windows-48/extTools.h index 0b905427..bff1c62c 100644 --- a/bootstrap/windows-48/extTools.h +++ b/bootstrap/windows-48/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/windows-48/vt100.c b/bootstrap/windows-48/vt100.c index c337a9e2..4f6a6c9d 100644 --- a/bootstrap/windows-48/vt100.c +++ b/bootstrap/windows-48/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int16 #define LONGINT int32 diff --git a/bootstrap/windows-48/vt100.h b/bootstrap/windows-48/vt100.h index 2428fce4..94f8add4 100644 --- a/bootstrap/windows-48/vt100.h +++ b/bootstrap/windows-48/vt100.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef vt100__h #define vt100__h diff --git a/bootstrap/windows-88/Configuration.c b/bootstrap/windows-88/Configuration.c index 8945bf88..fa5765f3 100644 --- a/bootstrap/windows-88/Configuration.c +++ b/bootstrap/windows-88/Configuration.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -18,6 +18,6 @@ export void *Configuration__init(void) __DEFMOD; __REGMOD("Configuration", 0); /* BEGIN */ - __MOVE("1.95 [2016/09/22] for gcc LP64 on cygwin", Configuration_versionLong, 41); + __MOVE("1.95 [2016/09/23] for gcc LP64 on cygwin", Configuration_versionLong, 41); __ENDMOD; } diff --git a/bootstrap/windows-88/Configuration.h b/bootstrap/windows-88/Configuration.h index dca477a6..f51f63f2 100644 --- a/bootstrap/windows-88/Configuration.h +++ b/bootstrap/windows-88/Configuration.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Configuration__h #define Configuration__h diff --git a/bootstrap/windows-88/Console.c b/bootstrap/windows-88/Console.c index 84cb998f..939de5cc 100644 --- a/bootstrap/windows-88/Console.c +++ b/bootstrap/windows-88/Console.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -118,10 +118,10 @@ void Console_Hex (int64 i) void Console_Read (CHAR *ch) { - address n; + int64 n; int32 error; Console_Flush(); - error = Platform_ReadBuf(Platform_StdIn, (void*)&*ch, 1, (void*)&n); + error = Platform_ReadBuf(Platform_StdIn, (void*)&*ch, 1, &n); if (n != 1) { *ch = 0x00; } diff --git a/bootstrap/windows-88/Console.h b/bootstrap/windows-88/Console.h index 02fad3c1..64d39044 100644 --- a/bootstrap/windows-88/Console.h +++ b/bootstrap/windows-88/Console.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Console__h #define Console__h diff --git a/bootstrap/windows-88/Files.c b/bootstrap/windows-88/Files.c index 8336cb0e..27fb9031 100644 --- a/bootstrap/windows-88/Files.c +++ b/bootstrap/windows-88/Files.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -56,11 +56,11 @@ static struct { CHAR data[1]; } *Files_SearchPath; -export LONGINT *Files_FileDesc__typ; -export LONGINT *Files_BufDesc__typ; -export LONGINT *Files_Rider__typ; +export address *Files_FileDesc__typ; +export address *Files_BufDesc__typ; +export address *Files_Rider__typ; -export Files_File Files_Base (Files_Rider *r, LONGINT *r__typ); +export Files_File Files_Base (Files_Rider *r, address *r__typ); static Files_File Files_CacheEntry (Platform_FileIdentity identity); export void Files_ChangeDirectory (CHAR *path, LONGINT path__len, int32 *res); export void Files_Close (Files_File f); @@ -79,37 +79,37 @@ export int64 Files_Length (Files_File f); static void Files_MakeFileName (CHAR *dir, LONGINT dir__len, CHAR *name, LONGINT name__len, CHAR *dest, LONGINT dest__len); export Files_File Files_New (CHAR *name, LONGINT name__len); export Files_File Files_Old (CHAR *name, LONGINT name__len); -export int64 Files_Pos (Files_Rider *r, LONGINT *r__typ); +export int64 Files_Pos (Files_Rider *r, address *r__typ); export void Files_Purge (Files_File f); -export void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x); -export void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x); -export void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len); -export void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); -export void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int32 *x); -export void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int64 *x); -export void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x); -export void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); -export void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int64 *x); -export void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x); -export void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x); -export void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x); -export void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +export void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x); +export void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x); +export void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len); +export void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); +export void Files_ReadInt (Files_Rider *R, address *R__typ, int32 *x); +export void Files_ReadLInt (Files_Rider *R, address *R__typ, int64 *x); +export void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x); +export void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); +export void Files_ReadNum (Files_Rider *R, address *R__typ, int64 *x); +export void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x); +export void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x); +export void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x); +export void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); export void Files_Register (Files_File f); export void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, int32 *res); static void Files_ScanPath (int32 *pos, CHAR *dir, LONGINT dir__len); -export void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int64 pos); +export void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int64 pos); export void Files_SetSearchPath (CHAR *path, LONGINT path__len); -export void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x); -export void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x); -export void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); -export void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int32 x); -export void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int64 x); -export void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x); -export void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int64 x); -export void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x); -export void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x); -export void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x); -export void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +export void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x); +export void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x); +export void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); +export void Files_WriteInt (Files_Rider *R, address *R__typ, int32 x); +export void Files_WriteLInt (Files_Rider *R, address *R__typ, int64 x); +export void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x); +export void Files_WriteNum (Files_Rider *R, address *R__typ, int64 x); +export void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x); +export void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x); +export void Files_WriteSet (Files_Rider *R, address *R__typ, SET x); +export void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); #define Files_IdxTrap() __HALT(-1) @@ -544,14 +544,14 @@ void Files_GetDate (Files_File f, int64 *t, int64 *d) Platform_MTimeAsClock(identity, &*t, &*d); } -int64 Files_Pos (Files_Rider *r, LONGINT *r__typ) +int64 Files_Pos (Files_Rider *r, address *r__typ) { int64 _o_result; _o_result = (*r).org + (*r).offset; return _o_result; } -void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int64 pos) +void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int64 pos) { int64 org, offset, i, n; Files_Buffer buf = NIL; @@ -613,7 +613,7 @@ void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int64 pos) (*r).res = 0; } -void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x) +void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x) { int64 offset; Files_Buffer buf = NIL; @@ -637,7 +637,7 @@ void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x) } } -void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n) +void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n) { int64 xpos, min, restInBuf, offset; Files_Buffer buf = NIL; @@ -673,19 +673,19 @@ void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x (*r).eof = 0; } -void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len) +void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len) { Files_ReadBytes(&*r, r__typ, (void*)x, x__len * 1, 1); } -Files_File Files_Base (Files_Rider *r, LONGINT *r__typ) +Files_File Files_Base (Files_Rider *r, address *r__typ) { Files_File _o_result; _o_result = (*r).buf->f; return _o_result; } -void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x) +void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x) { Files_Buffer buf = NIL; int64 offset; @@ -706,7 +706,7 @@ void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x) (*r).res = 0; } -void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n) +void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n) { int64 xpos, min, restInBuf, offset; Files_Buffer buf = NIL; @@ -849,26 +849,26 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *de } } -void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x) +void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x) { Files_Read(&*R, R__typ, (CHAR*)(void*)&*x); } -void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int32 *x) +void Files_ReadInt (Files_Rider *R, address *R__typ, int32 *x) { CHAR b[2]; Files_ReadBytes(&*R, R__typ, (void*)b, 2, 2); *x = b[0] + __ASHL(b[1], 8); } -void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int64 *x) +void Files_ReadLInt (Files_Rider *R, address *R__typ, int64 *x) { CHAR b[4]; Files_ReadBytes(&*R, R__typ, (void*)b, 4, 4); *x = ((b[0] + __ASHL(b[1], 8)) + __ASHL(b[2], 16)) + __ASHL(b[3], 24); } -void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x) +void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x) { CHAR b[4]; int64 l; @@ -877,21 +877,21 @@ void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x) *x = (SET)l; } -void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x) +void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x) { CHAR b[4]; Files_ReadBytes(&*R, R__typ, (void*)b, 4, 4); Files_FlipBytes((void*)b, 4, (void*)&*x, 4); } -void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x) +void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x) { CHAR b[8]; Files_ReadBytes(&*R, R__typ, (void*)b, 8, 8); Files_FlipBytes((void*)b, 8, (void*)&*x, 8); } -void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int32 i; CHAR ch; @@ -903,7 +903,7 @@ void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) } while (!(ch == 0x00)); } -void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int32 i; CHAR ch; @@ -921,7 +921,7 @@ void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) } while (!b); } -void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int64 *x) +void Files_ReadNum (Files_Rider *R, address *R__typ, int64 *x) { int8 s; CHAR ch; @@ -938,19 +938,19 @@ void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int64 *x) *x = n; } -void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x) +void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x) { int64 n; Files_ReadNum(&*R, R__typ, &n); *x = n; } -void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x) +void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x) { Files_Write(&*R, R__typ, __VAL(CHAR, x)); } -void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int32 x) +void Files_WriteInt (Files_Rider *R, address *R__typ, int32 x) { CHAR b[2]; b[0] = (CHAR)x; @@ -958,7 +958,7 @@ void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int32 x) Files_WriteBytes(&*R, R__typ, (void*)b, 2, 2); } -void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int64 x) +void Files_WriteLInt (Files_Rider *R, address *R__typ, int64 x) { CHAR b[4]; b[0] = (CHAR)x; @@ -968,7 +968,7 @@ void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int64 x) Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x) +void Files_WriteSet (Files_Rider *R, address *R__typ, SET x) { CHAR b[4]; int64 i; @@ -980,21 +980,21 @@ void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x) Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x) +void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x) { CHAR b[4]; Files_FlipBytes((void*)&x, 4, (void*)b, 4); Files_WriteBytes(&*R, R__typ, (void*)b, 4, 4); } -void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x) +void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x) { CHAR b[8]; Files_FlipBytes((void*)&x, 8, (void*)b, 8); Files_WriteBytes(&*R, R__typ, (void*)b, 8, 8); } -void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len) +void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len) { int32 i; i = 0; @@ -1004,7 +1004,7 @@ void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len Files_WriteBytes(&*R, R__typ, (void*)x, x__len * 1, i + 1); } -void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int64 x) +void Files_WriteNum (Files_Rider *R, address *R__typ, int64 x) { while (x < -64 || x > 63) { Files_Write(&*R, R__typ, (CHAR)(__MASK(x, -128) + 128)); @@ -1013,7 +1013,7 @@ void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int64 x) Files_Write(&*R, R__typ, (CHAR)__MASK(x, -128)); } -void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x) +void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x) { while (x < -64 || x > 63) { Files_Write(&*R, R__typ, (CHAR)(__MASK(x, -128) + 128)); diff --git a/bootstrap/windows-88/Files.h b/bootstrap/windows-88/Files.h index 1fa0bb84..399f2137 100644 --- a/bootstrap/windows-88/Files.h +++ b/bootstrap/windows-88/Files.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #ifndef Files__h #define Files__h @@ -24,10 +24,10 @@ typedef -import LONGINT *Files_FileDesc__typ; -import LONGINT *Files_Rider__typ; +import address *Files_FileDesc__typ; +import address *Files_Rider__typ; -import Files_File Files_Base (Files_Rider *r, LONGINT *r__typ); +import Files_File Files_Base (Files_Rider *r, address *r__typ); import void Files_ChangeDirectory (CHAR *path, LONGINT path__len, int32 *res); import void Files_Close (Files_File f); import void Files_Delete (CHAR *name, LONGINT name__len, int32 *res); @@ -36,36 +36,36 @@ import void Files_GetName (Files_File f, CHAR *name, LONGINT name__len); import int64 Files_Length (Files_File f); import Files_File Files_New (CHAR *name, LONGINT name__len); import Files_File Files_Old (CHAR *name, LONGINT name__len); -import int64 Files_Pos (Files_Rider *r, LONGINT *r__typ); +import int64 Files_Pos (Files_Rider *r, address *r__typ); import void Files_Purge (Files_File f); -import void Files_Read (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x); -import void Files_ReadBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN *x); -import void Files_ReadByte (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len); -import void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); -import void Files_ReadInt (Files_Rider *R, LONGINT *R__typ, int32 *x); -import void Files_ReadLInt (Files_Rider *R, LONGINT *R__typ, int64 *x); -import void Files_ReadLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL *x); -import void Files_ReadLine (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); -import void Files_ReadNum (Files_Rider *R, LONGINT *R__typ, int64 *x); -import void Files_ReadNum64 (Files_Rider *R, LONGINT *R__typ, int64 *x); -import void Files_ReadReal (Files_Rider *R, LONGINT *R__typ, REAL *x); -import void Files_ReadSet (Files_Rider *R, LONGINT *R__typ, SET *x); -import void Files_ReadString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +import void Files_Read (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x); +import void Files_ReadBool (Files_Rider *R, address *R__typ, BOOLEAN *x); +import void Files_ReadByte (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len); +import void Files_ReadBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); +import void Files_ReadInt (Files_Rider *R, address *R__typ, int32 *x); +import void Files_ReadLInt (Files_Rider *R, address *R__typ, int64 *x); +import void Files_ReadLReal (Files_Rider *R, address *R__typ, LONGREAL *x); +import void Files_ReadLine (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); +import void Files_ReadNum (Files_Rider *R, address *R__typ, int64 *x); +import void Files_ReadNum64 (Files_Rider *R, address *R__typ, int64 *x); +import void Files_ReadReal (Files_Rider *R, address *R__typ, REAL *x); +import void Files_ReadSet (Files_Rider *R, address *R__typ, SET *x); +import void Files_ReadString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); import void Files_Register (Files_File f); import void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, int32 *res); -import void Files_Set (Files_Rider *r, LONGINT *r__typ, Files_File f, int64 pos); +import void Files_Set (Files_Rider *r, address *r__typ, Files_File f, int64 pos); import void Files_SetSearchPath (CHAR *path, LONGINT path__len); -import void Files_Write (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE x); -import void Files_WriteBool (Files_Rider *R, LONGINT *R__typ, BOOLEAN x); -import void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); -import void Files_WriteInt (Files_Rider *R, LONGINT *R__typ, int32 x); -import void Files_WriteLInt (Files_Rider *R, LONGINT *R__typ, int64 x); -import void Files_WriteLReal (Files_Rider *R, LONGINT *R__typ, LONGREAL x); -import void Files_WriteNum (Files_Rider *R, LONGINT *R__typ, int64 x); -import void Files_WriteNum64 (Files_Rider *R, LONGINT *R__typ, int64 x); -import void Files_WriteReal (Files_Rider *R, LONGINT *R__typ, REAL x); -import void Files_WriteSet (Files_Rider *R, LONGINT *R__typ, SET x); -import void Files_WriteString (Files_Rider *R, LONGINT *R__typ, CHAR *x, LONGINT x__len); +import void Files_Write (Files_Rider *r, address *r__typ, SYSTEM_BYTE x); +import void Files_WriteBool (Files_Rider *R, address *R__typ, BOOLEAN x); +import void Files_WriteBytes (Files_Rider *r, address *r__typ, SYSTEM_BYTE *x, LONGINT x__len, int64 n); +import void Files_WriteInt (Files_Rider *R, address *R__typ, int32 x); +import void Files_WriteLInt (Files_Rider *R, address *R__typ, int64 x); +import void Files_WriteLReal (Files_Rider *R, address *R__typ, LONGREAL x); +import void Files_WriteNum (Files_Rider *R, address *R__typ, int64 x); +import void Files_WriteNum64 (Files_Rider *R, address *R__typ, int64 x); +import void Files_WriteReal (Files_Rider *R, address *R__typ, REAL x); +import void Files_WriteSet (Files_Rider *R, address *R__typ, SET x); +import void Files_WriteString (Files_Rider *R, address *R__typ, CHAR *x, LONGINT x__len); import void *Files__init(void); diff --git a/bootstrap/windows-88/Heap.c b/bootstrap/windows-88/Heap.c index 8d65bb87..c87cfd6d 100644 --- a/bootstrap/windows-88/Heap.c +++ b/bootstrap/windows-88/Heap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tsSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tsSfF */ #define INTEGER int32 #define LONGINT int64 @@ -74,10 +74,10 @@ static int32 Heap_lockdepth; static BOOLEAN Heap_interrupted; export int32 Heap_FileCount; -export LONGINT *Heap_ModuleDesc__typ; -export LONGINT *Heap_CmdDesc__typ; -export LONGINT *Heap_FinDesc__typ; -export LONGINT *Heap__1__typ; +export address *Heap_ModuleDesc__typ; +export address *Heap_CmdDesc__typ; +export address *Heap_FinDesc__typ; +export address *Heap__1__typ; static void Heap_CheckFin (void); static void Heap_ExtendHeap (address blksz); diff --git a/bootstrap/windows-88/Heap.h b/bootstrap/windows-88/Heap.h index 516a3aca..b4829f2f 100644 --- a/bootstrap/windows-88/Heap.h +++ b/bootstrap/windows-88/Heap.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tsSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tsSfF */ #ifndef Heap__h #define Heap__h @@ -34,7 +34,7 @@ import SYSTEM_PTR Heap_modules; import address Heap_allocated, Heap_heapsize; import int32 Heap_FileCount; -import LONGINT *Heap_ModuleDesc__typ; +import address *Heap_ModuleDesc__typ; import void Heap_FINALL (void); import void Heap_GC (BOOLEAN markStack); diff --git a/bootstrap/windows-88/Modules.c b/bootstrap/windows-88/Modules.c index 3d3d4700..23fec310 100644 --- a/bootstrap/windows-88/Modules.c +++ b/bootstrap/windows-88/Modules.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -43,8 +43,8 @@ export int32 Modules_res; export CHAR Modules_resMsg[256]; export Modules_ModuleName Modules_imported, Modules_importing; -export LONGINT *Modules_ModuleDesc__typ; -export LONGINT *Modules_CmdDesc__typ; +export address *Modules_ModuleDesc__typ; +export address *Modules_CmdDesc__typ; static void Modules_Append (CHAR *a, LONGINT a__len, CHAR *b, LONGINT b__len); export void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all); diff --git a/bootstrap/windows-88/Modules.h b/bootstrap/windows-88/Modules.h index 46624045..7cafac5f 100644 --- a/bootstrap/windows-88/Modules.h +++ b/bootstrap/windows-88/Modules.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Modules__h #define Modules__h @@ -40,8 +40,8 @@ import int32 Modules_res; import CHAR Modules_resMsg[256]; import Modules_ModuleName Modules_imported, Modules_importing; -import LONGINT *Modules_ModuleDesc__typ; -import LONGINT *Modules_CmdDesc__typ; +import address *Modules_ModuleDesc__typ; +import address *Modules_CmdDesc__typ; import void Modules_Free (CHAR *name, LONGINT name__len, BOOLEAN all); import Modules_Command Modules_ThisCommand (Modules_Module mod, CHAR *name, LONGINT name__len); diff --git a/bootstrap/windows-88/OPB.c b/bootstrap/windows-88/OPB.c index 5cea943a..81077606 100644 --- a/bootstrap/windows-88/OPB.c +++ b/bootstrap/windows-88/OPB.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/windows-88/OPB.h b/bootstrap/windows-88/OPB.h index 66bdcc6c..6863fee8 100644 --- a/bootstrap/windows-88/OPB.h +++ b/bootstrap/windows-88/OPB.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPB__h #define OPB__h diff --git a/bootstrap/windows-88/OPC.c b/bootstrap/windows-88/OPC.c index a01fcde9..ee7f4baa 100644 --- a/bootstrap/windows-88/OPC.c +++ b/bootstrap/windows-88/OPC.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -1041,7 +1041,7 @@ static void OPC_IdentList (OPT_Object obj, int32 vis) } else if ((obj->mode == 2 && obj->typ->comp == 4)) { OPC_EndStat(); OPC_BegStat(); - OPM_WriteString((CHAR*)"LONGINT *", 10); + OPM_WriteString((CHAR*)"address *", 10); OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); base = NIL; @@ -1078,7 +1078,7 @@ static void OPC_AnsiParamList (OPT_Object obj, BOOLEAN showParamNames) OPM_WriteString((CHAR*)", LONGINT ", 11); OPC_LenList(obj, 1, showParamNames); } else if ((obj->mode == 2 && obj->typ->comp == 4)) { - OPM_WriteString((CHAR*)", LONGINT *", 12); + OPM_WriteString((CHAR*)", address *", 12); if (showParamNames) { OPC_Ident(obj); OPM_WriteString((CHAR*)"__typ", 6); @@ -1166,7 +1166,7 @@ static void OPC_GenDynTypes (OPT_Node n, int32 vis) } else { OPM_WriteString((CHAR*)"export ", 8); } - OPM_WriteString((CHAR*)"LONGINT *", 10); + OPM_WriteString((CHAR*)"address *", 10); OPC_Andent(typ); OPM_WriteString((CHAR*)"__typ", 6); OPC_EndStat(); diff --git a/bootstrap/windows-88/OPC.h b/bootstrap/windows-88/OPC.h index 4a7c8523..6fe30a31 100644 --- a/bootstrap/windows-88/OPC.h +++ b/bootstrap/windows-88/OPC.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPC__h #define OPC__h diff --git a/bootstrap/windows-88/OPM.c b/bootstrap/windows-88/OPM.c index 22131ab9..3f07341b 100644 --- a/bootstrap/windows-88/OPM.c +++ b/bootstrap/windows-88/OPM.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -40,7 +40,7 @@ static CHAR OPM_OBERON[1024]; static CHAR OPM_MODULES[1024]; -static void OPM_Append (Files_Rider *R, LONGINT *R__typ, Files_File F); +static void OPM_Append (Files_Rider *R, address *R__typ, Files_File F); export void OPM_CloseFiles (void); export void OPM_CloseOldSym (void); export void OPM_DeleteNewSym (void); @@ -48,10 +48,10 @@ export void OPM_FPrint (int64 *fp, int64 val); export void OPM_FPrintLReal (int64 *fp, LONGREAL lr); export void OPM_FPrintReal (int64 *fp, REAL real); export void OPM_FPrintSet (int64 *fp, SET set); -static void OPM_FindLine (Files_File f, Files_Rider *r, LONGINT *r__typ, int64 pos); +static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos); export void OPM_Get (CHAR *ch); static void OPM_GetProperties (void); -static void OPM_GetProperty (Texts_Scanner *S, LONGINT *S__typ, CHAR *name, LONGINT name__len, int32 *size, int32 *align); +static void OPM_GetProperty (Texts_Scanner *S, address *S__typ, CHAR *name, LONGINT name__len, int32 *size, int32 *align); export void OPM_Init (BOOLEAN *done, CHAR *mname, LONGINT mname__len); export void OPM_InitOptions (void); export int32 OPM_Integer (int64 n); @@ -495,7 +495,7 @@ static void OPM_LogErrMsg (int32 n) OPM_LogWStr(errors_errors[__X(n, 350)], 128); } -static void OPM_FindLine (Files_File f, Files_Rider *r, LONGINT *r__typ, int64 pos) +static void OPM_FindLine (Files_File f, Files_Rider *r, address *r__typ, int64 pos) { CHAR ch, cheol; if (pos < OPM_ErrorLineStartPos) { @@ -651,7 +651,7 @@ void OPM_FPrintLReal (int64 *fp, LONGREAL lr) OPM_FPrint(&*fp, __VAL(int64, lr)); } -static void OPM_GetProperty (Texts_Scanner *S, LONGINT *S__typ, CHAR *name, LONGINT name__len, int32 *size, int32 *align) +static void OPM_GetProperty (Texts_Scanner *S, address *S__typ, CHAR *name, LONGINT name__len, int32 *size, int32 *align) { __DUP(name, name__len, CHAR); if (((*S).class == 1 && __STRCMP((*S).s, name) == 0)) { @@ -993,7 +993,7 @@ void OPM_WriteLn (void) Files_Write(&OPM_R[__X(OPM_currFile, 3)], Files_Rider__typ, 0x0a); } -static void OPM_Append (Files_Rider *R, LONGINT *R__typ, Files_File F) +static void OPM_Append (Files_Rider *R, address *R__typ, Files_File F) { Files_Rider R1; CHAR buffer[4096]; diff --git a/bootstrap/windows-88/OPM.h b/bootstrap/windows-88/OPM.h index b1fab659..765b9680 100644 --- a/bootstrap/windows-88/OPM.h +++ b/bootstrap/windows-88/OPM.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPM__h #define OPM__h diff --git a/bootstrap/windows-88/OPP.c b/bootstrap/windows-88/OPP.c index 8c85929d..9b25c35f 100644 --- a/bootstrap/windows-88/OPP.c +++ b/bootstrap/windows-88/OPP.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -24,7 +24,7 @@ static OPT_Node OPP_TDinit, OPP_lastTDinit; static int32 OPP_nofFwdPtr; static OPT_Struct OPP_FwdPtr[64]; -export LONGINT *OPP__1__typ; +export address *OPP__1__typ; static void OPP_ActualParameters (OPT_Node *aparlist, OPT_Object fpar); static void OPP_ArrayType (OPT_Struct *typ, OPT_Struct *banned); diff --git a/bootstrap/windows-88/OPP.h b/bootstrap/windows-88/OPP.h index 28045a86..e5a59f6c 100644 --- a/bootstrap/windows-88/OPP.h +++ b/bootstrap/windows-88/OPP.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPP__h #define OPP__h diff --git a/bootstrap/windows-88/OPS.c b/bootstrap/windows-88/OPS.c index 869dfa4b..cd24b8ee 100644 --- a/bootstrap/windows-88/OPS.c +++ b/bootstrap/windows-88/OPS.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/windows-88/OPS.h b/bootstrap/windows-88/OPS.h index 7de91cb4..bcc2ae4d 100644 --- a/bootstrap/windows-88/OPS.h +++ b/bootstrap/windows-88/OPS.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin tspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin tspaSfF */ #ifndef OPS__h #define OPS__h diff --git a/bootstrap/windows-88/OPT.c b/bootstrap/windows-88/OPT.c index 2dd48c74..41686385 100644 --- a/bootstrap/windows-88/OPT.c +++ b/bootstrap/windows-88/OPT.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -100,12 +100,12 @@ static OPT_ExpCtxt OPT_expCtxt; static int64 OPT_nofhdfld; static BOOLEAN OPT_newsf, OPT_findpc, OPT_extsf, OPT_sfpresent, OPT_symExtended, OPT_symNew; -export LONGINT *OPT_ConstDesc__typ; -export LONGINT *OPT_ObjDesc__typ; -export LONGINT *OPT_StrDesc__typ; -export LONGINT *OPT_NodeDesc__typ; -export LONGINT *OPT_ImpCtxt__typ; -export LONGINT *OPT_ExpCtxt__typ; +export address *OPT_ConstDesc__typ; +export address *OPT_ObjDesc__typ; +export address *OPT_StrDesc__typ; +export address *OPT_NodeDesc__typ; +export address *OPT_ImpCtxt__typ; +export address *OPT_ExpCtxt__typ; export void OPT_Close (void); export void OPT_CloseScope (void); diff --git a/bootstrap/windows-88/OPT.h b/bootstrap/windows-88/OPT.h index a1956589..697eb2c9 100644 --- a/bootstrap/windows-88/OPT.h +++ b/bootstrap/windows-88/OPT.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPT__h #define OPT__h @@ -74,10 +74,10 @@ import OPT_Object OPT_GlbMod[64]; import OPS_Name OPT_SelfName; import BOOLEAN OPT_SYSimported; -import LONGINT *OPT_ConstDesc__typ; -import LONGINT *OPT_ObjDesc__typ; -import LONGINT *OPT_StrDesc__typ; -import LONGINT *OPT_NodeDesc__typ; +import address *OPT_ConstDesc__typ; +import address *OPT_ObjDesc__typ; +import address *OPT_StrDesc__typ; +import address *OPT_NodeDesc__typ; import void OPT_Close (void); import void OPT_CloseScope (void); diff --git a/bootstrap/windows-88/OPV.c b/bootstrap/windows-88/OPV.c index 22d0def4..b57b2868 100644 --- a/bootstrap/windows-88/OPV.c +++ b/bootstrap/windows-88/OPV.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -21,7 +21,7 @@ static int64 OPV_recno; static OPV_ExitInfo OPV_exit; static int32 OPV_nofExitLabels; -export LONGINT *OPV_ExitInfo__typ; +export address *OPV_ExitInfo__typ; static void OPV_ActualPar (OPT_Node n, OPT_Object fp); export void OPV_AdrAndSize (OPT_Object topScope); diff --git a/bootstrap/windows-88/OPV.h b/bootstrap/windows-88/OPV.h index 4a3f9d07..c309d63c 100644 --- a/bootstrap/windows-88/OPV.h +++ b/bootstrap/windows-88/OPV.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef OPV__h #define OPV__h diff --git a/bootstrap/windows-88/Platform.c b/bootstrap/windows-88/Platform.c index 6651ddd3..363a0045 100644 --- a/bootstrap/windows-88/Platform.c +++ b/bootstrap/windows-88/Platform.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -44,7 +44,7 @@ export int64 Platform_StdIn, Platform_StdOut, Platform_StdErr; static Platform_SignalHandler Platform_InterruptHandler; export CHAR Platform_nl[3]; -export LONGINT *Platform_FileIdentity__typ; +export address *Platform_FileIdentity__typ; export BOOLEAN Platform_Absent (int32 e); export int32 Platform_ArgPos (CHAR *s, LONGINT s__len); @@ -63,8 +63,8 @@ export void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val export void Platform_GetIntArg (int32 n, int64 *val); export void Platform_GetTimeOfDay (int64 *sec, int64 *usec); export void Platform_Halt (int64 code); -export int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, LONGINT *identity__typ); -export int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ); +export int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, address *identity__typ); +export int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ); export BOOLEAN Platform_Inaccessible (int32 e); export void Platform_Init (int32 argc, address argvadr); export void Platform_MTimeAsClock (Platform_FileIdentity i, int64 *t, int64 *d); @@ -82,7 +82,7 @@ export BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIde export int32 Platform_Seek (int64 h, int64 o, int32 r); export void Platform_SetBadInstructionHandler (Platform_SignalHandler handler); export void Platform_SetHalt (Platform_HaltProcedure p); -export void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source); +export void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source); export int32 Platform_Size (int64 h, int64 *l); export int32 Platform_Sync (int64 h); export int32 Platform_System (CHAR *cmd, LONGINT cmd__len); @@ -467,7 +467,7 @@ int32 Platform_Close (int64 h) __RETCHK; } -int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, LONGINT *identity__typ) +int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, address *identity__typ) { int32 _o_result; Platform_byHandleFileInformation(); @@ -484,7 +484,7 @@ int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, LONGINT *iden return _o_result; } -int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ) +int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ) { int32 _o_result; int64 h; @@ -517,7 +517,7 @@ BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIdentity i return _o_result; } -void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source) +void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source) { (*target).mtimehigh = source.mtimehigh; (*target).mtimelow = source.mtimelow; diff --git a/bootstrap/windows-88/Platform.h b/bootstrap/windows-88/Platform.h index 8fd37cdd..6cab3690 100644 --- a/bootstrap/windows-88/Platform.h +++ b/bootstrap/windows-88/Platform.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Platform__h #define Platform__h @@ -29,7 +29,7 @@ import int32 Platform_SeekSet, Platform_SeekCur, Platform_SeekEnd; import int64 Platform_StdIn, Platform_StdOut, Platform_StdErr; import CHAR Platform_nl[3]; -import LONGINT *Platform_FileIdentity__typ; +import address *Platform_FileIdentity__typ; import BOOLEAN Platform_Absent (int32 e); import int32 Platform_ArgPos (CHAR *s, LONGINT s__len); @@ -47,8 +47,8 @@ import void Platform_GetEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val import void Platform_GetIntArg (int32 n, int64 *val); import void Platform_GetTimeOfDay (int64 *sec, int64 *usec); import void Platform_Halt (int64 code); -import int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, LONGINT *identity__typ); -import int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, LONGINT *identity__typ); +import int32 Platform_Identify (int64 h, Platform_FileIdentity *identity, address *identity__typ); +import int32 Platform_IdentifyByName (CHAR *n, LONGINT n__len, Platform_FileIdentity *identity, address *identity__typ); import BOOLEAN Platform_Inaccessible (int32 e); import void Platform_Init (int32 argc, address argvadr); import void Platform_MTimeAsClock (Platform_FileIdentity i, int64 *t, int64 *d); @@ -66,7 +66,7 @@ import BOOLEAN Platform_SameFileTime (Platform_FileIdentity i1, Platform_FileIde import int32 Platform_Seek (int64 h, int64 o, int32 r); import void Platform_SetBadInstructionHandler (Platform_SignalHandler handler); import void Platform_SetHalt (Platform_HaltProcedure p); -import void Platform_SetMTime (Platform_FileIdentity *target, LONGINT *target__typ, Platform_FileIdentity source); +import void Platform_SetMTime (Platform_FileIdentity *target, address *target__typ, Platform_FileIdentity source); import int32 Platform_Size (int64 h, int64 *l); import int32 Platform_Sync (int64 h); import int32 Platform_System (CHAR *cmd, LONGINT cmd__len); diff --git a/bootstrap/windows-88/Reals.c b/bootstrap/windows-88/Reals.c index 039a3b6d..7678a81e 100644 --- a/bootstrap/windows-88/Reals.c +++ b/bootstrap/windows-88/Reals.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/windows-88/Reals.h b/bootstrap/windows-88/Reals.h index e27d5dca..4de192c6 100644 --- a/bootstrap/windows-88/Reals.h +++ b/bootstrap/windows-88/Reals.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Reals__h #define Reals__h diff --git a/bootstrap/windows-88/Strings.c b/bootstrap/windows-88/Strings.c index 2f1a7062..49fbdd21 100644 --- a/bootstrap/windows-88/Strings.c +++ b/bootstrap/windows-88/Strings.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/windows-88/Strings.h b/bootstrap/windows-88/Strings.h index 90baacae..4dd0d2c3 100644 --- a/bootstrap/windows-88/Strings.h +++ b/bootstrap/windows-88/Strings.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Strings__h #define Strings__h diff --git a/bootstrap/windows-88/Texts.c b/bootstrap/windows-88/Texts.c index ee371c4e..6403ce33 100644 --- a/bootstrap/windows-88/Texts.c +++ b/bootstrap/windows-88/Texts.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 @@ -33,7 +33,7 @@ typedef } Texts_ElemMsg; typedef - void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, LONGINT *); + void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, address *); typedef struct Texts_TextDesc *Texts_Text; @@ -167,20 +167,20 @@ export Texts_Elem Texts_new; static Texts_Buffer Texts_del; static Texts_FontsFont Texts_FontsDefault; -export LONGINT *Texts_FontDesc__typ; -export LONGINT *Texts_RunDesc__typ; -export LONGINT *Texts_PieceDesc__typ; -export LONGINT *Texts_ElemMsg__typ; -export LONGINT *Texts_ElemDesc__typ; -export LONGINT *Texts_FileMsg__typ; -export LONGINT *Texts_CopyMsg__typ; -export LONGINT *Texts_IdentifyMsg__typ; -export LONGINT *Texts_BufDesc__typ; -export LONGINT *Texts_TextDesc__typ; -export LONGINT *Texts_Reader__typ; -export LONGINT *Texts_Scanner__typ; -export LONGINT *Texts_Writer__typ; -export LONGINT *Texts__1__typ; +export address *Texts_FontDesc__typ; +export address *Texts_RunDesc__typ; +export address *Texts_PieceDesc__typ; +export address *Texts_ElemMsg__typ; +export address *Texts_ElemDesc__typ; +export address *Texts_FileMsg__typ; +export address *Texts_CopyMsg__typ; +export address *Texts_IdentifyMsg__typ; +export address *Texts_BufDesc__typ; +export address *Texts_TextDesc__typ; +export address *Texts_Reader__typ; +export address *Texts_Scanner__typ; +export address *Texts_Writer__typ; +export address *Texts__1__typ; export void Texts_Append (Texts_Text T, Texts_Buffer B); export void Texts_ChangeLooks (Texts_Text T, int64 beg, int64 end, SET sel, Texts_FontsFont fnt, int8 col, int8 voff); @@ -194,41 +194,41 @@ export Texts_Text Texts_ElemBase (Texts_Elem E); export int64 Texts_ElemPos (Texts_Elem E); static void Texts_Find (Texts_Text T, int64 *pos, Texts_Run *u, int64 *org, int64 *off); static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len); -static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, LONGINT *msg__typ); +static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, address *msg__typ); export void Texts_Insert (Texts_Text T, int64 pos, Texts_Buffer B); -export void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T); +export void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T); +static void Texts_Load0 (Files_Rider *r, address *r__typ, Texts_Text T); static void Texts_Merge (Texts_Text T, Texts_Run u, Texts_Run *v); export void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len); export void Texts_OpenBuf (Texts_Buffer B); -export void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int64 pos); -export void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int64 pos); -export void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ); -export int64 Texts_Pos (Texts_Reader *R, LONGINT *R__typ); -export void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch); -export void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ); -export void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ); +export void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int64 pos); +export void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int64 pos); +export void Texts_OpenWriter (Texts_Writer *W, address *W__typ); +export int64 Texts_Pos (Texts_Reader *R, address *R__typ); +export void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch); +export void Texts_ReadElem (Texts_Reader *R, address *R__typ); +export void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ); export void Texts_Recall (Texts_Buffer *B); export void Texts_Save (Texts_Text T, int64 beg, int64 end, Texts_Buffer B); -export void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ); -export void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col); -export void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt); -export void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff); +export void Texts_Scan (Texts_Scanner *S, address *S__typ); +export void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col); +export void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt); +export void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff); static void Texts_Splice (Texts_Run un, Texts_Run v, Texts_Run w, Texts_Text base); static void Texts_Split (int64 off, Texts_Run *u, Texts_Run *un); -export void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -export void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch); -export void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int64 t, int64 d); -export void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e); -export void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int64 x); -export void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n); -export void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ); -export void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int32 n); -export void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x); -export void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n); -export void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n, int32 k); -export void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x); -export void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len); +export void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T); +export void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch); +export void Texts_WriteDate (Texts_Writer *W, address *W__typ, int64 t, int64 d); +export void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e); +export void Texts_WriteHex (Texts_Writer *W, address *W__typ, int64 x); +export void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n); +export void Texts_WriteLn (Texts_Writer *W, address *W__typ); +export void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int32 n); +export void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x); +export void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int32 n); +export void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int32 n, int32 k); +export void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x); +export void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len); static Texts_FontsFont Texts_FontsThis (CHAR *name, LONGINT name__len) @@ -388,7 +388,7 @@ int64 Texts_ElemPos (Texts_Elem E) return _o_result; } -static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, LONGINT *msg__typ) +static void Texts_HandleAlien (Texts_Elem E, Texts_ElemMsg *msg, address *msg__typ) { Texts_Alien e = NIL; Files_Rider r; @@ -604,7 +604,7 @@ void Texts_ChangeLooks (Texts_Text T, int64 beg, int64 end, SET sel, Texts_Fonts } } -void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int64 pos) +void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int64 pos) { Texts_Run u = NIL; if (pos >= T->len) { @@ -618,7 +618,7 @@ void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int64 pos } } -void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch) +void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch) { Texts_Run u = NIL; int64 pos; @@ -663,7 +663,7 @@ void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch) } } -void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ) +void Texts_ReadElem (Texts_Reader *R, address *R__typ) { Texts_Run u = NIL, un = NIL; u = (*R).run; @@ -691,7 +691,7 @@ void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ) } } -void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ) +void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ) { Texts_Run u = NIL; u = (*R).run->prev; @@ -713,14 +713,14 @@ void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ) } } -int64 Texts_Pos (Texts_Reader *R, LONGINT *R__typ) +int64 Texts_Pos (Texts_Reader *R, address *R__typ) { int64 _o_result; _o_result = (*R).org + (*R).off; return _o_result; } -void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int64 pos) +void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int64 pos) { Texts_OpenReader((void*)&*S, S__typ, T, pos); (*S).line = 0; @@ -729,7 +729,7 @@ void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int64 p static struct Scan__31 { Texts_Scanner *S; - LONGINT *S__typ; + address *S__typ; CHAR *ch; BOOLEAN *negE; int32 *e; @@ -756,7 +756,7 @@ static void ReadScaleFactor__32 (void) } } -void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ) +void Texts_Scan (Texts_Scanner *S, address *S__typ) { CHAR ch, term; BOOLEAN neg, negE, hex; @@ -962,7 +962,7 @@ void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ) Scan__31_s = _s.lnk; } -void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ) +void Texts_OpenWriter (Texts_Writer *W, address *W__typ) { __NEW((*W).buf, Texts_BufDesc); Texts_OpenBuf((*W).buf); @@ -973,22 +973,22 @@ void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ) Files_Set(&(*W).rider, Files_Rider__typ, (*W).file, 0); } -void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt) +void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt) { (*W).fnt = fnt; } -void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col) +void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col) { (*W).col = col; } -void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff) +void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff) { (*W).voff = voff; } -void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch) +void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch) { Texts_Run u = NIL, un = NIL; Texts_Piece p = NIL; @@ -1014,7 +1014,7 @@ void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch) } } -void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e) +void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e) { Texts_Run u = NIL, un = NIL; if (e->base != NIL) { @@ -1033,12 +1033,12 @@ void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e) un->prev = (Texts_Run)e; } -void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ) +void Texts_WriteLn (Texts_Writer *W, address *W__typ) { Texts_Write(&*W, W__typ, 0x0d); } -void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len) +void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len) { int32 i; __DUP(s, s__len, CHAR); @@ -1050,7 +1050,7 @@ void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__le __DEL(s); } -void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n) +void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n) { int32 i; int64 x0; @@ -1085,7 +1085,7 @@ void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n) } while (!(i == 0)); } -void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int64 x) +void Texts_WriteHex (Texts_Writer *W, address *W__typ, int64 x) { int32 i; int64 y; @@ -1108,7 +1108,7 @@ void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int64 x) } while (!(i == 0)); } -void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n) +void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int32 n) { int32 e; REAL x0; @@ -1180,7 +1180,7 @@ void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n) static struct WriteRealFix__53 { Texts_Writer *W; - LONGINT *W__typ; + address *W__typ; int32 *i; CHAR (*d)[9]; struct WriteRealFix__53 *lnk; @@ -1206,7 +1206,7 @@ static void dig__54 (int32 n) } } -void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n, int32 k) +void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int32 n, int32 k) { int32 e, i; CHAR sign; @@ -1278,7 +1278,7 @@ void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n, int3 WriteRealFix__53_s = _s.lnk; } -void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x) +void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x) { int32 i; CHAR d[8]; @@ -1290,7 +1290,7 @@ void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x) } while (!(i == 8)); } -void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int32 n) +void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int32 n) { int32 e; LONGREAL x0; @@ -1362,7 +1362,7 @@ void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int32 n) } } -void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x) +void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x) { int32 i; CHAR d[16]; @@ -1376,7 +1376,7 @@ void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x) static struct WriteDate__43 { Texts_Writer *W; - LONGINT *W__typ; + address *W__typ; struct WriteDate__43 *lnk; } *WriteDate__43_s; @@ -1389,7 +1389,7 @@ static void WritePair__44 (CHAR ch, int64 x) Texts_Write(&*WriteDate__43_s->W, WriteDate__43_s->W__typ, (CHAR)(__MOD(x, 10) + 48)); } -void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int64 t, int64 d) +void Texts_WriteDate (Texts_Writer *W, address *W__typ, int64 t, int64 d) { struct WriteDate__43 _s; _s.W = W; _s.W__typ = W__typ; @@ -1413,9 +1413,9 @@ static struct Load0__16 { struct Load0__16 *lnk; } *Load0__16_s; -static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int64 pos, int64 span, Texts_Elem *e); +static void LoadElem__17 (Files_Rider *r, address *r__typ, int64 pos, int64 span, Texts_Elem *e); -static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int64 pos, int64 span, Texts_Elem *e) +static void LoadElem__17 (Files_Rider *r, address *r__typ, int64 pos, int64 span, Texts_Elem *e) { Modules_Module M = NIL; Modules_Command Cmd; @@ -1466,7 +1466,7 @@ static void LoadElem__17 (Files_Rider *r, LONGINT *r__typ, int64 pos, int64 span } } -static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +static void Texts_Load0 (Files_Rider *r, address *r__typ, Texts_Text T) { Texts_Run u = NIL, un = NIL; Texts_Piece p = NIL; @@ -1540,7 +1540,7 @@ static void Texts_Load0 (Files_Rider *r, LONGINT *r__typ, Texts_Text T) Load0__16_s = _s.lnk; } -void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T) { int32 tag; Files_ReadInt(&*r, r__typ, &tag); @@ -1614,9 +1614,9 @@ static struct Store__39 { struct Store__39 *lnk; } *Store__39_s; -static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int64 pos, Texts_Elem e); +static void StoreElem__40 (Files_Rider *r, address *r__typ, int64 pos, Texts_Elem e); -static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int64 pos, Texts_Elem e) +static void StoreElem__40 (Files_Rider *r, address *r__typ, int64 pos, Texts_Elem e) { Files_Rider r1; int64 org, span; @@ -1646,7 +1646,7 @@ static void StoreElem__40 (Files_Rider *r, LONGINT *r__typ, int64 pos, Texts_Ele Files_WriteLInt(&r1, Files_Rider__typ, e->H); } -void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T) +void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T) { Files_Rider r1; Texts_Run u = NIL, un = NIL; diff --git a/bootstrap/windows-88/Texts.h b/bootstrap/windows-88/Texts.h index 32047663..e85157ed 100644 --- a/bootstrap/windows-88/Texts.h +++ b/bootstrap/windows-88/Texts.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef Texts__h #define Texts__h @@ -35,7 +35,7 @@ typedef } Texts_RunDesc; typedef - void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, LONGINT *); + void (*Texts_Handler)(Texts_Elem, Texts_ElemMsg*, address *); typedef struct Texts_ElemDesc { @@ -115,18 +115,18 @@ typedef import Texts_Elem Texts_new; -import LONGINT *Texts_FontDesc__typ; -import LONGINT *Texts_RunDesc__typ; -import LONGINT *Texts_ElemMsg__typ; -import LONGINT *Texts_ElemDesc__typ; -import LONGINT *Texts_FileMsg__typ; -import LONGINT *Texts_CopyMsg__typ; -import LONGINT *Texts_IdentifyMsg__typ; -import LONGINT *Texts_BufDesc__typ; -import LONGINT *Texts_TextDesc__typ; -import LONGINT *Texts_Reader__typ; -import LONGINT *Texts_Scanner__typ; -import LONGINT *Texts_Writer__typ; +import address *Texts_FontDesc__typ; +import address *Texts_RunDesc__typ; +import address *Texts_ElemMsg__typ; +import address *Texts_ElemDesc__typ; +import address *Texts_FileMsg__typ; +import address *Texts_CopyMsg__typ; +import address *Texts_IdentifyMsg__typ; +import address *Texts_BufDesc__typ; +import address *Texts_TextDesc__typ; +import address *Texts_Reader__typ; +import address *Texts_Scanner__typ; +import address *Texts_Writer__typ; import void Texts_Append (Texts_Text T, Texts_Buffer B); import void Texts_ChangeLooks (Texts_Text T, int64 beg, int64 end, SET sel, Texts_FontsFont fnt, int8 col, int8 voff); @@ -137,35 +137,35 @@ import void Texts_Delete (Texts_Text T, int64 beg, int64 end); import Texts_Text Texts_ElemBase (Texts_Elem E); import int64 Texts_ElemPos (Texts_Elem E); import void Texts_Insert (Texts_Text T, int64 pos, Texts_Buffer B); -import void Texts_Load (Files_Rider *r, LONGINT *r__typ, Texts_Text T); +import void Texts_Load (Files_Rider *r, address *r__typ, Texts_Text T); import void Texts_Open (Texts_Text T, CHAR *name, LONGINT name__len); import void Texts_OpenBuf (Texts_Buffer B); -import void Texts_OpenReader (Texts_Reader *R, LONGINT *R__typ, Texts_Text T, int64 pos); -import void Texts_OpenScanner (Texts_Scanner *S, LONGINT *S__typ, Texts_Text T, int64 pos); -import void Texts_OpenWriter (Texts_Writer *W, LONGINT *W__typ); -import int64 Texts_Pos (Texts_Reader *R, LONGINT *R__typ); -import void Texts_Read (Texts_Reader *R, LONGINT *R__typ, CHAR *ch); -import void Texts_ReadElem (Texts_Reader *R, LONGINT *R__typ); -import void Texts_ReadPrevElem (Texts_Reader *R, LONGINT *R__typ); +import void Texts_OpenReader (Texts_Reader *R, address *R__typ, Texts_Text T, int64 pos); +import void Texts_OpenScanner (Texts_Scanner *S, address *S__typ, Texts_Text T, int64 pos); +import void Texts_OpenWriter (Texts_Writer *W, address *W__typ); +import int64 Texts_Pos (Texts_Reader *R, address *R__typ); +import void Texts_Read (Texts_Reader *R, address *R__typ, CHAR *ch); +import void Texts_ReadElem (Texts_Reader *R, address *R__typ); +import void Texts_ReadPrevElem (Texts_Reader *R, address *R__typ); import void Texts_Recall (Texts_Buffer *B); import void Texts_Save (Texts_Text T, int64 beg, int64 end, Texts_Buffer B); -import void Texts_Scan (Texts_Scanner *S, LONGINT *S__typ); -import void Texts_SetColor (Texts_Writer *W, LONGINT *W__typ, int8 col); -import void Texts_SetFont (Texts_Writer *W, LONGINT *W__typ, Texts_FontsFont fnt); -import void Texts_SetOffset (Texts_Writer *W, LONGINT *W__typ, int8 voff); -import void Texts_Store (Files_Rider *r, LONGINT *r__typ, Texts_Text T); -import void Texts_Write (Texts_Writer *W, LONGINT *W__typ, CHAR ch); -import void Texts_WriteDate (Texts_Writer *W, LONGINT *W__typ, int64 t, int64 d); -import void Texts_WriteElem (Texts_Writer *W, LONGINT *W__typ, Texts_Elem e); -import void Texts_WriteHex (Texts_Writer *W, LONGINT *W__typ, int64 x); -import void Texts_WriteInt (Texts_Writer *W, LONGINT *W__typ, int64 x, int64 n); -import void Texts_WriteLn (Texts_Writer *W, LONGINT *W__typ); -import void Texts_WriteLongReal (Texts_Writer *W, LONGINT *W__typ, LONGREAL x, int32 n); -import void Texts_WriteLongRealHex (Texts_Writer *W, LONGINT *W__typ, LONGREAL x); -import void Texts_WriteReal (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n); -import void Texts_WriteRealFix (Texts_Writer *W, LONGINT *W__typ, REAL x, int32 n, int32 k); -import void Texts_WriteRealHex (Texts_Writer *W, LONGINT *W__typ, REAL x); -import void Texts_WriteString (Texts_Writer *W, LONGINT *W__typ, CHAR *s, LONGINT s__len); +import void Texts_Scan (Texts_Scanner *S, address *S__typ); +import void Texts_SetColor (Texts_Writer *W, address *W__typ, int8 col); +import void Texts_SetFont (Texts_Writer *W, address *W__typ, Texts_FontsFont fnt); +import void Texts_SetOffset (Texts_Writer *W, address *W__typ, int8 voff); +import void Texts_Store (Files_Rider *r, address *r__typ, Texts_Text T); +import void Texts_Write (Texts_Writer *W, address *W__typ, CHAR ch); +import void Texts_WriteDate (Texts_Writer *W, address *W__typ, int64 t, int64 d); +import void Texts_WriteElem (Texts_Writer *W, address *W__typ, Texts_Elem e); +import void Texts_WriteHex (Texts_Writer *W, address *W__typ, int64 x); +import void Texts_WriteInt (Texts_Writer *W, address *W__typ, int64 x, int64 n); +import void Texts_WriteLn (Texts_Writer *W, address *W__typ); +import void Texts_WriteLongReal (Texts_Writer *W, address *W__typ, LONGREAL x, int32 n); +import void Texts_WriteLongRealHex (Texts_Writer *W, address *W__typ, LONGREAL x); +import void Texts_WriteReal (Texts_Writer *W, address *W__typ, REAL x, int32 n); +import void Texts_WriteRealFix (Texts_Writer *W, address *W__typ, REAL x, int32 n, int32 k); +import void Texts_WriteRealHex (Texts_Writer *W, address *W__typ, REAL x); +import void Texts_WriteString (Texts_Writer *W, address *W__typ, CHAR *s, LONGINT s__len); import void *Texts__init(void); diff --git a/bootstrap/windows-88/Vishap.c b/bootstrap/windows-88/Vishap.c index 87812cc2..5c6cada1 100644 --- a/bootstrap/windows-88/Vishap.c +++ b/bootstrap/windows-88/Vishap.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspamSf */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspamSf */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/windows-88/errors.c b/bootstrap/windows-88/errors.c index 897999f4..4bb09433 100644 --- a/bootstrap/windows-88/errors.c +++ b/bootstrap/windows-88/errors.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/windows-88/errors.h b/bootstrap/windows-88/errors.h index 6ca6c961..759b613e 100644 --- a/bootstrap/windows-88/errors.h +++ b/bootstrap/windows-88/errors.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef errors__h #define errors__h diff --git a/bootstrap/windows-88/extTools.c b/bootstrap/windows-88/extTools.c index 1647c4fe..d6bc2194 100644 --- a/bootstrap/windows-88/extTools.c +++ b/bootstrap/windows-88/extTools.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/windows-88/extTools.h b/bootstrap/windows-88/extTools.h index 0b905427..bff1c62c 100644 --- a/bootstrap/windows-88/extTools.h +++ b/bootstrap/windows-88/extTools.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef extTools__h #define extTools__h diff --git a/bootstrap/windows-88/vt100.c b/bootstrap/windows-88/vt100.c index 8b57066f..bb55d599 100644 --- a/bootstrap/windows-88/vt100.c +++ b/bootstrap/windows-88/vt100.c @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #define INTEGER int32 #define LONGINT int64 diff --git a/bootstrap/windows-88/vt100.h b/bootstrap/windows-88/vt100.h index e8809371..2bc7d18f 100644 --- a/bootstrap/windows-88/vt100.h +++ b/bootstrap/windows-88/vt100.h @@ -1,4 +1,4 @@ -/* voc 1.95 [2016/09/22] for gcc LP64 on cygwin xtspaSfF */ +/* voc 1.95 [2016/09/23] for gcc LP64 on cygwin xtspaSfF */ #ifndef vt100__h #define vt100__h diff --git a/src/compiler/OPC.Mod b/src/compiler/OPC.Mod index 29b8c302..8059d5fb 100644 --- a/src/compiler/OPC.Mod +++ b/src/compiler/OPC.Mod @@ -698,7 +698,7 @@ MODULE OPC; (* copyright (c) J. Templ 12.7.95 / 3.7.96 *) OPM.WriteString("LONGINT "); LenList(obj, FALSE, TRUE) ELSIF (obj^.mode = OPT.VarPar) & (obj^.typ^.comp = OPT.Record) THEN EndStat; BegStat; - OPM.WriteString("LONGINT *"); Ident(obj); OPM.WriteString(TagExt); + OPM.WriteString("address *"); Ident(obj); OPM.WriteString(TagExt); base := NIL ELSIF (OPM.ptrinit IN OPM.opt) & (vis = 0) & (obj^.mnolev > 0) & (obj^.typ^.form = OPT.Pointer) THEN OPM.WriteString(" = NIL") @@ -726,7 +726,7 @@ MODULE OPC; (* copyright (c) J. Templ 12.7.95 / 3.7.96 *) OPM.WriteString(", LONGINT "); LenList(obj, TRUE, showParamNames) ELSIF (obj^.mode = OPT.VarPar) & (obj^.typ^.comp = OPT.Record) THEN - OPM.WriteString(", LONGINT *"); + OPM.WriteString(", address *"); IF showParamNames THEN Ident(obj); OPM.WriteString(TagExt) END END ; IF (obj^.link = NIL) OR (obj^.link.mode = OPT.TProc) THEN EXIT END ; @@ -790,7 +790,7 @@ MODULE OPC; (* copyright (c) J. Templ 12.7.95 / 3.7.96 *) ELSIF (typ^.strobj # NIL) & (typ^.strobj^.mnolev > 0) THEN OPM.WriteString('static ') ELSE OPM.WriteString(Export) END ; - OPM.WriteString("LONGINT *"); Andent(typ); OPM.WriteString(DynTypExt); + OPM.WriteString("address *"); Andent(typ); OPM.WriteString(DynTypExt); EndStat END ; n := n^.link diff --git a/src/system/Console.Mod b/src/system/Console.Mod index bf1c9a1d..6b35a090 100644 --- a/src/system/Console.Mod +++ b/src/system/Console.Mod @@ -65,7 +65,7 @@ MODULE Console; (* J. Templ, 29-June-96 *) END Hex; PROCEDURE Read*(VAR ch: CHAR); - VAR n: SYSTEM.ADDRESS; error: Platform.ErrorCode; + VAR n: LONGINT; error: Platform.ErrorCode; BEGIN Flush(); error := Platform.ReadBuf(Platform.StdIn, ch, n); IF n # 1 THEN ch := 0X END diff --git a/src/system/Platformunix.Mod b/src/system/Platformunix.Mod index a6e5d399..f514c9cf 100644 --- a/src/system/Platformunix.Mod +++ b/src/system/Platformunix.Mod @@ -316,7 +316,7 @@ PROCEDURE -structstats "struct stat s"; PROCEDURE -statdev(): LONGINT "(LONGINT)s.st_dev"; PROCEDURE -statino(): LONGINT "(LONGINT)s.st_ino"; PROCEDURE -statmtime(): LONGINT "(LONGINT)s.st_mtime"; -PROCEDURE -statsize(): SYSTEM.ADDRESS "(address)s.st_size"; +PROCEDURE -statsize(): LONGINT "(address)s.st_size"; PROCEDURE Identify*(h: FileHandle; VAR identity: FileIdentity): ErrorCode; BEGIN @@ -358,7 +358,7 @@ BEGIN END MTimeAsClock; -PROCEDURE Size*(h: FileHandle; VAR l: SYSTEM.ADDRESS): ErrorCode; +PROCEDURE Size*(h: FileHandle; VAR l: LONGINT): ErrorCode; BEGIN structstats; IF fstat(h) < 0 THEN RETURN err() END; @@ -368,16 +368,16 @@ END Size; -PROCEDURE -readfile (fd: LONGINT; p: SYSTEM.ADDRESS; l: SYSTEM.ADDRESS): SYSTEM.ADDRESS +PROCEDURE -readfile (fd: LONGINT; p: SYSTEM.ADDRESS; l: LONGINT): LONGINT "read(fd, (void*)(address)(p), l)"; -PROCEDURE Read*(h: FileHandle; p: SYSTEM.ADDRESS; l: SYSTEM.ADDRESS; VAR n: SYSTEM.ADDRESS): ErrorCode; +PROCEDURE Read*(h: FileHandle; p: SYSTEM.ADDRESS; l: LONGINT; VAR n: LONGINT): ErrorCode; BEGIN n := readfile(h, p, l); IF n < 0 THEN n := 0; RETURN err() ELSE RETURN 0 END END Read; -PROCEDURE ReadBuf*(h: FileHandle; VAR b: ARRAY OF SYSTEM.BYTE; VAR n: SYSTEM.ADDRESS): ErrorCode; +PROCEDURE ReadBuf*(h: FileHandle; VAR b: ARRAY OF SYSTEM.BYTE; VAR n: LONGINT): ErrorCode; BEGIN n := readfile(h, SYSTEM.ADR(b), LEN(b)); IF n < 0 THEN n := 0; RETURN err() ELSE RETURN 0 END diff --git a/src/system/SYSTEM.h b/src/system/SYSTEM.h index ddd85144..6ddf909a 100644 --- a/src/system/SYSTEM.h +++ b/src/system/SYSTEM.h @@ -243,10 +243,16 @@ static inline double SYSTEM_ABSD(double i) {return i >= 0.0 ? i : -i;} #define __CASECHK __HALT(-4) #define __WITHCHK __HALT(-7) -#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(address)typ##__typ) -#define __TYPEOF(p) ((LONGINT*)(address)(*(((LONGINT*)(p))-1))) + +//#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(address)typ##__typ) +//#define __TYPEOF(p) ((address*)(address)(*(((LONGINT*)(p))-1))) +//#define __ISP(p, typ, level) __IS(__TYPEOF(p),typ,level) + +#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(address)typ##__typ) +#define __TYPEOF(p) ((address*)(address)(*(((address*)(p))-1))) #define __ISP(p, typ, level) __IS(__TYPEOF(p),typ,level) + #define __GUARDP(p, typ, level) ((typ*)(__ISP(p,typ,level)?p:(__HALT(-5),p))) #define __GUARDR(r, typ, level) (*((typ*)(__IS(r##__typ,typ,level)?r:(__HALT(-5),r)))) #define __GUARDA(p, typ, level) ((struct typ*)(__IS(__TYPEOF(p),typ,level)?p:(__HALT(-5),p))) diff --git a/src/tools/make/vishap.make b/src/tools/make/vishap.make index 99e12608..260ca57c 100644 --- a/src/tools/make/vishap.make +++ b/src/tools/make/vishap.make @@ -20,7 +20,7 @@ FLAVOUR = $(OS).$(DATAMODEL).$(COMPILER) BUILDDIR = build/$(FLAVOUR) VISHAP = $(ONAME)$(BINEXT) -# MODEL=-O2 # Override model - build everything as S8,I16,L32. +#MODEL=-O2 # Override model - build everything as S8,I16,L32.