diff --git a/bootstrap/unix-44/Configuration.c b/bootstrap/unix-44/Configuration.c
index 821dff97..b0d48f0a 100644
--- a/bootstrap/unix-44/Configuration.c
+++ b/bootstrap/unix-44/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 
@@ -13,6 +13,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/08/23] for gcc LP64 on cygwin", Configuration_versionLong, 41);
+	__MOVE("1.95 [2016/08/26] for gcc LP64 on cygwin", Configuration_versionLong, 41);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-44/Configuration.h b/bootstrap/unix-44/Configuration.h
index ec5e865a..38a63260 100644
--- a/bootstrap/unix-44/Configuration.h
+++ b/bootstrap/unix-44/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-44/Console.c b/bootstrap/unix-44/Console.c
index f9161937..cc4cc8bd 100644
--- a/bootstrap/unix-44/Console.c
+++ b/bootstrap/unix-44/Console.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Platform.h"
 
@@ -21,7 +21,7 @@ export void Console_String (CHAR *s, LONGINT s__len);
 void Console_Flush (void)
 {
 	INTEGER error;
-	error = Platform_Write(((LONGINT)(1)), (LONGINT)(SYSTEM_ADDRESS)Console_line, Console_pos);
+	error = Platform_Write(((LONGINT)(1)), (LONGINT)(SYSTEM_ADRINT)Console_line, Console_pos);
 	Console_pos = 0;
 }
 
diff --git a/bootstrap/unix-44/Console.h b/bootstrap/unix-44/Console.h
index 5fdd4e4d..2c462da9 100644
--- a/bootstrap/unix-44/Console.h
+++ b/bootstrap/unix-44/Console.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Console__h
 #define Console__h
diff --git a/bootstrap/unix-44/Files.c b/bootstrap/unix-44/Files.c
index 5a1dd875..496a4a87 100644
--- a/bootstrap/unix-44/Files.c
+++ b/bootstrap/unix-44/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Console.h"
@@ -257,7 +257,7 @@ static void Files_Flush (Files_Buffer buf)
 		if (buf->org != f->pos) {
 			error = Platform_Seek(f->fd, buf->org, Platform_SeekSet);
 		}
-		error = Platform_Write(f->fd, (LONGINT)(SYSTEM_ADDRESS)buf->data, buf->size);
+		error = Platform_Write(f->fd, (LONGINT)(SYSTEM_ADRINT)buf->data, buf->size);
 		if (error != 0) {
 			Files_Err((CHAR*)"error writing file", (LONGINT)19, f, error);
 		}
@@ -656,7 +656,7 @@ void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x
 		} else {
 			min = n;
 		}
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)buf->data + offset, (LONGINT)(SYSTEM_ADDRESS)x + xpos, min);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)buf->data + offset, (LONGINT)(SYSTEM_ADRINT)x + xpos, min);
 		offset += min;
 		(*r).offset = offset;
 		xpos += min;
@@ -721,7 +721,7 @@ void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT
 		} else {
 			min = n;
 		}
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)x + xpos, (LONGINT)(SYSTEM_ADDRESS)buf->data + offset, min);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)x + xpos, (LONGINT)(SYSTEM_ADRINT)buf->data + offset, min);
 		offset += min;
 		(*r).offset = offset;
 		if (offset > buf->size) {
@@ -772,15 +772,15 @@ void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT
 				*res = 3;
 				return;
 			}
-			error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADDRESS)buf, ((LONGINT)(4096)), &n);
+			error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADRINT)buf, ((LONGINT)(4096)), &n);
 			while (n > 0) {
-				error = Platform_Write(fdnew, (LONGINT)(SYSTEM_ADDRESS)buf, n);
+				error = Platform_Write(fdnew, (LONGINT)(SYSTEM_ADRINT)buf, n);
 				if (error != 0) {
 					ignore = Platform_Close(fdold);
 					ignore = Platform_Close(fdnew);
 					Files_Err((CHAR*)"cannot move file", (LONGINT)17, NIL, error);
 				}
-				error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADDRESS)buf, ((LONGINT)(4096)), &n);
+				error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADRINT)buf, ((LONGINT)(4096)), &n);
 			}
 			ignore = Platform_Close(fdold);
 			ignore = Platform_Close(fdnew);
@@ -838,7 +838,7 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *de
 			j += 1;
 		}
 	} else {
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)src, (LONGINT)(SYSTEM_ADDRESS)dest, src__len);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)src, (LONGINT)(SYSTEM_ADRINT)dest, src__len);
 	}
 }
 
@@ -1008,7 +1008,7 @@ static void Files_Finalize (SYSTEM_PTR o)
 {
 	Files_File f = NIL;
 	LONGINT res;
-	f = (Files_File)(SYSTEM_ADDRESS)o;
+	f = (Files_File)(SYSTEM_ADRINT)o;
 	if (f->fd >= 0) {
 		Files_CloseOSFile(f);
 		if (f->tempFile) {
diff --git a/bootstrap/unix-44/Files.h b/bootstrap/unix-44/Files.h
index a4a4ea8c..bc1d11eb 100644
--- a/bootstrap/unix-44/Files.h
+++ b/bootstrap/unix-44/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-44/Heap.c b/bootstrap/unix-44/Heap.c
index 30ec687a..cca2fc74 100644
--- a/bootstrap/unix-44/Heap.c
+++ b/bootstrap/unix-44/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tskSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tskSfF */
 #include "SYSTEM.h"
 
 struct Heap__1 {
@@ -101,7 +101,7 @@ export void Heap_Unlock (void);
 extern void *Heap__init();
 extern LONGINT Platform_MainStackFrame;
 extern LONGINT Platform_OSAllocate(LONGINT size);
-#define Heap_FetchAddress(pointer)	(LONGINT)(SYSTEM_ADDRESS)(*((void**)((SYSTEM_ADDRESS)pointer)))
+#define Heap_FetchAddress(pointer)	(LONGINT)(SYSTEM_ADRINT)(*((void**)((SYSTEM_ADRINT)pointer)))
 #define Heap_HeapModuleInit()	Heap__init()
 #define Heap_OSAllocate(size)	Platform_OSAllocate(size)
 #define Heap_PlatformHalt(code)	Platform_Halt(code)
@@ -134,7 +134,7 @@ SYSTEM_PTR Heap_REGMOD (Heap_ModuleName name, Heap_EnumProc enumPtrs)
 	__COPY(name, m->name, ((LONGINT)(20)));
 	m->refcnt = 0;
 	m->enumPtrs = enumPtrs;
-	m->next = (Heap_Module)(SYSTEM_ADDRESS)Heap_modules;
+	m->next = (Heap_Module)(SYSTEM_ADRINT)Heap_modules;
 	Heap_modules = (SYSTEM_PTR)m;
 	_o_result = (void*)m;
 	return _o_result;
@@ -315,7 +315,7 @@ SYSTEM_PTR Heap_NEWREC (LONGINT tag)
 	__PUT(adr + 8, 0, LONGINT);
 	Heap_allocated += blksz;
 	Heap_Unlock();
-	_o_result = (SYSTEM_PTR)(SYSTEM_ADDRESS)(adr + 4);
+	_o_result = (SYSTEM_PTR)(SYSTEM_ADRINT)(adr + 4);
 	return _o_result;
 }
 
@@ -326,12 +326,12 @@ SYSTEM_PTR Heap_NEWBLK (LONGINT size)
 	SYSTEM_PTR new;
 	Heap_Lock();
 	blksz = __ASHL(__ASHR(size + 31, 4), 4);
-	new = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)&blksz);
-	tag = ((LONGINT)(SYSTEM_ADDRESS)new + blksz) - 12;
+	new = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)&blksz);
+	tag = ((LONGINT)(SYSTEM_ADRINT)new + blksz) - 12;
 	__PUT(tag - 4, 0, LONGINT);
 	__PUT(tag, blksz, LONGINT);
 	__PUT(tag + 4, -4, LONGINT);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)new - 4, tag, LONGINT);
+	__PUT((LONGINT)(SYSTEM_ADRINT)new - 4, tag, LONGINT);
 	Heap_Unlock();
 	_o_result = new;
 	return _o_result;
@@ -360,7 +360,7 @@ static void Heap_Mark (LONGINT q)
 					__GET(tag, offset, LONGINT);
 					fld = q + offset;
 					p = Heap_FetchAddress(fld);
-					__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADDRESS)n, SYSTEM_PTR);
+					__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADRINT)n, SYSTEM_PTR);
 				} else {
 					fld = q + offset;
 					n = Heap_FetchAddress(fld);
@@ -369,7 +369,7 @@ static void Heap_Mark (LONGINT q)
 						if (!__ODD(tagbits)) {
 							__PUT(n - 4, tagbits + 1, LONGINT);
 							__PUT(q - 4, tag + 1, LONGINT);
-							__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADDRESS)p, SYSTEM_PTR);
+							__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADRINT)p, SYSTEM_PTR);
 							p = q;
 							q = n;
 							tag = tagbits;
@@ -384,7 +384,7 @@ static void Heap_Mark (LONGINT q)
 
 static void Heap_MarkP (SYSTEM_PTR p)
 {
-	Heap_Mark((LONGINT)(SYSTEM_ADDRESS)p);
+	Heap_Mark((LONGINT)(SYSTEM_ADRINT)p);
 }
 
 static void Heap_Scan (void)
@@ -553,7 +553,7 @@ static void Heap_Finalize (void)
 			} else {
 				prev->next = n->next;
 			}
-			(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADDRESS)n->obj);
+			(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADRINT)n->obj);
 			if (prev == NIL) {
 				n = Heap_fin;
 			} else {
@@ -572,7 +572,7 @@ void Heap_FINALL (void)
 	while (Heap_fin != NIL) {
 		n = Heap_fin;
 		Heap_fin = Heap_fin->next;
-		(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADDRESS)n->obj);
+		(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADRINT)n->obj);
 	}
 }
 
@@ -589,9 +589,9 @@ static void Heap_MarkStack (LONGINT n, LONGINT *cand, LONGINT cand__len)
 	}
 	if (n == 0) {
 		nofcand = 0;
-		sp = (LONGINT)(SYSTEM_ADDRESS)&frame;
+		sp = (LONGINT)(SYSTEM_ADRINT)&frame;
 		stack0 = Heap_PlatformMainStackFrame();
-		inc = (LONGINT)(SYSTEM_ADDRESS)&align.p - (LONGINT)(SYSTEM_ADDRESS)&align;
+		inc = (LONGINT)(SYSTEM_ADRINT)&align.p - (LONGINT)(SYSTEM_ADRINT)&align;
 		if (sp > stack0) {
 			inc = -inc;
 		}
@@ -622,7 +622,7 @@ void Heap_GC (BOOLEAN markStack)
 	LONGINT cand[10000];
 	if (Heap_lockdepth == 0 || (Heap_lockdepth == 1 && !markStack)) {
 		Heap_Lock();
-		m = (Heap_Module)(SYSTEM_ADDRESS)Heap_modules;
+		m = (Heap_Module)(SYSTEM_ADRINT)Heap_modules;
 		while (m != NIL) {
 			if (m->enumPtrs != NIL) {
 				(*m->enumPtrs)(Heap_MarkP);
@@ -699,7 +699,7 @@ void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize)
 {
 	Heap_FinNode f;
 	__NEW(f, Heap_FinDesc);
-	f->obj = (LONGINT)(SYSTEM_ADDRESS)obj;
+	f->obj = (LONGINT)(SYSTEM_ADRINT)obj;
 	f->finalize = finalize;
 	f->marked = 1;
 	f->next = Heap_fin;
diff --git a/bootstrap/unix-44/Heap.h b/bootstrap/unix-44/Heap.h
index a2cab30c..d05f688c 100644
--- a/bootstrap/unix-44/Heap.h
+++ b/bootstrap/unix-44/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tskSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tskSfF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-44/Modules.c b/bootstrap/unix-44/Modules.c
index 330b7506..d76a50a2 100644
--- a/bootstrap/unix-44/Modules.c
+++ b/bootstrap/unix-44/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Console.h"
 #include "Heap.h"
diff --git a/bootstrap/unix-44/Modules.h b/bootstrap/unix-44/Modules.h
index ac8ac89e..78c8d49e 100644
--- a/bootstrap/unix-44/Modules.h
+++ b/bootstrap/unix-44/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-44/OPB.c b/bootstrap/unix-44/OPB.c
index 0f614e6a..60b37750 100644
--- a/bootstrap/unix-44/OPB.c
+++ b/bootstrap/unix-44/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPM.h"
 #include "OPS.h"
diff --git a/bootstrap/unix-44/OPB.h b/bootstrap/unix-44/OPB.h
index d1c88266..e7a96131 100644
--- a/bootstrap/unix-44/OPB.h
+++ b/bootstrap/unix-44/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-44/OPC.c b/bootstrap/unix-44/OPC.c
index 3abccc9a..fce9997f 100644
--- a/bootstrap/unix-44/OPC.c
+++ b/bootstrap/unix-44/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "OPM.h"
@@ -211,7 +211,7 @@ void OPC_Ident (OPT_Object obj)
 				OPM_WriteStringVar((void*)OPM_modName, ((LONGINT)(32)));
 			}
 			OPM_Write('_');
-		} else if (obj == OPT_sysptrtyp->strobj || obj == OPT_bytetyp->strobj) {
+		} else if ((obj == OPT_sysptrtyp->strobj || obj == OPT_ainttyp->strobj) || obj == OPT_bytetyp->strobj) {
 			OPM_WriteString((CHAR*)"SYSTEM_", (LONGINT)8);
 		}
 		OPM_WriteStringVar((void*)obj->name, ((LONGINT)(256)));
diff --git a/bootstrap/unix-44/OPC.h b/bootstrap/unix-44/OPC.h
index b7d34a07..7aea7283 100644
--- a/bootstrap/unix-44/OPC.h
+++ b/bootstrap/unix-44/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-44/OPM.c b/bootstrap/unix-44/OPM.c
index bf683e41..88c3bd4d 100644
--- a/bootstrap/unix-44/OPM.c
+++ b/bootstrap/unix-44/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Console.h"
@@ -544,15 +544,15 @@ void OPM_FPrintReal (LONGINT *fp, REAL real)
 {
 	INTEGER i;
 	LONGINT l;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&real, l, LONGINT);
+	__GET((LONGINT)(SYSTEM_ADRINT)&real, l, LONGINT);
 	OPM_FPrint(&*fp, l);
 }
 
 void OPM_FPrintLReal (LONGINT *fp, LONGREAL lr)
 {
 	LONGINT l, h;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&lr, l, LONGINT);
-	__GET((LONGINT)(SYSTEM_ADDRESS)&lr + 4, h, LONGINT);
+	__GET((LONGINT)(SYSTEM_ADRINT)&lr, l, LONGINT);
+	__GET((LONGINT)(SYSTEM_ADRINT)&lr + 4, h, LONGINT);
 	OPM_FPrint(&*fp, l);
 	OPM_FPrint(&*fp, h);
 }
diff --git a/bootstrap/unix-44/OPM.h b/bootstrap/unix-44/OPM.h
index ed914bff..3c2be746 100644
--- a/bootstrap/unix-44/OPM.h
+++ b/bootstrap/unix-44/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-44/OPP.c b/bootstrap/unix-44/OPP.c
index 01d2144d..a0c19958 100644
--- a/bootstrap/unix-44/OPP.c
+++ b/bootstrap/unix-44/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPB.h"
 #include "OPM.h"
diff --git a/bootstrap/unix-44/OPP.h b/bootstrap/unix-44/OPP.h
index bf56b7d7..6c24817c 100644
--- a/bootstrap/unix-44/OPP.h
+++ b/bootstrap/unix-44/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-44/OPS.c b/bootstrap/unix-44/OPS.c
index cacf9256..85c8b275 100644
--- a/bootstrap/unix-44/OPS.c
+++ b/bootstrap/unix-44/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 #include "SYSTEM.h"
 #include "OPM.h"
 
diff --git a/bootstrap/unix-44/OPS.h b/bootstrap/unix-44/OPS.h
index e901bcfc..313c0ac7 100644
--- a/bootstrap/unix-44/OPS.h
+++ b/bootstrap/unix-44/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-44/OPT.c b/bootstrap/unix-44/OPT.c
index b32d0ebd..4b76312b 100644
--- a/bootstrap/unix-44/OPT.c
+++ b/bootstrap/unix-44/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPM.h"
 #include "OPS.h"
@@ -83,7 +83,7 @@ typedef
 
 export void (*OPT_typSize)(OPT_Struct);
 export OPT_Object OPT_topScope;
-export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
+export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_ainttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
 export SHORTINT OPT_nofGmod;
 export OPT_Object OPT_GlbMod[64];
 export OPS_Name OPT_SelfName;
@@ -1718,6 +1718,7 @@ static void EnumPtrs(void (*P)(void*))
 	P(OPT_sinttyp);
 	P(OPT_inttyp);
 	P(OPT_linttyp);
+	P(OPT_ainttyp);
 	P(OPT_realtyp);
 	P(OPT_lrltyp);
 	P(OPT_settyp);
@@ -1794,6 +1795,7 @@ export void *OPT__init(void)
 	OPT_undftyp->BaseTyp = OPT_undftyp;
 	OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp);
 	OPT_EnterTyp((CHAR*)"PTR", 13, OPM_PointerSize, &OPT_sysptrtyp);
+	OPT_EnterTyp((CHAR*)"ADRINT", 5, OPM_LIntSize, &OPT_ainttyp);
 	OPT_EnterProc((CHAR*)"ADR", 20);
 	OPT_EnterProc((CHAR*)"CC", 21);
 	OPT_EnterProc((CHAR*)"LSH", 22);
diff --git a/bootstrap/unix-44/OPT.h b/bootstrap/unix-44/OPT.h
index 41b3e7ec..7187f687 100644
--- a/bootstrap/unix-44/OPT.h
+++ b/bootstrap/unix-44/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPT__h
 #define OPT__h
@@ -67,7 +67,7 @@ typedef
 
 import void (*OPT_typSize)(OPT_Struct);
 import OPT_Object OPT_topScope;
-import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
+import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_ainttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
 import SHORTINT OPT_nofGmod;
 import OPT_Object OPT_GlbMod[64];
 import OPS_Name OPT_SelfName;
diff --git a/bootstrap/unix-44/OPV.c b/bootstrap/unix-44/OPV.c
index cf646f5e..8b98e5f9 100644
--- a/bootstrap/unix-44/OPV.c
+++ b/bootstrap/unix-44/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPC.h"
 #include "OPM.h"
@@ -284,6 +284,7 @@ void OPV_AdrAndSize (OPT_Object topScope)
 	OPT_realtyp->strobj->linkadr = 2;
 	OPT_inttyp->strobj->linkadr = 2;
 	OPT_linttyp->strobj->linkadr = 2;
+	OPT_ainttyp->strobj->linkadr = 2;
 	OPT_lrltyp->strobj->linkadr = 2;
 	OPT_sinttyp->strobj->linkadr = 2;
 	OPT_booltyp->strobj->linkadr = 2;
@@ -931,7 +932,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec)
 					OPM_Write(')');
 					break;
 				case 24: 
-					OPM_WriteString((CHAR*)"(LONGINT)(SYSTEM_ADDRESS)", (LONGINT)26);
+					OPM_WriteString((CHAR*)"(LONGINT)(SYSTEM_ADRINT)", (LONGINT)25);
 					if (l->class == 1) {
 						OPC_CompleteIdent(l->obj);
 					} else {
@@ -947,7 +948,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec)
 						OPC_Ident(n->typ->strobj);
 						OPM_Write(')');
 						if (__IN(n->typ->form, 0x6000) || __IN(l->typ->form, 0x6000)) {
-							OPM_WriteString((CHAR*)"(SYSTEM_ADDRESS)", (LONGINT)17);
+							OPM_WriteString((CHAR*)"(SYSTEM_ADRINT)", (LONGINT)16);
 						}
 						OPV_expr(l, exprPrec);
 					} else {
diff --git a/bootstrap/unix-44/OPV.h b/bootstrap/unix-44/OPV.h
index 04828b2f..122fda4a 100644
--- a/bootstrap/unix-44/OPV.h
+++ b/bootstrap/unix-44/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-44/Platform.c b/bootstrap/unix-44/Platform.c
index 74c43788..6326549f 100644
--- a/bootstrap/unix-44/Platform.c
+++ b/bootstrap/unix-44/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 typedef
@@ -118,14 +118,14 @@ export BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT
 #define Platform_EXDEV()	EXDEV
 extern void Heap_InitHeap();
 #define Platform_HeapInitHeap()	Heap_InitHeap()
-#define Platform_allocate(size)	(LONGINT)(SYSTEM_ADDRESS)((void*)malloc((size_t)size))
+#define Platform_allocate(size)	(LONGINT)(SYSTEM_ADRINT)((void*)malloc((size_t)size))
 #define Platform_chdir(n, n__len)	chdir((char*)n)
 #define Platform_closefile(fd)	close(fd)
 #define Platform_err()	errno
 #define Platform_errc(c)	write(1, &c, 1)
 #define Platform_errstring(s, s__len)	write(1, s, s__len-1)
 #define Platform_exit(code)	exit(code)
-#define Platform_free(address)	free((void*)(SYSTEM_ADDRESS)address)
+#define Platform_free(address)	free((void*)(SYSTEM_ADRINT)address)
 #define Platform_fstat(fd)	fstat(fd, &s)
 #define Platform_fsync(fd)	fsync(fd)
 #define Platform_ftruncate(fd, l)	ftruncate(fd, l)
@@ -138,13 +138,13 @@ extern void Heap_InitHeap();
 #define Platform_opennew(n, n__len)	open((char*)n, O_CREAT | O_TRUNC | O_RDWR, 0664)
 #define Platform_openro(n, n__len)	open((char*)n, O_RDONLY)
 #define Platform_openrw(n, n__len)	open((char*)n, O_RDWR)
-#define Platform_readfile(fd, p, l)	read(fd, (void*)(SYSTEM_ADDRESS)(p), l)
+#define Platform_readfile(fd, p, l)	read(fd, (void*)(SYSTEM_ADRINT)(p), l)
 #define Platform_rename(o, o__len, n, n__len)	rename((char*)o, (char*)n)
 #define Platform_sectotm(s)	struct tm *time = localtime((time_t*)&s)
 #define Platform_seekcur()	SEEK_CUR
 #define Platform_seekend()	SEEK_END
 #define Platform_seekset()	SEEK_SET
-#define Platform_sethandler(s, h)	SystemSetHandler(s, (SYSTEM_ADDRESS)h)
+#define Platform_sethandler(s, h)	SystemSetHandler(s, (SYSTEM_ADRINT)h)
 #define Platform_stat(n, n__len)	stat((char*)n, &s)
 #define Platform_statdev()	(LONGINT)s.st_dev
 #define Platform_statino()	(LONGINT)s.st_ino
@@ -161,7 +161,7 @@ extern void Heap_InitHeap();
 #define Platform_tvsec()	tv.tv_sec
 #define Platform_tvusec()	tv.tv_usec
 #define Platform_unlink(n, n__len)	unlink((char*)n)
-#define Platform_writefile(fd, p, l)	write(fd, (void*)(SYSTEM_ADDRESS)(p), l)
+#define Platform_writefile(fd, p, l)	write(fd, (void*)(SYSTEM_ADRINT)(p), l)
 
 BOOLEAN Platform_TooManyFiles (INTEGER e)
 {
@@ -229,7 +229,7 @@ void Platform_Init (INTEGER argc, LONGINT argvadr)
 	Platform_ArgVecPtr av = NIL;
 	Platform_MainStackFrame = argvadr;
 	Platform_ArgCount = argc;
-	av = (Platform_ArgVecPtr)(SYSTEM_ADDRESS)argvadr;
+	av = (Platform_ArgVecPtr)(SYSTEM_ADRINT)argvadr;
 	Platform_ArgVector = (*av)[0];
 	Platform_HaltCode = -128;
 	Platform_HeapInitHeap();
@@ -262,7 +262,7 @@ void Platform_GetArg (INTEGER n, CHAR *val, LONGINT val__len)
 {
 	Platform_ArgVec av = NIL;
 	if (n < Platform_ArgCount) {
-		av = (Platform_ArgVec)(SYSTEM_ADDRESS)Platform_ArgVector;
+		av = (Platform_ArgVec)(SYSTEM_ADRINT)Platform_ArgVector;
 		__COPY(*(*av)[__X(n, ((LONGINT)(1024)))], val, val__len);
 	}
 }
@@ -529,7 +529,7 @@ INTEGER Platform_Read (LONGINT h, LONGINT p, LONGINT l, LONGINT *n)
 INTEGER Platform_ReadBuf (LONGINT h, SYSTEM_BYTE *b, LONGINT b__len, LONGINT *n)
 {
 	INTEGER _o_result;
-	*n = Platform_readfile(h, (LONGINT)(SYSTEM_ADDRESS)b, b__len);
+	*n = Platform_readfile(h, (LONGINT)(SYSTEM_ADRINT)b, b__len);
 	if (*n < 0) {
 		*n = 0;
 		_o_result = Platform_err();
@@ -765,7 +765,7 @@ static void Platform_TestLittleEndian (void)
 {
 	INTEGER i;
 	i = 1;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&i, Platform_LittleEndian, BOOLEAN);
+	__GET((LONGINT)(SYSTEM_ADRINT)&i, Platform_LittleEndian, BOOLEAN);
 }
 
 __TDESC(Platform_FileIdentity, 1, 0) = {__TDFLDS("FileIdentity", 12), {-4}};
diff --git a/bootstrap/unix-44/Platform.h b/bootstrap/unix-44/Platform.h
index dd5ce434..77a9b68f 100644
--- a/bootstrap/unix-44/Platform.h
+++ b/bootstrap/unix-44/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-44/Reals.c b/bootstrap/unix-44/Reals.c
index 2323e34d..11c99924 100644
--- a/bootstrap/unix-44/Reals.c
+++ b/bootstrap/unix-44/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 
@@ -58,7 +58,7 @@ INTEGER Reals_Expo (REAL x)
 {
 	INTEGER _o_result;
 	INTEGER i;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&x + 2, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&x + 2, i, INTEGER);
 	_o_result = __MASK(__ASHR(i, 7), -256);
 	return _o_result;
 }
@@ -66,17 +66,17 @@ INTEGER Reals_Expo (REAL x)
 void Reals_SetExpo (REAL *x, INTEGER ex)
 {
 	CHAR c;
-	__GET((LONGINT)(SYSTEM_ADDRESS)x + 3, c, CHAR);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)x + 3, (CHAR)(__ASHL(__ASHR((int)c, 7), 7) + __MASK(__ASHR(ex, 1), -128)), CHAR);
-	__GET((LONGINT)(SYSTEM_ADDRESS)x + 2, c, CHAR);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)x + 2, (CHAR)(__MASK((int)c, -128) + __ASHL(__MASK(ex, -2), 7)), CHAR);
+	__GET((LONGINT)(SYSTEM_ADRINT)x + 3, c, CHAR);
+	__PUT((LONGINT)(SYSTEM_ADRINT)x + 3, (CHAR)(__ASHL(__ASHR((int)c, 7), 7) + __MASK(__ASHR(ex, 1), -128)), CHAR);
+	__GET((LONGINT)(SYSTEM_ADRINT)x + 2, c, CHAR);
+	__PUT((LONGINT)(SYSTEM_ADRINT)x + 2, (CHAR)(__MASK((int)c, -128) + __ASHL(__MASK(ex, -2), 7)), CHAR);
 }
 
 INTEGER Reals_ExpoL (LONGREAL x)
 {
 	INTEGER _o_result;
 	INTEGER i;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&x + 6, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&x + 6, i, INTEGER);
 	_o_result = __MASK(__ASHR(i, 4), -2048);
 	return _o_result;
 }
diff --git a/bootstrap/unix-44/Reals.h b/bootstrap/unix-44/Reals.h
index 7e6b534c..b0497a9c 100644
--- a/bootstrap/unix-44/Reals.h
+++ b/bootstrap/unix-44/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-44/SYSTEM.c b/bootstrap/unix-44/SYSTEM.c
index 33511a70..1077d3ce 100644
--- a/bootstrap/unix-44/SYSTEM.c
+++ b/bootstrap/unix-44/SYSTEM.c
@@ -35,7 +35,7 @@ void SYSTEM_INHERIT(LONGINT *t, LONGINT *t0)
 void SYSTEM_ENUMP(void *adr, LONGINT n, void (*P)())
 {
     while (n > 0) {
-        P((LONGINT)(SYSTEM_ADDRESS)(*((void**)(adr))));
+        P((LONGINT)(SYSTEM_ADRINT)(*((void**)(adr))));
         adr = ((void**)adr) + 1;
         n--;
     }
@@ -106,7 +106,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
     else if (typ == (LONGINT*)POINTER__typ) {
         /* element type is a pointer */
         x = Heap_NEWBLK(size + nofelems * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[-1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[-1];
         p[-nofelems] = *p;  /* build new type desc in situ: 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nofelems - 1; n = 1;   /* n =1 for skipping the size field */
         while (n <= nofelems) {*p = n*sizeof(LONGINT); p++; n++;}
@@ -119,7 +119,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
         while (ptab[nofptrs] >= 0) {nofptrs++;} /* number of pointers per element */
         nptr = nofelems * nofptrs;  /* total number of pointers */
         x = Heap_NEWBLK(size + nptr * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[- 1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[- 1];
         p[-nptr] = *p;  /* build new type desc in situ; 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nptr - 1; n = 0; off = dataoff;
         while (n < nofelems) {i = 0;
@@ -155,7 +155,7 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         // (Ignore other signals)
     }
 
-    void SystemSetHandler(int s, SYSTEM_ADDRESS h) {
+    void SystemSetHandler(int s, SYSTEM_ADRINT h) {
         if (s >= 2 && s <= 4) {
             int needtosetsystemhandler = handler[s-2] == 0;
             handler[s-2] = (SystemSignalHandler)h;
@@ -194,12 +194,12 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         }
     }
 
-    void SystemSetInterruptHandler(SYSTEM_ADDRESS h) {
+    void SystemSetInterruptHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemInterruptHandler = (SystemSignalHandler)h;
     }
 
-    void SystemSetQuitHandler(SYSTEM_ADDRESS h) {
+    void SystemSetQuitHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemQuitHandler = (SystemSignalHandler)h;
     }
diff --git a/bootstrap/unix-44/SYSTEM.h b/bootstrap/unix-44/SYSTEM.h
index 6377745e..35620b9b 100644
--- a/bootstrap/unix-44/SYSTEM.h
+++ b/bootstrap/unix-44/SYSTEM.h
@@ -26,11 +26,12 @@ typedef unsigned char        SYSTEM_CARD8;
   typedef unsigned int         size_t;
 #endif
 
-#define SYSTEM_ADDRESS size_t
+#define SYSTEM_ADRINT size_t
+#define SYSTEM_ADDRESS size_t   // Temporarily for bootstrap
 #define _SIZE_T_DECLARED // For FreeBSD
 #define _SIZE_T_DEFINED_ // For OpenBSD
 
-void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);
+void *memcpy(void *dest, const void *source, SYSTEM_ADRINT size);
 
 
 
@@ -107,10 +108,10 @@ extern LONGINT SYSTEM_ENTIER (double x);
 // Signal handling in SYSTEM.c
 
 #ifndef _WIN32
-  extern void SystemSetHandler(int s, SYSTEM_ADDRESS h);
+  extern void SystemSetHandler(int s, SYSTEM_ADRINT h);
 #else
-  extern void SystemSetInterruptHandler(SYSTEM_ADDRESS h);
-  extern void SystemSetQuitHandler     (SYSTEM_ADDRESS h);
+  extern void SystemSetInterruptHandler(SYSTEM_ADRINT h);
+  extern void SystemSetQuitHandler     (SYSTEM_ADRINT h);
 #endif
 
 
@@ -133,9 +134,9 @@ static int __str_cmp(CHAR *x, CHAR *y){
 
 #define __COPY(s, d, n) {char*_a=(void*)s,*_b=(void*)d; LONGINT _i=0,_t=n-1; \
                          while(_i<_t&&((_b[_i]=_a[_i])!=0)){_i++;};_b[_i]=0;}
-#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADDRESS)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
+#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADRINT)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
 #define __DUPARR(v, t)  v=(void*)memcpy(v##__copy,v,sizeof(t))
-#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADDRESS)x)
+#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADRINT)x)
 
 
 
@@ -145,8 +146,8 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __VAL(t, x)     (*(t*)&(x))
 
 
-#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADDRESS)(a)
-#define __PUT(a, x, t)  *(t*)(SYSTEM_ADDRESS)(a)=x
+#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADRINT)(a)
+#define __PUT(a, x, t)  *(t*)(SYSTEM_ADRINT)(a)=x
 
 #define __LSHL(x, n, t) ((t)((U_##t)(x)<<(n)))
 #define __LSHR(x, n, t) ((t)((U_##t)(x)>>(n)))
@@ -161,7 +162,7 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __ROT(x, n, t)  ((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
 
 #define __BIT(x, n)     (*(U_LONGINT*)(x)>>(n)&1)
-#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADDRESS)(d),(char*)(SYSTEM_ADDRESS)(s),n)
+#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADRINT)(d),(char*)(SYSTEM_ADRINT)(s),n)
 #define __ASHF(x, n)    SYSTEM_ASH((LONGINT)(x), (LONGINT)(n))
 #define __SHORT(x, y)   ((int)((U_LONGINT)(x)+(y)<(y)+(y)?(x):(__HALT(-8),0)))
 #define __SHORTF(x, y)  ((int)(__RF((x)+(y),(y)+(y))-(y)))
@@ -222,7 +223,7 @@ extern void       Heap_INCREF();
 extern void Platform_Init(INTEGER argc, LONGINT argv);
 extern void Heap_FINALL();
 
-#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADDRESS)&argv);
+#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADRINT)&argv);
 #define __REGMAIN(name, enum) m = Heap_REGMOD((CHAR*)name,enum)
 #define __FINI                Heap_FINALL(); return 0
 
@@ -243,7 +244,7 @@ extern SYSTEM_PTR Heap_NEWREC (LONGINT tag);
 extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 
 #define __SYSNEW(p, len) p = Heap_NEWBLK((LONGINT)(len))
-#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)t##__typ)
+#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)t##__typ)
 #define __NEWARR         SYSTEM_NEWARR
 
 
@@ -274,20 +275,20 @@ extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 #define __INITYP(t, t0, level) \
   t##__typ               = (LONGINT*)&t##__desc.blksz;                                                    \
   memcpy(t##__desc.basep, t0##__typ - __BASEOFF, level*sizeof(LONGINT));                                  \
-  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADDRESS)t##__typ;                                                  \
-  t##__desc.module       = (LONGINT)(SYSTEM_ADDRESS)m;                                                         \
+  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADRINT)t##__typ;                                                  \
+  t##__desc.module       = (LONGINT)(SYSTEM_ADRINT)m;                                                         \
   if(t##__desc.blksz!=sizeof(struct t)) __HALT(-15);                                                      \
   t##__desc.blksz        = (t##__desc.blksz+5*sizeof(LONGINT)-1)/(4*sizeof(LONGINT))*(4*sizeof(LONGINT)); \
-  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADDRESS)&t##__desc.next);                                                    \
+  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADRINT)&t##__desc.next);                                                    \
   SYSTEM_INHERIT(t##__typ, t0##__typ)
 
-#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADDRESS)typ##__typ)
-#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADDRESS)(*(((LONGINT*)(p))-1)))
+#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADRINT)typ##__typ)
+#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADRINT)(*(((LONGINT*)(p))-1)))
 #define __ISP(p, typ, level)  __IS(__TYPEOF(p),typ,level)
 
 // Oberon-2 type bound procedures support
-#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADDRESS)proc
-#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADDRESS)*(typ-(__TPROC0OFF+num))))parlist
+#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADRINT)proc
+#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADRINT)*(typ-(__TPROC0OFF+num))))parlist
 
 
 
diff --git a/bootstrap/unix-44/Strings.c b/bootstrap/unix-44/Strings.c
index 115456ea..15aeff29 100644
--- a/bootstrap/unix-44/Strings.c
+++ b/bootstrap/unix-44/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 
diff --git a/bootstrap/unix-44/Strings.h b/bootstrap/unix-44/Strings.h
index 96dbb01d..385096bc 100644
--- a/bootstrap/unix-44/Strings.h
+++ b/bootstrap/unix-44/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-44/Texts.c b/bootstrap/unix-44/Texts.c
index 9ab3b430..52012a3c 100644
--- a/bootstrap/unix-44/Texts.c
+++ b/bootstrap/unix-44/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Files.h"
 #include "Modules.h"
diff --git a/bootstrap/unix-44/Texts.h b/bootstrap/unix-44/Texts.h
index 777a6c22..9a5617f1 100644
--- a/bootstrap/unix-44/Texts.h
+++ b/bootstrap/unix-44/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-44/Vishap.c b/bootstrap/unix-44/Vishap.c
index 4c9e3b45..0feff79c 100644
--- a/bootstrap/unix-44/Vishap.c
+++ b/bootstrap/unix-44/Vishap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkamSf */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkamSf */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Heap.h"
@@ -81,6 +81,7 @@ static void Vishap_PropagateElementaryTypeSizes (void)
 	OPT_realtyp->size = OPM_RealSize;
 	OPT_inttyp->size = OPM_IntSize;
 	OPT_linttyp->size = OPM_LIntSize;
+	OPT_ainttyp->size = OPM_LIntSize;
 	OPT_lrltyp->size = OPM_LRealSize;
 	OPT_sinttyp->size = OPM_SIntSize;
 	OPT_booltyp->size = OPM_BoolSize;
diff --git a/bootstrap/unix-44/errors.c b/bootstrap/unix-44/errors.c
index 68e433df..59b8db27 100644
--- a/bootstrap/unix-44/errors.c
+++ b/bootstrap/unix-44/errors.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 typedef
diff --git a/bootstrap/unix-44/errors.h b/bootstrap/unix-44/errors.h
index 41d399ad..6ae0cd7a 100644
--- a/bootstrap/unix-44/errors.h
+++ b/bootstrap/unix-44/errors.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef errors__h
 #define errors__h
diff --git a/bootstrap/unix-44/extTools.c b/bootstrap/unix-44/extTools.c
index 4efd107a..2ef65e7b 100644
--- a/bootstrap/unix-44/extTools.c
+++ b/bootstrap/unix-44/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Console.h"
diff --git a/bootstrap/unix-44/extTools.h b/bootstrap/unix-44/extTools.h
index fc4f0da1..39837586 100644
--- a/bootstrap/unix-44/extTools.h
+++ b/bootstrap/unix-44/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/unix-44/vt100.c b/bootstrap/unix-44/vt100.c
index d77b0b84..e0edabd9 100644
--- a/bootstrap/unix-44/vt100.c
+++ b/bootstrap/unix-44/vt100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Console.h"
 #include "Strings.h"
diff --git a/bootstrap/unix-44/vt100.h b/bootstrap/unix-44/vt100.h
index 4af04d6e..413ae867 100644
--- a/bootstrap/unix-44/vt100.h
+++ b/bootstrap/unix-44/vt100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef vt100__h
 #define vt100__h
diff --git a/bootstrap/unix-48/Configuration.c b/bootstrap/unix-48/Configuration.c
index 821dff97..b0d48f0a 100644
--- a/bootstrap/unix-48/Configuration.c
+++ b/bootstrap/unix-48/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 
@@ -13,6 +13,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/08/23] for gcc LP64 on cygwin", Configuration_versionLong, 41);
+	__MOVE("1.95 [2016/08/26] for gcc LP64 on cygwin", Configuration_versionLong, 41);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-48/Configuration.h b/bootstrap/unix-48/Configuration.h
index ec5e865a..38a63260 100644
--- a/bootstrap/unix-48/Configuration.h
+++ b/bootstrap/unix-48/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-48/Console.c b/bootstrap/unix-48/Console.c
index f9161937..cc4cc8bd 100644
--- a/bootstrap/unix-48/Console.c
+++ b/bootstrap/unix-48/Console.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Platform.h"
 
@@ -21,7 +21,7 @@ export void Console_String (CHAR *s, LONGINT s__len);
 void Console_Flush (void)
 {
 	INTEGER error;
-	error = Platform_Write(((LONGINT)(1)), (LONGINT)(SYSTEM_ADDRESS)Console_line, Console_pos);
+	error = Platform_Write(((LONGINT)(1)), (LONGINT)(SYSTEM_ADRINT)Console_line, Console_pos);
 	Console_pos = 0;
 }
 
diff --git a/bootstrap/unix-48/Console.h b/bootstrap/unix-48/Console.h
index 5fdd4e4d..2c462da9 100644
--- a/bootstrap/unix-48/Console.h
+++ b/bootstrap/unix-48/Console.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Console__h
 #define Console__h
diff --git a/bootstrap/unix-48/Files.c b/bootstrap/unix-48/Files.c
index 5a1dd875..496a4a87 100644
--- a/bootstrap/unix-48/Files.c
+++ b/bootstrap/unix-48/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Console.h"
@@ -257,7 +257,7 @@ static void Files_Flush (Files_Buffer buf)
 		if (buf->org != f->pos) {
 			error = Platform_Seek(f->fd, buf->org, Platform_SeekSet);
 		}
-		error = Platform_Write(f->fd, (LONGINT)(SYSTEM_ADDRESS)buf->data, buf->size);
+		error = Platform_Write(f->fd, (LONGINT)(SYSTEM_ADRINT)buf->data, buf->size);
 		if (error != 0) {
 			Files_Err((CHAR*)"error writing file", (LONGINT)19, f, error);
 		}
@@ -656,7 +656,7 @@ void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x
 		} else {
 			min = n;
 		}
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)buf->data + offset, (LONGINT)(SYSTEM_ADDRESS)x + xpos, min);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)buf->data + offset, (LONGINT)(SYSTEM_ADRINT)x + xpos, min);
 		offset += min;
 		(*r).offset = offset;
 		xpos += min;
@@ -721,7 +721,7 @@ void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT
 		} else {
 			min = n;
 		}
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)x + xpos, (LONGINT)(SYSTEM_ADDRESS)buf->data + offset, min);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)x + xpos, (LONGINT)(SYSTEM_ADRINT)buf->data + offset, min);
 		offset += min;
 		(*r).offset = offset;
 		if (offset > buf->size) {
@@ -772,15 +772,15 @@ void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT
 				*res = 3;
 				return;
 			}
-			error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADDRESS)buf, ((LONGINT)(4096)), &n);
+			error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADRINT)buf, ((LONGINT)(4096)), &n);
 			while (n > 0) {
-				error = Platform_Write(fdnew, (LONGINT)(SYSTEM_ADDRESS)buf, n);
+				error = Platform_Write(fdnew, (LONGINT)(SYSTEM_ADRINT)buf, n);
 				if (error != 0) {
 					ignore = Platform_Close(fdold);
 					ignore = Platform_Close(fdnew);
 					Files_Err((CHAR*)"cannot move file", (LONGINT)17, NIL, error);
 				}
-				error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADDRESS)buf, ((LONGINT)(4096)), &n);
+				error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADRINT)buf, ((LONGINT)(4096)), &n);
 			}
 			ignore = Platform_Close(fdold);
 			ignore = Platform_Close(fdnew);
@@ -838,7 +838,7 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *de
 			j += 1;
 		}
 	} else {
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)src, (LONGINT)(SYSTEM_ADDRESS)dest, src__len);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)src, (LONGINT)(SYSTEM_ADRINT)dest, src__len);
 	}
 }
 
@@ -1008,7 +1008,7 @@ static void Files_Finalize (SYSTEM_PTR o)
 {
 	Files_File f = NIL;
 	LONGINT res;
-	f = (Files_File)(SYSTEM_ADDRESS)o;
+	f = (Files_File)(SYSTEM_ADRINT)o;
 	if (f->fd >= 0) {
 		Files_CloseOSFile(f);
 		if (f->tempFile) {
diff --git a/bootstrap/unix-48/Files.h b/bootstrap/unix-48/Files.h
index a4a4ea8c..bc1d11eb 100644
--- a/bootstrap/unix-48/Files.h
+++ b/bootstrap/unix-48/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-48/Heap.c b/bootstrap/unix-48/Heap.c
index 30ec687a..cca2fc74 100644
--- a/bootstrap/unix-48/Heap.c
+++ b/bootstrap/unix-48/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tskSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tskSfF */
 #include "SYSTEM.h"
 
 struct Heap__1 {
@@ -101,7 +101,7 @@ export void Heap_Unlock (void);
 extern void *Heap__init();
 extern LONGINT Platform_MainStackFrame;
 extern LONGINT Platform_OSAllocate(LONGINT size);
-#define Heap_FetchAddress(pointer)	(LONGINT)(SYSTEM_ADDRESS)(*((void**)((SYSTEM_ADDRESS)pointer)))
+#define Heap_FetchAddress(pointer)	(LONGINT)(SYSTEM_ADRINT)(*((void**)((SYSTEM_ADRINT)pointer)))
 #define Heap_HeapModuleInit()	Heap__init()
 #define Heap_OSAllocate(size)	Platform_OSAllocate(size)
 #define Heap_PlatformHalt(code)	Platform_Halt(code)
@@ -134,7 +134,7 @@ SYSTEM_PTR Heap_REGMOD (Heap_ModuleName name, Heap_EnumProc enumPtrs)
 	__COPY(name, m->name, ((LONGINT)(20)));
 	m->refcnt = 0;
 	m->enumPtrs = enumPtrs;
-	m->next = (Heap_Module)(SYSTEM_ADDRESS)Heap_modules;
+	m->next = (Heap_Module)(SYSTEM_ADRINT)Heap_modules;
 	Heap_modules = (SYSTEM_PTR)m;
 	_o_result = (void*)m;
 	return _o_result;
@@ -315,7 +315,7 @@ SYSTEM_PTR Heap_NEWREC (LONGINT tag)
 	__PUT(adr + 8, 0, LONGINT);
 	Heap_allocated += blksz;
 	Heap_Unlock();
-	_o_result = (SYSTEM_PTR)(SYSTEM_ADDRESS)(adr + 4);
+	_o_result = (SYSTEM_PTR)(SYSTEM_ADRINT)(adr + 4);
 	return _o_result;
 }
 
@@ -326,12 +326,12 @@ SYSTEM_PTR Heap_NEWBLK (LONGINT size)
 	SYSTEM_PTR new;
 	Heap_Lock();
 	blksz = __ASHL(__ASHR(size + 31, 4), 4);
-	new = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)&blksz);
-	tag = ((LONGINT)(SYSTEM_ADDRESS)new + blksz) - 12;
+	new = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)&blksz);
+	tag = ((LONGINT)(SYSTEM_ADRINT)new + blksz) - 12;
 	__PUT(tag - 4, 0, LONGINT);
 	__PUT(tag, blksz, LONGINT);
 	__PUT(tag + 4, -4, LONGINT);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)new - 4, tag, LONGINT);
+	__PUT((LONGINT)(SYSTEM_ADRINT)new - 4, tag, LONGINT);
 	Heap_Unlock();
 	_o_result = new;
 	return _o_result;
@@ -360,7 +360,7 @@ static void Heap_Mark (LONGINT q)
 					__GET(tag, offset, LONGINT);
 					fld = q + offset;
 					p = Heap_FetchAddress(fld);
-					__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADDRESS)n, SYSTEM_PTR);
+					__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADRINT)n, SYSTEM_PTR);
 				} else {
 					fld = q + offset;
 					n = Heap_FetchAddress(fld);
@@ -369,7 +369,7 @@ static void Heap_Mark (LONGINT q)
 						if (!__ODD(tagbits)) {
 							__PUT(n - 4, tagbits + 1, LONGINT);
 							__PUT(q - 4, tag + 1, LONGINT);
-							__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADDRESS)p, SYSTEM_PTR);
+							__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADRINT)p, SYSTEM_PTR);
 							p = q;
 							q = n;
 							tag = tagbits;
@@ -384,7 +384,7 @@ static void Heap_Mark (LONGINT q)
 
 static void Heap_MarkP (SYSTEM_PTR p)
 {
-	Heap_Mark((LONGINT)(SYSTEM_ADDRESS)p);
+	Heap_Mark((LONGINT)(SYSTEM_ADRINT)p);
 }
 
 static void Heap_Scan (void)
@@ -553,7 +553,7 @@ static void Heap_Finalize (void)
 			} else {
 				prev->next = n->next;
 			}
-			(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADDRESS)n->obj);
+			(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADRINT)n->obj);
 			if (prev == NIL) {
 				n = Heap_fin;
 			} else {
@@ -572,7 +572,7 @@ void Heap_FINALL (void)
 	while (Heap_fin != NIL) {
 		n = Heap_fin;
 		Heap_fin = Heap_fin->next;
-		(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADDRESS)n->obj);
+		(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADRINT)n->obj);
 	}
 }
 
@@ -589,9 +589,9 @@ static void Heap_MarkStack (LONGINT n, LONGINT *cand, LONGINT cand__len)
 	}
 	if (n == 0) {
 		nofcand = 0;
-		sp = (LONGINT)(SYSTEM_ADDRESS)&frame;
+		sp = (LONGINT)(SYSTEM_ADRINT)&frame;
 		stack0 = Heap_PlatformMainStackFrame();
-		inc = (LONGINT)(SYSTEM_ADDRESS)&align.p - (LONGINT)(SYSTEM_ADDRESS)&align;
+		inc = (LONGINT)(SYSTEM_ADRINT)&align.p - (LONGINT)(SYSTEM_ADRINT)&align;
 		if (sp > stack0) {
 			inc = -inc;
 		}
@@ -622,7 +622,7 @@ void Heap_GC (BOOLEAN markStack)
 	LONGINT cand[10000];
 	if (Heap_lockdepth == 0 || (Heap_lockdepth == 1 && !markStack)) {
 		Heap_Lock();
-		m = (Heap_Module)(SYSTEM_ADDRESS)Heap_modules;
+		m = (Heap_Module)(SYSTEM_ADRINT)Heap_modules;
 		while (m != NIL) {
 			if (m->enumPtrs != NIL) {
 				(*m->enumPtrs)(Heap_MarkP);
@@ -699,7 +699,7 @@ void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize)
 {
 	Heap_FinNode f;
 	__NEW(f, Heap_FinDesc);
-	f->obj = (LONGINT)(SYSTEM_ADDRESS)obj;
+	f->obj = (LONGINT)(SYSTEM_ADRINT)obj;
 	f->finalize = finalize;
 	f->marked = 1;
 	f->next = Heap_fin;
diff --git a/bootstrap/unix-48/Heap.h b/bootstrap/unix-48/Heap.h
index a2cab30c..d05f688c 100644
--- a/bootstrap/unix-48/Heap.h
+++ b/bootstrap/unix-48/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tskSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tskSfF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-48/Modules.c b/bootstrap/unix-48/Modules.c
index 330b7506..d76a50a2 100644
--- a/bootstrap/unix-48/Modules.c
+++ b/bootstrap/unix-48/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Console.h"
 #include "Heap.h"
diff --git a/bootstrap/unix-48/Modules.h b/bootstrap/unix-48/Modules.h
index ac8ac89e..78c8d49e 100644
--- a/bootstrap/unix-48/Modules.h
+++ b/bootstrap/unix-48/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-48/OPB.c b/bootstrap/unix-48/OPB.c
index 0f614e6a..60b37750 100644
--- a/bootstrap/unix-48/OPB.c
+++ b/bootstrap/unix-48/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPM.h"
 #include "OPS.h"
diff --git a/bootstrap/unix-48/OPB.h b/bootstrap/unix-48/OPB.h
index d1c88266..e7a96131 100644
--- a/bootstrap/unix-48/OPB.h
+++ b/bootstrap/unix-48/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-48/OPC.c b/bootstrap/unix-48/OPC.c
index 3abccc9a..fce9997f 100644
--- a/bootstrap/unix-48/OPC.c
+++ b/bootstrap/unix-48/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "OPM.h"
@@ -211,7 +211,7 @@ void OPC_Ident (OPT_Object obj)
 				OPM_WriteStringVar((void*)OPM_modName, ((LONGINT)(32)));
 			}
 			OPM_Write('_');
-		} else if (obj == OPT_sysptrtyp->strobj || obj == OPT_bytetyp->strobj) {
+		} else if ((obj == OPT_sysptrtyp->strobj || obj == OPT_ainttyp->strobj) || obj == OPT_bytetyp->strobj) {
 			OPM_WriteString((CHAR*)"SYSTEM_", (LONGINT)8);
 		}
 		OPM_WriteStringVar((void*)obj->name, ((LONGINT)(256)));
diff --git a/bootstrap/unix-48/OPC.h b/bootstrap/unix-48/OPC.h
index b7d34a07..7aea7283 100644
--- a/bootstrap/unix-48/OPC.h
+++ b/bootstrap/unix-48/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-48/OPM.c b/bootstrap/unix-48/OPM.c
index bf683e41..88c3bd4d 100644
--- a/bootstrap/unix-48/OPM.c
+++ b/bootstrap/unix-48/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Console.h"
@@ -544,15 +544,15 @@ void OPM_FPrintReal (LONGINT *fp, REAL real)
 {
 	INTEGER i;
 	LONGINT l;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&real, l, LONGINT);
+	__GET((LONGINT)(SYSTEM_ADRINT)&real, l, LONGINT);
 	OPM_FPrint(&*fp, l);
 }
 
 void OPM_FPrintLReal (LONGINT *fp, LONGREAL lr)
 {
 	LONGINT l, h;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&lr, l, LONGINT);
-	__GET((LONGINT)(SYSTEM_ADDRESS)&lr + 4, h, LONGINT);
+	__GET((LONGINT)(SYSTEM_ADRINT)&lr, l, LONGINT);
+	__GET((LONGINT)(SYSTEM_ADRINT)&lr + 4, h, LONGINT);
 	OPM_FPrint(&*fp, l);
 	OPM_FPrint(&*fp, h);
 }
diff --git a/bootstrap/unix-48/OPM.h b/bootstrap/unix-48/OPM.h
index ed914bff..3c2be746 100644
--- a/bootstrap/unix-48/OPM.h
+++ b/bootstrap/unix-48/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-48/OPP.c b/bootstrap/unix-48/OPP.c
index 01d2144d..a0c19958 100644
--- a/bootstrap/unix-48/OPP.c
+++ b/bootstrap/unix-48/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPB.h"
 #include "OPM.h"
diff --git a/bootstrap/unix-48/OPP.h b/bootstrap/unix-48/OPP.h
index bf56b7d7..6c24817c 100644
--- a/bootstrap/unix-48/OPP.h
+++ b/bootstrap/unix-48/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-48/OPS.c b/bootstrap/unix-48/OPS.c
index cacf9256..85c8b275 100644
--- a/bootstrap/unix-48/OPS.c
+++ b/bootstrap/unix-48/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 #include "SYSTEM.h"
 #include "OPM.h"
 
diff --git a/bootstrap/unix-48/OPS.h b/bootstrap/unix-48/OPS.h
index e901bcfc..313c0ac7 100644
--- a/bootstrap/unix-48/OPS.h
+++ b/bootstrap/unix-48/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-48/OPT.c b/bootstrap/unix-48/OPT.c
index b32d0ebd..4b76312b 100644
--- a/bootstrap/unix-48/OPT.c
+++ b/bootstrap/unix-48/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPM.h"
 #include "OPS.h"
@@ -83,7 +83,7 @@ typedef
 
 export void (*OPT_typSize)(OPT_Struct);
 export OPT_Object OPT_topScope;
-export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
+export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_ainttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
 export SHORTINT OPT_nofGmod;
 export OPT_Object OPT_GlbMod[64];
 export OPS_Name OPT_SelfName;
@@ -1718,6 +1718,7 @@ static void EnumPtrs(void (*P)(void*))
 	P(OPT_sinttyp);
 	P(OPT_inttyp);
 	P(OPT_linttyp);
+	P(OPT_ainttyp);
 	P(OPT_realtyp);
 	P(OPT_lrltyp);
 	P(OPT_settyp);
@@ -1794,6 +1795,7 @@ export void *OPT__init(void)
 	OPT_undftyp->BaseTyp = OPT_undftyp;
 	OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp);
 	OPT_EnterTyp((CHAR*)"PTR", 13, OPM_PointerSize, &OPT_sysptrtyp);
+	OPT_EnterTyp((CHAR*)"ADRINT", 5, OPM_LIntSize, &OPT_ainttyp);
 	OPT_EnterProc((CHAR*)"ADR", 20);
 	OPT_EnterProc((CHAR*)"CC", 21);
 	OPT_EnterProc((CHAR*)"LSH", 22);
diff --git a/bootstrap/unix-48/OPT.h b/bootstrap/unix-48/OPT.h
index 41b3e7ec..7187f687 100644
--- a/bootstrap/unix-48/OPT.h
+++ b/bootstrap/unix-48/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPT__h
 #define OPT__h
@@ -67,7 +67,7 @@ typedef
 
 import void (*OPT_typSize)(OPT_Struct);
 import OPT_Object OPT_topScope;
-import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
+import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_ainttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
 import SHORTINT OPT_nofGmod;
 import OPT_Object OPT_GlbMod[64];
 import OPS_Name OPT_SelfName;
diff --git a/bootstrap/unix-48/OPV.c b/bootstrap/unix-48/OPV.c
index cf646f5e..8b98e5f9 100644
--- a/bootstrap/unix-48/OPV.c
+++ b/bootstrap/unix-48/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPC.h"
 #include "OPM.h"
@@ -284,6 +284,7 @@ void OPV_AdrAndSize (OPT_Object topScope)
 	OPT_realtyp->strobj->linkadr = 2;
 	OPT_inttyp->strobj->linkadr = 2;
 	OPT_linttyp->strobj->linkadr = 2;
+	OPT_ainttyp->strobj->linkadr = 2;
 	OPT_lrltyp->strobj->linkadr = 2;
 	OPT_sinttyp->strobj->linkadr = 2;
 	OPT_booltyp->strobj->linkadr = 2;
@@ -931,7 +932,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec)
 					OPM_Write(')');
 					break;
 				case 24: 
-					OPM_WriteString((CHAR*)"(LONGINT)(SYSTEM_ADDRESS)", (LONGINT)26);
+					OPM_WriteString((CHAR*)"(LONGINT)(SYSTEM_ADRINT)", (LONGINT)25);
 					if (l->class == 1) {
 						OPC_CompleteIdent(l->obj);
 					} else {
@@ -947,7 +948,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec)
 						OPC_Ident(n->typ->strobj);
 						OPM_Write(')');
 						if (__IN(n->typ->form, 0x6000) || __IN(l->typ->form, 0x6000)) {
-							OPM_WriteString((CHAR*)"(SYSTEM_ADDRESS)", (LONGINT)17);
+							OPM_WriteString((CHAR*)"(SYSTEM_ADRINT)", (LONGINT)16);
 						}
 						OPV_expr(l, exprPrec);
 					} else {
diff --git a/bootstrap/unix-48/OPV.h b/bootstrap/unix-48/OPV.h
index 04828b2f..122fda4a 100644
--- a/bootstrap/unix-48/OPV.h
+++ b/bootstrap/unix-48/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-48/Platform.c b/bootstrap/unix-48/Platform.c
index 74c43788..6326549f 100644
--- a/bootstrap/unix-48/Platform.c
+++ b/bootstrap/unix-48/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 typedef
@@ -118,14 +118,14 @@ export BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT
 #define Platform_EXDEV()	EXDEV
 extern void Heap_InitHeap();
 #define Platform_HeapInitHeap()	Heap_InitHeap()
-#define Platform_allocate(size)	(LONGINT)(SYSTEM_ADDRESS)((void*)malloc((size_t)size))
+#define Platform_allocate(size)	(LONGINT)(SYSTEM_ADRINT)((void*)malloc((size_t)size))
 #define Platform_chdir(n, n__len)	chdir((char*)n)
 #define Platform_closefile(fd)	close(fd)
 #define Platform_err()	errno
 #define Platform_errc(c)	write(1, &c, 1)
 #define Platform_errstring(s, s__len)	write(1, s, s__len-1)
 #define Platform_exit(code)	exit(code)
-#define Platform_free(address)	free((void*)(SYSTEM_ADDRESS)address)
+#define Platform_free(address)	free((void*)(SYSTEM_ADRINT)address)
 #define Platform_fstat(fd)	fstat(fd, &s)
 #define Platform_fsync(fd)	fsync(fd)
 #define Platform_ftruncate(fd, l)	ftruncate(fd, l)
@@ -138,13 +138,13 @@ extern void Heap_InitHeap();
 #define Platform_opennew(n, n__len)	open((char*)n, O_CREAT | O_TRUNC | O_RDWR, 0664)
 #define Platform_openro(n, n__len)	open((char*)n, O_RDONLY)
 #define Platform_openrw(n, n__len)	open((char*)n, O_RDWR)
-#define Platform_readfile(fd, p, l)	read(fd, (void*)(SYSTEM_ADDRESS)(p), l)
+#define Platform_readfile(fd, p, l)	read(fd, (void*)(SYSTEM_ADRINT)(p), l)
 #define Platform_rename(o, o__len, n, n__len)	rename((char*)o, (char*)n)
 #define Platform_sectotm(s)	struct tm *time = localtime((time_t*)&s)
 #define Platform_seekcur()	SEEK_CUR
 #define Platform_seekend()	SEEK_END
 #define Platform_seekset()	SEEK_SET
-#define Platform_sethandler(s, h)	SystemSetHandler(s, (SYSTEM_ADDRESS)h)
+#define Platform_sethandler(s, h)	SystemSetHandler(s, (SYSTEM_ADRINT)h)
 #define Platform_stat(n, n__len)	stat((char*)n, &s)
 #define Platform_statdev()	(LONGINT)s.st_dev
 #define Platform_statino()	(LONGINT)s.st_ino
@@ -161,7 +161,7 @@ extern void Heap_InitHeap();
 #define Platform_tvsec()	tv.tv_sec
 #define Platform_tvusec()	tv.tv_usec
 #define Platform_unlink(n, n__len)	unlink((char*)n)
-#define Platform_writefile(fd, p, l)	write(fd, (void*)(SYSTEM_ADDRESS)(p), l)
+#define Platform_writefile(fd, p, l)	write(fd, (void*)(SYSTEM_ADRINT)(p), l)
 
 BOOLEAN Platform_TooManyFiles (INTEGER e)
 {
@@ -229,7 +229,7 @@ void Platform_Init (INTEGER argc, LONGINT argvadr)
 	Platform_ArgVecPtr av = NIL;
 	Platform_MainStackFrame = argvadr;
 	Platform_ArgCount = argc;
-	av = (Platform_ArgVecPtr)(SYSTEM_ADDRESS)argvadr;
+	av = (Platform_ArgVecPtr)(SYSTEM_ADRINT)argvadr;
 	Platform_ArgVector = (*av)[0];
 	Platform_HaltCode = -128;
 	Platform_HeapInitHeap();
@@ -262,7 +262,7 @@ void Platform_GetArg (INTEGER n, CHAR *val, LONGINT val__len)
 {
 	Platform_ArgVec av = NIL;
 	if (n < Platform_ArgCount) {
-		av = (Platform_ArgVec)(SYSTEM_ADDRESS)Platform_ArgVector;
+		av = (Platform_ArgVec)(SYSTEM_ADRINT)Platform_ArgVector;
 		__COPY(*(*av)[__X(n, ((LONGINT)(1024)))], val, val__len);
 	}
 }
@@ -529,7 +529,7 @@ INTEGER Platform_Read (LONGINT h, LONGINT p, LONGINT l, LONGINT *n)
 INTEGER Platform_ReadBuf (LONGINT h, SYSTEM_BYTE *b, LONGINT b__len, LONGINT *n)
 {
 	INTEGER _o_result;
-	*n = Platform_readfile(h, (LONGINT)(SYSTEM_ADDRESS)b, b__len);
+	*n = Platform_readfile(h, (LONGINT)(SYSTEM_ADRINT)b, b__len);
 	if (*n < 0) {
 		*n = 0;
 		_o_result = Platform_err();
@@ -765,7 +765,7 @@ static void Platform_TestLittleEndian (void)
 {
 	INTEGER i;
 	i = 1;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&i, Platform_LittleEndian, BOOLEAN);
+	__GET((LONGINT)(SYSTEM_ADRINT)&i, Platform_LittleEndian, BOOLEAN);
 }
 
 __TDESC(Platform_FileIdentity, 1, 0) = {__TDFLDS("FileIdentity", 12), {-4}};
diff --git a/bootstrap/unix-48/Platform.h b/bootstrap/unix-48/Platform.h
index dd5ce434..77a9b68f 100644
--- a/bootstrap/unix-48/Platform.h
+++ b/bootstrap/unix-48/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-48/Reals.c b/bootstrap/unix-48/Reals.c
index 2323e34d..11c99924 100644
--- a/bootstrap/unix-48/Reals.c
+++ b/bootstrap/unix-48/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 
@@ -58,7 +58,7 @@ INTEGER Reals_Expo (REAL x)
 {
 	INTEGER _o_result;
 	INTEGER i;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&x + 2, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&x + 2, i, INTEGER);
 	_o_result = __MASK(__ASHR(i, 7), -256);
 	return _o_result;
 }
@@ -66,17 +66,17 @@ INTEGER Reals_Expo (REAL x)
 void Reals_SetExpo (REAL *x, INTEGER ex)
 {
 	CHAR c;
-	__GET((LONGINT)(SYSTEM_ADDRESS)x + 3, c, CHAR);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)x + 3, (CHAR)(__ASHL(__ASHR((int)c, 7), 7) + __MASK(__ASHR(ex, 1), -128)), CHAR);
-	__GET((LONGINT)(SYSTEM_ADDRESS)x + 2, c, CHAR);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)x + 2, (CHAR)(__MASK((int)c, -128) + __ASHL(__MASK(ex, -2), 7)), CHAR);
+	__GET((LONGINT)(SYSTEM_ADRINT)x + 3, c, CHAR);
+	__PUT((LONGINT)(SYSTEM_ADRINT)x + 3, (CHAR)(__ASHL(__ASHR((int)c, 7), 7) + __MASK(__ASHR(ex, 1), -128)), CHAR);
+	__GET((LONGINT)(SYSTEM_ADRINT)x + 2, c, CHAR);
+	__PUT((LONGINT)(SYSTEM_ADRINT)x + 2, (CHAR)(__MASK((int)c, -128) + __ASHL(__MASK(ex, -2), 7)), CHAR);
 }
 
 INTEGER Reals_ExpoL (LONGREAL x)
 {
 	INTEGER _o_result;
 	INTEGER i;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&x + 6, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&x + 6, i, INTEGER);
 	_o_result = __MASK(__ASHR(i, 4), -2048);
 	return _o_result;
 }
diff --git a/bootstrap/unix-48/Reals.h b/bootstrap/unix-48/Reals.h
index 7e6b534c..b0497a9c 100644
--- a/bootstrap/unix-48/Reals.h
+++ b/bootstrap/unix-48/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-48/SYSTEM.c b/bootstrap/unix-48/SYSTEM.c
index 33511a70..1077d3ce 100644
--- a/bootstrap/unix-48/SYSTEM.c
+++ b/bootstrap/unix-48/SYSTEM.c
@@ -35,7 +35,7 @@ void SYSTEM_INHERIT(LONGINT *t, LONGINT *t0)
 void SYSTEM_ENUMP(void *adr, LONGINT n, void (*P)())
 {
     while (n > 0) {
-        P((LONGINT)(SYSTEM_ADDRESS)(*((void**)(adr))));
+        P((LONGINT)(SYSTEM_ADRINT)(*((void**)(adr))));
         adr = ((void**)adr) + 1;
         n--;
     }
@@ -106,7 +106,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
     else if (typ == (LONGINT*)POINTER__typ) {
         /* element type is a pointer */
         x = Heap_NEWBLK(size + nofelems * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[-1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[-1];
         p[-nofelems] = *p;  /* build new type desc in situ: 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nofelems - 1; n = 1;   /* n =1 for skipping the size field */
         while (n <= nofelems) {*p = n*sizeof(LONGINT); p++; n++;}
@@ -119,7 +119,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
         while (ptab[nofptrs] >= 0) {nofptrs++;} /* number of pointers per element */
         nptr = nofelems * nofptrs;  /* total number of pointers */
         x = Heap_NEWBLK(size + nptr * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[- 1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[- 1];
         p[-nptr] = *p;  /* build new type desc in situ; 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nptr - 1; n = 0; off = dataoff;
         while (n < nofelems) {i = 0;
@@ -155,7 +155,7 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         // (Ignore other signals)
     }
 
-    void SystemSetHandler(int s, SYSTEM_ADDRESS h) {
+    void SystemSetHandler(int s, SYSTEM_ADRINT h) {
         if (s >= 2 && s <= 4) {
             int needtosetsystemhandler = handler[s-2] == 0;
             handler[s-2] = (SystemSignalHandler)h;
@@ -194,12 +194,12 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         }
     }
 
-    void SystemSetInterruptHandler(SYSTEM_ADDRESS h) {
+    void SystemSetInterruptHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemInterruptHandler = (SystemSignalHandler)h;
     }
 
-    void SystemSetQuitHandler(SYSTEM_ADDRESS h) {
+    void SystemSetQuitHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemQuitHandler = (SystemSignalHandler)h;
     }
diff --git a/bootstrap/unix-48/SYSTEM.h b/bootstrap/unix-48/SYSTEM.h
index 6377745e..35620b9b 100644
--- a/bootstrap/unix-48/SYSTEM.h
+++ b/bootstrap/unix-48/SYSTEM.h
@@ -26,11 +26,12 @@ typedef unsigned char        SYSTEM_CARD8;
   typedef unsigned int         size_t;
 #endif
 
-#define SYSTEM_ADDRESS size_t
+#define SYSTEM_ADRINT size_t
+#define SYSTEM_ADDRESS size_t   // Temporarily for bootstrap
 #define _SIZE_T_DECLARED // For FreeBSD
 #define _SIZE_T_DEFINED_ // For OpenBSD
 
-void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);
+void *memcpy(void *dest, const void *source, SYSTEM_ADRINT size);
 
 
 
@@ -107,10 +108,10 @@ extern LONGINT SYSTEM_ENTIER (double x);
 // Signal handling in SYSTEM.c
 
 #ifndef _WIN32
-  extern void SystemSetHandler(int s, SYSTEM_ADDRESS h);
+  extern void SystemSetHandler(int s, SYSTEM_ADRINT h);
 #else
-  extern void SystemSetInterruptHandler(SYSTEM_ADDRESS h);
-  extern void SystemSetQuitHandler     (SYSTEM_ADDRESS h);
+  extern void SystemSetInterruptHandler(SYSTEM_ADRINT h);
+  extern void SystemSetQuitHandler     (SYSTEM_ADRINT h);
 #endif
 
 
@@ -133,9 +134,9 @@ static int __str_cmp(CHAR *x, CHAR *y){
 
 #define __COPY(s, d, n) {char*_a=(void*)s,*_b=(void*)d; LONGINT _i=0,_t=n-1; \
                          while(_i<_t&&((_b[_i]=_a[_i])!=0)){_i++;};_b[_i]=0;}
-#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADDRESS)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
+#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADRINT)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
 #define __DUPARR(v, t)  v=(void*)memcpy(v##__copy,v,sizeof(t))
-#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADDRESS)x)
+#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADRINT)x)
 
 
 
@@ -145,8 +146,8 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __VAL(t, x)     (*(t*)&(x))
 
 
-#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADDRESS)(a)
-#define __PUT(a, x, t)  *(t*)(SYSTEM_ADDRESS)(a)=x
+#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADRINT)(a)
+#define __PUT(a, x, t)  *(t*)(SYSTEM_ADRINT)(a)=x
 
 #define __LSHL(x, n, t) ((t)((U_##t)(x)<<(n)))
 #define __LSHR(x, n, t) ((t)((U_##t)(x)>>(n)))
@@ -161,7 +162,7 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __ROT(x, n, t)  ((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
 
 #define __BIT(x, n)     (*(U_LONGINT*)(x)>>(n)&1)
-#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADDRESS)(d),(char*)(SYSTEM_ADDRESS)(s),n)
+#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADRINT)(d),(char*)(SYSTEM_ADRINT)(s),n)
 #define __ASHF(x, n)    SYSTEM_ASH((LONGINT)(x), (LONGINT)(n))
 #define __SHORT(x, y)   ((int)((U_LONGINT)(x)+(y)<(y)+(y)?(x):(__HALT(-8),0)))
 #define __SHORTF(x, y)  ((int)(__RF((x)+(y),(y)+(y))-(y)))
@@ -222,7 +223,7 @@ extern void       Heap_INCREF();
 extern void Platform_Init(INTEGER argc, LONGINT argv);
 extern void Heap_FINALL();
 
-#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADDRESS)&argv);
+#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADRINT)&argv);
 #define __REGMAIN(name, enum) m = Heap_REGMOD((CHAR*)name,enum)
 #define __FINI                Heap_FINALL(); return 0
 
@@ -243,7 +244,7 @@ extern SYSTEM_PTR Heap_NEWREC (LONGINT tag);
 extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 
 #define __SYSNEW(p, len) p = Heap_NEWBLK((LONGINT)(len))
-#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)t##__typ)
+#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)t##__typ)
 #define __NEWARR         SYSTEM_NEWARR
 
 
@@ -274,20 +275,20 @@ extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 #define __INITYP(t, t0, level) \
   t##__typ               = (LONGINT*)&t##__desc.blksz;                                                    \
   memcpy(t##__desc.basep, t0##__typ - __BASEOFF, level*sizeof(LONGINT));                                  \
-  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADDRESS)t##__typ;                                                  \
-  t##__desc.module       = (LONGINT)(SYSTEM_ADDRESS)m;                                                         \
+  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADRINT)t##__typ;                                                  \
+  t##__desc.module       = (LONGINT)(SYSTEM_ADRINT)m;                                                         \
   if(t##__desc.blksz!=sizeof(struct t)) __HALT(-15);                                                      \
   t##__desc.blksz        = (t##__desc.blksz+5*sizeof(LONGINT)-1)/(4*sizeof(LONGINT))*(4*sizeof(LONGINT)); \
-  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADDRESS)&t##__desc.next);                                                    \
+  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADRINT)&t##__desc.next);                                                    \
   SYSTEM_INHERIT(t##__typ, t0##__typ)
 
-#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADDRESS)typ##__typ)
-#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADDRESS)(*(((LONGINT*)(p))-1)))
+#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADRINT)typ##__typ)
+#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADRINT)(*(((LONGINT*)(p))-1)))
 #define __ISP(p, typ, level)  __IS(__TYPEOF(p),typ,level)
 
 // Oberon-2 type bound procedures support
-#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADDRESS)proc
-#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADDRESS)*(typ-(__TPROC0OFF+num))))parlist
+#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADRINT)proc
+#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADRINT)*(typ-(__TPROC0OFF+num))))parlist
 
 
 
diff --git a/bootstrap/unix-48/Strings.c b/bootstrap/unix-48/Strings.c
index 115456ea..15aeff29 100644
--- a/bootstrap/unix-48/Strings.c
+++ b/bootstrap/unix-48/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 
diff --git a/bootstrap/unix-48/Strings.h b/bootstrap/unix-48/Strings.h
index 96dbb01d..385096bc 100644
--- a/bootstrap/unix-48/Strings.h
+++ b/bootstrap/unix-48/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-48/Texts.c b/bootstrap/unix-48/Texts.c
index cfe34ca7..f7a3fdd3 100644
--- a/bootstrap/unix-48/Texts.c
+++ b/bootstrap/unix-48/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Files.h"
 #include "Modules.h"
diff --git a/bootstrap/unix-48/Texts.h b/bootstrap/unix-48/Texts.h
index 632b644a..d178499a 100644
--- a/bootstrap/unix-48/Texts.h
+++ b/bootstrap/unix-48/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-48/Vishap.c b/bootstrap/unix-48/Vishap.c
index 4c9e3b45..0feff79c 100644
--- a/bootstrap/unix-48/Vishap.c
+++ b/bootstrap/unix-48/Vishap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkamSf */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkamSf */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Heap.h"
@@ -81,6 +81,7 @@ static void Vishap_PropagateElementaryTypeSizes (void)
 	OPT_realtyp->size = OPM_RealSize;
 	OPT_inttyp->size = OPM_IntSize;
 	OPT_linttyp->size = OPM_LIntSize;
+	OPT_ainttyp->size = OPM_LIntSize;
 	OPT_lrltyp->size = OPM_LRealSize;
 	OPT_sinttyp->size = OPM_SIntSize;
 	OPT_booltyp->size = OPM_BoolSize;
diff --git a/bootstrap/unix-48/errors.c b/bootstrap/unix-48/errors.c
index 68e433df..59b8db27 100644
--- a/bootstrap/unix-48/errors.c
+++ b/bootstrap/unix-48/errors.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 typedef
diff --git a/bootstrap/unix-48/errors.h b/bootstrap/unix-48/errors.h
index 41d399ad..6ae0cd7a 100644
--- a/bootstrap/unix-48/errors.h
+++ b/bootstrap/unix-48/errors.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef errors__h
 #define errors__h
diff --git a/bootstrap/unix-48/extTools.c b/bootstrap/unix-48/extTools.c
index 4efd107a..2ef65e7b 100644
--- a/bootstrap/unix-48/extTools.c
+++ b/bootstrap/unix-48/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Console.h"
diff --git a/bootstrap/unix-48/extTools.h b/bootstrap/unix-48/extTools.h
index fc4f0da1..39837586 100644
--- a/bootstrap/unix-48/extTools.h
+++ b/bootstrap/unix-48/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/unix-48/vt100.c b/bootstrap/unix-48/vt100.c
index d77b0b84..e0edabd9 100644
--- a/bootstrap/unix-48/vt100.c
+++ b/bootstrap/unix-48/vt100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Console.h"
 #include "Strings.h"
diff --git a/bootstrap/unix-48/vt100.h b/bootstrap/unix-48/vt100.h
index 4af04d6e..413ae867 100644
--- a/bootstrap/unix-48/vt100.h
+++ b/bootstrap/unix-48/vt100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef vt100__h
 #define vt100__h
diff --git a/bootstrap/unix-88/Configuration.c b/bootstrap/unix-88/Configuration.c
index 47f1ffc7..8539a1e2 100644
--- a/bootstrap/unix-88/Configuration.c
+++ b/bootstrap/unix-88/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 
@@ -14,6 +14,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/08/23] for gcc LP64 on cygwin", Configuration_versionLong, 41);
+	__MOVE("1.95 [2016/08/26] for gcc LP64 on cygwin", Configuration_versionLong, 41);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-88/Configuration.h b/bootstrap/unix-88/Configuration.h
index ba0bbd99..b091f1f7 100644
--- a/bootstrap/unix-88/Configuration.h
+++ b/bootstrap/unix-88/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-88/Console.c b/bootstrap/unix-88/Console.c
index b39e6cf3..6cd166ef 100644
--- a/bootstrap/unix-88/Console.c
+++ b/bootstrap/unix-88/Console.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Platform.h"
@@ -22,7 +22,7 @@ export void Console_String (CHAR *s, LONGINT s__len);
 void Console_Flush (void)
 {
 	INTEGER error;
-	error = Platform_Write(((LONGINT)(1)), (LONGINT)(SYSTEM_ADDRESS)Console_line, Console_pos);
+	error = Platform_Write(((LONGINT)(1)), (LONGINT)(SYSTEM_ADRINT)Console_line, Console_pos);
 	Console_pos = 0;
 }
 
diff --git a/bootstrap/unix-88/Console.h b/bootstrap/unix-88/Console.h
index 4606384c..a0813c94 100644
--- a/bootstrap/unix-88/Console.h
+++ b/bootstrap/unix-88/Console.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Console__h
 #define Console__h
diff --git a/bootstrap/unix-88/Files.c b/bootstrap/unix-88/Files.c
index 1b144711..86914f24 100644
--- a/bootstrap/unix-88/Files.c
+++ b/bootstrap/unix-88/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Configuration.h"
@@ -258,7 +258,7 @@ static void Files_Flush (Files_Buffer buf)
 		if (buf->org != f->pos) {
 			error = Platform_Seek(f->fd, buf->org, Platform_SeekSet);
 		}
-		error = Platform_Write(f->fd, (LONGINT)(SYSTEM_ADDRESS)buf->data, buf->size);
+		error = Platform_Write(f->fd, (LONGINT)(SYSTEM_ADRINT)buf->data, buf->size);
 		if (error != 0) {
 			Files_Err((CHAR*)"error writing file", (LONGINT)19, f, error);
 		}
@@ -657,7 +657,7 @@ void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x
 		} else {
 			min = n;
 		}
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)buf->data + offset, (LONGINT)(SYSTEM_ADDRESS)x + xpos, min);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)buf->data + offset, (LONGINT)(SYSTEM_ADRINT)x + xpos, min);
 		offset += min;
 		(*r).offset = offset;
 		xpos += min;
@@ -722,7 +722,7 @@ void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT
 		} else {
 			min = n;
 		}
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)x + xpos, (LONGINT)(SYSTEM_ADDRESS)buf->data + offset, min);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)x + xpos, (LONGINT)(SYSTEM_ADRINT)buf->data + offset, min);
 		offset += min;
 		(*r).offset = offset;
 		if (offset > buf->size) {
@@ -773,15 +773,15 @@ void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT
 				*res = 3;
 				return;
 			}
-			error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADDRESS)buf, ((LONGINT)(4096)), &n);
+			error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADRINT)buf, ((LONGINT)(4096)), &n);
 			while (n > 0) {
-				error = Platform_Write(fdnew, (LONGINT)(SYSTEM_ADDRESS)buf, n);
+				error = Platform_Write(fdnew, (LONGINT)(SYSTEM_ADRINT)buf, n);
 				if (error != 0) {
 					ignore = Platform_Close(fdold);
 					ignore = Platform_Close(fdnew);
 					Files_Err((CHAR*)"cannot move file", (LONGINT)17, NIL, error);
 				}
-				error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADDRESS)buf, ((LONGINT)(4096)), &n);
+				error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADRINT)buf, ((LONGINT)(4096)), &n);
 			}
 			ignore = Platform_Close(fdold);
 			ignore = Platform_Close(fdnew);
@@ -839,7 +839,7 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *de
 			j += 1;
 		}
 	} else {
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)src, (LONGINT)(SYSTEM_ADDRESS)dest, src__len);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)src, (LONGINT)(SYSTEM_ADRINT)dest, src__len);
 	}
 }
 
@@ -1009,7 +1009,7 @@ static void Files_Finalize (SYSTEM_PTR o)
 {
 	Files_File f = NIL;
 	LONGINT res;
-	f = (Files_File)(SYSTEM_ADDRESS)o;
+	f = (Files_File)(SYSTEM_ADRINT)o;
 	if (f->fd >= 0) {
 		Files_CloseOSFile(f);
 		if (f->tempFile) {
diff --git a/bootstrap/unix-88/Files.h b/bootstrap/unix-88/Files.h
index 62487a35..8bcec40e 100644
--- a/bootstrap/unix-88/Files.h
+++ b/bootstrap/unix-88/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-88/Heap.c b/bootstrap/unix-88/Heap.c
index 9873a734..d3529141 100644
--- a/bootstrap/unix-88/Heap.c
+++ b/bootstrap/unix-88/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tskSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tskSfF */
 #define LARGE
 #include "SYSTEM.h"
 
@@ -102,7 +102,7 @@ export void Heap_Unlock (void);
 extern void *Heap__init();
 extern LONGINT Platform_MainStackFrame;
 extern LONGINT Platform_OSAllocate(LONGINT size);
-#define Heap_FetchAddress(pointer)	(LONGINT)(SYSTEM_ADDRESS)(*((void**)((SYSTEM_ADDRESS)pointer)))
+#define Heap_FetchAddress(pointer)	(LONGINT)(SYSTEM_ADRINT)(*((void**)((SYSTEM_ADRINT)pointer)))
 #define Heap_HeapModuleInit()	Heap__init()
 #define Heap_OSAllocate(size)	Platform_OSAllocate(size)
 #define Heap_PlatformHalt(code)	Platform_Halt(code)
@@ -135,7 +135,7 @@ SYSTEM_PTR Heap_REGMOD (Heap_ModuleName name, Heap_EnumProc enumPtrs)
 	__COPY(name, m->name, ((LONGINT)(20)));
 	m->refcnt = 0;
 	m->enumPtrs = enumPtrs;
-	m->next = (Heap_Module)(SYSTEM_ADDRESS)Heap_modules;
+	m->next = (Heap_Module)(SYSTEM_ADRINT)Heap_modules;
 	Heap_modules = (SYSTEM_PTR)m;
 	_o_result = (void*)m;
 	return _o_result;
@@ -316,7 +316,7 @@ SYSTEM_PTR Heap_NEWREC (LONGINT tag)
 	__PUT(adr + 16, 0, LONGINT);
 	Heap_allocated += blksz;
 	Heap_Unlock();
-	_o_result = (SYSTEM_PTR)(SYSTEM_ADDRESS)(adr + 8);
+	_o_result = (SYSTEM_PTR)(SYSTEM_ADRINT)(adr + 8);
 	return _o_result;
 }
 
@@ -327,12 +327,12 @@ SYSTEM_PTR Heap_NEWBLK (LONGINT size)
 	SYSTEM_PTR new;
 	Heap_Lock();
 	blksz = __ASHL(__ASHR(size + 63, 5), 5);
-	new = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)&blksz);
-	tag = ((LONGINT)(SYSTEM_ADDRESS)new + blksz) - 24;
+	new = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)&blksz);
+	tag = ((LONGINT)(SYSTEM_ADRINT)new + blksz) - 24;
 	__PUT(tag - 8, 0, LONGINT);
 	__PUT(tag, blksz, LONGINT);
 	__PUT(tag + 8, -8, LONGINT);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)new - 8, tag, LONGINT);
+	__PUT((LONGINT)(SYSTEM_ADRINT)new - 8, tag, LONGINT);
 	Heap_Unlock();
 	_o_result = new;
 	return _o_result;
@@ -361,7 +361,7 @@ static void Heap_Mark (LONGINT q)
 					__GET(tag, offset, LONGINT);
 					fld = q + offset;
 					p = Heap_FetchAddress(fld);
-					__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADDRESS)n, SYSTEM_PTR);
+					__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADRINT)n, SYSTEM_PTR);
 				} else {
 					fld = q + offset;
 					n = Heap_FetchAddress(fld);
@@ -370,7 +370,7 @@ static void Heap_Mark (LONGINT q)
 						if (!__ODD(tagbits)) {
 							__PUT(n - 8, tagbits + 1, LONGINT);
 							__PUT(q - 8, tag + 1, LONGINT);
-							__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADDRESS)p, SYSTEM_PTR);
+							__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADRINT)p, SYSTEM_PTR);
 							p = q;
 							q = n;
 							tag = tagbits;
@@ -385,7 +385,7 @@ static void Heap_Mark (LONGINT q)
 
 static void Heap_MarkP (SYSTEM_PTR p)
 {
-	Heap_Mark((LONGINT)(SYSTEM_ADDRESS)p);
+	Heap_Mark((LONGINT)(SYSTEM_ADRINT)p);
 }
 
 static void Heap_Scan (void)
@@ -554,7 +554,7 @@ static void Heap_Finalize (void)
 			} else {
 				prev->next = n->next;
 			}
-			(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADDRESS)n->obj);
+			(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADRINT)n->obj);
 			if (prev == NIL) {
 				n = Heap_fin;
 			} else {
@@ -573,7 +573,7 @@ void Heap_FINALL (void)
 	while (Heap_fin != NIL) {
 		n = Heap_fin;
 		Heap_fin = Heap_fin->next;
-		(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADDRESS)n->obj);
+		(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADRINT)n->obj);
 	}
 }
 
@@ -590,9 +590,9 @@ static void Heap_MarkStack (LONGINT n, LONGINT *cand, LONGINT cand__len)
 	}
 	if (n == 0) {
 		nofcand = 0;
-		sp = (LONGINT)(SYSTEM_ADDRESS)&frame;
+		sp = (LONGINT)(SYSTEM_ADRINT)&frame;
 		stack0 = Heap_PlatformMainStackFrame();
-		inc = (LONGINT)(SYSTEM_ADDRESS)&align.p - (LONGINT)(SYSTEM_ADDRESS)&align;
+		inc = (LONGINT)(SYSTEM_ADRINT)&align.p - (LONGINT)(SYSTEM_ADRINT)&align;
 		if (sp > stack0) {
 			inc = -inc;
 		}
@@ -623,7 +623,7 @@ void Heap_GC (BOOLEAN markStack)
 	LONGINT cand[10000];
 	if (Heap_lockdepth == 0 || (Heap_lockdepth == 1 && !markStack)) {
 		Heap_Lock();
-		m = (Heap_Module)(SYSTEM_ADDRESS)Heap_modules;
+		m = (Heap_Module)(SYSTEM_ADRINT)Heap_modules;
 		while (m != NIL) {
 			if (m->enumPtrs != NIL) {
 				(*m->enumPtrs)(Heap_MarkP);
@@ -700,7 +700,7 @@ void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize)
 {
 	Heap_FinNode f;
 	__NEW(f, Heap_FinDesc);
-	f->obj = (LONGINT)(SYSTEM_ADDRESS)obj;
+	f->obj = (LONGINT)(SYSTEM_ADRINT)obj;
 	f->finalize = finalize;
 	f->marked = 1;
 	f->next = Heap_fin;
diff --git a/bootstrap/unix-88/Heap.h b/bootstrap/unix-88/Heap.h
index b1ff5968..7827d119 100644
--- a/bootstrap/unix-88/Heap.h
+++ b/bootstrap/unix-88/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tskSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tskSfF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-88/Modules.c b/bootstrap/unix-88/Modules.c
index 0c836ead..e006bde8 100644
--- a/bootstrap/unix-88/Modules.c
+++ b/bootstrap/unix-88/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Console.h"
diff --git a/bootstrap/unix-88/Modules.h b/bootstrap/unix-88/Modules.h
index 6e6ded2e..9a0517b5 100644
--- a/bootstrap/unix-88/Modules.h
+++ b/bootstrap/unix-88/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-88/OPB.c b/bootstrap/unix-88/OPB.c
index f4bdb1a8..cb07c606 100644
--- a/bootstrap/unix-88/OPB.c
+++ b/bootstrap/unix-88/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "OPM.h"
diff --git a/bootstrap/unix-88/OPB.h b/bootstrap/unix-88/OPB.h
index af419f75..f2056569 100644
--- a/bootstrap/unix-88/OPB.h
+++ b/bootstrap/unix-88/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-88/OPC.c b/bootstrap/unix-88/OPC.c
index bb9b75e6..7e9ddb90 100644
--- a/bootstrap/unix-88/OPC.c
+++ b/bootstrap/unix-88/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Configuration.h"
@@ -212,7 +212,7 @@ void OPC_Ident (OPT_Object obj)
 				OPM_WriteStringVar((void*)OPM_modName, ((LONGINT)(32)));
 			}
 			OPM_Write('_');
-		} else if (obj == OPT_sysptrtyp->strobj || obj == OPT_bytetyp->strobj) {
+		} else if ((obj == OPT_sysptrtyp->strobj || obj == OPT_ainttyp->strobj) || obj == OPT_bytetyp->strobj) {
 			OPM_WriteString((CHAR*)"SYSTEM_", (LONGINT)8);
 		}
 		OPM_WriteStringVar((void*)obj->name, ((LONGINT)(256)));
diff --git a/bootstrap/unix-88/OPC.h b/bootstrap/unix-88/OPC.h
index 37a86252..aa92d405 100644
--- a/bootstrap/unix-88/OPC.h
+++ b/bootstrap/unix-88/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-88/OPM.c b/bootstrap/unix-88/OPM.c
index 50047c9e..3bc1b6d2 100644
--- a/bootstrap/unix-88/OPM.c
+++ b/bootstrap/unix-88/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Configuration.h"
@@ -545,7 +545,7 @@ void OPM_FPrintReal (LONGINT *fp, REAL real)
 {
 	INTEGER i;
 	LONGINT l;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&real, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&real, i, INTEGER);
 	l = i;
 	OPM_FPrint(&*fp, l);
 }
diff --git a/bootstrap/unix-88/OPM.h b/bootstrap/unix-88/OPM.h
index 1706f8f1..f11b56ba 100644
--- a/bootstrap/unix-88/OPM.h
+++ b/bootstrap/unix-88/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-88/OPP.c b/bootstrap/unix-88/OPP.c
index be7c13b5..3a345c1f 100644
--- a/bootstrap/unix-88/OPP.c
+++ b/bootstrap/unix-88/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "OPB.h"
diff --git a/bootstrap/unix-88/OPP.h b/bootstrap/unix-88/OPP.h
index 0b3b1b2c..c0c9c3dd 100644
--- a/bootstrap/unix-88/OPP.h
+++ b/bootstrap/unix-88/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-88/OPS.c b/bootstrap/unix-88/OPS.c
index cc04e014..1f9f2a46 100644
--- a/bootstrap/unix-88/OPS.c
+++ b/bootstrap/unix-88/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "OPM.h"
diff --git a/bootstrap/unix-88/OPS.h b/bootstrap/unix-88/OPS.h
index 32148c49..4b760b22 100644
--- a/bootstrap/unix-88/OPS.h
+++ b/bootstrap/unix-88/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-88/OPT.c b/bootstrap/unix-88/OPT.c
index a0d41c71..daf5051d 100644
--- a/bootstrap/unix-88/OPT.c
+++ b/bootstrap/unix-88/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "OPM.h"
@@ -84,7 +84,7 @@ typedef
 
 export void (*OPT_typSize)(OPT_Struct);
 export OPT_Object OPT_topScope;
-export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
+export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_ainttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
 export SHORTINT OPT_nofGmod;
 export OPT_Object OPT_GlbMod[64];
 export OPS_Name OPT_SelfName;
@@ -1719,6 +1719,7 @@ static void EnumPtrs(void (*P)(void*))
 	P(OPT_sinttyp);
 	P(OPT_inttyp);
 	P(OPT_linttyp);
+	P(OPT_ainttyp);
 	P(OPT_realtyp);
 	P(OPT_lrltyp);
 	P(OPT_settyp);
@@ -1795,6 +1796,7 @@ export void *OPT__init(void)
 	OPT_undftyp->BaseTyp = OPT_undftyp;
 	OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp);
 	OPT_EnterTyp((CHAR*)"PTR", 13, OPM_PointerSize, &OPT_sysptrtyp);
+	OPT_EnterTyp((CHAR*)"ADRINT", 5, OPM_LIntSize, &OPT_ainttyp);
 	OPT_EnterProc((CHAR*)"ADR", 20);
 	OPT_EnterProc((CHAR*)"CC", 21);
 	OPT_EnterProc((CHAR*)"LSH", 22);
diff --git a/bootstrap/unix-88/OPT.h b/bootstrap/unix-88/OPT.h
index ab2c4684..550ea673 100644
--- a/bootstrap/unix-88/OPT.h
+++ b/bootstrap/unix-88/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPT__h
 #define OPT__h
@@ -68,7 +68,7 @@ typedef
 
 import void (*OPT_typSize)(OPT_Struct);
 import OPT_Object OPT_topScope;
-import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
+import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_ainttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
 import SHORTINT OPT_nofGmod;
 import OPT_Object OPT_GlbMod[64];
 import OPS_Name OPT_SelfName;
diff --git a/bootstrap/unix-88/OPV.c b/bootstrap/unix-88/OPV.c
index ae14f629..fe8d848a 100644
--- a/bootstrap/unix-88/OPV.c
+++ b/bootstrap/unix-88/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "OPC.h"
@@ -285,6 +285,7 @@ void OPV_AdrAndSize (OPT_Object topScope)
 	OPT_realtyp->strobj->linkadr = 2;
 	OPT_inttyp->strobj->linkadr = 2;
 	OPT_linttyp->strobj->linkadr = 2;
+	OPT_ainttyp->strobj->linkadr = 2;
 	OPT_lrltyp->strobj->linkadr = 2;
 	OPT_sinttyp->strobj->linkadr = 2;
 	OPT_booltyp->strobj->linkadr = 2;
@@ -932,7 +933,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec)
 					OPM_Write(')');
 					break;
 				case 24: 
-					OPM_WriteString((CHAR*)"(LONGINT)(SYSTEM_ADDRESS)", (LONGINT)26);
+					OPM_WriteString((CHAR*)"(LONGINT)(SYSTEM_ADRINT)", (LONGINT)25);
 					if (l->class == 1) {
 						OPC_CompleteIdent(l->obj);
 					} else {
@@ -948,7 +949,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec)
 						OPC_Ident(n->typ->strobj);
 						OPM_Write(')');
 						if (__IN(n->typ->form, 0x6000) || __IN(l->typ->form, 0x6000)) {
-							OPM_WriteString((CHAR*)"(SYSTEM_ADDRESS)", (LONGINT)17);
+							OPM_WriteString((CHAR*)"(SYSTEM_ADRINT)", (LONGINT)16);
 						}
 						OPV_expr(l, exprPrec);
 					} else {
diff --git a/bootstrap/unix-88/OPV.h b/bootstrap/unix-88/OPV.h
index 4eba5b89..b0551679 100644
--- a/bootstrap/unix-88/OPV.h
+++ b/bootstrap/unix-88/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-88/Platform.c b/bootstrap/unix-88/Platform.c
index c1a0ea9e..7ecd9794 100644
--- a/bootstrap/unix-88/Platform.c
+++ b/bootstrap/unix-88/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 
@@ -119,14 +119,14 @@ export BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT
 #define Platform_EXDEV()	EXDEV
 extern void Heap_InitHeap();
 #define Platform_HeapInitHeap()	Heap_InitHeap()
-#define Platform_allocate(size)	(LONGINT)(SYSTEM_ADDRESS)((void*)malloc((size_t)size))
+#define Platform_allocate(size)	(LONGINT)(SYSTEM_ADRINT)((void*)malloc((size_t)size))
 #define Platform_chdir(n, n__len)	chdir((char*)n)
 #define Platform_closefile(fd)	close(fd)
 #define Platform_err()	errno
 #define Platform_errc(c)	write(1, &c, 1)
 #define Platform_errstring(s, s__len)	write(1, s, s__len-1)
 #define Platform_exit(code)	exit(code)
-#define Platform_free(address)	free((void*)(SYSTEM_ADDRESS)address)
+#define Platform_free(address)	free((void*)(SYSTEM_ADRINT)address)
 #define Platform_fstat(fd)	fstat(fd, &s)
 #define Platform_fsync(fd)	fsync(fd)
 #define Platform_ftruncate(fd, l)	ftruncate(fd, l)
@@ -139,13 +139,13 @@ extern void Heap_InitHeap();
 #define Platform_opennew(n, n__len)	open((char*)n, O_CREAT | O_TRUNC | O_RDWR, 0664)
 #define Platform_openro(n, n__len)	open((char*)n, O_RDONLY)
 #define Platform_openrw(n, n__len)	open((char*)n, O_RDWR)
-#define Platform_readfile(fd, p, l)	read(fd, (void*)(SYSTEM_ADDRESS)(p), l)
+#define Platform_readfile(fd, p, l)	read(fd, (void*)(SYSTEM_ADRINT)(p), l)
 #define Platform_rename(o, o__len, n, n__len)	rename((char*)o, (char*)n)
 #define Platform_sectotm(s)	struct tm *time = localtime((time_t*)&s)
 #define Platform_seekcur()	SEEK_CUR
 #define Platform_seekend()	SEEK_END
 #define Platform_seekset()	SEEK_SET
-#define Platform_sethandler(s, h)	SystemSetHandler(s, (SYSTEM_ADDRESS)h)
+#define Platform_sethandler(s, h)	SystemSetHandler(s, (SYSTEM_ADRINT)h)
 #define Platform_stat(n, n__len)	stat((char*)n, &s)
 #define Platform_statdev()	(LONGINT)s.st_dev
 #define Platform_statino()	(LONGINT)s.st_ino
@@ -162,7 +162,7 @@ extern void Heap_InitHeap();
 #define Platform_tvsec()	tv.tv_sec
 #define Platform_tvusec()	tv.tv_usec
 #define Platform_unlink(n, n__len)	unlink((char*)n)
-#define Platform_writefile(fd, p, l)	write(fd, (void*)(SYSTEM_ADDRESS)(p), l)
+#define Platform_writefile(fd, p, l)	write(fd, (void*)(SYSTEM_ADRINT)(p), l)
 
 BOOLEAN Platform_TooManyFiles (INTEGER e)
 {
@@ -230,7 +230,7 @@ void Platform_Init (INTEGER argc, LONGINT argvadr)
 	Platform_ArgVecPtr av = NIL;
 	Platform_MainStackFrame = argvadr;
 	Platform_ArgCount = argc;
-	av = (Platform_ArgVecPtr)(SYSTEM_ADDRESS)argvadr;
+	av = (Platform_ArgVecPtr)(SYSTEM_ADRINT)argvadr;
 	Platform_ArgVector = (*av)[0];
 	Platform_HaltCode = -128;
 	Platform_HeapInitHeap();
@@ -263,7 +263,7 @@ void Platform_GetArg (INTEGER n, CHAR *val, LONGINT val__len)
 {
 	Platform_ArgVec av = NIL;
 	if (n < Platform_ArgCount) {
-		av = (Platform_ArgVec)(SYSTEM_ADDRESS)Platform_ArgVector;
+		av = (Platform_ArgVec)(SYSTEM_ADRINT)Platform_ArgVector;
 		__COPY(*(*av)[__X(n, ((LONGINT)(1024)))], val, val__len);
 	}
 }
@@ -530,7 +530,7 @@ INTEGER Platform_Read (LONGINT h, LONGINT p, LONGINT l, LONGINT *n)
 INTEGER Platform_ReadBuf (LONGINT h, SYSTEM_BYTE *b, LONGINT b__len, LONGINT *n)
 {
 	INTEGER _o_result;
-	*n = Platform_readfile(h, (LONGINT)(SYSTEM_ADDRESS)b, b__len);
+	*n = Platform_readfile(h, (LONGINT)(SYSTEM_ADRINT)b, b__len);
 	if (*n < 0) {
 		*n = 0;
 		_o_result = Platform_err();
@@ -766,7 +766,7 @@ static void Platform_TestLittleEndian (void)
 {
 	INTEGER i;
 	i = 1;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&i, Platform_LittleEndian, BOOLEAN);
+	__GET((LONGINT)(SYSTEM_ADRINT)&i, Platform_LittleEndian, BOOLEAN);
 }
 
 __TDESC(Platform_FileIdentity, 1, 0) = {__TDFLDS("FileIdentity", 24), {-8}};
diff --git a/bootstrap/unix-88/Platform.h b/bootstrap/unix-88/Platform.h
index 49702e6d..832aaa35 100644
--- a/bootstrap/unix-88/Platform.h
+++ b/bootstrap/unix-88/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-88/Reals.c b/bootstrap/unix-88/Reals.c
index 8b61d8cd..660cd605 100644
--- a/bootstrap/unix-88/Reals.c
+++ b/bootstrap/unix-88/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 
@@ -59,7 +59,7 @@ INTEGER Reals_Expo (REAL x)
 {
 	INTEGER _o_result;
 	INTEGER i;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&x + 2, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&x + 2, i, INTEGER);
 	_o_result = __MASK(__ASHR(i, 7), -256);
 	return _o_result;
 }
@@ -67,17 +67,17 @@ INTEGER Reals_Expo (REAL x)
 void Reals_SetExpo (REAL *x, INTEGER ex)
 {
 	CHAR c;
-	__GET((LONGINT)(SYSTEM_ADDRESS)x + 3, c, CHAR);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)x + 3, (CHAR)(__ASHL(__ASHR((int)c, 7), 7) + __MASK(__ASHR(ex, 1), -128)), CHAR);
-	__GET((LONGINT)(SYSTEM_ADDRESS)x + 2, c, CHAR);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)x + 2, (CHAR)(__MASK((int)c, -128) + __ASHL(__MASK(ex, -2), 7)), CHAR);
+	__GET((LONGINT)(SYSTEM_ADRINT)x + 3, c, CHAR);
+	__PUT((LONGINT)(SYSTEM_ADRINT)x + 3, (CHAR)(__ASHL(__ASHR((int)c, 7), 7) + __MASK(__ASHR(ex, 1), -128)), CHAR);
+	__GET((LONGINT)(SYSTEM_ADRINT)x + 2, c, CHAR);
+	__PUT((LONGINT)(SYSTEM_ADRINT)x + 2, (CHAR)(__MASK((int)c, -128) + __ASHL(__MASK(ex, -2), 7)), CHAR);
 }
 
 INTEGER Reals_ExpoL (LONGREAL x)
 {
 	INTEGER _o_result;
 	INTEGER i;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&x + 6, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&x + 6, i, INTEGER);
 	_o_result = __MASK(__ASHR(i, 4), -2048);
 	return _o_result;
 }
diff --git a/bootstrap/unix-88/Reals.h b/bootstrap/unix-88/Reals.h
index ff21c192..3102ce18 100644
--- a/bootstrap/unix-88/Reals.h
+++ b/bootstrap/unix-88/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-88/SYSTEM.c b/bootstrap/unix-88/SYSTEM.c
index 33511a70..1077d3ce 100644
--- a/bootstrap/unix-88/SYSTEM.c
+++ b/bootstrap/unix-88/SYSTEM.c
@@ -35,7 +35,7 @@ void SYSTEM_INHERIT(LONGINT *t, LONGINT *t0)
 void SYSTEM_ENUMP(void *adr, LONGINT n, void (*P)())
 {
     while (n > 0) {
-        P((LONGINT)(SYSTEM_ADDRESS)(*((void**)(adr))));
+        P((LONGINT)(SYSTEM_ADRINT)(*((void**)(adr))));
         adr = ((void**)adr) + 1;
         n--;
     }
@@ -106,7 +106,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
     else if (typ == (LONGINT*)POINTER__typ) {
         /* element type is a pointer */
         x = Heap_NEWBLK(size + nofelems * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[-1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[-1];
         p[-nofelems] = *p;  /* build new type desc in situ: 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nofelems - 1; n = 1;   /* n =1 for skipping the size field */
         while (n <= nofelems) {*p = n*sizeof(LONGINT); p++; n++;}
@@ -119,7 +119,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
         while (ptab[nofptrs] >= 0) {nofptrs++;} /* number of pointers per element */
         nptr = nofelems * nofptrs;  /* total number of pointers */
         x = Heap_NEWBLK(size + nptr * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[- 1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[- 1];
         p[-nptr] = *p;  /* build new type desc in situ; 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nptr - 1; n = 0; off = dataoff;
         while (n < nofelems) {i = 0;
@@ -155,7 +155,7 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         // (Ignore other signals)
     }
 
-    void SystemSetHandler(int s, SYSTEM_ADDRESS h) {
+    void SystemSetHandler(int s, SYSTEM_ADRINT h) {
         if (s >= 2 && s <= 4) {
             int needtosetsystemhandler = handler[s-2] == 0;
             handler[s-2] = (SystemSignalHandler)h;
@@ -194,12 +194,12 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         }
     }
 
-    void SystemSetInterruptHandler(SYSTEM_ADDRESS h) {
+    void SystemSetInterruptHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemInterruptHandler = (SystemSignalHandler)h;
     }
 
-    void SystemSetQuitHandler(SYSTEM_ADDRESS h) {
+    void SystemSetQuitHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemQuitHandler = (SystemSignalHandler)h;
     }
diff --git a/bootstrap/unix-88/SYSTEM.h b/bootstrap/unix-88/SYSTEM.h
index 6377745e..35620b9b 100644
--- a/bootstrap/unix-88/SYSTEM.h
+++ b/bootstrap/unix-88/SYSTEM.h
@@ -26,11 +26,12 @@ typedef unsigned char        SYSTEM_CARD8;
   typedef unsigned int         size_t;
 #endif
 
-#define SYSTEM_ADDRESS size_t
+#define SYSTEM_ADRINT size_t
+#define SYSTEM_ADDRESS size_t   // Temporarily for bootstrap
 #define _SIZE_T_DECLARED // For FreeBSD
 #define _SIZE_T_DEFINED_ // For OpenBSD
 
-void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);
+void *memcpy(void *dest, const void *source, SYSTEM_ADRINT size);
 
 
 
@@ -107,10 +108,10 @@ extern LONGINT SYSTEM_ENTIER (double x);
 // Signal handling in SYSTEM.c
 
 #ifndef _WIN32
-  extern void SystemSetHandler(int s, SYSTEM_ADDRESS h);
+  extern void SystemSetHandler(int s, SYSTEM_ADRINT h);
 #else
-  extern void SystemSetInterruptHandler(SYSTEM_ADDRESS h);
-  extern void SystemSetQuitHandler     (SYSTEM_ADDRESS h);
+  extern void SystemSetInterruptHandler(SYSTEM_ADRINT h);
+  extern void SystemSetQuitHandler     (SYSTEM_ADRINT h);
 #endif
 
 
@@ -133,9 +134,9 @@ static int __str_cmp(CHAR *x, CHAR *y){
 
 #define __COPY(s, d, n) {char*_a=(void*)s,*_b=(void*)d; LONGINT _i=0,_t=n-1; \
                          while(_i<_t&&((_b[_i]=_a[_i])!=0)){_i++;};_b[_i]=0;}
-#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADDRESS)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
+#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADRINT)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
 #define __DUPARR(v, t)  v=(void*)memcpy(v##__copy,v,sizeof(t))
-#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADDRESS)x)
+#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADRINT)x)
 
 
 
@@ -145,8 +146,8 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __VAL(t, x)     (*(t*)&(x))
 
 
-#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADDRESS)(a)
-#define __PUT(a, x, t)  *(t*)(SYSTEM_ADDRESS)(a)=x
+#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADRINT)(a)
+#define __PUT(a, x, t)  *(t*)(SYSTEM_ADRINT)(a)=x
 
 #define __LSHL(x, n, t) ((t)((U_##t)(x)<<(n)))
 #define __LSHR(x, n, t) ((t)((U_##t)(x)>>(n)))
@@ -161,7 +162,7 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __ROT(x, n, t)  ((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
 
 #define __BIT(x, n)     (*(U_LONGINT*)(x)>>(n)&1)
-#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADDRESS)(d),(char*)(SYSTEM_ADDRESS)(s),n)
+#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADRINT)(d),(char*)(SYSTEM_ADRINT)(s),n)
 #define __ASHF(x, n)    SYSTEM_ASH((LONGINT)(x), (LONGINT)(n))
 #define __SHORT(x, y)   ((int)((U_LONGINT)(x)+(y)<(y)+(y)?(x):(__HALT(-8),0)))
 #define __SHORTF(x, y)  ((int)(__RF((x)+(y),(y)+(y))-(y)))
@@ -222,7 +223,7 @@ extern void       Heap_INCREF();
 extern void Platform_Init(INTEGER argc, LONGINT argv);
 extern void Heap_FINALL();
 
-#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADDRESS)&argv);
+#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADRINT)&argv);
 #define __REGMAIN(name, enum) m = Heap_REGMOD((CHAR*)name,enum)
 #define __FINI                Heap_FINALL(); return 0
 
@@ -243,7 +244,7 @@ extern SYSTEM_PTR Heap_NEWREC (LONGINT tag);
 extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 
 #define __SYSNEW(p, len) p = Heap_NEWBLK((LONGINT)(len))
-#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)t##__typ)
+#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)t##__typ)
 #define __NEWARR         SYSTEM_NEWARR
 
 
@@ -274,20 +275,20 @@ extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 #define __INITYP(t, t0, level) \
   t##__typ               = (LONGINT*)&t##__desc.blksz;                                                    \
   memcpy(t##__desc.basep, t0##__typ - __BASEOFF, level*sizeof(LONGINT));                                  \
-  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADDRESS)t##__typ;                                                  \
-  t##__desc.module       = (LONGINT)(SYSTEM_ADDRESS)m;                                                         \
+  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADRINT)t##__typ;                                                  \
+  t##__desc.module       = (LONGINT)(SYSTEM_ADRINT)m;                                                         \
   if(t##__desc.blksz!=sizeof(struct t)) __HALT(-15);                                                      \
   t##__desc.blksz        = (t##__desc.blksz+5*sizeof(LONGINT)-1)/(4*sizeof(LONGINT))*(4*sizeof(LONGINT)); \
-  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADDRESS)&t##__desc.next);                                                    \
+  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADRINT)&t##__desc.next);                                                    \
   SYSTEM_INHERIT(t##__typ, t0##__typ)
 
-#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADDRESS)typ##__typ)
-#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADDRESS)(*(((LONGINT*)(p))-1)))
+#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADRINT)typ##__typ)
+#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADRINT)(*(((LONGINT*)(p))-1)))
 #define __ISP(p, typ, level)  __IS(__TYPEOF(p),typ,level)
 
 // Oberon-2 type bound procedures support
-#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADDRESS)proc
-#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADDRESS)*(typ-(__TPROC0OFF+num))))parlist
+#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADRINT)proc
+#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADRINT)*(typ-(__TPROC0OFF+num))))parlist
 
 
 
diff --git a/bootstrap/unix-88/Strings.c b/bootstrap/unix-88/Strings.c
index 20a14540..2df49d25 100644
--- a/bootstrap/unix-88/Strings.c
+++ b/bootstrap/unix-88/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 
diff --git a/bootstrap/unix-88/Strings.h b/bootstrap/unix-88/Strings.h
index d64d3478..9505fe03 100644
--- a/bootstrap/unix-88/Strings.h
+++ b/bootstrap/unix-88/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-88/Texts.c b/bootstrap/unix-88/Texts.c
index a1fb81c0..0e0b4725 100644
--- a/bootstrap/unix-88/Texts.c
+++ b/bootstrap/unix-88/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Files.h"
diff --git a/bootstrap/unix-88/Texts.h b/bootstrap/unix-88/Texts.h
index bca5665d..3086fb00 100644
--- a/bootstrap/unix-88/Texts.h
+++ b/bootstrap/unix-88/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-88/Vishap.c b/bootstrap/unix-88/Vishap.c
index 6eda4f2c..7e1eba78 100644
--- a/bootstrap/unix-88/Vishap.c
+++ b/bootstrap/unix-88/Vishap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkamSf */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkamSf */
 #define LARGE
 #include "SYSTEM.h"
 #include "Configuration.h"
@@ -82,6 +82,7 @@ static void Vishap_PropagateElementaryTypeSizes (void)
 	OPT_realtyp->size = OPM_RealSize;
 	OPT_inttyp->size = OPM_IntSize;
 	OPT_linttyp->size = OPM_LIntSize;
+	OPT_ainttyp->size = OPM_LIntSize;
 	OPT_lrltyp->size = OPM_LRealSize;
 	OPT_sinttyp->size = OPM_SIntSize;
 	OPT_booltyp->size = OPM_BoolSize;
diff --git a/bootstrap/unix-88/errors.c b/bootstrap/unix-88/errors.c
index 48246ffa..8489752b 100644
--- a/bootstrap/unix-88/errors.c
+++ b/bootstrap/unix-88/errors.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 
diff --git a/bootstrap/unix-88/errors.h b/bootstrap/unix-88/errors.h
index 9081238a..a5af5a7d 100644
--- a/bootstrap/unix-88/errors.h
+++ b/bootstrap/unix-88/errors.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef errors__h
 #define errors__h
diff --git a/bootstrap/unix-88/extTools.c b/bootstrap/unix-88/extTools.c
index 4005b0a6..fce52835 100644
--- a/bootstrap/unix-88/extTools.c
+++ b/bootstrap/unix-88/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Configuration.h"
diff --git a/bootstrap/unix-88/extTools.h b/bootstrap/unix-88/extTools.h
index 6ac1ab91..9e5aed51 100644
--- a/bootstrap/unix-88/extTools.h
+++ b/bootstrap/unix-88/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/unix-88/vt100.c b/bootstrap/unix-88/vt100.c
index a9110e8a..0e0401e3 100644
--- a/bootstrap/unix-88/vt100.c
+++ b/bootstrap/unix-88/vt100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Console.h"
diff --git a/bootstrap/unix-88/vt100.h b/bootstrap/unix-88/vt100.h
index 801bc8f9..eb6374ea 100644
--- a/bootstrap/unix-88/vt100.h
+++ b/bootstrap/unix-88/vt100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef vt100__h
 #define vt100__h
diff --git a/bootstrap/windows-48/Configuration.c b/bootstrap/windows-48/Configuration.c
index 821dff97..b0d48f0a 100644
--- a/bootstrap/windows-48/Configuration.c
+++ b/bootstrap/windows-48/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 
@@ -13,6 +13,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/08/23] for gcc LP64 on cygwin", Configuration_versionLong, 41);
+	__MOVE("1.95 [2016/08/26] for gcc LP64 on cygwin", Configuration_versionLong, 41);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-48/Configuration.h b/bootstrap/windows-48/Configuration.h
index ec5e865a..38a63260 100644
--- a/bootstrap/windows-48/Configuration.h
+++ b/bootstrap/windows-48/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/windows-48/Console.c b/bootstrap/windows-48/Console.c
index ebd86b8d..52a0ced0 100644
--- a/bootstrap/windows-48/Console.c
+++ b/bootstrap/windows-48/Console.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Platform.h"
 
@@ -21,7 +21,7 @@ export void Console_String (CHAR *s, LONGINT s__len);
 void Console_Flush (void)
 {
 	INTEGER error;
-	error = Platform_Write(Platform_StdOut, (LONGINT)(SYSTEM_ADDRESS)Console_line, Console_pos);
+	error = Platform_Write(Platform_StdOut, (LONGINT)(SYSTEM_ADRINT)Console_line, Console_pos);
 	Console_pos = 0;
 }
 
diff --git a/bootstrap/windows-48/Console.h b/bootstrap/windows-48/Console.h
index 5fdd4e4d..2c462da9 100644
--- a/bootstrap/windows-48/Console.h
+++ b/bootstrap/windows-48/Console.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Console__h
 #define Console__h
diff --git a/bootstrap/windows-48/Files.c b/bootstrap/windows-48/Files.c
index 1f3a8e9c..966fb2ca 100644
--- a/bootstrap/windows-48/Files.c
+++ b/bootstrap/windows-48/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Console.h"
@@ -257,7 +257,7 @@ static void Files_Flush (Files_Buffer buf)
 		if (buf->org != f->pos) {
 			error = Platform_Seek(f->fd, buf->org, Platform_SeekSet);
 		}
-		error = Platform_Write(f->fd, (LONGINT)(SYSTEM_ADDRESS)buf->data, buf->size);
+		error = Platform_Write(f->fd, (LONGINT)(SYSTEM_ADRINT)buf->data, buf->size);
 		if (error != 0) {
 			Files_Err((CHAR*)"error writing file", (LONGINT)19, f, error);
 		}
@@ -656,7 +656,7 @@ void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x
 		} else {
 			min = n;
 		}
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)buf->data + offset, (LONGINT)(SYSTEM_ADDRESS)x + xpos, min);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)buf->data + offset, (LONGINT)(SYSTEM_ADRINT)x + xpos, min);
 		offset += min;
 		(*r).offset = offset;
 		xpos += min;
@@ -721,7 +721,7 @@ void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT
 		} else {
 			min = n;
 		}
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)x + xpos, (LONGINT)(SYSTEM_ADDRESS)buf->data + offset, min);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)x + xpos, (LONGINT)(SYSTEM_ADRINT)buf->data + offset, min);
 		offset += min;
 		(*r).offset = offset;
 		if (offset > buf->size) {
@@ -772,15 +772,15 @@ void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT
 				*res = 3;
 				return;
 			}
-			error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADDRESS)buf, ((LONGINT)(4096)), &n);
+			error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADRINT)buf, ((LONGINT)(4096)), &n);
 			while (n > 0) {
-				error = Platform_Write(fdnew, (LONGINT)(SYSTEM_ADDRESS)buf, n);
+				error = Platform_Write(fdnew, (LONGINT)(SYSTEM_ADRINT)buf, n);
 				if (error != 0) {
 					ignore = Platform_Close(fdold);
 					ignore = Platform_Close(fdnew);
 					Files_Err((CHAR*)"cannot move file", (LONGINT)17, NIL, error);
 				}
-				error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADDRESS)buf, ((LONGINT)(4096)), &n);
+				error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADRINT)buf, ((LONGINT)(4096)), &n);
 			}
 			ignore = Platform_Close(fdold);
 			ignore = Platform_Close(fdnew);
@@ -838,7 +838,7 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *de
 			j += 1;
 		}
 	} else {
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)src, (LONGINT)(SYSTEM_ADDRESS)dest, src__len);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)src, (LONGINT)(SYSTEM_ADRINT)dest, src__len);
 	}
 }
 
@@ -1008,7 +1008,7 @@ static void Files_Finalize (SYSTEM_PTR o)
 {
 	Files_File f = NIL;
 	LONGINT res;
-	f = (Files_File)(SYSTEM_ADDRESS)o;
+	f = (Files_File)(SYSTEM_ADRINT)o;
 	if (f->fd >= 0) {
 		Files_CloseOSFile(f);
 		if (f->tempFile) {
diff --git a/bootstrap/windows-48/Files.h b/bootstrap/windows-48/Files.h
index 868f24df..7e437f34 100644
--- a/bootstrap/windows-48/Files.h
+++ b/bootstrap/windows-48/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/windows-48/Heap.c b/bootstrap/windows-48/Heap.c
index 30ec687a..cca2fc74 100644
--- a/bootstrap/windows-48/Heap.c
+++ b/bootstrap/windows-48/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tskSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tskSfF */
 #include "SYSTEM.h"
 
 struct Heap__1 {
@@ -101,7 +101,7 @@ export void Heap_Unlock (void);
 extern void *Heap__init();
 extern LONGINT Platform_MainStackFrame;
 extern LONGINT Platform_OSAllocate(LONGINT size);
-#define Heap_FetchAddress(pointer)	(LONGINT)(SYSTEM_ADDRESS)(*((void**)((SYSTEM_ADDRESS)pointer)))
+#define Heap_FetchAddress(pointer)	(LONGINT)(SYSTEM_ADRINT)(*((void**)((SYSTEM_ADRINT)pointer)))
 #define Heap_HeapModuleInit()	Heap__init()
 #define Heap_OSAllocate(size)	Platform_OSAllocate(size)
 #define Heap_PlatformHalt(code)	Platform_Halt(code)
@@ -134,7 +134,7 @@ SYSTEM_PTR Heap_REGMOD (Heap_ModuleName name, Heap_EnumProc enumPtrs)
 	__COPY(name, m->name, ((LONGINT)(20)));
 	m->refcnt = 0;
 	m->enumPtrs = enumPtrs;
-	m->next = (Heap_Module)(SYSTEM_ADDRESS)Heap_modules;
+	m->next = (Heap_Module)(SYSTEM_ADRINT)Heap_modules;
 	Heap_modules = (SYSTEM_PTR)m;
 	_o_result = (void*)m;
 	return _o_result;
@@ -315,7 +315,7 @@ SYSTEM_PTR Heap_NEWREC (LONGINT tag)
 	__PUT(adr + 8, 0, LONGINT);
 	Heap_allocated += blksz;
 	Heap_Unlock();
-	_o_result = (SYSTEM_PTR)(SYSTEM_ADDRESS)(adr + 4);
+	_o_result = (SYSTEM_PTR)(SYSTEM_ADRINT)(adr + 4);
 	return _o_result;
 }
 
@@ -326,12 +326,12 @@ SYSTEM_PTR Heap_NEWBLK (LONGINT size)
 	SYSTEM_PTR new;
 	Heap_Lock();
 	blksz = __ASHL(__ASHR(size + 31, 4), 4);
-	new = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)&blksz);
-	tag = ((LONGINT)(SYSTEM_ADDRESS)new + blksz) - 12;
+	new = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)&blksz);
+	tag = ((LONGINT)(SYSTEM_ADRINT)new + blksz) - 12;
 	__PUT(tag - 4, 0, LONGINT);
 	__PUT(tag, blksz, LONGINT);
 	__PUT(tag + 4, -4, LONGINT);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)new - 4, tag, LONGINT);
+	__PUT((LONGINT)(SYSTEM_ADRINT)new - 4, tag, LONGINT);
 	Heap_Unlock();
 	_o_result = new;
 	return _o_result;
@@ -360,7 +360,7 @@ static void Heap_Mark (LONGINT q)
 					__GET(tag, offset, LONGINT);
 					fld = q + offset;
 					p = Heap_FetchAddress(fld);
-					__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADDRESS)n, SYSTEM_PTR);
+					__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADRINT)n, SYSTEM_PTR);
 				} else {
 					fld = q + offset;
 					n = Heap_FetchAddress(fld);
@@ -369,7 +369,7 @@ static void Heap_Mark (LONGINT q)
 						if (!__ODD(tagbits)) {
 							__PUT(n - 4, tagbits + 1, LONGINT);
 							__PUT(q - 4, tag + 1, LONGINT);
-							__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADDRESS)p, SYSTEM_PTR);
+							__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADRINT)p, SYSTEM_PTR);
 							p = q;
 							q = n;
 							tag = tagbits;
@@ -384,7 +384,7 @@ static void Heap_Mark (LONGINT q)
 
 static void Heap_MarkP (SYSTEM_PTR p)
 {
-	Heap_Mark((LONGINT)(SYSTEM_ADDRESS)p);
+	Heap_Mark((LONGINT)(SYSTEM_ADRINT)p);
 }
 
 static void Heap_Scan (void)
@@ -553,7 +553,7 @@ static void Heap_Finalize (void)
 			} else {
 				prev->next = n->next;
 			}
-			(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADDRESS)n->obj);
+			(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADRINT)n->obj);
 			if (prev == NIL) {
 				n = Heap_fin;
 			} else {
@@ -572,7 +572,7 @@ void Heap_FINALL (void)
 	while (Heap_fin != NIL) {
 		n = Heap_fin;
 		Heap_fin = Heap_fin->next;
-		(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADDRESS)n->obj);
+		(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADRINT)n->obj);
 	}
 }
 
@@ -589,9 +589,9 @@ static void Heap_MarkStack (LONGINT n, LONGINT *cand, LONGINT cand__len)
 	}
 	if (n == 0) {
 		nofcand = 0;
-		sp = (LONGINT)(SYSTEM_ADDRESS)&frame;
+		sp = (LONGINT)(SYSTEM_ADRINT)&frame;
 		stack0 = Heap_PlatformMainStackFrame();
-		inc = (LONGINT)(SYSTEM_ADDRESS)&align.p - (LONGINT)(SYSTEM_ADDRESS)&align;
+		inc = (LONGINT)(SYSTEM_ADRINT)&align.p - (LONGINT)(SYSTEM_ADRINT)&align;
 		if (sp > stack0) {
 			inc = -inc;
 		}
@@ -622,7 +622,7 @@ void Heap_GC (BOOLEAN markStack)
 	LONGINT cand[10000];
 	if (Heap_lockdepth == 0 || (Heap_lockdepth == 1 && !markStack)) {
 		Heap_Lock();
-		m = (Heap_Module)(SYSTEM_ADDRESS)Heap_modules;
+		m = (Heap_Module)(SYSTEM_ADRINT)Heap_modules;
 		while (m != NIL) {
 			if (m->enumPtrs != NIL) {
 				(*m->enumPtrs)(Heap_MarkP);
@@ -699,7 +699,7 @@ void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize)
 {
 	Heap_FinNode f;
 	__NEW(f, Heap_FinDesc);
-	f->obj = (LONGINT)(SYSTEM_ADDRESS)obj;
+	f->obj = (LONGINT)(SYSTEM_ADRINT)obj;
 	f->finalize = finalize;
 	f->marked = 1;
 	f->next = Heap_fin;
diff --git a/bootstrap/windows-48/Heap.h b/bootstrap/windows-48/Heap.h
index a2cab30c..d05f688c 100644
--- a/bootstrap/windows-48/Heap.h
+++ b/bootstrap/windows-48/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tskSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tskSfF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/windows-48/Modules.c b/bootstrap/windows-48/Modules.c
index 330b7506..d76a50a2 100644
--- a/bootstrap/windows-48/Modules.c
+++ b/bootstrap/windows-48/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Console.h"
 #include "Heap.h"
diff --git a/bootstrap/windows-48/Modules.h b/bootstrap/windows-48/Modules.h
index ac8ac89e..78c8d49e 100644
--- a/bootstrap/windows-48/Modules.h
+++ b/bootstrap/windows-48/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/windows-48/OPB.c b/bootstrap/windows-48/OPB.c
index 0f614e6a..60b37750 100644
--- a/bootstrap/windows-48/OPB.c
+++ b/bootstrap/windows-48/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPM.h"
 #include "OPS.h"
diff --git a/bootstrap/windows-48/OPB.h b/bootstrap/windows-48/OPB.h
index d1c88266..e7a96131 100644
--- a/bootstrap/windows-48/OPB.h
+++ b/bootstrap/windows-48/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/windows-48/OPC.c b/bootstrap/windows-48/OPC.c
index 3abccc9a..fce9997f 100644
--- a/bootstrap/windows-48/OPC.c
+++ b/bootstrap/windows-48/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "OPM.h"
@@ -211,7 +211,7 @@ void OPC_Ident (OPT_Object obj)
 				OPM_WriteStringVar((void*)OPM_modName, ((LONGINT)(32)));
 			}
 			OPM_Write('_');
-		} else if (obj == OPT_sysptrtyp->strobj || obj == OPT_bytetyp->strobj) {
+		} else if ((obj == OPT_sysptrtyp->strobj || obj == OPT_ainttyp->strobj) || obj == OPT_bytetyp->strobj) {
 			OPM_WriteString((CHAR*)"SYSTEM_", (LONGINT)8);
 		}
 		OPM_WriteStringVar((void*)obj->name, ((LONGINT)(256)));
diff --git a/bootstrap/windows-48/OPC.h b/bootstrap/windows-48/OPC.h
index b7d34a07..7aea7283 100644
--- a/bootstrap/windows-48/OPC.h
+++ b/bootstrap/windows-48/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/windows-48/OPM.c b/bootstrap/windows-48/OPM.c
index bf683e41..88c3bd4d 100644
--- a/bootstrap/windows-48/OPM.c
+++ b/bootstrap/windows-48/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Console.h"
@@ -544,15 +544,15 @@ void OPM_FPrintReal (LONGINT *fp, REAL real)
 {
 	INTEGER i;
 	LONGINT l;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&real, l, LONGINT);
+	__GET((LONGINT)(SYSTEM_ADRINT)&real, l, LONGINT);
 	OPM_FPrint(&*fp, l);
 }
 
 void OPM_FPrintLReal (LONGINT *fp, LONGREAL lr)
 {
 	LONGINT l, h;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&lr, l, LONGINT);
-	__GET((LONGINT)(SYSTEM_ADDRESS)&lr + 4, h, LONGINT);
+	__GET((LONGINT)(SYSTEM_ADRINT)&lr, l, LONGINT);
+	__GET((LONGINT)(SYSTEM_ADRINT)&lr + 4, h, LONGINT);
 	OPM_FPrint(&*fp, l);
 	OPM_FPrint(&*fp, h);
 }
diff --git a/bootstrap/windows-48/OPM.h b/bootstrap/windows-48/OPM.h
index ed914bff..3c2be746 100644
--- a/bootstrap/windows-48/OPM.h
+++ b/bootstrap/windows-48/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/windows-48/OPP.c b/bootstrap/windows-48/OPP.c
index 01d2144d..a0c19958 100644
--- a/bootstrap/windows-48/OPP.c
+++ b/bootstrap/windows-48/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPB.h"
 #include "OPM.h"
diff --git a/bootstrap/windows-48/OPP.h b/bootstrap/windows-48/OPP.h
index bf56b7d7..6c24817c 100644
--- a/bootstrap/windows-48/OPP.h
+++ b/bootstrap/windows-48/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/windows-48/OPS.c b/bootstrap/windows-48/OPS.c
index cacf9256..85c8b275 100644
--- a/bootstrap/windows-48/OPS.c
+++ b/bootstrap/windows-48/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 #include "SYSTEM.h"
 #include "OPM.h"
 
diff --git a/bootstrap/windows-48/OPS.h b/bootstrap/windows-48/OPS.h
index e901bcfc..313c0ac7 100644
--- a/bootstrap/windows-48/OPS.h
+++ b/bootstrap/windows-48/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/windows-48/OPT.c b/bootstrap/windows-48/OPT.c
index b32d0ebd..4b76312b 100644
--- a/bootstrap/windows-48/OPT.c
+++ b/bootstrap/windows-48/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPM.h"
 #include "OPS.h"
@@ -83,7 +83,7 @@ typedef
 
 export void (*OPT_typSize)(OPT_Struct);
 export OPT_Object OPT_topScope;
-export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
+export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_ainttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
 export SHORTINT OPT_nofGmod;
 export OPT_Object OPT_GlbMod[64];
 export OPS_Name OPT_SelfName;
@@ -1718,6 +1718,7 @@ static void EnumPtrs(void (*P)(void*))
 	P(OPT_sinttyp);
 	P(OPT_inttyp);
 	P(OPT_linttyp);
+	P(OPT_ainttyp);
 	P(OPT_realtyp);
 	P(OPT_lrltyp);
 	P(OPT_settyp);
@@ -1794,6 +1795,7 @@ export void *OPT__init(void)
 	OPT_undftyp->BaseTyp = OPT_undftyp;
 	OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp);
 	OPT_EnterTyp((CHAR*)"PTR", 13, OPM_PointerSize, &OPT_sysptrtyp);
+	OPT_EnterTyp((CHAR*)"ADRINT", 5, OPM_LIntSize, &OPT_ainttyp);
 	OPT_EnterProc((CHAR*)"ADR", 20);
 	OPT_EnterProc((CHAR*)"CC", 21);
 	OPT_EnterProc((CHAR*)"LSH", 22);
diff --git a/bootstrap/windows-48/OPT.h b/bootstrap/windows-48/OPT.h
index 41b3e7ec..7187f687 100644
--- a/bootstrap/windows-48/OPT.h
+++ b/bootstrap/windows-48/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPT__h
 #define OPT__h
@@ -67,7 +67,7 @@ typedef
 
 import void (*OPT_typSize)(OPT_Struct);
 import OPT_Object OPT_topScope;
-import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
+import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_ainttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
 import SHORTINT OPT_nofGmod;
 import OPT_Object OPT_GlbMod[64];
 import OPS_Name OPT_SelfName;
diff --git a/bootstrap/windows-48/OPV.c b/bootstrap/windows-48/OPV.c
index cf646f5e..8b98e5f9 100644
--- a/bootstrap/windows-48/OPV.c
+++ b/bootstrap/windows-48/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "OPC.h"
 #include "OPM.h"
@@ -284,6 +284,7 @@ void OPV_AdrAndSize (OPT_Object topScope)
 	OPT_realtyp->strobj->linkadr = 2;
 	OPT_inttyp->strobj->linkadr = 2;
 	OPT_linttyp->strobj->linkadr = 2;
+	OPT_ainttyp->strobj->linkadr = 2;
 	OPT_lrltyp->strobj->linkadr = 2;
 	OPT_sinttyp->strobj->linkadr = 2;
 	OPT_booltyp->strobj->linkadr = 2;
@@ -931,7 +932,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec)
 					OPM_Write(')');
 					break;
 				case 24: 
-					OPM_WriteString((CHAR*)"(LONGINT)(SYSTEM_ADDRESS)", (LONGINT)26);
+					OPM_WriteString((CHAR*)"(LONGINT)(SYSTEM_ADRINT)", (LONGINT)25);
 					if (l->class == 1) {
 						OPC_CompleteIdent(l->obj);
 					} else {
@@ -947,7 +948,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec)
 						OPC_Ident(n->typ->strobj);
 						OPM_Write(')');
 						if (__IN(n->typ->form, 0x6000) || __IN(l->typ->form, 0x6000)) {
-							OPM_WriteString((CHAR*)"(SYSTEM_ADDRESS)", (LONGINT)17);
+							OPM_WriteString((CHAR*)"(SYSTEM_ADRINT)", (LONGINT)16);
 						}
 						OPV_expr(l, exprPrec);
 					} else {
diff --git a/bootstrap/windows-48/OPV.h b/bootstrap/windows-48/OPV.h
index 04828b2f..122fda4a 100644
--- a/bootstrap/windows-48/OPV.h
+++ b/bootstrap/windows-48/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/windows-48/Platform.c b/bootstrap/windows-48/Platform.c
index 4e8b44c8..6204567c 100644
--- a/bootstrap/windows-48/Platform.c
+++ b/bootstrap/windows-48/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 typedef
@@ -111,9 +111,9 @@ export BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT
 extern void Heap_InitHeap();
 #define Platform_GetTickCount()	(LONGINT)(SYSTEM_CARD32)GetTickCount()
 #define Platform_HeapInitHeap()	Heap_InitHeap()
-#define Platform_SetInterruptHandler(h)	SystemSetInterruptHandler((SYSTEM_ADDRESS)h)
-#define Platform_SetQuitHandler(h)	SystemSetQuitHandler((SYSTEM_ADDRESS)h)
-#define Platform_allocate(size)	(LONGINT)(SYSTEM_ADDRESS)((void*)HeapAlloc(GetProcessHeap(), 0, (size_t)size))
+#define Platform_SetInterruptHandler(h)	SystemSetInterruptHandler((SYSTEM_ADRINT)h)
+#define Platform_SetQuitHandler(h)	SystemSetQuitHandler((SYSTEM_ADRINT)h)
+#define Platform_allocate(size)	(LONGINT)(SYSTEM_ADRINT)((void*)HeapAlloc(GetProcessHeap(), 0, (size_t)size))
 #define Platform_bhfiIndexHigh()	(LONGINT)bhfi.nFileIndexHigh
 #define Platform_bhfiIndexLow()	(LONGINT)bhfi.nFileIndexLow
 #define Platform_bhfiMtimeHigh()	(LONGINT)bhfi.ftLastWriteTime.dwHighDateTime
@@ -121,44 +121,44 @@ extern void Heap_InitHeap();
 #define Platform_bhfiVsn()	(LONGINT)bhfi.dwVolumeSerialNumber
 #define Platform_byHandleFileInformation()	BY_HANDLE_FILE_INFORMATION bhfi
 #define Platform_cleanupProcess()	CloseHandle(pi.hProcess); CloseHandle(pi.hThread);
-#define Platform_closeHandle(h)	(INTEGER)CloseHandle((HANDLE)(SYSTEM_ADDRESS)h)
+#define Platform_closeHandle(h)	(INTEGER)CloseHandle((HANDLE)(SYSTEM_ADRINT)h)
 #define Platform_createProcess(str, str__len)	(INTEGER)CreateProcess(0, (char*)str, 0,0,0,0,0,0,&si,&pi)
 #define Platform_deleteFile(n, n__len)	(INTEGER)DeleteFile((char*)n)
 #define Platform_err()	(INTEGER)GetLastError()
-#define Platform_errc(c)	WriteFile((HANDLE)(SYSTEM_ADDRESS)Platform_StdOut, &c, 1, 0,0)
-#define Platform_errstring(s, s__len)	WriteFile((HANDLE)(SYSTEM_ADDRESS)Platform_StdOut, s, s__len-1, 0,0)
+#define Platform_errc(c)	WriteFile((HANDLE)(SYSTEM_ADRINT)Platform_StdOut, &c, 1, 0,0)
+#define Platform_errstring(s, s__len)	WriteFile((HANDLE)(SYSTEM_ADRINT)Platform_StdOut, s, s__len-1, 0,0)
 #define Platform_exit(code)	ExitProcess((UINT)code)
 #define Platform_fileTimeToSysTime()	SYSTEMTIME st; FileTimeToSystemTime(&ft, &st)
-#define Platform_flushFileBuffers(h)	(INTEGER)FlushFileBuffers((HANDLE)(SYSTEM_ADDRESS)h)
-#define Platform_free(address)	HeapFree(GetProcessHeap(), 0, (void*)(SYSTEM_ADDRESS)address)
+#define Platform_flushFileBuffers(h)	(INTEGER)FlushFileBuffers((HANDLE)(SYSTEM_ADRINT)h)
+#define Platform_free(address)	HeapFree(GetProcessHeap(), 0, (void*)(SYSTEM_ADRINT)address)
 #define Platform_ftToUli()	ULARGE_INTEGER ul; ul.LowPart=ft.dwLowDateTime; ul.HighPart=ft.dwHighDateTime
 #define Platform_getCurrentDirectory(n, n__len)	GetCurrentDirectory(n__len, (char*)n)
 #define Platform_getExitCodeProcess(exitcode)	GetExitCodeProcess(pi.hProcess, (DWORD*)exitcode);
-#define Platform_getFileInformationByHandle(h)	(INTEGER)GetFileInformationByHandle((HANDLE)(SYSTEM_ADDRESS)h, &bhfi)
-#define Platform_getFilePos(h, r, rc)	LARGE_INTEGER liz = {0}; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADDRESS)h, liz, &li, FILE_CURRENT); *r = (LONGINT)li.QuadPart
-#define Platform_getFileSize(h)	(INTEGER)GetFileSizeEx((HANDLE)(SYSTEM_ADDRESS)h, &li)
+#define Platform_getFileInformationByHandle(h)	(INTEGER)GetFileInformationByHandle((HANDLE)(SYSTEM_ADRINT)h, &bhfi)
+#define Platform_getFilePos(h, r, rc)	LARGE_INTEGER liz = {0}; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADRINT)h, liz, &li, FILE_CURRENT); *r = (LONGINT)li.QuadPart
+#define Platform_getFileSize(h)	(INTEGER)GetFileSizeEx((HANDLE)(SYSTEM_ADRINT)h, &li)
 #define Platform_getLocalTime()	SYSTEMTIME st; GetLocalTime(&st)
 #define Platform_getenv(name, name__len, buf, buf__len)	(INTEGER)GetEnvironmentVariable((char*)name, (char*)buf, buf__len)
 #define Platform_getpid()	(INTEGER)GetCurrentProcessId()
-#define Platform_getstderrhandle()	(SYSTEM_ADDRESS)GetStdHandle(STD_ERROR_HANDLE)
-#define Platform_getstdinhandle()	(SYSTEM_ADDRESS)GetStdHandle(STD_INPUT_HANDLE)
-#define Platform_getstdouthandle()	(SYSTEM_ADDRESS)GetStdHandle(STD_OUTPUT_HANDLE)
+#define Platform_getstderrhandle()	(SYSTEM_ADRINT)GetStdHandle(STD_ERROR_HANDLE)
+#define Platform_getstdinhandle()	(SYSTEM_ADRINT)GetStdHandle(STD_INPUT_HANDLE)
+#define Platform_getstdouthandle()	(SYSTEM_ADRINT)GetStdHandle(STD_OUTPUT_HANDLE)
 #define Platform_identityToFileTime(i)	FILETIME ft; ft.dwHighDateTime = i.mtimehigh; ft.dwLowDateTime = i.mtimelow
-#define Platform_invalidHandleValue()	((LONGINT)(SYSTEM_ADDRESS)INVALID_HANDLE_VALUE)
+#define Platform_invalidHandleValue()	((LONGINT)(SYSTEM_ADRINT)INVALID_HANDLE_VALUE)
 #define Platform_largeInteger()	LARGE_INTEGER li
 #define Platform_liLongint()	(LONGINT)li.QuadPart
 #define Platform_moveFile(o, o__len, n, n__len)	(INTEGER)MoveFileEx((char*)o, (char*)n, MOVEFILE_REPLACE_EXISTING)
-#define Platform_opennew(n, n__len)	(LONGINT)(SYSTEM_ADDRESS)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0)
-#define Platform_openro(n, n__len)	(LONGINT)(SYSTEM_ADDRESS)CreateFile((char*)n, GENERIC_READ              , FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)
-#define Platform_openrw(n, n__len)	(LONGINT)(SYSTEM_ADDRESS)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)
+#define Platform_opennew(n, n__len)	(LONGINT)(SYSTEM_ADRINT)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0)
+#define Platform_openro(n, n__len)	(LONGINT)(SYSTEM_ADRINT)CreateFile((char*)n, GENERIC_READ              , FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)
+#define Platform_openrw(n, n__len)	(LONGINT)(SYSTEM_ADRINT)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)
 #define Platform_processInfo()	PROCESS_INFORMATION pi = {0};
-#define Platform_readfile(fd, p, l, n)	(INTEGER)ReadFile ((HANDLE)(SYSTEM_ADDRESS)fd, (void*)(SYSTEM_ADDRESS)(p), (DWORD)l, (DWORD*)n, 0)
+#define Platform_readfile(fd, p, l, n)	(INTEGER)ReadFile ((HANDLE)(SYSTEM_ADRINT)fd, (void*)(SYSTEM_ADRINT)(p), (DWORD)l, (DWORD*)n, 0)
 #define Platform_seekcur()	FILE_CURRENT
 #define Platform_seekend()	FILE_END
 #define Platform_seekset()	FILE_BEGIN
 #define Platform_setCurrentDirectory(n, n__len)	(INTEGER)SetCurrentDirectory((char*)n)
-#define Platform_setEndOfFile(h)	(INTEGER)SetEndOfFile((HANDLE)(SYSTEM_ADDRESS)h)
-#define Platform_setFilePointerEx(h, o, r, rc)	li.QuadPart=o; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADDRESS)h, li, 0, (DWORD)r)
+#define Platform_setEndOfFile(h)	(INTEGER)SetEndOfFile((HANDLE)(SYSTEM_ADRINT)h)
+#define Platform_setFilePointerEx(h, o, r, rc)	li.QuadPart=o; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADRINT)h, li, 0, (DWORD)r)
 #define Platform_sleep(ms)	Sleep((DWORD)ms)
 #define Platform_stToFt()	FILETIME ft; SystemTimeToFileTime(&st, &ft)
 #define Platform_startupInfo()	STARTUPINFO si = {0}; si.cb = sizeof(si);
@@ -173,7 +173,7 @@ extern void Heap_InitHeap();
 #define Platform_ulSec()	(LONGINT)(ul.QuadPart / 1000000LL)
 #define Platform_uluSec()	(LONGINT)(ul.QuadPart % 1000000LL)
 #define Platform_waitForProcess()	(INTEGER)WaitForSingleObject(pi.hProcess, INFINITE)
-#define Platform_writefile(fd, p, l)	(INTEGER)WriteFile((HANDLE)(SYSTEM_ADDRESS)fd, (void*)(SYSTEM_ADDRESS)(p), (DWORD)l, 0,0)
+#define Platform_writefile(fd, p, l)	(INTEGER)WriteFile((HANDLE)(SYSTEM_ADRINT)fd, (void*)(SYSTEM_ADRINT)(p), (DWORD)l, 0,0)
 
 BOOLEAN Platform_TooManyFiles (INTEGER e)
 {
@@ -241,7 +241,7 @@ void Platform_Init (INTEGER argc, LONGINT argvadr)
 	Platform_ArgVecPtr av = NIL;
 	Platform_MainStackFrame = argvadr;
 	Platform_ArgCount = argc;
-	av = (Platform_ArgVecPtr)(SYSTEM_ADDRESS)argvadr;
+	av = (Platform_ArgVecPtr)(SYSTEM_ADRINT)argvadr;
 	Platform_ArgVector = (*av)[0];
 	Platform_HaltCode = -128;
 	Platform_HeapInitHeap();
@@ -280,7 +280,7 @@ void Platform_GetArg (INTEGER n, CHAR *val, LONGINT val__len)
 {
 	Platform_ArgVec av = NIL;
 	if (n < Platform_ArgCount) {
-		av = (Platform_ArgVec)(SYSTEM_ADDRESS)Platform_ArgVector;
+		av = (Platform_ArgVec)(SYSTEM_ADRINT)Platform_ArgVector;
 		__COPY(*(*av)[__X(n, ((LONGINT)(1024)))], val, val__len);
 	}
 }
@@ -559,7 +559,7 @@ INTEGER Platform_ReadBuf (LONGINT h, SYSTEM_BYTE *b, LONGINT b__len, LONGINT *n)
 	INTEGER _o_result;
 	INTEGER result;
 	*n = 0;
-	result = Platform_readfile(h, (LONGINT)(SYSTEM_ADDRESS)b, b__len, &*n);
+	result = Platform_readfile(h, (LONGINT)(SYSTEM_ADRINT)b, b__len, &*n);
 	if (result == 0) {
 		*n = 0;
 		_o_result = Platform_err();
@@ -795,7 +795,7 @@ static void Platform_TestLittleEndian (void)
 {
 	INTEGER i;
 	i = 1;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&i, Platform_LittleEndian, BOOLEAN);
+	__GET((LONGINT)(SYSTEM_ADRINT)&i, Platform_LittleEndian, BOOLEAN);
 }
 
 __TDESC(Platform_FileIdentity, 1, 0) = {__TDFLDS("FileIdentity", 20), {-4}};
diff --git a/bootstrap/windows-48/Platform.h b/bootstrap/windows-48/Platform.h
index 673b2b0b..b4e3ecf5 100644
--- a/bootstrap/windows-48/Platform.h
+++ b/bootstrap/windows-48/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Platform__h
 #define Platform__h
@@ -78,7 +78,7 @@ import INTEGER Platform_Write (LONGINT h, LONGINT p, LONGINT l);
 import BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
 import void *Platform__init(void);
 
-#define Platform_SetInterruptHandler(h)	SystemSetInterruptHandler((SYSTEM_ADDRESS)h)
-#define Platform_SetQuitHandler(h)	SystemSetQuitHandler((SYSTEM_ADDRESS)h)
+#define Platform_SetInterruptHandler(h)	SystemSetInterruptHandler((SYSTEM_ADRINT)h)
+#define Platform_SetQuitHandler(h)	SystemSetQuitHandler((SYSTEM_ADRINT)h)
 
 #endif
diff --git a/bootstrap/windows-48/Reals.c b/bootstrap/windows-48/Reals.c
index 2323e34d..11c99924 100644
--- a/bootstrap/windows-48/Reals.c
+++ b/bootstrap/windows-48/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 
@@ -58,7 +58,7 @@ INTEGER Reals_Expo (REAL x)
 {
 	INTEGER _o_result;
 	INTEGER i;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&x + 2, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&x + 2, i, INTEGER);
 	_o_result = __MASK(__ASHR(i, 7), -256);
 	return _o_result;
 }
@@ -66,17 +66,17 @@ INTEGER Reals_Expo (REAL x)
 void Reals_SetExpo (REAL *x, INTEGER ex)
 {
 	CHAR c;
-	__GET((LONGINT)(SYSTEM_ADDRESS)x + 3, c, CHAR);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)x + 3, (CHAR)(__ASHL(__ASHR((int)c, 7), 7) + __MASK(__ASHR(ex, 1), -128)), CHAR);
-	__GET((LONGINT)(SYSTEM_ADDRESS)x + 2, c, CHAR);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)x + 2, (CHAR)(__MASK((int)c, -128) + __ASHL(__MASK(ex, -2), 7)), CHAR);
+	__GET((LONGINT)(SYSTEM_ADRINT)x + 3, c, CHAR);
+	__PUT((LONGINT)(SYSTEM_ADRINT)x + 3, (CHAR)(__ASHL(__ASHR((int)c, 7), 7) + __MASK(__ASHR(ex, 1), -128)), CHAR);
+	__GET((LONGINT)(SYSTEM_ADRINT)x + 2, c, CHAR);
+	__PUT((LONGINT)(SYSTEM_ADRINT)x + 2, (CHAR)(__MASK((int)c, -128) + __ASHL(__MASK(ex, -2), 7)), CHAR);
 }
 
 INTEGER Reals_ExpoL (LONGREAL x)
 {
 	INTEGER _o_result;
 	INTEGER i;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&x + 6, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&x + 6, i, INTEGER);
 	_o_result = __MASK(__ASHR(i, 4), -2048);
 	return _o_result;
 }
diff --git a/bootstrap/windows-48/Reals.h b/bootstrap/windows-48/Reals.h
index 7e6b534c..b0497a9c 100644
--- a/bootstrap/windows-48/Reals.h
+++ b/bootstrap/windows-48/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/windows-48/SYSTEM.c b/bootstrap/windows-48/SYSTEM.c
index 33511a70..1077d3ce 100644
--- a/bootstrap/windows-48/SYSTEM.c
+++ b/bootstrap/windows-48/SYSTEM.c
@@ -35,7 +35,7 @@ void SYSTEM_INHERIT(LONGINT *t, LONGINT *t0)
 void SYSTEM_ENUMP(void *adr, LONGINT n, void (*P)())
 {
     while (n > 0) {
-        P((LONGINT)(SYSTEM_ADDRESS)(*((void**)(adr))));
+        P((LONGINT)(SYSTEM_ADRINT)(*((void**)(adr))));
         adr = ((void**)adr) + 1;
         n--;
     }
@@ -106,7 +106,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
     else if (typ == (LONGINT*)POINTER__typ) {
         /* element type is a pointer */
         x = Heap_NEWBLK(size + nofelems * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[-1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[-1];
         p[-nofelems] = *p;  /* build new type desc in situ: 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nofelems - 1; n = 1;   /* n =1 for skipping the size field */
         while (n <= nofelems) {*p = n*sizeof(LONGINT); p++; n++;}
@@ -119,7 +119,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
         while (ptab[nofptrs] >= 0) {nofptrs++;} /* number of pointers per element */
         nptr = nofelems * nofptrs;  /* total number of pointers */
         x = Heap_NEWBLK(size + nptr * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[- 1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[- 1];
         p[-nptr] = *p;  /* build new type desc in situ; 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nptr - 1; n = 0; off = dataoff;
         while (n < nofelems) {i = 0;
@@ -155,7 +155,7 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         // (Ignore other signals)
     }
 
-    void SystemSetHandler(int s, SYSTEM_ADDRESS h) {
+    void SystemSetHandler(int s, SYSTEM_ADRINT h) {
         if (s >= 2 && s <= 4) {
             int needtosetsystemhandler = handler[s-2] == 0;
             handler[s-2] = (SystemSignalHandler)h;
@@ -194,12 +194,12 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         }
     }
 
-    void SystemSetInterruptHandler(SYSTEM_ADDRESS h) {
+    void SystemSetInterruptHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemInterruptHandler = (SystemSignalHandler)h;
     }
 
-    void SystemSetQuitHandler(SYSTEM_ADDRESS h) {
+    void SystemSetQuitHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemQuitHandler = (SystemSignalHandler)h;
     }
diff --git a/bootstrap/windows-48/SYSTEM.h b/bootstrap/windows-48/SYSTEM.h
index 6377745e..35620b9b 100644
--- a/bootstrap/windows-48/SYSTEM.h
+++ b/bootstrap/windows-48/SYSTEM.h
@@ -26,11 +26,12 @@ typedef unsigned char        SYSTEM_CARD8;
   typedef unsigned int         size_t;
 #endif
 
-#define SYSTEM_ADDRESS size_t
+#define SYSTEM_ADRINT size_t
+#define SYSTEM_ADDRESS size_t   // Temporarily for bootstrap
 #define _SIZE_T_DECLARED // For FreeBSD
 #define _SIZE_T_DEFINED_ // For OpenBSD
 
-void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);
+void *memcpy(void *dest, const void *source, SYSTEM_ADRINT size);
 
 
 
@@ -107,10 +108,10 @@ extern LONGINT SYSTEM_ENTIER (double x);
 // Signal handling in SYSTEM.c
 
 #ifndef _WIN32
-  extern void SystemSetHandler(int s, SYSTEM_ADDRESS h);
+  extern void SystemSetHandler(int s, SYSTEM_ADRINT h);
 #else
-  extern void SystemSetInterruptHandler(SYSTEM_ADDRESS h);
-  extern void SystemSetQuitHandler     (SYSTEM_ADDRESS h);
+  extern void SystemSetInterruptHandler(SYSTEM_ADRINT h);
+  extern void SystemSetQuitHandler     (SYSTEM_ADRINT h);
 #endif
 
 
@@ -133,9 +134,9 @@ static int __str_cmp(CHAR *x, CHAR *y){
 
 #define __COPY(s, d, n) {char*_a=(void*)s,*_b=(void*)d; LONGINT _i=0,_t=n-1; \
                          while(_i<_t&&((_b[_i]=_a[_i])!=0)){_i++;};_b[_i]=0;}
-#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADDRESS)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
+#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADRINT)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
 #define __DUPARR(v, t)  v=(void*)memcpy(v##__copy,v,sizeof(t))
-#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADDRESS)x)
+#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADRINT)x)
 
 
 
@@ -145,8 +146,8 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __VAL(t, x)     (*(t*)&(x))
 
 
-#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADDRESS)(a)
-#define __PUT(a, x, t)  *(t*)(SYSTEM_ADDRESS)(a)=x
+#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADRINT)(a)
+#define __PUT(a, x, t)  *(t*)(SYSTEM_ADRINT)(a)=x
 
 #define __LSHL(x, n, t) ((t)((U_##t)(x)<<(n)))
 #define __LSHR(x, n, t) ((t)((U_##t)(x)>>(n)))
@@ -161,7 +162,7 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __ROT(x, n, t)  ((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
 
 #define __BIT(x, n)     (*(U_LONGINT*)(x)>>(n)&1)
-#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADDRESS)(d),(char*)(SYSTEM_ADDRESS)(s),n)
+#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADRINT)(d),(char*)(SYSTEM_ADRINT)(s),n)
 #define __ASHF(x, n)    SYSTEM_ASH((LONGINT)(x), (LONGINT)(n))
 #define __SHORT(x, y)   ((int)((U_LONGINT)(x)+(y)<(y)+(y)?(x):(__HALT(-8),0)))
 #define __SHORTF(x, y)  ((int)(__RF((x)+(y),(y)+(y))-(y)))
@@ -222,7 +223,7 @@ extern void       Heap_INCREF();
 extern void Platform_Init(INTEGER argc, LONGINT argv);
 extern void Heap_FINALL();
 
-#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADDRESS)&argv);
+#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADRINT)&argv);
 #define __REGMAIN(name, enum) m = Heap_REGMOD((CHAR*)name,enum)
 #define __FINI                Heap_FINALL(); return 0
 
@@ -243,7 +244,7 @@ extern SYSTEM_PTR Heap_NEWREC (LONGINT tag);
 extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 
 #define __SYSNEW(p, len) p = Heap_NEWBLK((LONGINT)(len))
-#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)t##__typ)
+#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)t##__typ)
 #define __NEWARR         SYSTEM_NEWARR
 
 
@@ -274,20 +275,20 @@ extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 #define __INITYP(t, t0, level) \
   t##__typ               = (LONGINT*)&t##__desc.blksz;                                                    \
   memcpy(t##__desc.basep, t0##__typ - __BASEOFF, level*sizeof(LONGINT));                                  \
-  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADDRESS)t##__typ;                                                  \
-  t##__desc.module       = (LONGINT)(SYSTEM_ADDRESS)m;                                                         \
+  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADRINT)t##__typ;                                                  \
+  t##__desc.module       = (LONGINT)(SYSTEM_ADRINT)m;                                                         \
   if(t##__desc.blksz!=sizeof(struct t)) __HALT(-15);                                                      \
   t##__desc.blksz        = (t##__desc.blksz+5*sizeof(LONGINT)-1)/(4*sizeof(LONGINT))*(4*sizeof(LONGINT)); \
-  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADDRESS)&t##__desc.next);                                                    \
+  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADRINT)&t##__desc.next);                                                    \
   SYSTEM_INHERIT(t##__typ, t0##__typ)
 
-#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADDRESS)typ##__typ)
-#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADDRESS)(*(((LONGINT*)(p))-1)))
+#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADRINT)typ##__typ)
+#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADRINT)(*(((LONGINT*)(p))-1)))
 #define __ISP(p, typ, level)  __IS(__TYPEOF(p),typ,level)
 
 // Oberon-2 type bound procedures support
-#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADDRESS)proc
-#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADDRESS)*(typ-(__TPROC0OFF+num))))parlist
+#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADRINT)proc
+#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADRINT)*(typ-(__TPROC0OFF+num))))parlist
 
 
 
diff --git a/bootstrap/windows-48/Strings.c b/bootstrap/windows-48/Strings.c
index 115456ea..15aeff29 100644
--- a/bootstrap/windows-48/Strings.c
+++ b/bootstrap/windows-48/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 
diff --git a/bootstrap/windows-48/Strings.h b/bootstrap/windows-48/Strings.h
index 96dbb01d..385096bc 100644
--- a/bootstrap/windows-48/Strings.h
+++ b/bootstrap/windows-48/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/windows-48/Texts.c b/bootstrap/windows-48/Texts.c
index cfe34ca7..f7a3fdd3 100644
--- a/bootstrap/windows-48/Texts.c
+++ b/bootstrap/windows-48/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Files.h"
 #include "Modules.h"
diff --git a/bootstrap/windows-48/Texts.h b/bootstrap/windows-48/Texts.h
index 632b644a..d178499a 100644
--- a/bootstrap/windows-48/Texts.h
+++ b/bootstrap/windows-48/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/windows-48/Vishap.c b/bootstrap/windows-48/Vishap.c
index 4c9e3b45..0feff79c 100644
--- a/bootstrap/windows-48/Vishap.c
+++ b/bootstrap/windows-48/Vishap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkamSf */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkamSf */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Heap.h"
@@ -81,6 +81,7 @@ static void Vishap_PropagateElementaryTypeSizes (void)
 	OPT_realtyp->size = OPM_RealSize;
 	OPT_inttyp->size = OPM_IntSize;
 	OPT_linttyp->size = OPM_LIntSize;
+	OPT_ainttyp->size = OPM_LIntSize;
 	OPT_lrltyp->size = OPM_LRealSize;
 	OPT_sinttyp->size = OPM_SIntSize;
 	OPT_booltyp->size = OPM_BoolSize;
diff --git a/bootstrap/windows-48/errors.c b/bootstrap/windows-48/errors.c
index 68e433df..59b8db27 100644
--- a/bootstrap/windows-48/errors.c
+++ b/bootstrap/windows-48/errors.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 
 typedef
diff --git a/bootstrap/windows-48/errors.h b/bootstrap/windows-48/errors.h
index 41d399ad..6ae0cd7a 100644
--- a/bootstrap/windows-48/errors.h
+++ b/bootstrap/windows-48/errors.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef errors__h
 #define errors__h
diff --git a/bootstrap/windows-48/extTools.c b/bootstrap/windows-48/extTools.c
index 4efd107a..2ef65e7b 100644
--- a/bootstrap/windows-48/extTools.c
+++ b/bootstrap/windows-48/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Configuration.h"
 #include "Console.h"
diff --git a/bootstrap/windows-48/extTools.h b/bootstrap/windows-48/extTools.h
index fc4f0da1..39837586 100644
--- a/bootstrap/windows-48/extTools.h
+++ b/bootstrap/windows-48/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/windows-48/vt100.c b/bootstrap/windows-48/vt100.c
index d77b0b84..e0edabd9 100644
--- a/bootstrap/windows-48/vt100.c
+++ b/bootstrap/windows-48/vt100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #include "SYSTEM.h"
 #include "Console.h"
 #include "Strings.h"
diff --git a/bootstrap/windows-48/vt100.h b/bootstrap/windows-48/vt100.h
index 4af04d6e..413ae867 100644
--- a/bootstrap/windows-48/vt100.h
+++ b/bootstrap/windows-48/vt100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef vt100__h
 #define vt100__h
diff --git a/bootstrap/windows-88/Configuration.c b/bootstrap/windows-88/Configuration.c
index 47f1ffc7..8539a1e2 100644
--- a/bootstrap/windows-88/Configuration.c
+++ b/bootstrap/windows-88/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 
@@ -14,6 +14,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("1.95 [2016/08/23] for gcc LP64 on cygwin", Configuration_versionLong, 41);
+	__MOVE("1.95 [2016/08/26] for gcc LP64 on cygwin", Configuration_versionLong, 41);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-88/Configuration.h b/bootstrap/windows-88/Configuration.h
index ba0bbd99..b091f1f7 100644
--- a/bootstrap/windows-88/Configuration.h
+++ b/bootstrap/windows-88/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/windows-88/Console.c b/bootstrap/windows-88/Console.c
index 5a9998a9..e0344732 100644
--- a/bootstrap/windows-88/Console.c
+++ b/bootstrap/windows-88/Console.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Platform.h"
@@ -22,7 +22,7 @@ export void Console_String (CHAR *s, LONGINT s__len);
 void Console_Flush (void)
 {
 	INTEGER error;
-	error = Platform_Write(Platform_StdOut, (LONGINT)(SYSTEM_ADDRESS)Console_line, Console_pos);
+	error = Platform_Write(Platform_StdOut, (LONGINT)(SYSTEM_ADRINT)Console_line, Console_pos);
 	Console_pos = 0;
 }
 
diff --git a/bootstrap/windows-88/Console.h b/bootstrap/windows-88/Console.h
index 4606384c..a0813c94 100644
--- a/bootstrap/windows-88/Console.h
+++ b/bootstrap/windows-88/Console.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Console__h
 #define Console__h
diff --git a/bootstrap/windows-88/Files.c b/bootstrap/windows-88/Files.c
index c46ffdd2..db7f4cd9 100644
--- a/bootstrap/windows-88/Files.c
+++ b/bootstrap/windows-88/Files.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Configuration.h"
@@ -258,7 +258,7 @@ static void Files_Flush (Files_Buffer buf)
 		if (buf->org != f->pos) {
 			error = Platform_Seek(f->fd, buf->org, Platform_SeekSet);
 		}
-		error = Platform_Write(f->fd, (LONGINT)(SYSTEM_ADDRESS)buf->data, buf->size);
+		error = Platform_Write(f->fd, (LONGINT)(SYSTEM_ADRINT)buf->data, buf->size);
 		if (error != 0) {
 			Files_Err((CHAR*)"error writing file", (LONGINT)19, f, error);
 		}
@@ -657,7 +657,7 @@ void Files_ReadBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT x
 		} else {
 			min = n;
 		}
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)buf->data + offset, (LONGINT)(SYSTEM_ADDRESS)x + xpos, min);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)buf->data + offset, (LONGINT)(SYSTEM_ADRINT)x + xpos, min);
 		offset += min;
 		(*r).offset = offset;
 		xpos += min;
@@ -722,7 +722,7 @@ void Files_WriteBytes (Files_Rider *r, LONGINT *r__typ, SYSTEM_BYTE *x, LONGINT
 		} else {
 			min = n;
 		}
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)x + xpos, (LONGINT)(SYSTEM_ADDRESS)buf->data + offset, min);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)x + xpos, (LONGINT)(SYSTEM_ADRINT)buf->data + offset, min);
 		offset += min;
 		(*r).offset = offset;
 		if (offset > buf->size) {
@@ -773,15 +773,15 @@ void Files_Rename (CHAR *old, LONGINT old__len, CHAR *new, LONGINT new__len, INT
 				*res = 3;
 				return;
 			}
-			error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADDRESS)buf, ((LONGINT)(4096)), &n);
+			error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADRINT)buf, ((LONGINT)(4096)), &n);
 			while (n > 0) {
-				error = Platform_Write(fdnew, (LONGINT)(SYSTEM_ADDRESS)buf, n);
+				error = Platform_Write(fdnew, (LONGINT)(SYSTEM_ADRINT)buf, n);
 				if (error != 0) {
 					ignore = Platform_Close(fdold);
 					ignore = Platform_Close(fdnew);
 					Files_Err((CHAR*)"cannot move file", (LONGINT)17, NIL, error);
 				}
-				error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADDRESS)buf, ((LONGINT)(4096)), &n);
+				error = Platform_Read(fdold, (LONGINT)(SYSTEM_ADRINT)buf, ((LONGINT)(4096)), &n);
 			}
 			ignore = Platform_Close(fdold);
 			ignore = Platform_Close(fdnew);
@@ -839,7 +839,7 @@ static void Files_FlipBytes (SYSTEM_BYTE *src, LONGINT src__len, SYSTEM_BYTE *de
 			j += 1;
 		}
 	} else {
-		__MOVE((LONGINT)(SYSTEM_ADDRESS)src, (LONGINT)(SYSTEM_ADDRESS)dest, src__len);
+		__MOVE((LONGINT)(SYSTEM_ADRINT)src, (LONGINT)(SYSTEM_ADRINT)dest, src__len);
 	}
 }
 
@@ -1009,7 +1009,7 @@ static void Files_Finalize (SYSTEM_PTR o)
 {
 	Files_File f = NIL;
 	LONGINT res;
-	f = (Files_File)(SYSTEM_ADDRESS)o;
+	f = (Files_File)(SYSTEM_ADRINT)o;
 	if (f->fd >= 0) {
 		Files_CloseOSFile(f);
 		if (f->tempFile) {
diff --git a/bootstrap/windows-88/Files.h b/bootstrap/windows-88/Files.h
index eb946544..12178ad1 100644
--- a/bootstrap/windows-88/Files.h
+++ b/bootstrap/windows-88/Files.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/windows-88/Heap.c b/bootstrap/windows-88/Heap.c
index 9873a734..d3529141 100644
--- a/bootstrap/windows-88/Heap.c
+++ b/bootstrap/windows-88/Heap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tskSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tskSfF */
 #define LARGE
 #include "SYSTEM.h"
 
@@ -102,7 +102,7 @@ export void Heap_Unlock (void);
 extern void *Heap__init();
 extern LONGINT Platform_MainStackFrame;
 extern LONGINT Platform_OSAllocate(LONGINT size);
-#define Heap_FetchAddress(pointer)	(LONGINT)(SYSTEM_ADDRESS)(*((void**)((SYSTEM_ADDRESS)pointer)))
+#define Heap_FetchAddress(pointer)	(LONGINT)(SYSTEM_ADRINT)(*((void**)((SYSTEM_ADRINT)pointer)))
 #define Heap_HeapModuleInit()	Heap__init()
 #define Heap_OSAllocate(size)	Platform_OSAllocate(size)
 #define Heap_PlatformHalt(code)	Platform_Halt(code)
@@ -135,7 +135,7 @@ SYSTEM_PTR Heap_REGMOD (Heap_ModuleName name, Heap_EnumProc enumPtrs)
 	__COPY(name, m->name, ((LONGINT)(20)));
 	m->refcnt = 0;
 	m->enumPtrs = enumPtrs;
-	m->next = (Heap_Module)(SYSTEM_ADDRESS)Heap_modules;
+	m->next = (Heap_Module)(SYSTEM_ADRINT)Heap_modules;
 	Heap_modules = (SYSTEM_PTR)m;
 	_o_result = (void*)m;
 	return _o_result;
@@ -316,7 +316,7 @@ SYSTEM_PTR Heap_NEWREC (LONGINT tag)
 	__PUT(adr + 16, 0, LONGINT);
 	Heap_allocated += blksz;
 	Heap_Unlock();
-	_o_result = (SYSTEM_PTR)(SYSTEM_ADDRESS)(adr + 8);
+	_o_result = (SYSTEM_PTR)(SYSTEM_ADRINT)(adr + 8);
 	return _o_result;
 }
 
@@ -327,12 +327,12 @@ SYSTEM_PTR Heap_NEWBLK (LONGINT size)
 	SYSTEM_PTR new;
 	Heap_Lock();
 	blksz = __ASHL(__ASHR(size + 63, 5), 5);
-	new = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)&blksz);
-	tag = ((LONGINT)(SYSTEM_ADDRESS)new + blksz) - 24;
+	new = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)&blksz);
+	tag = ((LONGINT)(SYSTEM_ADRINT)new + blksz) - 24;
 	__PUT(tag - 8, 0, LONGINT);
 	__PUT(tag, blksz, LONGINT);
 	__PUT(tag + 8, -8, LONGINT);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)new - 8, tag, LONGINT);
+	__PUT((LONGINT)(SYSTEM_ADRINT)new - 8, tag, LONGINT);
 	Heap_Unlock();
 	_o_result = new;
 	return _o_result;
@@ -361,7 +361,7 @@ static void Heap_Mark (LONGINT q)
 					__GET(tag, offset, LONGINT);
 					fld = q + offset;
 					p = Heap_FetchAddress(fld);
-					__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADDRESS)n, SYSTEM_PTR);
+					__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADRINT)n, SYSTEM_PTR);
 				} else {
 					fld = q + offset;
 					n = Heap_FetchAddress(fld);
@@ -370,7 +370,7 @@ static void Heap_Mark (LONGINT q)
 						if (!__ODD(tagbits)) {
 							__PUT(n - 8, tagbits + 1, LONGINT);
 							__PUT(q - 8, tag + 1, LONGINT);
-							__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADDRESS)p, SYSTEM_PTR);
+							__PUT(fld, (SYSTEM_PTR)(SYSTEM_ADRINT)p, SYSTEM_PTR);
 							p = q;
 							q = n;
 							tag = tagbits;
@@ -385,7 +385,7 @@ static void Heap_Mark (LONGINT q)
 
 static void Heap_MarkP (SYSTEM_PTR p)
 {
-	Heap_Mark((LONGINT)(SYSTEM_ADDRESS)p);
+	Heap_Mark((LONGINT)(SYSTEM_ADRINT)p);
 }
 
 static void Heap_Scan (void)
@@ -554,7 +554,7 @@ static void Heap_Finalize (void)
 			} else {
 				prev->next = n->next;
 			}
-			(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADDRESS)n->obj);
+			(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADRINT)n->obj);
 			if (prev == NIL) {
 				n = Heap_fin;
 			} else {
@@ -573,7 +573,7 @@ void Heap_FINALL (void)
 	while (Heap_fin != NIL) {
 		n = Heap_fin;
 		Heap_fin = Heap_fin->next;
-		(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADDRESS)n->obj);
+		(*n->finalize)((SYSTEM_PTR)(SYSTEM_ADRINT)n->obj);
 	}
 }
 
@@ -590,9 +590,9 @@ static void Heap_MarkStack (LONGINT n, LONGINT *cand, LONGINT cand__len)
 	}
 	if (n == 0) {
 		nofcand = 0;
-		sp = (LONGINT)(SYSTEM_ADDRESS)&frame;
+		sp = (LONGINT)(SYSTEM_ADRINT)&frame;
 		stack0 = Heap_PlatformMainStackFrame();
-		inc = (LONGINT)(SYSTEM_ADDRESS)&align.p - (LONGINT)(SYSTEM_ADDRESS)&align;
+		inc = (LONGINT)(SYSTEM_ADRINT)&align.p - (LONGINT)(SYSTEM_ADRINT)&align;
 		if (sp > stack0) {
 			inc = -inc;
 		}
@@ -623,7 +623,7 @@ void Heap_GC (BOOLEAN markStack)
 	LONGINT cand[10000];
 	if (Heap_lockdepth == 0 || (Heap_lockdepth == 1 && !markStack)) {
 		Heap_Lock();
-		m = (Heap_Module)(SYSTEM_ADDRESS)Heap_modules;
+		m = (Heap_Module)(SYSTEM_ADRINT)Heap_modules;
 		while (m != NIL) {
 			if (m->enumPtrs != NIL) {
 				(*m->enumPtrs)(Heap_MarkP);
@@ -700,7 +700,7 @@ void Heap_RegisterFinalizer (SYSTEM_PTR obj, Heap_Finalizer finalize)
 {
 	Heap_FinNode f;
 	__NEW(f, Heap_FinDesc);
-	f->obj = (LONGINT)(SYSTEM_ADDRESS)obj;
+	f->obj = (LONGINT)(SYSTEM_ADRINT)obj;
 	f->finalize = finalize;
 	f->marked = 1;
 	f->next = Heap_fin;
diff --git a/bootstrap/windows-88/Heap.h b/bootstrap/windows-88/Heap.h
index b1ff5968..7827d119 100644
--- a/bootstrap/windows-88/Heap.h
+++ b/bootstrap/windows-88/Heap.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tskSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tskSfF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/windows-88/Modules.c b/bootstrap/windows-88/Modules.c
index 0c836ead..e006bde8 100644
--- a/bootstrap/windows-88/Modules.c
+++ b/bootstrap/windows-88/Modules.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Console.h"
diff --git a/bootstrap/windows-88/Modules.h b/bootstrap/windows-88/Modules.h
index 6e6ded2e..9a0517b5 100644
--- a/bootstrap/windows-88/Modules.h
+++ b/bootstrap/windows-88/Modules.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/windows-88/OPB.c b/bootstrap/windows-88/OPB.c
index f4bdb1a8..cb07c606 100644
--- a/bootstrap/windows-88/OPB.c
+++ b/bootstrap/windows-88/OPB.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "OPM.h"
diff --git a/bootstrap/windows-88/OPB.h b/bootstrap/windows-88/OPB.h
index af419f75..f2056569 100644
--- a/bootstrap/windows-88/OPB.h
+++ b/bootstrap/windows-88/OPB.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/windows-88/OPC.c b/bootstrap/windows-88/OPC.c
index bb9b75e6..7e9ddb90 100644
--- a/bootstrap/windows-88/OPC.c
+++ b/bootstrap/windows-88/OPC.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Configuration.h"
@@ -212,7 +212,7 @@ void OPC_Ident (OPT_Object obj)
 				OPM_WriteStringVar((void*)OPM_modName, ((LONGINT)(32)));
 			}
 			OPM_Write('_');
-		} else if (obj == OPT_sysptrtyp->strobj || obj == OPT_bytetyp->strobj) {
+		} else if ((obj == OPT_sysptrtyp->strobj || obj == OPT_ainttyp->strobj) || obj == OPT_bytetyp->strobj) {
 			OPM_WriteString((CHAR*)"SYSTEM_", (LONGINT)8);
 		}
 		OPM_WriteStringVar((void*)obj->name, ((LONGINT)(256)));
diff --git a/bootstrap/windows-88/OPC.h b/bootstrap/windows-88/OPC.h
index 37a86252..aa92d405 100644
--- a/bootstrap/windows-88/OPC.h
+++ b/bootstrap/windows-88/OPC.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/windows-88/OPM.c b/bootstrap/windows-88/OPM.c
index 50047c9e..3bc1b6d2 100644
--- a/bootstrap/windows-88/OPM.c
+++ b/bootstrap/windows-88/OPM.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Configuration.h"
@@ -545,7 +545,7 @@ void OPM_FPrintReal (LONGINT *fp, REAL real)
 {
 	INTEGER i;
 	LONGINT l;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&real, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&real, i, INTEGER);
 	l = i;
 	OPM_FPrint(&*fp, l);
 }
diff --git a/bootstrap/windows-88/OPM.h b/bootstrap/windows-88/OPM.h
index 1706f8f1..f11b56ba 100644
--- a/bootstrap/windows-88/OPM.h
+++ b/bootstrap/windows-88/OPM.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/windows-88/OPP.c b/bootstrap/windows-88/OPP.c
index be7c13b5..3a345c1f 100644
--- a/bootstrap/windows-88/OPP.c
+++ b/bootstrap/windows-88/OPP.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "OPB.h"
diff --git a/bootstrap/windows-88/OPP.h b/bootstrap/windows-88/OPP.h
index 0b3b1b2c..c0c9c3dd 100644
--- a/bootstrap/windows-88/OPP.h
+++ b/bootstrap/windows-88/OPP.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/windows-88/OPS.c b/bootstrap/windows-88/OPS.c
index cc04e014..1f9f2a46 100644
--- a/bootstrap/windows-88/OPS.c
+++ b/bootstrap/windows-88/OPS.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "OPM.h"
diff --git a/bootstrap/windows-88/OPS.h b/bootstrap/windows-88/OPS.h
index 32148c49..4b760b22 100644
--- a/bootstrap/windows-88/OPS.h
+++ b/bootstrap/windows-88/OPS.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin tspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin tspkaSfF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/windows-88/OPT.c b/bootstrap/windows-88/OPT.c
index a0d41c71..daf5051d 100644
--- a/bootstrap/windows-88/OPT.c
+++ b/bootstrap/windows-88/OPT.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "OPM.h"
@@ -84,7 +84,7 @@ typedef
 
 export void (*OPT_typSize)(OPT_Struct);
 export OPT_Object OPT_topScope;
-export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
+export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_ainttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
 export SHORTINT OPT_nofGmod;
 export OPT_Object OPT_GlbMod[64];
 export OPS_Name OPT_SelfName;
@@ -1719,6 +1719,7 @@ static void EnumPtrs(void (*P)(void*))
 	P(OPT_sinttyp);
 	P(OPT_inttyp);
 	P(OPT_linttyp);
+	P(OPT_ainttyp);
 	P(OPT_realtyp);
 	P(OPT_lrltyp);
 	P(OPT_settyp);
@@ -1795,6 +1796,7 @@ export void *OPT__init(void)
 	OPT_undftyp->BaseTyp = OPT_undftyp;
 	OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp);
 	OPT_EnterTyp((CHAR*)"PTR", 13, OPM_PointerSize, &OPT_sysptrtyp);
+	OPT_EnterTyp((CHAR*)"ADRINT", 5, OPM_LIntSize, &OPT_ainttyp);
 	OPT_EnterProc((CHAR*)"ADR", 20);
 	OPT_EnterProc((CHAR*)"CC", 21);
 	OPT_EnterProc((CHAR*)"LSH", 22);
diff --git a/bootstrap/windows-88/OPT.h b/bootstrap/windows-88/OPT.h
index ab2c4684..550ea673 100644
--- a/bootstrap/windows-88/OPT.h
+++ b/bootstrap/windows-88/OPT.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPT__h
 #define OPT__h
@@ -68,7 +68,7 @@ typedef
 
 import void (*OPT_typSize)(OPT_Struct);
 import OPT_Object OPT_topScope;
-import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
+import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_ainttyp, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
 import SHORTINT OPT_nofGmod;
 import OPT_Object OPT_GlbMod[64];
 import OPS_Name OPT_SelfName;
diff --git a/bootstrap/windows-88/OPV.c b/bootstrap/windows-88/OPV.c
index ae14f629..fe8d848a 100644
--- a/bootstrap/windows-88/OPV.c
+++ b/bootstrap/windows-88/OPV.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "OPC.h"
@@ -285,6 +285,7 @@ void OPV_AdrAndSize (OPT_Object topScope)
 	OPT_realtyp->strobj->linkadr = 2;
 	OPT_inttyp->strobj->linkadr = 2;
 	OPT_linttyp->strobj->linkadr = 2;
+	OPT_ainttyp->strobj->linkadr = 2;
 	OPT_lrltyp->strobj->linkadr = 2;
 	OPT_sinttyp->strobj->linkadr = 2;
 	OPT_booltyp->strobj->linkadr = 2;
@@ -932,7 +933,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec)
 					OPM_Write(')');
 					break;
 				case 24: 
-					OPM_WriteString((CHAR*)"(LONGINT)(SYSTEM_ADDRESS)", (LONGINT)26);
+					OPM_WriteString((CHAR*)"(LONGINT)(SYSTEM_ADRINT)", (LONGINT)25);
 					if (l->class == 1) {
 						OPC_CompleteIdent(l->obj);
 					} else {
@@ -948,7 +949,7 @@ static void OPV_expr (OPT_Node n, INTEGER prec)
 						OPC_Ident(n->typ->strobj);
 						OPM_Write(')');
 						if (__IN(n->typ->form, 0x6000) || __IN(l->typ->form, 0x6000)) {
-							OPM_WriteString((CHAR*)"(SYSTEM_ADDRESS)", (LONGINT)17);
+							OPM_WriteString((CHAR*)"(SYSTEM_ADRINT)", (LONGINT)16);
 						}
 						OPV_expr(l, exprPrec);
 					} else {
diff --git a/bootstrap/windows-88/OPV.h b/bootstrap/windows-88/OPV.h
index 4eba5b89..b0551679 100644
--- a/bootstrap/windows-88/OPV.h
+++ b/bootstrap/windows-88/OPV.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/windows-88/Platform.c b/bootstrap/windows-88/Platform.c
index 4281164c..875aa4b4 100644
--- a/bootstrap/windows-88/Platform.c
+++ b/bootstrap/windows-88/Platform.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 
@@ -112,9 +112,9 @@ export BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT
 extern void Heap_InitHeap();
 #define Platform_GetTickCount()	(LONGINT)(SYSTEM_CARD32)GetTickCount()
 #define Platform_HeapInitHeap()	Heap_InitHeap()
-#define Platform_SetInterruptHandler(h)	SystemSetInterruptHandler((SYSTEM_ADDRESS)h)
-#define Platform_SetQuitHandler(h)	SystemSetQuitHandler((SYSTEM_ADDRESS)h)
-#define Platform_allocate(size)	(LONGINT)(SYSTEM_ADDRESS)((void*)HeapAlloc(GetProcessHeap(), 0, (size_t)size))
+#define Platform_SetInterruptHandler(h)	SystemSetInterruptHandler((SYSTEM_ADRINT)h)
+#define Platform_SetQuitHandler(h)	SystemSetQuitHandler((SYSTEM_ADRINT)h)
+#define Platform_allocate(size)	(LONGINT)(SYSTEM_ADRINT)((void*)HeapAlloc(GetProcessHeap(), 0, (size_t)size))
 #define Platform_bhfiIndexHigh()	(LONGINT)bhfi.nFileIndexHigh
 #define Platform_bhfiIndexLow()	(LONGINT)bhfi.nFileIndexLow
 #define Platform_bhfiMtimeHigh()	(LONGINT)bhfi.ftLastWriteTime.dwHighDateTime
@@ -122,44 +122,44 @@ extern void Heap_InitHeap();
 #define Platform_bhfiVsn()	(LONGINT)bhfi.dwVolumeSerialNumber
 #define Platform_byHandleFileInformation()	BY_HANDLE_FILE_INFORMATION bhfi
 #define Platform_cleanupProcess()	CloseHandle(pi.hProcess); CloseHandle(pi.hThread);
-#define Platform_closeHandle(h)	(INTEGER)CloseHandle((HANDLE)(SYSTEM_ADDRESS)h)
+#define Platform_closeHandle(h)	(INTEGER)CloseHandle((HANDLE)(SYSTEM_ADRINT)h)
 #define Platform_createProcess(str, str__len)	(INTEGER)CreateProcess(0, (char*)str, 0,0,0,0,0,0,&si,&pi)
 #define Platform_deleteFile(n, n__len)	(INTEGER)DeleteFile((char*)n)
 #define Platform_err()	(INTEGER)GetLastError()
-#define Platform_errc(c)	WriteFile((HANDLE)(SYSTEM_ADDRESS)Platform_StdOut, &c, 1, 0,0)
-#define Platform_errstring(s, s__len)	WriteFile((HANDLE)(SYSTEM_ADDRESS)Platform_StdOut, s, s__len-1, 0,0)
+#define Platform_errc(c)	WriteFile((HANDLE)(SYSTEM_ADRINT)Platform_StdOut, &c, 1, 0,0)
+#define Platform_errstring(s, s__len)	WriteFile((HANDLE)(SYSTEM_ADRINT)Platform_StdOut, s, s__len-1, 0,0)
 #define Platform_exit(code)	ExitProcess((UINT)code)
 #define Platform_fileTimeToSysTime()	SYSTEMTIME st; FileTimeToSystemTime(&ft, &st)
-#define Platform_flushFileBuffers(h)	(INTEGER)FlushFileBuffers((HANDLE)(SYSTEM_ADDRESS)h)
-#define Platform_free(address)	HeapFree(GetProcessHeap(), 0, (void*)(SYSTEM_ADDRESS)address)
+#define Platform_flushFileBuffers(h)	(INTEGER)FlushFileBuffers((HANDLE)(SYSTEM_ADRINT)h)
+#define Platform_free(address)	HeapFree(GetProcessHeap(), 0, (void*)(SYSTEM_ADRINT)address)
 #define Platform_ftToUli()	ULARGE_INTEGER ul; ul.LowPart=ft.dwLowDateTime; ul.HighPart=ft.dwHighDateTime
 #define Platform_getCurrentDirectory(n, n__len)	GetCurrentDirectory(n__len, (char*)n)
 #define Platform_getExitCodeProcess(exitcode)	GetExitCodeProcess(pi.hProcess, (DWORD*)exitcode);
-#define Platform_getFileInformationByHandle(h)	(INTEGER)GetFileInformationByHandle((HANDLE)(SYSTEM_ADDRESS)h, &bhfi)
-#define Platform_getFilePos(h, r, rc)	LARGE_INTEGER liz = {0}; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADDRESS)h, liz, &li, FILE_CURRENT); *r = (LONGINT)li.QuadPart
-#define Platform_getFileSize(h)	(INTEGER)GetFileSizeEx((HANDLE)(SYSTEM_ADDRESS)h, &li)
+#define Platform_getFileInformationByHandle(h)	(INTEGER)GetFileInformationByHandle((HANDLE)(SYSTEM_ADRINT)h, &bhfi)
+#define Platform_getFilePos(h, r, rc)	LARGE_INTEGER liz = {0}; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADRINT)h, liz, &li, FILE_CURRENT); *r = (LONGINT)li.QuadPart
+#define Platform_getFileSize(h)	(INTEGER)GetFileSizeEx((HANDLE)(SYSTEM_ADRINT)h, &li)
 #define Platform_getLocalTime()	SYSTEMTIME st; GetLocalTime(&st)
 #define Platform_getenv(name, name__len, buf, buf__len)	(INTEGER)GetEnvironmentVariable((char*)name, (char*)buf, buf__len)
 #define Platform_getpid()	(INTEGER)GetCurrentProcessId()
-#define Platform_getstderrhandle()	(SYSTEM_ADDRESS)GetStdHandle(STD_ERROR_HANDLE)
-#define Platform_getstdinhandle()	(SYSTEM_ADDRESS)GetStdHandle(STD_INPUT_HANDLE)
-#define Platform_getstdouthandle()	(SYSTEM_ADDRESS)GetStdHandle(STD_OUTPUT_HANDLE)
+#define Platform_getstderrhandle()	(SYSTEM_ADRINT)GetStdHandle(STD_ERROR_HANDLE)
+#define Platform_getstdinhandle()	(SYSTEM_ADRINT)GetStdHandle(STD_INPUT_HANDLE)
+#define Platform_getstdouthandle()	(SYSTEM_ADRINT)GetStdHandle(STD_OUTPUT_HANDLE)
 #define Platform_identityToFileTime(i)	FILETIME ft; ft.dwHighDateTime = i.mtimehigh; ft.dwLowDateTime = i.mtimelow
-#define Platform_invalidHandleValue()	((LONGINT)(SYSTEM_ADDRESS)INVALID_HANDLE_VALUE)
+#define Platform_invalidHandleValue()	((LONGINT)(SYSTEM_ADRINT)INVALID_HANDLE_VALUE)
 #define Platform_largeInteger()	LARGE_INTEGER li
 #define Platform_liLongint()	(LONGINT)li.QuadPart
 #define Platform_moveFile(o, o__len, n, n__len)	(INTEGER)MoveFileEx((char*)o, (char*)n, MOVEFILE_REPLACE_EXISTING)
-#define Platform_opennew(n, n__len)	(LONGINT)(SYSTEM_ADDRESS)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0)
-#define Platform_openro(n, n__len)	(LONGINT)(SYSTEM_ADDRESS)CreateFile((char*)n, GENERIC_READ              , FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)
-#define Platform_openrw(n, n__len)	(LONGINT)(SYSTEM_ADDRESS)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)
+#define Platform_opennew(n, n__len)	(LONGINT)(SYSTEM_ADRINT)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0)
+#define Platform_openro(n, n__len)	(LONGINT)(SYSTEM_ADRINT)CreateFile((char*)n, GENERIC_READ              , FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)
+#define Platform_openrw(n, n__len)	(LONGINT)(SYSTEM_ADRINT)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)
 #define Platform_processInfo()	PROCESS_INFORMATION pi = {0};
-#define Platform_readfile(fd, p, l, n)	(INTEGER)ReadFile ((HANDLE)(SYSTEM_ADDRESS)fd, (void*)(SYSTEM_ADDRESS)(p), (DWORD)l, (DWORD*)n, 0)
+#define Platform_readfile(fd, p, l, n)	(INTEGER)ReadFile ((HANDLE)(SYSTEM_ADRINT)fd, (void*)(SYSTEM_ADRINT)(p), (DWORD)l, (DWORD*)n, 0)
 #define Platform_seekcur()	FILE_CURRENT
 #define Platform_seekend()	FILE_END
 #define Platform_seekset()	FILE_BEGIN
 #define Platform_setCurrentDirectory(n, n__len)	(INTEGER)SetCurrentDirectory((char*)n)
-#define Platform_setEndOfFile(h)	(INTEGER)SetEndOfFile((HANDLE)(SYSTEM_ADDRESS)h)
-#define Platform_setFilePointerEx(h, o, r, rc)	li.QuadPart=o; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADDRESS)h, li, 0, (DWORD)r)
+#define Platform_setEndOfFile(h)	(INTEGER)SetEndOfFile((HANDLE)(SYSTEM_ADRINT)h)
+#define Platform_setFilePointerEx(h, o, r, rc)	li.QuadPart=o; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADRINT)h, li, 0, (DWORD)r)
 #define Platform_sleep(ms)	Sleep((DWORD)ms)
 #define Platform_stToFt()	FILETIME ft; SystemTimeToFileTime(&st, &ft)
 #define Platform_startupInfo()	STARTUPINFO si = {0}; si.cb = sizeof(si);
@@ -174,7 +174,7 @@ extern void Heap_InitHeap();
 #define Platform_ulSec()	(LONGINT)(ul.QuadPart / 1000000LL)
 #define Platform_uluSec()	(LONGINT)(ul.QuadPart % 1000000LL)
 #define Platform_waitForProcess()	(INTEGER)WaitForSingleObject(pi.hProcess, INFINITE)
-#define Platform_writefile(fd, p, l)	(INTEGER)WriteFile((HANDLE)(SYSTEM_ADDRESS)fd, (void*)(SYSTEM_ADDRESS)(p), (DWORD)l, 0,0)
+#define Platform_writefile(fd, p, l)	(INTEGER)WriteFile((HANDLE)(SYSTEM_ADRINT)fd, (void*)(SYSTEM_ADRINT)(p), (DWORD)l, 0,0)
 
 BOOLEAN Platform_TooManyFiles (INTEGER e)
 {
@@ -242,7 +242,7 @@ void Platform_Init (INTEGER argc, LONGINT argvadr)
 	Platform_ArgVecPtr av = NIL;
 	Platform_MainStackFrame = argvadr;
 	Platform_ArgCount = argc;
-	av = (Platform_ArgVecPtr)(SYSTEM_ADDRESS)argvadr;
+	av = (Platform_ArgVecPtr)(SYSTEM_ADRINT)argvadr;
 	Platform_ArgVector = (*av)[0];
 	Platform_HaltCode = -128;
 	Platform_HeapInitHeap();
@@ -281,7 +281,7 @@ void Platform_GetArg (INTEGER n, CHAR *val, LONGINT val__len)
 {
 	Platform_ArgVec av = NIL;
 	if (n < Platform_ArgCount) {
-		av = (Platform_ArgVec)(SYSTEM_ADDRESS)Platform_ArgVector;
+		av = (Platform_ArgVec)(SYSTEM_ADRINT)Platform_ArgVector;
 		__COPY(*(*av)[__X(n, ((LONGINT)(1024)))], val, val__len);
 	}
 }
@@ -560,7 +560,7 @@ INTEGER Platform_ReadBuf (LONGINT h, SYSTEM_BYTE *b, LONGINT b__len, LONGINT *n)
 	INTEGER _o_result;
 	INTEGER result;
 	*n = 0;
-	result = Platform_readfile(h, (LONGINT)(SYSTEM_ADDRESS)b, b__len, &*n);
+	result = Platform_readfile(h, (LONGINT)(SYSTEM_ADRINT)b, b__len, &*n);
 	if (result == 0) {
 		*n = 0;
 		_o_result = Platform_err();
@@ -796,7 +796,7 @@ static void Platform_TestLittleEndian (void)
 {
 	INTEGER i;
 	i = 1;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&i, Platform_LittleEndian, BOOLEAN);
+	__GET((LONGINT)(SYSTEM_ADRINT)&i, Platform_LittleEndian, BOOLEAN);
 }
 
 __TDESC(Platform_FileIdentity, 1, 0) = {__TDFLDS("FileIdentity", 40), {-8}};
diff --git a/bootstrap/windows-88/Platform.h b/bootstrap/windows-88/Platform.h
index 374b6842..1c350cbf 100644
--- a/bootstrap/windows-88/Platform.h
+++ b/bootstrap/windows-88/Platform.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Platform__h
 #define Platform__h
@@ -79,7 +79,7 @@ import INTEGER Platform_Write (LONGINT h, LONGINT p, LONGINT l);
 import BOOLEAN Platform_getEnv (CHAR *var, LONGINT var__len, CHAR *val, LONGINT val__len);
 import void *Platform__init(void);
 
-#define Platform_SetInterruptHandler(h)	SystemSetInterruptHandler((SYSTEM_ADDRESS)h)
-#define Platform_SetQuitHandler(h)	SystemSetQuitHandler((SYSTEM_ADDRESS)h)
+#define Platform_SetInterruptHandler(h)	SystemSetInterruptHandler((SYSTEM_ADRINT)h)
+#define Platform_SetQuitHandler(h)	SystemSetQuitHandler((SYSTEM_ADRINT)h)
 
 #endif
diff --git a/bootstrap/windows-88/Reals.c b/bootstrap/windows-88/Reals.c
index 8b61d8cd..660cd605 100644
--- a/bootstrap/windows-88/Reals.c
+++ b/bootstrap/windows-88/Reals.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 
@@ -59,7 +59,7 @@ INTEGER Reals_Expo (REAL x)
 {
 	INTEGER _o_result;
 	INTEGER i;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&x + 2, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&x + 2, i, INTEGER);
 	_o_result = __MASK(__ASHR(i, 7), -256);
 	return _o_result;
 }
@@ -67,17 +67,17 @@ INTEGER Reals_Expo (REAL x)
 void Reals_SetExpo (REAL *x, INTEGER ex)
 {
 	CHAR c;
-	__GET((LONGINT)(SYSTEM_ADDRESS)x + 3, c, CHAR);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)x + 3, (CHAR)(__ASHL(__ASHR((int)c, 7), 7) + __MASK(__ASHR(ex, 1), -128)), CHAR);
-	__GET((LONGINT)(SYSTEM_ADDRESS)x + 2, c, CHAR);
-	__PUT((LONGINT)(SYSTEM_ADDRESS)x + 2, (CHAR)(__MASK((int)c, -128) + __ASHL(__MASK(ex, -2), 7)), CHAR);
+	__GET((LONGINT)(SYSTEM_ADRINT)x + 3, c, CHAR);
+	__PUT((LONGINT)(SYSTEM_ADRINT)x + 3, (CHAR)(__ASHL(__ASHR((int)c, 7), 7) + __MASK(__ASHR(ex, 1), -128)), CHAR);
+	__GET((LONGINT)(SYSTEM_ADRINT)x + 2, c, CHAR);
+	__PUT((LONGINT)(SYSTEM_ADRINT)x + 2, (CHAR)(__MASK((int)c, -128) + __ASHL(__MASK(ex, -2), 7)), CHAR);
 }
 
 INTEGER Reals_ExpoL (LONGREAL x)
 {
 	INTEGER _o_result;
 	INTEGER i;
-	__GET((LONGINT)(SYSTEM_ADDRESS)&x + 6, i, INTEGER);
+	__GET((LONGINT)(SYSTEM_ADRINT)&x + 6, i, INTEGER);
 	_o_result = __MASK(__ASHR(i, 4), -2048);
 	return _o_result;
 }
diff --git a/bootstrap/windows-88/Reals.h b/bootstrap/windows-88/Reals.h
index ff21c192..3102ce18 100644
--- a/bootstrap/windows-88/Reals.h
+++ b/bootstrap/windows-88/Reals.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/windows-88/SYSTEM.c b/bootstrap/windows-88/SYSTEM.c
index 33511a70..1077d3ce 100644
--- a/bootstrap/windows-88/SYSTEM.c
+++ b/bootstrap/windows-88/SYSTEM.c
@@ -35,7 +35,7 @@ void SYSTEM_INHERIT(LONGINT *t, LONGINT *t0)
 void SYSTEM_ENUMP(void *adr, LONGINT n, void (*P)())
 {
     while (n > 0) {
-        P((LONGINT)(SYSTEM_ADDRESS)(*((void**)(adr))));
+        P((LONGINT)(SYSTEM_ADRINT)(*((void**)(adr))));
         adr = ((void**)adr) + 1;
         n--;
     }
@@ -106,7 +106,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
     else if (typ == (LONGINT*)POINTER__typ) {
         /* element type is a pointer */
         x = Heap_NEWBLK(size + nofelems * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[-1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[-1];
         p[-nofelems] = *p;  /* build new type desc in situ: 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nofelems - 1; n = 1;   /* n =1 for skipping the size field */
         while (n <= nofelems) {*p = n*sizeof(LONGINT); p++; n++;}
@@ -119,7 +119,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
         while (ptab[nofptrs] >= 0) {nofptrs++;} /* number of pointers per element */
         nptr = nofelems * nofptrs;  /* total number of pointers */
         x = Heap_NEWBLK(size + nptr * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[- 1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[- 1];
         p[-nptr] = *p;  /* build new type desc in situ; 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nptr - 1; n = 0; off = dataoff;
         while (n < nofelems) {i = 0;
@@ -155,7 +155,7 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         // (Ignore other signals)
     }
 
-    void SystemSetHandler(int s, SYSTEM_ADDRESS h) {
+    void SystemSetHandler(int s, SYSTEM_ADRINT h) {
         if (s >= 2 && s <= 4) {
             int needtosetsystemhandler = handler[s-2] == 0;
             handler[s-2] = (SystemSignalHandler)h;
@@ -194,12 +194,12 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         }
     }
 
-    void SystemSetInterruptHandler(SYSTEM_ADDRESS h) {
+    void SystemSetInterruptHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemInterruptHandler = (SystemSignalHandler)h;
     }
 
-    void SystemSetQuitHandler(SYSTEM_ADDRESS h) {
+    void SystemSetQuitHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemQuitHandler = (SystemSignalHandler)h;
     }
diff --git a/bootstrap/windows-88/SYSTEM.h b/bootstrap/windows-88/SYSTEM.h
index 6377745e..35620b9b 100644
--- a/bootstrap/windows-88/SYSTEM.h
+++ b/bootstrap/windows-88/SYSTEM.h
@@ -26,11 +26,12 @@ typedef unsigned char        SYSTEM_CARD8;
   typedef unsigned int         size_t;
 #endif
 
-#define SYSTEM_ADDRESS size_t
+#define SYSTEM_ADRINT size_t
+#define SYSTEM_ADDRESS size_t   // Temporarily for bootstrap
 #define _SIZE_T_DECLARED // For FreeBSD
 #define _SIZE_T_DEFINED_ // For OpenBSD
 
-void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);
+void *memcpy(void *dest, const void *source, SYSTEM_ADRINT size);
 
 
 
@@ -107,10 +108,10 @@ extern LONGINT SYSTEM_ENTIER (double x);
 // Signal handling in SYSTEM.c
 
 #ifndef _WIN32
-  extern void SystemSetHandler(int s, SYSTEM_ADDRESS h);
+  extern void SystemSetHandler(int s, SYSTEM_ADRINT h);
 #else
-  extern void SystemSetInterruptHandler(SYSTEM_ADDRESS h);
-  extern void SystemSetQuitHandler     (SYSTEM_ADDRESS h);
+  extern void SystemSetInterruptHandler(SYSTEM_ADRINT h);
+  extern void SystemSetQuitHandler     (SYSTEM_ADRINT h);
 #endif
 
 
@@ -133,9 +134,9 @@ static int __str_cmp(CHAR *x, CHAR *y){
 
 #define __COPY(s, d, n) {char*_a=(void*)s,*_b=(void*)d; LONGINT _i=0,_t=n-1; \
                          while(_i<_t&&((_b[_i]=_a[_i])!=0)){_i++;};_b[_i]=0;}
-#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADDRESS)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
+#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADRINT)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
 #define __DUPARR(v, t)  v=(void*)memcpy(v##__copy,v,sizeof(t))
-#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADDRESS)x)
+#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADRINT)x)
 
 
 
@@ -145,8 +146,8 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __VAL(t, x)     (*(t*)&(x))
 
 
-#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADDRESS)(a)
-#define __PUT(a, x, t)  *(t*)(SYSTEM_ADDRESS)(a)=x
+#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADRINT)(a)
+#define __PUT(a, x, t)  *(t*)(SYSTEM_ADRINT)(a)=x
 
 #define __LSHL(x, n, t) ((t)((U_##t)(x)<<(n)))
 #define __LSHR(x, n, t) ((t)((U_##t)(x)>>(n)))
@@ -161,7 +162,7 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __ROT(x, n, t)  ((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
 
 #define __BIT(x, n)     (*(U_LONGINT*)(x)>>(n)&1)
-#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADDRESS)(d),(char*)(SYSTEM_ADDRESS)(s),n)
+#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADRINT)(d),(char*)(SYSTEM_ADRINT)(s),n)
 #define __ASHF(x, n)    SYSTEM_ASH((LONGINT)(x), (LONGINT)(n))
 #define __SHORT(x, y)   ((int)((U_LONGINT)(x)+(y)<(y)+(y)?(x):(__HALT(-8),0)))
 #define __SHORTF(x, y)  ((int)(__RF((x)+(y),(y)+(y))-(y)))
@@ -222,7 +223,7 @@ extern void       Heap_INCREF();
 extern void Platform_Init(INTEGER argc, LONGINT argv);
 extern void Heap_FINALL();
 
-#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADDRESS)&argv);
+#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADRINT)&argv);
 #define __REGMAIN(name, enum) m = Heap_REGMOD((CHAR*)name,enum)
 #define __FINI                Heap_FINALL(); return 0
 
@@ -243,7 +244,7 @@ extern SYSTEM_PTR Heap_NEWREC (LONGINT tag);
 extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 
 #define __SYSNEW(p, len) p = Heap_NEWBLK((LONGINT)(len))
-#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)t##__typ)
+#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)t##__typ)
 #define __NEWARR         SYSTEM_NEWARR
 
 
@@ -274,20 +275,20 @@ extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 #define __INITYP(t, t0, level) \
   t##__typ               = (LONGINT*)&t##__desc.blksz;                                                    \
   memcpy(t##__desc.basep, t0##__typ - __BASEOFF, level*sizeof(LONGINT));                                  \
-  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADDRESS)t##__typ;                                                  \
-  t##__desc.module       = (LONGINT)(SYSTEM_ADDRESS)m;                                                         \
+  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADRINT)t##__typ;                                                  \
+  t##__desc.module       = (LONGINT)(SYSTEM_ADRINT)m;                                                         \
   if(t##__desc.blksz!=sizeof(struct t)) __HALT(-15);                                                      \
   t##__desc.blksz        = (t##__desc.blksz+5*sizeof(LONGINT)-1)/(4*sizeof(LONGINT))*(4*sizeof(LONGINT)); \
-  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADDRESS)&t##__desc.next);                                                    \
+  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADRINT)&t##__desc.next);                                                    \
   SYSTEM_INHERIT(t##__typ, t0##__typ)
 
-#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADDRESS)typ##__typ)
-#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADDRESS)(*(((LONGINT*)(p))-1)))
+#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADRINT)typ##__typ)
+#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADRINT)(*(((LONGINT*)(p))-1)))
 #define __ISP(p, typ, level)  __IS(__TYPEOF(p),typ,level)
 
 // Oberon-2 type bound procedures support
-#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADDRESS)proc
-#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADDRESS)*(typ-(__TPROC0OFF+num))))parlist
+#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADRINT)proc
+#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADRINT)*(typ-(__TPROC0OFF+num))))parlist
 
 
 
diff --git a/bootstrap/windows-88/Strings.c b/bootstrap/windows-88/Strings.c
index 20a14540..2df49d25 100644
--- a/bootstrap/windows-88/Strings.c
+++ b/bootstrap/windows-88/Strings.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 
diff --git a/bootstrap/windows-88/Strings.h b/bootstrap/windows-88/Strings.h
index d64d3478..9505fe03 100644
--- a/bootstrap/windows-88/Strings.h
+++ b/bootstrap/windows-88/Strings.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/windows-88/Texts.c b/bootstrap/windows-88/Texts.c
index a1fb81c0..0e0b4725 100644
--- a/bootstrap/windows-88/Texts.c
+++ b/bootstrap/windows-88/Texts.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Files.h"
diff --git a/bootstrap/windows-88/Texts.h b/bootstrap/windows-88/Texts.h
index bca5665d..3086fb00 100644
--- a/bootstrap/windows-88/Texts.h
+++ b/bootstrap/windows-88/Texts.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/windows-88/Vishap.c b/bootstrap/windows-88/Vishap.c
index 6eda4f2c..7e1eba78 100644
--- a/bootstrap/windows-88/Vishap.c
+++ b/bootstrap/windows-88/Vishap.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkamSf */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkamSf */
 #define LARGE
 #include "SYSTEM.h"
 #include "Configuration.h"
@@ -82,6 +82,7 @@ static void Vishap_PropagateElementaryTypeSizes (void)
 	OPT_realtyp->size = OPM_RealSize;
 	OPT_inttyp->size = OPM_IntSize;
 	OPT_linttyp->size = OPM_LIntSize;
+	OPT_ainttyp->size = OPM_LIntSize;
 	OPT_lrltyp->size = OPM_LRealSize;
 	OPT_sinttyp->size = OPM_SIntSize;
 	OPT_booltyp->size = OPM_BoolSize;
diff --git a/bootstrap/windows-88/errors.c b/bootstrap/windows-88/errors.c
index 48246ffa..8489752b 100644
--- a/bootstrap/windows-88/errors.c
+++ b/bootstrap/windows-88/errors.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 
diff --git a/bootstrap/windows-88/errors.h b/bootstrap/windows-88/errors.h
index 9081238a..a5af5a7d 100644
--- a/bootstrap/windows-88/errors.h
+++ b/bootstrap/windows-88/errors.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef errors__h
 #define errors__h
diff --git a/bootstrap/windows-88/extTools.c b/bootstrap/windows-88/extTools.c
index 4005b0a6..fce52835 100644
--- a/bootstrap/windows-88/extTools.c
+++ b/bootstrap/windows-88/extTools.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Configuration.h"
diff --git a/bootstrap/windows-88/extTools.h b/bootstrap/windows-88/extTools.h
index 6ac1ab91..9e5aed51 100644
--- a/bootstrap/windows-88/extTools.h
+++ b/bootstrap/windows-88/extTools.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/windows-88/vt100.c b/bootstrap/windows-88/vt100.c
index a9110e8a..0e0401e3 100644
--- a/bootstrap/windows-88/vt100.c
+++ b/bootstrap/windows-88/vt100.c
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 #define LARGE
 #include "SYSTEM.h"
 #include "Console.h"
diff --git a/bootstrap/windows-88/vt100.h b/bootstrap/windows-88/vt100.h
index 801bc8f9..eb6374ea 100644
--- a/bootstrap/windows-88/vt100.h
+++ b/bootstrap/windows-88/vt100.h
@@ -1,4 +1,4 @@
-/* voc 1.95 [2016/08/23] for gcc LP64 on cygwin xtspkaSfF */
+/* voc 1.95 [2016/08/26] for gcc LP64 on cygwin xtspkaSfF */
 
 #ifndef vt100__h
 #define vt100__h
diff --git a/src/compiler/OPC.Mod b/src/compiler/OPC.Mod
index 1076a289..849c04e9 100644
--- a/src/compiler/OPC.Mod
+++ b/src/compiler/OPC.Mod
@@ -127,6 +127,7 @@ MODULE OPC;  (* copyright (c) J. Templ 12.7.95 / 3.7.96 *)
         END ;
         OPM.Write('_')
       ELSIF (obj = OPT.sysptrtyp^.strobj)
+         OR (obj = OPT.ainttyp^.strobj)
          OR (obj = OPT.bytetyp^.strobj) THEN
         OPM.WriteString("SYSTEM_")
       END;
diff --git a/src/compiler/OPT.Mod b/src/compiler/OPT.Mod
index fb77b0ea..62a0d4b7 100644
--- a/src/compiler/OPT.Mod
+++ b/src/compiler/OPT.Mod
@@ -155,6 +155,7 @@ VAR
   undftyp*,
   bytetyp*, booltyp*, chartyp*,
   sinttyp*, inttyp*, linttyp*,
+  ainttyp*,
   realtyp*, lrltyp*, settyp*, stringtyp*,
   niltyp*,  notyp*,  sysptrtyp*:            Struct;
 
@@ -1148,6 +1149,7 @@ BEGIN topScope := NIL; OpenScope(0, NIL); OPM.errpos := 0;
   (*initialization of module SYSTEM*)
   EnterTyp("BYTE", Byte, OPM.ByteSize, bytetyp);
   EnterTyp("PTR", Pointer, OPM.PointerSize, sysptrtyp);
+  EnterTyp("ADRINT", Int, OPM.LIntSize, ainttyp);
   EnterProc("ADR", adrfn);
   EnterProc("CC", ccfn);
   EnterProc("LSH", lshfn);
diff --git a/src/compiler/OPV.Mod b/src/compiler/OPV.Mod
index 7a59c1d3..529c1aa9 100644
--- a/src/compiler/OPV.Mod
+++ b/src/compiler/OPV.Mod
@@ -205,6 +205,7 @@ MODULE OPV;  (* J. Templ 16.2.95 / 3.7.96
     OPT.realtyp^.strobj^.linkadr   := PredefinedType;
     OPT.inttyp^.strobj^.linkadr    := PredefinedType;
     OPT.linttyp^.strobj^.linkadr   := PredefinedType;
+    OPT.ainttyp^.strobj^.linkadr   := PredefinedType;
     OPT.lrltyp^.strobj^.linkadr    := PredefinedType;
     OPT.sinttyp^.strobj^.linkadr   := PredefinedType;
     OPT.booltyp^.strobj^.linkadr   := PredefinedType;
@@ -555,7 +556,7 @@ MODULE OPV;  (* J. Templ 16.2.95 / 3.7.96
                                expr(l, MinPrec); OPM.Write(CloseParen)
                   | OPT.cap:   OPM.WriteString("__CAP("); expr(l, MinPrec); OPM.Write(CloseParen)
                   | OPT.odd:   OPM.WriteString("__ODD("); expr(l, MinPrec); OPM.Write(CloseParen)
-                  | OPT.adr:   OPM.WriteString("(LONGINT)(SYSTEM_ADDRESS)");                             (*SYSTEM*)
+                  | OPT.adr:   OPM.WriteString("(LONGINT)(SYSTEM_ADRINT)");                             (*SYSTEM*)
                                IF l^.class = OPT.Nvarpar THEN OPC.CompleteIdent(l^.obj)
                                ELSE
                                  IF (l^.typ^.form # OPT.String) & ~(l^.typ^.comp IN {OPT.Array, OPT.DynArr}) THEN OPM.Write("&") END ;
@@ -568,7 +569,7 @@ MODULE OPV;  (* J. Templ 16.2.95 / 3.7.96
                                THEN
                                  OPM.Write(OpenParen); OPC.Ident(n^.typ^.strobj); OPM.Write(CloseParen);
                                  IF (n^.typ^.form IN {OPT.Pointer, OPT.ProcTyp}) OR (l^.typ^.form IN {OPT.Pointer, OPT.ProcTyp}) THEN
-                                   OPM.WriteString("(SYSTEM_ADDRESS)")
+                                   OPM.WriteString("(SYSTEM_ADRINT)")
                                  END;
                                  expr(l, exprPrec)
                                ELSE
diff --git a/src/compiler/Vishap.Mod b/src/compiler/Vishap.Mod
index 63cc4260..216533a1 100644
--- a/src/compiler/Vishap.Mod
+++ b/src/compiler/Vishap.Mod
@@ -58,6 +58,7 @@ MODULE Vishap;  (* J. Templ 3.2.95 *)
     OPT.realtyp.size   := OPM.RealSize;
     OPT.inttyp.size    := OPM.IntSize;
     OPT.linttyp.size   := OPM.LIntSize;
+    OPT.ainttyp.size   := OPM.LIntSize;
     OPT.lrltyp.size    := OPM.LRealSize;
     OPT.sinttyp.size   := OPM.SIntSize;
     OPT.booltyp.size   := OPM.BoolSize;
diff --git a/src/system/Heap.Mod b/src/system/Heap.Mod
index 6395c0a7..5acbb04e 100644
--- a/src/system/Heap.Mod
+++ b/src/system/Heap.Mod
@@ -186,7 +186,7 @@ MODULE Heap;
      correctly regardless of the size of an address. Specifically on 32 bit address
      architectures with 64 bit LONGINT, it loads 32 bits and extends it to LONGINT
      rather than loading 64 bits. *)
-  PROCEDURE -FetchAddress(pointer: LONGINT): LONGINT "(LONGINT)(SYSTEM_ADDRESS)(*((void**)((SYSTEM_ADDRESS)pointer)))";
+  PROCEDURE -FetchAddress(pointer: LONGINT): LONGINT "(LONGINT)(SYSTEM_ADRINT)(*((void**)((SYSTEM_ADRINT)pointer)))";
 
   PROCEDURE ExtendHeap(blksz: LONGINT);
     VAR size, chnk, j, next: LONGINT;
diff --git a/src/system/Platformunix.Mod b/src/system/Platformunix.Mod
index 1c2da65d..a55e1130 100644
--- a/src/system/Platformunix.Mod
+++ b/src/system/Platformunix.Mod
@@ -106,10 +106,10 @@ BEGIN RETURN (e = ECONNREFUSED()) OR (e = ECONNABORTED())
 
 (* OS memory allocaton *)
 
-PROCEDURE -allocate(size: LONGINT): LONGINT "(LONGINT)(SYSTEM_ADDRESS)((void*)malloc((size_t)size))";
+PROCEDURE -allocate(size: LONGINT): LONGINT "(LONGINT)(SYSTEM_ADRINT)((void*)malloc((size_t)size))";
 PROCEDURE OSAllocate*(size: LONGINT): LONGINT; BEGIN RETURN allocate(size) END OSAllocate;
 
-PROCEDURE -free(address: LONGINT) "free((void*)(SYSTEM_ADDRESS)address)";
+PROCEDURE -free(address: LONGINT) "free((void*)(SYSTEM_ADRINT)address)";
 PROCEDURE OSFree*(address: LONGINT); BEGIN free(address) END OSFree;
 
 
@@ -189,7 +189,7 @@ END ArgPos;
 
 (* Signals and traps *)
 
-PROCEDURE -sethandler(s: INTEGER; h: SignalHandler) "SystemSetHandler(s, (SYSTEM_ADDRESS)h)";
+PROCEDURE -sethandler(s: INTEGER; h: SignalHandler) "SystemSetHandler(s, (SYSTEM_ADRINT)h)";
 
 PROCEDURE SetInterruptHandler*(handler: SignalHandler);
 BEGIN sethandler(2, handler); END SetInterruptHandler;
@@ -369,7 +369,7 @@ END Size;
 
 
 PROCEDURE -readfile (fd: LONGINT; p: LONGINT; l: LONGINT): LONGINT
-"read(fd, (void*)(SYSTEM_ADDRESS)(p), l)";
+"read(fd, (void*)(SYSTEM_ADRINT)(p), l)";
 
 PROCEDURE Read*(h: FileHandle; p: LONGINT; l: LONGINT; VAR n: LONGINT): ErrorCode;
 BEGIN
@@ -386,7 +386,7 @@ END ReadBuf;
 
 
 PROCEDURE -writefile(fd: LONGINT; p: LONGINT; l: LONGINT): LONGINT
-"write(fd, (void*)(SYSTEM_ADDRESS)(p), l)";
+"write(fd, (void*)(SYSTEM_ADRINT)(p), l)";
 
 PROCEDURE Write*(h: FileHandle; p: LONGINT; l: LONGINT): ErrorCode;
   VAR written: LONGINT;
diff --git a/src/system/Platformwindows.Mod b/src/system/Platformwindows.Mod
index a97d7da9..cfd080be 100644
--- a/src/system/Platformwindows.Mod
+++ b/src/system/Platformwindows.Mod
@@ -104,10 +104,10 @@ BEGIN RETURN (e = ECONNREFUSED()) OR (e = ECONNABORTED())
 
 (* OS memory allocaton *)
 
-PROCEDURE -allocate(size: LONGINT): LONGINT "(LONGINT)(SYSTEM_ADDRESS)((void*)HeapAlloc(GetProcessHeap(), 0, (size_t)size))";
+PROCEDURE -allocate(size: LONGINT): LONGINT "(LONGINT)(SYSTEM_ADRINT)((void*)HeapAlloc(GetProcessHeap(), 0, (size_t)size))";
 PROCEDURE OSAllocate*(size: LONGINT): LONGINT; BEGIN RETURN allocate(size) END OSAllocate;
 
-PROCEDURE -free(address: LONGINT) "HeapFree(GetProcessHeap(), 0, (void*)(SYSTEM_ADDRESS)address)";
+PROCEDURE -free(address: LONGINT) "HeapFree(GetProcessHeap(), 0, (void*)(SYSTEM_ADRINT)address)";
 PROCEDURE OSFree*(address: LONGINT); BEGIN free(address) END OSFree;
 
 
@@ -200,8 +200,8 @@ END ArgPos;
 
 (* Ctrl/c handling *)
 
-PROCEDURE -SetInterruptHandler*(h: SignalHandler) "SystemSetInterruptHandler((SYSTEM_ADDRESS)h)";
-PROCEDURE -SetQuitHandler*     (h: SignalHandler) "SystemSetQuitHandler((SYSTEM_ADDRESS)h)";
+PROCEDURE -SetInterruptHandler*(h: SignalHandler) "SystemSetInterruptHandler((SYSTEM_ADRINT)h)";
+PROCEDURE -SetQuitHandler*     (h: SignalHandler) "SystemSetQuitHandler((SYSTEM_ADRINT)h)";
 
 PROCEDURE SetBadInstructionHandler*(handler: SignalHandler);
 BEGIN (* TODO *) END SetBadInstructionHandler;
@@ -293,16 +293,16 @@ PROCEDURE Error*(): ErrorCode; BEGIN RETURN err() END Error;
 
 (* File system *)
 
-PROCEDURE -invalidHandleValue(): LONGINT "((LONGINT)(SYSTEM_ADDRESS)INVALID_HANDLE_VALUE)";
+PROCEDURE -invalidHandleValue(): LONGINT "((LONGINT)(SYSTEM_ADRINT)INVALID_HANDLE_VALUE)";
 
 PROCEDURE -openrw (n: ARRAY OF CHAR): LONGINT
-"(LONGINT)(SYSTEM_ADDRESS)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)";
+"(LONGINT)(SYSTEM_ADRINT)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)";
 
 PROCEDURE -openro (n: ARRAY OF CHAR): LONGINT
-"(LONGINT)(SYSTEM_ADDRESS)CreateFile((char*)n, GENERIC_READ              , FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)";
+"(LONGINT)(SYSTEM_ADRINT)CreateFile((char*)n, GENERIC_READ              , FILE_SHARE_READ|FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0)";
 
 PROCEDURE -opennew(n: ARRAY OF CHAR): LONGINT
-"(LONGINT)(SYSTEM_ADDRESS)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0)";
+"(LONGINT)(SYSTEM_ADRINT)CreateFile((char*)n, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0)";
 
 
 
@@ -332,7 +332,7 @@ END New;
 
 
 
-PROCEDURE -closeHandle(h: FileHandle): INTEGER "(INTEGER)CloseHandle((HANDLE)(SYSTEM_ADDRESS)h)";
+PROCEDURE -closeHandle(h: FileHandle): INTEGER "(INTEGER)CloseHandle((HANDLE)(SYSTEM_ADRINT)h)";
 
 PROCEDURE Close*(h: FileHandle): ErrorCode;
 BEGIN
@@ -342,7 +342,7 @@ END Close;
 
 
 PROCEDURE -byHandleFileInformation "BY_HANDLE_FILE_INFORMATION bhfi";
-PROCEDURE -getFileInformationByHandle(h: FileHandle): INTEGER "(INTEGER)GetFileInformationByHandle((HANDLE)(SYSTEM_ADDRESS)h, &bhfi)";
+PROCEDURE -getFileInformationByHandle(h: FileHandle): INTEGER "(INTEGER)GetFileInformationByHandle((HANDLE)(SYSTEM_ADRINT)h, &bhfi)";
 PROCEDURE -bhfiMtimeHigh(): LONGINT "(LONGINT)bhfi.ftLastWriteTime.dwHighDateTime";
 PROCEDURE -bhfiMtimeLow():  LONGINT "(LONGINT)bhfi.ftLastWriteTime.dwLowDateTime";
 PROCEDURE -bhfiVsn():       LONGINT "(LONGINT)bhfi.dwVolumeSerialNumber";
@@ -401,7 +401,7 @@ END MTimeAsClock;
 
 PROCEDURE -largeInteger "LARGE_INTEGER li";
 PROCEDURE -liLongint(): LONGINT "(LONGINT)li.QuadPart";
-PROCEDURE -getFileSize(h: FileHandle): INTEGER "(INTEGER)GetFileSizeEx((HANDLE)(SYSTEM_ADDRESS)h, &li)";
+PROCEDURE -getFileSize(h: FileHandle): INTEGER "(INTEGER)GetFileSizeEx((HANDLE)(SYSTEM_ADRINT)h, &li)";
 
 PROCEDURE Size*(h: FileHandle; VAR l: LONGINT): ErrorCode;
 BEGIN
@@ -413,7 +413,7 @@ END Size;
 
 
 PROCEDURE -readfile (fd: LONGINT; p: LONGINT; l: LONGINT; VAR n: LONGINT): INTEGER
-"(INTEGER)ReadFile ((HANDLE)(SYSTEM_ADDRESS)fd, (void*)(SYSTEM_ADDRESS)(p), (DWORD)l, (DWORD*)n, 0)";
+"(INTEGER)ReadFile ((HANDLE)(SYSTEM_ADRINT)fd, (void*)(SYSTEM_ADRINT)(p), (DWORD)l, (DWORD*)n, 0)";
 
 PROCEDURE Read*(h: FileHandle; p: LONGINT; l: LONGINT; VAR n: LONGINT): ErrorCode;
 VAR result: INTEGER;
@@ -434,7 +434,7 @@ END ReadBuf;
 
 
 PROCEDURE -writefile(fd: LONGINT; p: LONGINT; l: LONGINT): INTEGER
-"(INTEGER)WriteFile((HANDLE)(SYSTEM_ADDRESS)fd, (void*)(SYSTEM_ADDRESS)(p), (DWORD)l, 0,0)";
+"(INTEGER)WriteFile((HANDLE)(SYSTEM_ADRINT)fd, (void*)(SYSTEM_ADRINT)(p), (DWORD)l, 0,0)";
 
 PROCEDURE Write*(h: FileHandle; p: LONGINT; l: LONGINT): ErrorCode;
 BEGIN
@@ -443,7 +443,7 @@ END Write;
 
 
 
-PROCEDURE -flushFileBuffers(h: FileHandle): INTEGER "(INTEGER)FlushFileBuffers((HANDLE)(SYSTEM_ADDRESS)h)";
+PROCEDURE -flushFileBuffers(h: FileHandle): INTEGER "(INTEGER)FlushFileBuffers((HANDLE)(SYSTEM_ADRINT)h)";
 
 PROCEDURE Sync*(h: FileHandle): ErrorCode;
 BEGIN
@@ -453,7 +453,7 @@ END Sync;
 
 
 PROCEDURE -setFilePointerEx(h: FileHandle; o: LONGINT; r: INTEGER; VAR rc: INTEGER)
-"li.QuadPart=o; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADDRESS)h, li, 0, (DWORD)r)";
+"li.QuadPart=o; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADRINT)h, li, 0, (DWORD)r)";
 
 PROCEDURE -seekset(): INTEGER "FILE_BEGIN";
 PROCEDURE -seekcur(): INTEGER "FILE_CURRENT";
@@ -469,9 +469,9 @@ END Seek;
 
 
 
-PROCEDURE -setEndOfFile(h: FileHandle): INTEGER "(INTEGER)SetEndOfFile((HANDLE)(SYSTEM_ADDRESS)h)";
+PROCEDURE -setEndOfFile(h: FileHandle): INTEGER "(INTEGER)SetEndOfFile((HANDLE)(SYSTEM_ADRINT)h)";
 PROCEDURE -getFilePos(h: FileHandle; VAR r: LONGINT; VAR rc: INTEGER)
-"LARGE_INTEGER liz = {0}; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADDRESS)h, liz, &li, FILE_CURRENT); *r = (LONGINT)li.QuadPart";
+"LARGE_INTEGER liz = {0}; *rc = (INTEGER)SetFilePointerEx((HANDLE)(SYSTEM_ADRINT)h, liz, &li, FILE_CURRENT); *r = (LONGINT)li.QuadPart";
 
 PROCEDURE Truncate*(h: FileHandle; limit: LONGINT): ErrorCode;
 VAR rc: INTEGER; oldpos: LONGINT;
@@ -529,8 +529,8 @@ PROCEDURE Exit*(code: INTEGER);
 BEGIN exit(code) END Exit;
 
 
-PROCEDURE -errstring(s: ARRAY OF CHAR) 'WriteFile((HANDLE)(SYSTEM_ADDRESS)Platform_StdOut, s, s__len-1, 0,0)';
-PROCEDURE -errc     (c: CHAR)          'WriteFile((HANDLE)(SYSTEM_ADDRESS)Platform_StdOut, &c, 1, 0,0)';
+PROCEDURE -errstring(s: ARRAY OF CHAR) 'WriteFile((HANDLE)(SYSTEM_ADRINT)Platform_StdOut, s, s__len-1, 0,0)';
+PROCEDURE -errc     (c: CHAR)          'WriteFile((HANDLE)(SYSTEM_ADRINT)Platform_StdOut, &c, 1, 0,0)';
 PROCEDURE errch(c: CHAR); BEGIN errc(c) END errch;
 PROCEDURE errln; BEGIN errch(0DX); errch(0AX) END errln;
 
@@ -589,9 +589,9 @@ PROCEDURE TestLittleEndian;
  BEGIN i := 1; SYSTEM.GET(SYSTEM.ADR(i), LittleEndian); END TestLittleEndian;
 
 
-PROCEDURE -getstdinhandle():  FileHandle "(SYSTEM_ADDRESS)GetStdHandle(STD_INPUT_HANDLE)";
-PROCEDURE -getstdouthandle(): FileHandle "(SYSTEM_ADDRESS)GetStdHandle(STD_OUTPUT_HANDLE)";
-PROCEDURE -getstderrhandle(): FileHandle "(SYSTEM_ADDRESS)GetStdHandle(STD_ERROR_HANDLE)";
+PROCEDURE -getstdinhandle():  FileHandle "(SYSTEM_ADRINT)GetStdHandle(STD_INPUT_HANDLE)";
+PROCEDURE -getstdouthandle(): FileHandle "(SYSTEM_ADRINT)GetStdHandle(STD_OUTPUT_HANDLE)";
+PROCEDURE -getstderrhandle(): FileHandle "(SYSTEM_ADRINT)GetStdHandle(STD_ERROR_HANDLE)";
 PROCEDURE -getpid():          INTEGER    "(INTEGER)GetCurrentProcessId()";
 
 BEGIN
diff --git a/src/system/SYSTEM.c b/src/system/SYSTEM.c
index 33511a70..1077d3ce 100644
--- a/src/system/SYSTEM.c
+++ b/src/system/SYSTEM.c
@@ -35,7 +35,7 @@ void SYSTEM_INHERIT(LONGINT *t, LONGINT *t0)
 void SYSTEM_ENUMP(void *adr, LONGINT n, void (*P)())
 {
     while (n > 0) {
-        P((LONGINT)(SYSTEM_ADDRESS)(*((void**)(adr))));
+        P((LONGINT)(SYSTEM_ADRINT)(*((void**)(adr))));
         adr = ((void**)adr) + 1;
         n--;
     }
@@ -106,7 +106,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
     else if (typ == (LONGINT*)POINTER__typ) {
         /* element type is a pointer */
         x = Heap_NEWBLK(size + nofelems * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[-1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[-1];
         p[-nofelems] = *p;  /* build new type desc in situ: 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nofelems - 1; n = 1;   /* n =1 for skipping the size field */
         while (n <= nofelems) {*p = n*sizeof(LONGINT); p++; n++;}
@@ -119,7 +119,7 @@ SYSTEM_PTR SYSTEM_NEWARR(LONGINT *typ, LONGINT elemsz, int elemalgn, int nofdim,
         while (ptab[nofptrs] >= 0) {nofptrs++;} /* number of pointers per element */
         nptr = nofelems * nofptrs;  /* total number of pointers */
         x = Heap_NEWBLK(size + nptr * sizeof(LONGINT));
-        p = (LONGINT*)(SYSTEM_ADDRESS)x[- 1];
+        p = (LONGINT*)(SYSTEM_ADRINT)x[- 1];
         p[-nptr] = *p;  /* build new type desc in situ; 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
         p -= nptr - 1; n = 0; off = dataoff;
         while (n < nofelems) {i = 0;
@@ -155,7 +155,7 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         // (Ignore other signals)
     }
 
-    void SystemSetHandler(int s, SYSTEM_ADDRESS h) {
+    void SystemSetHandler(int s, SYSTEM_ADRINT h) {
         if (s >= 2 && s <= 4) {
             int needtosetsystemhandler = handler[s-2] == 0;
             handler[s-2] = (SystemSignalHandler)h;
@@ -194,12 +194,12 @@ typedef void (*SystemSignalHandler)(INTEGER); // = Platform_SignalHandler
         }
     }
 
-    void SystemSetInterruptHandler(SYSTEM_ADDRESS h) {
+    void SystemSetInterruptHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemInterruptHandler = (SystemSignalHandler)h;
     }
 
-    void SystemSetQuitHandler(SYSTEM_ADDRESS h) {
+    void SystemSetQuitHandler(SYSTEM_ADRINT h) {
         EnsureConsoleCtrlHandler();
         SystemQuitHandler = (SystemSignalHandler)h;
     }
diff --git a/src/system/SYSTEM.h b/src/system/SYSTEM.h
index 6377745e..35620b9b 100644
--- a/src/system/SYSTEM.h
+++ b/src/system/SYSTEM.h
@@ -26,11 +26,12 @@ typedef unsigned char        SYSTEM_CARD8;
   typedef unsigned int         size_t;
 #endif
 
-#define SYSTEM_ADDRESS size_t
+#define SYSTEM_ADRINT size_t
+#define SYSTEM_ADDRESS size_t   // Temporarily for bootstrap
 #define _SIZE_T_DECLARED // For FreeBSD
 #define _SIZE_T_DEFINED_ // For OpenBSD
 
-void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);
+void *memcpy(void *dest, const void *source, SYSTEM_ADRINT size);
 
 
 
@@ -107,10 +108,10 @@ extern LONGINT SYSTEM_ENTIER (double x);
 // Signal handling in SYSTEM.c
 
 #ifndef _WIN32
-  extern void SystemSetHandler(int s, SYSTEM_ADDRESS h);
+  extern void SystemSetHandler(int s, SYSTEM_ADRINT h);
 #else
-  extern void SystemSetInterruptHandler(SYSTEM_ADDRESS h);
-  extern void SystemSetQuitHandler     (SYSTEM_ADDRESS h);
+  extern void SystemSetInterruptHandler(SYSTEM_ADRINT h);
+  extern void SystemSetQuitHandler     (SYSTEM_ADRINT h);
 #endif
 
 
@@ -133,9 +134,9 @@ static int __str_cmp(CHAR *x, CHAR *y){
 
 #define __COPY(s, d, n) {char*_a=(void*)s,*_b=(void*)d; LONGINT _i=0,_t=n-1; \
                          while(_i<_t&&((_b[_i]=_a[_i])!=0)){_i++;};_b[_i]=0;}
-#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADDRESS)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
+#define __DUP(x, l, t)  x=(void*)memcpy((void*)(SYSTEM_ADRINT)Platform_OSAllocate(l*sizeof(t)),x,l*sizeof(t))
 #define __DUPARR(v, t)  v=(void*)memcpy(v##__copy,v,sizeof(t))
-#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADDRESS)x)
+#define __DEL(x)        Platform_OSFree((LONGINT)(SYSTEM_ADRINT)x)
 
 
 
@@ -145,8 +146,8 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __VAL(t, x)     (*(t*)&(x))
 
 
-#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADDRESS)(a)
-#define __PUT(a, x, t)  *(t*)(SYSTEM_ADDRESS)(a)=x
+#define __GET(a, x, t)  x= *(t*)(SYSTEM_ADRINT)(a)
+#define __PUT(a, x, t)  *(t*)(SYSTEM_ADRINT)(a)=x
 
 #define __LSHL(x, n, t) ((t)((U_##t)(x)<<(n)))
 #define __LSHR(x, n, t) ((t)((U_##t)(x)>>(n)))
@@ -161,7 +162,7 @@ static int __str_cmp(CHAR *x, CHAR *y){
 #define __ROT(x, n, t)  ((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
 
 #define __BIT(x, n)     (*(U_LONGINT*)(x)>>(n)&1)
-#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADDRESS)(d),(char*)(SYSTEM_ADDRESS)(s),n)
+#define __MOVE(s, d, n) memcpy((char*)(SYSTEM_ADRINT)(d),(char*)(SYSTEM_ADRINT)(s),n)
 #define __ASHF(x, n)    SYSTEM_ASH((LONGINT)(x), (LONGINT)(n))
 #define __SHORT(x, y)   ((int)((U_LONGINT)(x)+(y)<(y)+(y)?(x):(__HALT(-8),0)))
 #define __SHORTF(x, y)  ((int)(__RF((x)+(y),(y)+(y))-(y)))
@@ -222,7 +223,7 @@ extern void       Heap_INCREF();
 extern void Platform_Init(INTEGER argc, LONGINT argv);
 extern void Heap_FINALL();
 
-#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADDRESS)&argv);
+#define __INIT(argc, argv)    static void *m; Platform_Init((INTEGER)argc, (LONGINT)(SYSTEM_ADRINT)&argv);
 #define __REGMAIN(name, enum) m = Heap_REGMOD((CHAR*)name,enum)
 #define __FINI                Heap_FINALL(); return 0
 
@@ -243,7 +244,7 @@ extern SYSTEM_PTR Heap_NEWREC (LONGINT tag);
 extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 
 #define __SYSNEW(p, len) p = Heap_NEWBLK((LONGINT)(len))
-#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADDRESS)t##__typ)
+#define __NEW(p, t)      p = Heap_NEWREC((LONGINT)(SYSTEM_ADRINT)t##__typ)
 #define __NEWARR         SYSTEM_NEWARR
 
 
@@ -274,20 +275,20 @@ extern SYSTEM_PTR SYSTEM_NEWARR(LONGINT*, LONGINT, int, int, int, ...);
 #define __INITYP(t, t0, level) \
   t##__typ               = (LONGINT*)&t##__desc.blksz;                                                    \
   memcpy(t##__desc.basep, t0##__typ - __BASEOFF, level*sizeof(LONGINT));                                  \
-  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADDRESS)t##__typ;                                                  \
-  t##__desc.module       = (LONGINT)(SYSTEM_ADDRESS)m;                                                         \
+  t##__desc.basep[level] = (LONGINT)(SYSTEM_ADRINT)t##__typ;                                                  \
+  t##__desc.module       = (LONGINT)(SYSTEM_ADRINT)m;                                                         \
   if(t##__desc.blksz!=sizeof(struct t)) __HALT(-15);                                                      \
   t##__desc.blksz        = (t##__desc.blksz+5*sizeof(LONGINT)-1)/(4*sizeof(LONGINT))*(4*sizeof(LONGINT)); \
-  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADDRESS)&t##__desc.next);                                                    \
+  Heap_REGTYP(m, (LONGINT)(SYSTEM_ADRINT)&t##__desc.next);                                                    \
   SYSTEM_INHERIT(t##__typ, t0##__typ)
 
-#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADDRESS)typ##__typ)
-#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADDRESS)(*(((LONGINT*)(p))-1)))
+#define __IS(tag, typ, level) (*(tag-(__BASEOFF-level))==(LONGINT)(SYSTEM_ADRINT)typ##__typ)
+#define __TYPEOF(p)           ((LONGINT*)(SYSTEM_ADRINT)(*(((LONGINT*)(p))-1)))
 #define __ISP(p, typ, level)  __IS(__TYPEOF(p),typ,level)
 
 // Oberon-2 type bound procedures support
-#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADDRESS)proc
-#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADDRESS)*(typ-(__TPROC0OFF+num))))parlist
+#define __INITBP(t, proc, num)            *(t##__typ-(__TPROC0OFF+num))=(LONGINT)(SYSTEM_ADRINT)proc
+#define __SEND(typ, num, funtyp, parlist) ((funtyp)((SYSTEM_ADRINT)*(typ-(__TPROC0OFF+num))))parlist