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

Remove obsolete SYSTEM.ADRINT. (Not that I much like uintptr).

Browse source
This commit is contained in:
David Brown 2016-09-03 23:28:50 +01:00
parent 4ec2e61ed0
commit 90737e5677
33 changed files with 30 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bootstrap/unix-44/OPC.c
View file

@ -200,7 +200,7 @@ void OPC_Ident (OPT_Object obj)
} }
} }
} else if ((mode == 5 && obj->typ->form == 4)) { } else if ((mode == 5 && obj->typ->form == 4)) {
if (obj->typ == OPT_pinttyp || obj->typ == OPT_ainttyp) { if (obj->typ == OPT_pinttyp) {
OPM_WriteString((CHAR*)"uintptr", 8); OPM_WriteString((CHAR*)"uintptr", 8);
} else { } else {
OPM_WriteString((CHAR*)"int", 4); OPM_WriteString((CHAR*)"int", 4);

4
bootstrap/unix-44/OPT.c
View file

@ -83,7 +83,7 @@ typedef
export void (*OPT_typSize)(OPT_Struct); export void (*OPT_typSize)(OPT_Struct);
export OPT_Object OPT_topScope; export OPT_Object OPT_topScope;
export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_pinttyp, OPT_ainttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, 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_pinttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
export int8 OPT_nofGmod; export int8 OPT_nofGmod;
export OPT_Object OPT_GlbMod[64]; export OPT_Object OPT_GlbMod[64];
export OPS_Name OPT_SelfName; export OPS_Name OPT_SelfName;
@ -1768,7 +1768,6 @@ static void EnumPtrs(void (*P)(void*))
P(OPT_inttyp); P(OPT_inttyp);
P(OPT_linttyp); P(OPT_linttyp);
P(OPT_pinttyp); P(OPT_pinttyp);
P(OPT_ainttyp);
P(OPT_int8typ); P(OPT_int8typ);
P(OPT_int16typ); P(OPT_int16typ);
P(OPT_int32typ); P(OPT_int32typ);
@ -1851,7 +1850,6 @@ export void *OPT__init(void)
OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp); OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp);
OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp); OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp);
OPT_EnterTyp((CHAR*)"UINTPTR", 4, OPM_PointerSize, &OPT_pinttyp); OPT_EnterTyp((CHAR*)"UINTPTR", 4, OPM_PointerSize, &OPT_pinttyp);
OPT_EnterTyp((CHAR*)"ADRINT", 4, OPM_PointerSize, &OPT_ainttyp);
OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ); OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ);
OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ); OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ);
OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ); OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ);

2
bootstrap/unix-44/OPT.h
View file

@ -67,7 +67,7 @@ typedef
import void (*OPT_typSize)(OPT_Struct); import void (*OPT_typSize)(OPT_Struct);
import OPT_Object OPT_topScope; import OPT_Object OPT_topScope;
import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_pinttyp, OPT_ainttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, 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_pinttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
import int8 OPT_nofGmod; import int8 OPT_nofGmod;
import OPT_Object OPT_GlbMod[64]; import OPT_Object OPT_GlbMod[64];
import OPS_Name OPT_SelfName; import OPS_Name OPT_SelfName;

1
bootstrap/unix-44/OPV.c
View file

@ -286,7 +286,6 @@ void OPV_AdrAndSize (OPT_Object topScope)
OPT_inttyp->strobj->linkadr = 2; OPT_inttyp->strobj->linkadr = 2;
OPT_linttyp->strobj->linkadr = 2; OPT_linttyp->strobj->linkadr = 2;
OPT_pinttyp->strobj->linkadr = 2; OPT_pinttyp->strobj->linkadr = 2;
OPT_ainttyp->strobj->linkadr = 2;
OPT_int8typ->strobj->linkadr = 2; OPT_int8typ->strobj->linkadr = 2;
OPT_int16typ->strobj->linkadr = 2; OPT_int16typ->strobj->linkadr = 2;
OPT_int32typ->strobj->linkadr = 2; OPT_int32typ->strobj->linkadr = 2;

2
bootstrap/unix-44/Platform.c
View file

@ -263,7 +263,7 @@ void Platform_GetArg (int16 n, CHAR *val, LONGINT val__len)
{ {
Platform_ArgVec av = NIL; Platform_ArgVec av = NIL;
if (n < Platform_ArgCount) { if (n < Platform_ArgCount) {
av = __VAL(Platform_ArgVec, Platform_ArgVector); av = (Platform_ArgVec)(uintptr)Platform_ArgVector;
__COPY(*(*av)[__X(n, 1024)], val, val__len); __COPY(*(*av)[__X(n, 1024)], val, val__len);
} }
} }

2
bootstrap/unix-44/SYSTEM.h
View file

@ -67,7 +67,7 @@ typedef float REAL;
typedef double LONGREAL; typedef double LONGREAL;
typedef void* SYSTEM_PTR; typedef void* SYSTEM_PTR;
typedef uintptr SYSTEM_ADRINT;
// For 32 bit builds, the size of LONGINT depends on a make option: // For 32 bit builds, the size of LONGINT depends on a make option:

2
bootstrap/unix-48/OPC.c
View file

@ -200,7 +200,7 @@ void OPC_Ident (OPT_Object obj)
} }
} }
} else if ((mode == 5 && obj->typ->form == 4)) { } else if ((mode == 5 && obj->typ->form == 4)) {
if (obj->typ == OPT_pinttyp || obj->typ == OPT_ainttyp) { if (obj->typ == OPT_pinttyp) {
OPM_WriteString((CHAR*)"uintptr", 8); OPM_WriteString((CHAR*)"uintptr", 8);
} else { } else {
OPM_WriteString((CHAR*)"int", 4); OPM_WriteString((CHAR*)"int", 4);

4
bootstrap/unix-48/OPT.c
View file

@ -83,7 +83,7 @@ typedef
export void (*OPT_typSize)(OPT_Struct); export void (*OPT_typSize)(OPT_Struct);
export OPT_Object OPT_topScope; export OPT_Object OPT_topScope;
export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_pinttyp, OPT_ainttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, 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_pinttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
export int8 OPT_nofGmod; export int8 OPT_nofGmod;
export OPT_Object OPT_GlbMod[64]; export OPT_Object OPT_GlbMod[64];
export OPS_Name OPT_SelfName; export OPS_Name OPT_SelfName;
@ -1768,7 +1768,6 @@ static void EnumPtrs(void (*P)(void*))
P(OPT_inttyp); P(OPT_inttyp);
P(OPT_linttyp); P(OPT_linttyp);
P(OPT_pinttyp); P(OPT_pinttyp);
P(OPT_ainttyp);
P(OPT_int8typ); P(OPT_int8typ);
P(OPT_int16typ); P(OPT_int16typ);
P(OPT_int32typ); P(OPT_int32typ);
@ -1851,7 +1850,6 @@ export void *OPT__init(void)
OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp); OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp);
OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp); OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp);
OPT_EnterTyp((CHAR*)"UINTPTR", 4, OPM_PointerSize, &OPT_pinttyp); OPT_EnterTyp((CHAR*)"UINTPTR", 4, OPM_PointerSize, &OPT_pinttyp);
OPT_EnterTyp((CHAR*)"ADRINT", 4, OPM_PointerSize, &OPT_ainttyp);
OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ); OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ);
OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ); OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ);
OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ); OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ);

2
bootstrap/unix-48/OPT.h
View file

@ -67,7 +67,7 @@ typedef
import void (*OPT_typSize)(OPT_Struct); import void (*OPT_typSize)(OPT_Struct);
import OPT_Object OPT_topScope; import OPT_Object OPT_topScope;
import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_pinttyp, OPT_ainttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, 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_pinttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
import int8 OPT_nofGmod; import int8 OPT_nofGmod;
import OPT_Object OPT_GlbMod[64]; import OPT_Object OPT_GlbMod[64];
import OPS_Name OPT_SelfName; import OPS_Name OPT_SelfName;

1
bootstrap/unix-48/OPV.c
View file

@ -286,7 +286,6 @@ void OPV_AdrAndSize (OPT_Object topScope)
OPT_inttyp->strobj->linkadr = 2; OPT_inttyp->strobj->linkadr = 2;
OPT_linttyp->strobj->linkadr = 2; OPT_linttyp->strobj->linkadr = 2;
OPT_pinttyp->strobj->linkadr = 2; OPT_pinttyp->strobj->linkadr = 2;
OPT_ainttyp->strobj->linkadr = 2;
OPT_int8typ->strobj->linkadr = 2; OPT_int8typ->strobj->linkadr = 2;
OPT_int16typ->strobj->linkadr = 2; OPT_int16typ->strobj->linkadr = 2;
OPT_int32typ->strobj->linkadr = 2; OPT_int32typ->strobj->linkadr = 2;

2
bootstrap/unix-48/Platform.c
View file

@ -263,7 +263,7 @@ void Platform_GetArg (int16 n, CHAR *val, LONGINT val__len)
{ {
Platform_ArgVec av = NIL; Platform_ArgVec av = NIL;
if (n < Platform_ArgCount) { if (n < Platform_ArgCount) {
av = __VAL(Platform_ArgVec, Platform_ArgVector); av = (Platform_ArgVec)(uintptr)Platform_ArgVector;
__COPY(*(*av)[__X(n, 1024)], val, val__len); __COPY(*(*av)[__X(n, 1024)], val, val__len);
} }
} }

2
bootstrap/unix-48/SYSTEM.h
View file

@ -67,7 +67,7 @@ typedef float REAL;
typedef double LONGREAL; typedef double LONGREAL;
typedef void* SYSTEM_PTR; typedef void* SYSTEM_PTR;
typedef uintptr SYSTEM_ADRINT;
// For 32 bit builds, the size of LONGINT depends on a make option: // For 32 bit builds, the size of LONGINT depends on a make option:

2
bootstrap/unix-88/OPC.c
View file

@ -201,7 +201,7 @@ void OPC_Ident (OPT_Object obj)
} }
} }
} else if ((mode == 5 && obj->typ->form == 4)) { } else if ((mode == 5 && obj->typ->form == 4)) {
if (obj->typ == OPT_pinttyp || obj->typ == OPT_ainttyp) { if (obj->typ == OPT_pinttyp) {
OPM_WriteString((CHAR*)"uintptr", 8); OPM_WriteString((CHAR*)"uintptr", 8);
} else { } else {
OPM_WriteString((CHAR*)"int", 4); OPM_WriteString((CHAR*)"int", 4);

4
bootstrap/unix-88/OPT.c
View file

@ -84,7 +84,7 @@ typedef
export void (*OPT_typSize)(OPT_Struct); export void (*OPT_typSize)(OPT_Struct);
export OPT_Object OPT_topScope; export OPT_Object OPT_topScope;
export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_pinttyp, OPT_ainttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, 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_pinttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
export int8 OPT_nofGmod; export int8 OPT_nofGmod;
export OPT_Object OPT_GlbMod[64]; export OPT_Object OPT_GlbMod[64];
export OPS_Name OPT_SelfName; export OPS_Name OPT_SelfName;
@ -1769,7 +1769,6 @@ static void EnumPtrs(void (*P)(void*))
P(OPT_inttyp); P(OPT_inttyp);
P(OPT_linttyp); P(OPT_linttyp);
P(OPT_pinttyp); P(OPT_pinttyp);
P(OPT_ainttyp);
P(OPT_int8typ); P(OPT_int8typ);
P(OPT_int16typ); P(OPT_int16typ);
P(OPT_int32typ); P(OPT_int32typ);
@ -1852,7 +1851,6 @@ export void *OPT__init(void)
OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp); OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp);
OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp); OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp);
OPT_EnterTyp((CHAR*)"UINTPTR", 4, OPM_PointerSize, &OPT_pinttyp); OPT_EnterTyp((CHAR*)"UINTPTR", 4, OPM_PointerSize, &OPT_pinttyp);
OPT_EnterTyp((CHAR*)"ADRINT", 4, OPM_PointerSize, &OPT_ainttyp);
OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ); OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ);
OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ); OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ);
OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ); OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ);

2
bootstrap/unix-88/OPT.h
View file

@ -68,7 +68,7 @@ typedef
import void (*OPT_typSize)(OPT_Struct); import void (*OPT_typSize)(OPT_Struct);
import OPT_Object OPT_topScope; import OPT_Object OPT_topScope;
import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_pinttyp, OPT_ainttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, 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_pinttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
import int8 OPT_nofGmod; import int8 OPT_nofGmod;
import OPT_Object OPT_GlbMod[64]; import OPT_Object OPT_GlbMod[64];
import OPS_Name OPT_SelfName; import OPS_Name OPT_SelfName;

1
bootstrap/unix-88/OPV.c
View file

@ -287,7 +287,6 @@ void OPV_AdrAndSize (OPT_Object topScope)
OPT_inttyp->strobj->linkadr = 2; OPT_inttyp->strobj->linkadr = 2;
OPT_linttyp->strobj->linkadr = 2; OPT_linttyp->strobj->linkadr = 2;
OPT_pinttyp->strobj->linkadr = 2; OPT_pinttyp->strobj->linkadr = 2;
OPT_ainttyp->strobj->linkadr = 2;
OPT_int8typ->strobj->linkadr = 2; OPT_int8typ->strobj->linkadr = 2;
OPT_int16typ->strobj->linkadr = 2; OPT_int16typ->strobj->linkadr = 2;
OPT_int32typ->strobj->linkadr = 2; OPT_int32typ->strobj->linkadr = 2;

2
bootstrap/unix-88/SYSTEM.h
View file

@ -67,7 +67,7 @@ typedef float REAL;
typedef double LONGREAL; typedef double LONGREAL;
typedef void* SYSTEM_PTR; typedef void* SYSTEM_PTR;
typedef uintptr SYSTEM_ADRINT;
// For 32 bit builds, the size of LONGINT depends on a make option: // For 32 bit builds, the size of LONGINT depends on a make option:

2
bootstrap/windows-48/OPC.c
View file

@ -200,7 +200,7 @@ void OPC_Ident (OPT_Object obj)
} }
} }
} else if ((mode == 5 && obj->typ->form == 4)) { } else if ((mode == 5 && obj->typ->form == 4)) {
if (obj->typ == OPT_pinttyp || obj->typ == OPT_ainttyp) { if (obj->typ == OPT_pinttyp) {
OPM_WriteString((CHAR*)"uintptr", 8); OPM_WriteString((CHAR*)"uintptr", 8);
} else { } else {
OPM_WriteString((CHAR*)"int", 4); OPM_WriteString((CHAR*)"int", 4);

4
bootstrap/windows-48/OPT.c
View file

@ -83,7 +83,7 @@ typedef
export void (*OPT_typSize)(OPT_Struct); export void (*OPT_typSize)(OPT_Struct);
export OPT_Object OPT_topScope; export OPT_Object OPT_topScope;
export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_pinttyp, OPT_ainttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, 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_pinttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
export int8 OPT_nofGmod; export int8 OPT_nofGmod;
export OPT_Object OPT_GlbMod[64]; export OPT_Object OPT_GlbMod[64];
export OPS_Name OPT_SelfName; export OPS_Name OPT_SelfName;
@ -1768,7 +1768,6 @@ static void EnumPtrs(void (*P)(void*))
P(OPT_inttyp); P(OPT_inttyp);
P(OPT_linttyp); P(OPT_linttyp);
P(OPT_pinttyp); P(OPT_pinttyp);
P(OPT_ainttyp);
P(OPT_int8typ); P(OPT_int8typ);
P(OPT_int16typ); P(OPT_int16typ);
P(OPT_int32typ); P(OPT_int32typ);
@ -1851,7 +1850,6 @@ export void *OPT__init(void)
OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp); OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp);
OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp); OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp);
OPT_EnterTyp((CHAR*)"UINTPTR", 4, OPM_PointerSize, &OPT_pinttyp); OPT_EnterTyp((CHAR*)"UINTPTR", 4, OPM_PointerSize, &OPT_pinttyp);
OPT_EnterTyp((CHAR*)"ADRINT", 4, OPM_PointerSize, &OPT_ainttyp);
OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ); OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ);
OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ); OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ);
OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ); OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ);

2
bootstrap/windows-48/OPT.h
View file

@ -67,7 +67,7 @@ typedef
import void (*OPT_typSize)(OPT_Struct); import void (*OPT_typSize)(OPT_Struct);
import OPT_Object OPT_topScope; import OPT_Object OPT_topScope;
import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_pinttyp, OPT_ainttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, 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_pinttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
import int8 OPT_nofGmod; import int8 OPT_nofGmod;
import OPT_Object OPT_GlbMod[64]; import OPT_Object OPT_GlbMod[64];
import OPS_Name OPT_SelfName; import OPS_Name OPT_SelfName;

1
bootstrap/windows-48/OPV.c
View file

@ -286,7 +286,6 @@ void OPV_AdrAndSize (OPT_Object topScope)
OPT_inttyp->strobj->linkadr = 2; OPT_inttyp->strobj->linkadr = 2;
OPT_linttyp->strobj->linkadr = 2; OPT_linttyp->strobj->linkadr = 2;
OPT_pinttyp->strobj->linkadr = 2; OPT_pinttyp->strobj->linkadr = 2;
OPT_ainttyp->strobj->linkadr = 2;
OPT_int8typ->strobj->linkadr = 2; OPT_int8typ->strobj->linkadr = 2;
OPT_int16typ->strobj->linkadr = 2; OPT_int16typ->strobj->linkadr = 2;
OPT_int32typ->strobj->linkadr = 2; OPT_int32typ->strobj->linkadr = 2;

2
bootstrap/windows-48/SYSTEM.h
View file

@ -67,7 +67,7 @@ typedef float REAL;
typedef double LONGREAL; typedef double LONGREAL;
typedef void* SYSTEM_PTR; typedef void* SYSTEM_PTR;
typedef uintptr SYSTEM_ADRINT;
// For 32 bit builds, the size of LONGINT depends on a make option: // For 32 bit builds, the size of LONGINT depends on a make option:

2
bootstrap/windows-88/OPC.c
View file

@ -201,7 +201,7 @@ void OPC_Ident (OPT_Object obj)
} }
} }
} else if ((mode == 5 && obj->typ->form == 4)) { } else if ((mode == 5 && obj->typ->form == 4)) {
if (obj->typ == OPT_pinttyp || obj->typ == OPT_ainttyp) { if (obj->typ == OPT_pinttyp) {
OPM_WriteString((CHAR*)"uintptr", 8); OPM_WriteString((CHAR*)"uintptr", 8);
} else { } else {
OPM_WriteString((CHAR*)"int", 4); OPM_WriteString((CHAR*)"int", 4);

4
bootstrap/windows-88/OPT.c
View file

@ -84,7 +84,7 @@ typedef
export void (*OPT_typSize)(OPT_Struct); export void (*OPT_typSize)(OPT_Struct);
export OPT_Object OPT_topScope; export OPT_Object OPT_topScope;
export OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_pinttyp, OPT_ainttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, 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_pinttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
export int8 OPT_nofGmod; export int8 OPT_nofGmod;
export OPT_Object OPT_GlbMod[64]; export OPT_Object OPT_GlbMod[64];
export OPS_Name OPT_SelfName; export OPS_Name OPT_SelfName;
@ -1769,7 +1769,6 @@ static void EnumPtrs(void (*P)(void*))
P(OPT_inttyp); P(OPT_inttyp);
P(OPT_linttyp); P(OPT_linttyp);
P(OPT_pinttyp); P(OPT_pinttyp);
P(OPT_ainttyp);
P(OPT_int8typ); P(OPT_int8typ);
P(OPT_int16typ); P(OPT_int16typ);
P(OPT_int32typ); P(OPT_int32typ);
@ -1852,7 +1851,6 @@ export void *OPT__init(void)
OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp); OPT_EnterTyp((CHAR*)"BYTE", 1, OPM_ByteSize, &OPT_bytetyp);
OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp); OPT_EnterTyp((CHAR*)"PTR", 11, OPM_PointerSize, &OPT_sysptrtyp);
OPT_EnterTyp((CHAR*)"UINTPTR", 4, OPM_PointerSize, &OPT_pinttyp); OPT_EnterTyp((CHAR*)"UINTPTR", 4, OPM_PointerSize, &OPT_pinttyp);
OPT_EnterTyp((CHAR*)"ADRINT", 4, OPM_PointerSize, &OPT_ainttyp);
OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ); OPT_EnterTyp((CHAR*)"INT8", 4, 1, &OPT_int8typ);
OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ); OPT_EnterTyp((CHAR*)"INT16", 4, 2, &OPT_int16typ);
OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ); OPT_EnterTyp((CHAR*)"INT32", 4, 4, &OPT_int32typ);

2
bootstrap/windows-88/OPT.h
View file

@ -68,7 +68,7 @@ typedef
import void (*OPT_typSize)(OPT_Struct); import void (*OPT_typSize)(OPT_Struct);
import OPT_Object OPT_topScope; import OPT_Object OPT_topScope;
import OPT_Struct OPT_undftyp, OPT_bytetyp, OPT_booltyp, OPT_chartyp, OPT_sinttyp, OPT_inttyp, OPT_linttyp, OPT_pinttyp, OPT_ainttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, 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_pinttyp, OPT_int8typ, OPT_int16typ, OPT_int32typ, OPT_int64typ, OPT_realtyp, OPT_lrltyp, OPT_settyp, OPT_stringtyp, OPT_niltyp, OPT_notyp, OPT_sysptrtyp;
import int8 OPT_nofGmod; import int8 OPT_nofGmod;
import OPT_Object OPT_GlbMod[64]; import OPT_Object OPT_GlbMod[64];
import OPS_Name OPT_SelfName; import OPS_Name OPT_SelfName;

1
bootstrap/windows-88/OPV.c
View file

@ -287,7 +287,6 @@ void OPV_AdrAndSize (OPT_Object topScope)
OPT_inttyp->strobj->linkadr = 2; OPT_inttyp->strobj->linkadr = 2;
OPT_linttyp->strobj->linkadr = 2; OPT_linttyp->strobj->linkadr = 2;
OPT_pinttyp->strobj->linkadr = 2; OPT_pinttyp->strobj->linkadr = 2;
OPT_ainttyp->strobj->linkadr = 2;
OPT_int8typ->strobj->linkadr = 2; OPT_int8typ->strobj->linkadr = 2;
OPT_int16typ->strobj->linkadr = 2; OPT_int16typ->strobj->linkadr = 2;
OPT_int32typ->strobj->linkadr = 2; OPT_int32typ->strobj->linkadr = 2;

2
bootstrap/windows-88/SYSTEM.h
View file

@ -67,7 +67,7 @@ typedef float REAL;
typedef double LONGREAL; typedef double LONGREAL;
typedef void* SYSTEM_PTR; typedef void* SYSTEM_PTR;
typedef uintptr SYSTEM_ADRINT;
// For 32 bit builds, the size of LONGINT depends on a make option: // For 32 bit builds, the size of LONGINT depends on a make option:

6
src/compiler/OPC.Mod
View file

@ -117,10 +117,8 @@ MODULE OPC; (* copyright (c) J. Templ 12.7.95 / 3.7.96 *)
IF keytab[hashtab[h]] = obj^.name THEN OPM.Write('_') END IF keytab[hashtab[h]] = obj^.name THEN OPM.Write('_') END
END END
ELSIF (mode = OPT.Typ) & (obj.typ.form = OPT.Int) THEN ELSIF (mode = OPT.Typ) & (obj.typ.form = OPT.Int) THEN
IF (obj.typ = OPT.pinttyp) OR (obj.typ = OPT.ainttyp) THEN IF obj.typ = OPT.pinttyp THEN OPM.WriteString("uintptr")
OPM.WriteString("uintptr") ELSE OPM.WriteString("int"); OPM.WriteInt(obj.typ.size*8)
ELSE
OPM.WriteString("int"); OPM.WriteInt(obj.typ.size*8)
END END
ELSE ELSE
IF (mode # OPT.Typ) OR (obj^.linkadr # PredefinedType) THEN IF (mode # OPT.Typ) OR (obj^.linkadr # PredefinedType) THEN

3
src/compiler/OPT.Mod
View file

@ -155,7 +155,7 @@ VAR
undftyp*, undftyp*,
bytetyp*, booltyp*, chartyp*, bytetyp*, booltyp*, chartyp*,
sinttyp*, inttyp*, linttyp*, sinttyp*, inttyp*, linttyp*,
pinttyp*, ainttyp*, pinttyp*,
int8typ*, int16typ*, int32typ*, int64typ*, int8typ*, int16typ*, int32typ*, int64typ*,
realtyp*, lrltyp*, settyp*, stringtyp*, realtyp*, lrltyp*, settyp*, stringtyp*,
niltyp*, notyp*, sysptrtyp*: Struct; niltyp*, notyp*, sysptrtyp*: Struct;
@ -1189,7 +1189,6 @@ BEGIN topScope := NIL; OpenScope(0, NIL); OPM.errpos := 0;
EnterTyp("BYTE", Byte, OPM.ByteSize, bytetyp); EnterTyp("BYTE", Byte, OPM.ByteSize, bytetyp);
EnterTyp("PTR", Pointer, OPM.PointerSize, sysptrtyp); EnterTyp("PTR", Pointer, OPM.PointerSize, sysptrtyp);
EnterTyp("UINTPTR", Int, OPM.PointerSize, pinttyp); EnterTyp("UINTPTR", Int, OPM.PointerSize, pinttyp);
EnterTyp("ADRINT", Int, OPM.PointerSize, ainttyp); (* Temporary for bootstrapping *)
EnterTyp("INT8", Int, 1, int8typ); EnterTyp("INT8", Int, 1, int8typ);
EnterTyp("INT16", Int, 2, int16typ); EnterTyp("INT16", Int, 2, int16typ);
EnterTyp("INT32", Int, 4, int32typ); EnterTyp("INT32", Int, 4, int32typ);

1
src/compiler/OPV.Mod
View file

@ -206,7 +206,6 @@ MODULE OPV; (* J. Templ 16.2.95 / 3.7.96
OPT.inttyp^.strobj^.linkadr := PredefinedType; OPT.inttyp^.strobj^.linkadr := PredefinedType;
OPT.linttyp^.strobj^.linkadr := PredefinedType; OPT.linttyp^.strobj^.linkadr := PredefinedType;
OPT.pinttyp^.strobj^.linkadr := PredefinedType; OPT.pinttyp^.strobj^.linkadr := PredefinedType;
OPT.ainttyp^.strobj^.linkadr := PredefinedType;
OPT.int8typ^.strobj^.linkadr := PredefinedType; OPT.int8typ^.strobj^.linkadr := PredefinedType;
OPT.int16typ^.strobj^.linkadr := PredefinedType; OPT.int16typ^.strobj^.linkadr := PredefinedType;
OPT.int32typ^.strobj^.linkadr := PredefinedType; OPT.int32typ^.strobj^.linkadr := PredefinedType;

4
src/system/Heap.Mod
View file

@ -187,10 +187,10 @@ MODULE Heap;
architectures with 64 bit LONGINT, it loads 32 bits and extends it to LONGINT architectures with 64 bit LONGINT, it loads 32 bits and extends it to LONGINT
rather than loading 64 bits. rather than loading 64 bits.
NOTE - with uintpr work complete this function should be replaces withSYSTEM.GET NOTE - with uintpr work complete this function should be replaced with SYSTEM.GET
as there will be no need to extend addresses to larger types. as there will be no need to extend addresses to larger types.
*) *)
PROCEDURE -FetchAddress(pointer: SYSTEM.UINTPTR): SYSTEM.UINTPTR "(uintptr)(*((void**)((uintptr)pointer)))"; PROCEDURE -FetchAddress(pointer: SYSTEM.UINTPTR): SYSTEM.UINTPTR "(uintptr)(*((void**)((uintptr)pointer)))";
PROCEDURE ExtendHeap(blksz: SYSTEM.UINTPTR); PROCEDURE ExtendHeap(blksz: SYSTEM.UINTPTR);

4
src/system/Platformunix.Mod
View file

@ -27,13 +27,13 @@ TYPE
VAR VAR
LittleEndian-: BOOLEAN; LittleEndian-: BOOLEAN;
MainStackFrame-: SYSTEM.ADRINT; MainStackFrame-: SYSTEM.UINTPTR;
HaltCode-: LONGINT; HaltCode-: LONGINT;
PID-: INTEGER; (* Note: Must be updated by Fork implementation *) PID-: INTEGER; (* Note: Must be updated by Fork implementation *)
CWD-: ARRAY 256 OF CHAR; CWD-: ARRAY 256 OF CHAR;
ArgCount-: INTEGER; ArgCount-: INTEGER;
ArgVector-: SYSTEM.ADRINT; ArgVector-: SYSTEM.UINTPTR;
HaltHandler: HaltProcedure; HaltHandler: HaltProcedure;
TimeStart: LONGINT; TimeStart: LONGINT;

2
src/system/SYSTEM.h
View file

@ -67,7 +67,7 @@ typedef float REAL;
typedef double LONGREAL; typedef double LONGREAL;
typedef void* SYSTEM_PTR; typedef void* SYSTEM_PTR;
typedef uintptr SYSTEM_ADRINT;
// For 32 bit builds, the size of LONGINT depends on a make option: // For 32 bit builds, the size of LONGINT depends on a make option: