paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 09:26:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixes from Sebastian Guenther

Browse Source
This commit is contained in:
michael 1999-09-03 15:39:23 +00:00
parent 56ddb9a0af
commit 8ca0b0cab3
1 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
rtl/objpas/typinfo.pp
View File

@ -28,6 +28,7 @@ unit typinfo;
type type
PShortString =^ShortString; PShortString =^ShortString;
PByte =^Byte; PByte =^Byte;
PWord =^Word;
PLongint =^Longint; PLongint =^Longint;
PBoolean =^Boolean; PBoolean =^Boolean;
PSingle =^Single; PSingle =^Single;
@ -204,7 +205,7 @@ unit typinfo;
function GetEnumValue(TypeInfo : PTypeInfo;const Name : string) : Integer; function GetEnumValue(TypeInfo : PTypeInfo;const Name : string) : Integer;
implementation implementation
uses sysutils;
{$ASMMODE ATT} {$ASMMODE ATT}
function CallIntegerFunc(s : Pointer;Address : Pointer; INdex,IValue : Longint) : Integer;assembler; function CallIntegerFunc(s : Pointer;Address : Pointer; INdex,IValue : Longint) : Integer;assembler;
@ -214,10 +215,11 @@ unit typinfo;
// ? Indexed function // ? Indexed function
movl Index,%eax movl Index,%eax
xorl %eax,%eax xorl %eax,%eax
jnz .LINoPush je .LINoPush
movl IValue,%eax movl IValue,%eax
pushl %eax pushl %eax
.LINoPush: .LINoPush:
push %esi
call %edi call %edi
// now the result is in EAX // now the result is in EAX
end; end;
@ -232,10 +234,11 @@ unit typinfo;
// ? Indexed procedure // ? Indexed procedure
movl Index,%eax movl Index,%eax
xorl %eax,%eax xorl %eax,%eax
jnz .LIPNoPush je .LIPNoPush
movl IValue,%eax movl IValue,%eax
pushl %eax pushl %eax
.LIPNoPush: .LIPNoPush:
pushl %esi
call %edi call %edi
end; end;
@ -246,10 +249,11 @@ unit typinfo;
// ? Indexed function // ? Indexed function
movl Index,%eax movl Index,%eax
xorl %eax,%eax xorl %eax,%eax
jnz .LINoPush je .LINoPush
movl IValue,%eax movl IValue,%eax
pushl %eax pushl %eax
.LINoPush: .LINoPush:
push %esi
call %edi call %edi
// //
end; end;
@ -266,10 +270,11 @@ unit typinfo;
// ? Indexed procedure // ? Indexed procedure
movl Index,%eax movl Index,%eax
xorl %eax,%eax xorl %eax,%eax
jnz .LIPNoPush je .LIPNoPush
movl IValue,%eax movl IValue,%eax
pushl %eax pushl %eax
.LIPNoPush: .LIPNoPush:
push %esi
call %edi call %edi
end; end;
@ -280,10 +285,11 @@ unit typinfo;
// ? Indexed function // ? Indexed function
movl Index,%eax movl Index,%eax
xorl %eax,%eax xorl %eax,%eax
jnz .LBNoPush je .LBNoPush
movl IValue,%eax movl IValue,%eax
pushl %eax pushl %eax
.LBNoPush: .LBNoPush:
push %esi
call %edi call %edi
end; end;
@ -305,6 +311,7 @@ unit typinfo;
// the result is stored in an invisible parameter // the result is stored in an invisible parameter
pushl Res pushl Res
.LSSNoPush: .LSSNoPush:
push %esi
call %edi call %edi
end; end;
@ -322,6 +329,7 @@ unit typinfo;
movl IValue,%eax movl IValue,%eax
pushl %eax pushl %eax
.LSSPNoPush: .LSSPNoPush:
push %esi
call %edi call %edi
end; end;
@ -370,7 +378,7 @@ unit typinfo;
ptstatic: ptstatic:
IsStoredProp:=CallBooleanFunc(Instance,PropInfo^.StoredProc,0,0); IsStoredProp:=CallBooleanFunc(Instance,PropInfo^.StoredProc,0,0);
ptvirtual: ptvirtual:
IsStoredProp:=CallBooleanFunc(Instance,(PPointer(Instance.ClassType)+Longint(PropInfo^.StoredProc)),0,0); IsStoredProp:=CallBooleanFunc(Instance,(PPointer(Instance.ClassType)+Longint(PropInfo^.StoredProc))^,0,0);
ptconst: ptconst:
IsStoredProp:=LongBool(PropInfo^.StoredProc); IsStoredProp:=LongBool(PropInfo^.StoredProc);
end; end;
@ -460,7 +468,7 @@ unit typinfo;
begin begin
Index:=((P^.PropProcs shr 6) and 1); Index:=((P^.PropProcs shr 6) and 1);
If Index=0 then If Index<>0 then
IValue:=P^.Index IValue:=P^.Index
else else
IValue:=0; IValue:=0;
@ -480,7 +488,7 @@ unit typinfo;
Value:=CallIntegerFunc(Instance,PropInfo^.GetProc,Index,IValue); Value:=CallIntegerFunc(Instance,PropInfo^.GetProc,Index,IValue);
ptvirtual: ptvirtual:
Value:=CallIntegerFunc(Instance, Value:=CallIntegerFunc(Instance,
(PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc)), (PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc))^,
Index,IValue); Index,IValue);
end; end;
{ cut off unnecessary stuff } { cut off unnecessary stuff }
@ -496,25 +504,36 @@ unit typinfo;
procedure SetOrdProp(Instance : TObject;PropInfo : PPropInfo; procedure SetOrdProp(Instance : TObject;PropInfo : PPropInfo;
Value : Longint); Value : Longint);
Var Index,IValue : Longint; var
Index,IValue : Longint;
DataSize: Integer;
begin begin
{ cut off unnecessary stuff } { cut off unnecessary stuff }
case GetTypeData(PropInfo^.PropType)^.OrdType of case GetTypeData(PropInfo^.PropType)^.OrdType of
otSWord,otUWord: otSWord,otUWord: begin
Value:=Value and $ffff; Value:=Value and $ffff;
otSByte,otUByte: DataSize := 2;
Value:=Value and $ff; end;
otSByte,otUByte: begin
Value:=Value and $ff;
DataSize := 1;
end;
else DataSize := 4;
end; end;
SetIndexValues(PropInfo,Index,Ivalue); SetIndexValues(PropInfo,Index,Ivalue);
case (PropInfo^.PropProcs shr 2) and 3 of case (PropInfo^.PropProcs shr 2) and 3 of
ptfield: ptfield:
PLongint(Pointer(Instance)+Longint(PropInfo^.SetProc))^:=Value; case DataSize of
1: PByte(Pointer(Instance)+Longint(PropInfo^.SetProc))^:=Byte(Value);
2: PWord(Pointer(Instance)+Longint(PropInfo^.SetProc))^:=Word(Value);
4: PLongint(Pointer(Instance)+Longint(PropInfo^.SetProc))^:=Value;
end;
ptstatic: ptstatic:
CallIntegerProc(Instance,PropInfo^.SetProc,Value,Index,IValue); CallIntegerProc(Instance,PropInfo^.SetProc,Value,Index,IValue);
ptvirtual: ptvirtual:
CallIntegerProc(Instance, CallIntegerProc(Instance,
(PPointer(Instance.ClassType)+Longint(PropInfo^.SetProc)), (PPointer(Instance.ClassType)+Longint(PropInfo^.SetProc))^,
Value,Index,IValue); Value,Index,IValue);
end; end;
end; end;
@ -539,7 +558,7 @@ unit typinfo;
Value:=Pointer(CallIntegerFunc(Instance,PropInfo^.GetProc,Index,IValue)); Value:=Pointer(CallIntegerFunc(Instance,PropInfo^.GetProc,Index,IValue));
ptvirtual: ptvirtual:
Value:=Pointer(CallIntegerFunc(Instance, Value:=Pointer(CallIntegerFunc(Instance,
(PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc)), (PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc))^,
Index,IValue)); Index,IValue));
end; end;
GetAstrProp:=Value; GetAstrProp:=Value;
@ -560,7 +579,7 @@ unit typinfo;
CallSStringFunc(Instance,PropInfo^.GetProc,Index,IValue,Value); CallSStringFunc(Instance,PropInfo^.GetProc,Index,IValue,Value);
ptvirtual: ptvirtual:
CallSSTringFunc(Instance, CallSSTringFunc(Instance,
(PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc)), (PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc))^,
Index,Ivalue,Value); Index,Ivalue,Value);
end; end;
GetSStrProp:=Value; GetSStrProp:=Value;
@ -577,7 +596,6 @@ unit typinfo;
end; end;
end; end;
procedure SetAStrProp(Instance : TObject;PropInfo : PPropInfo; procedure SetAStrProp(Instance : TObject;PropInfo : PPropInfo;
const Value : AnsiString); const Value : AnsiString);
@ -588,7 +606,6 @@ unit typinfo;
var var
Index,Ivalue : Longint; Index,Ivalue : Longint;
begin begin
SetIndexValues(PropInfo,Index,IValue); SetIndexValues(PropInfo,Index,IValue);
case (PropInfo^.PropProcs shr 2) and 3 of case (PropInfo^.PropProcs shr 2) and 3 of
@ -598,7 +615,7 @@ unit typinfo;
CallIntegerProc(Instance,PropInfo^.SetProc,Longint(Pointer(Value)),Index,IValue); CallIntegerProc(Instance,PropInfo^.SetProc,Longint(Pointer(Value)),Index,IValue);
ptvirtual: ptvirtual:
CallIntegerProc(Instance, CallIntegerProc(Instance,
(PPointer(Instance.ClassType)+Longint(PropInfo^.SetProc)), (PPointer(Instance.ClassType)+Longint(PropInfo^.SetProc))^,
Longint(Pointer(Value)),Index,IValue); Longint(Pointer(Value)),Index,IValue);
end; end;
end; end;
@ -617,7 +634,7 @@ unit typinfo;
CallSStringProc(Instance,PropInfo^.GetProc,Value,Index,IValue); CallSStringProc(Instance,PropInfo^.GetProc,Value,Index,IValue);
ptvirtual: ptvirtual:
CallSStringProc(Instance, CallSStringProc(Instance,
(PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc)), (PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc))^,
Value,Index,IValue); Value,Index,IValue);
end; end;
end; end;
@ -663,7 +680,7 @@ unit typinfo;
Value:=CallExtendedFunc(Instance,PropInfo^.GetProc,Index,IValue); Value:=CallExtendedFunc(Instance,PropInfo^.GetProc,Index,IValue);
ptvirtual: ptvirtual:
Value:=CallExtendedFunc(Instance, Value:=CallExtendedFunc(Instance,
(PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc)), (PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc))^,
Index,IValue); Index,IValue);
end; end;
Result:=Value; Result:=Value;
@ -698,7 +715,7 @@ unit typinfo;
CallExtendedProc(Instance,PropInfo^.SetProc,Value,Index,IValue); CallExtendedProc(Instance,PropInfo^.SetProc,Value,Index,IValue);
ptvirtual: ptvirtual:
CallExtendedProc(Instance, CallExtendedProc(Instance,
(PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc)), (PPointer(Instance.ClassType)+Longint(PropInfo^.GetProc))^,
Value,Index,IValue); Value,Index,IValue);
end; end;
end; end;
@ -774,7 +791,10 @@ end.
{ {
$Log$ $Log$
Revision 1.25 1999-08-29 22:21:27 michael Revision 1.26 1999-09-03 15:39:23 michael
* Fixes from Sebastian Guenther
Revision 1.25 1999/08/29 22:21:27 michael
* Patch from Sebastian Guenther * Patch from Sebastian Guenther
Revision 1.24 1999/08/06 13:21:40 michael Revision 1.24 1999/08/06 13:21:40 michael