paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-03 01:31:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

* ptrint -> ptruint

Browse Source 
git-svn-id: trunk@7892 -
This commit is contained in:
daniel 2007-07-01 10:14:19 +00:00
parent fb00c0e253
commit ea47fcfc97
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtl/inc/objpas.inc
View File

@ -488,10 +488,10 @@
while assigned(vmt) do while assigned(vmt) do
begin begin
p:=(pointer(vmt)+vmtMsgStrPtr); p:=(pointer(vmt)+vmtMsgStrPtr);
If (P<>Nil) and (PPtrInt(P)^<>0) then If (P<>Nil) and (PPtruInt(P)^<>0) then
begin begin
count:=PPtrInt(PSizeUInt(p)^)^; count:=Pptruint(PSizeUInt(p)^)^;
msgstrtable:=pmsgstrtable(PSizeUInt(P)^+sizeof(ptrint)); msgstrtable:=pmsgstrtable(PSizeUInt(P)^+sizeof(ptruint));
end end
else else
Count:=0; Count:=0;
@ -610,18 +610,18 @@
etStandard: etStandard:
begin begin
//writeln('Doing etStandard cast of ', TObject(Instance).classname(), ' with self = ', ptruint(Instance), ' and offset = ', IEntry^.IOffset); //writeln('Doing etStandard cast of ', TObject(Instance).classname(), ' with self = ', ptruint(Instance), ' and offset = ', IEntry^.IOffset);
Pointer(Obj) := Pointer(PtrInt(Instance) + IEntry^.IOffset); Pbyte(Obj):=Pbyte(instance)+IEntry^.IOffset;
end; end;
etFieldValue: etFieldValue:
begin begin
//writeln('Doing etFieldValue cast of ', TObject(Instance).classname(), ' with offset = ', IEntry^.IOffset); //writeln('Doing etFieldValue cast of ', TObject(Instance).classname(), ' with offset = ', IEntry^.IOffset);
Pointer(obj) := ppointer(Pointer(Instance)+IEntry^.IOffset)^; Pointer(obj) := ppointer(Pbyte(Instance)+IEntry^.IOffset)^;
end; end;
etVirtualMethodResult: etVirtualMethodResult:
begin begin
//writeln('Doing etVirtualMethodResult cast of ', TObject(Instance).classname()); //writeln('Doing etVirtualMethodResult cast of ', TObject(Instance).classname());
TMethod(Getter).data := Instance; TMethod(Getter).data := Instance;
TMethod(Getter).code := ppointer(ptrint(Instance) + IEntry^.IOffset)^; TMethod(Getter).code := ppointer(Pbyte(Instance) + IEntry^.IOffset)^;
Pointer(obj) := Pointer(Getter()); Pointer(obj) := Pointer(Getter());
end; end;
etStaticMethodResult: etStaticMethodResult:

10
rtl/inc/objpash.inc
View File

@ -31,7 +31,7 @@
const const
vmtInstanceSize = 0; vmtInstanceSize = 0;
vmtParent = sizeof(ptrint)*2; vmtParent = sizeof(ptruint)*2;
{ These were negative value's, but are now positive, else classes { These were negative value's, but are now positive, else classes
couldn't be used with shared linking which copies only all data from couldn't be used with shared linking which copies only all data from
the .global directive and not the data before the directive (PFV) } the .global directive and not the data before the directive (PFV) }
@ -84,7 +84,7 @@
PMsgStrTable = ^TMsgStrTable; PMsgStrTable = ^TMsgStrTable;
TStringMessageTable = record TStringMessageTable = record
count : PtrInt; count : ptruint;
msgstrtable : array[0..0] of tmsgstrtable; msgstrtable : array[0..0] of tmsgstrtable;
end; end;
@ -122,7 +122,7 @@
tinterfaceentry = record tinterfaceentry = record
IID : pguid; { if assigned(IID) then Com else Corba} IID : pguid; { if assigned(IID) then Com else Corba}
VTable : Pointer; VTable : Pointer;
IOffset : PtrInt; IOffset : ptruint;
IIDStr : pshortstring; { never nil. Com: upper(GuidToString(IID^)) } IIDStr : pshortstring; { never nil. Com: upper(GuidToString(IID^)) }
case boolean of case boolean of
true : (IType : tinterfaceentrytype); true : (IType : tinterfaceentrytype);
@ -131,7 +131,7 @@
pinterfacetable = ^tinterfacetable; pinterfacetable = ^tinterfacetable;
tinterfacetable = record tinterfacetable = record
EntryCount : PtrInt; EntryCount : ptruint;
Entries : array[0..0] of tinterfaceentry; Entries : array[0..0] of tinterfaceentry;
end; end;
@ -317,7 +317,7 @@
type type
PVarRec = ^TVarRec; PVarRec = ^TVarRec;
TVarRec = record TVarRec = record
case VType : Ptrint of case VType : sizeuint of
{$ifdef ENDIAN_BIG} {$ifdef ENDIAN_BIG}
vtInteger : ({$IFDEF CPU64}integerdummy1 : Longint;{$ENDIF CPU64}VInteger: Longint); vtInteger : ({$IFDEF CPU64}integerdummy1 : Longint;{$ENDIF CPU64}VInteger: Longint);
vtBoolean : ({$IFDEF CPU64}booldummy : Longint;{$ENDIF CPU64}booldummy1,booldummy2,booldummy3: byte; VBoolean: Boolean); vtBoolean : ({$IFDEF CPU64}booldummy : Longint;{$ENDIF CPU64}booldummy1,booldummy2,booldummy3: byte; VBoolean: Boolean);

2
rtl/inc/systemh.inc
View File

@ -256,7 +256,7 @@ Type
PCardinal = ^Cardinal; PCardinal = ^Cardinal;
PQWord = ^QWord; PQWord = ^QWord;
PInt64 = ^Int64; PInt64 = ^Int64;
PPtrInt = ^PtrInt; PPtrUInt = ^PtrUInt;
PSizeInt = ^SizeInt; PSizeInt = ^SizeInt;
PPointer = ^Pointer; PPointer = ^Pointer;