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

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

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
END
ELSIF (mode = OPT.Typ) & (obj.typ.form = OPT.Int) THEN
IF (obj.typ = OPT.pinttyp) OR (obj.typ = OPT.ainttyp) THEN
OPM.WriteString("uintptr")
ELSE
OPM.WriteString("int"); OPM.WriteInt(obj.typ.size*8)
IF obj.typ = OPT.pinttyp THEN OPM.WriteString("uintptr")
ELSE OPM.WriteString("int"); OPM.WriteInt(obj.typ.size*8)
END
ELSE
IF (mode # OPT.Typ) OR (obj^.linkadr # PredefinedType) THEN

View file

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

View file

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

View file

@ -187,10 +187,10 @@ MODULE Heap;
architectures with 64 bit LONGINT, it loads 32 bits and extends it to LONGINT
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.
*)
PROCEDURE -FetchAddress(pointer: SYSTEM.UINTPTR): SYSTEM.UINTPTR "(uintptr)(*((void**)((uintptr)pointer)))";
PROCEDURE ExtendHeap(blksz: SYSTEM.UINTPTR);

View file

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

View file

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