paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 03:39:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* directly use the indirection information instead of calculating it a second time in ValueToFFIValue()

Browse Source 
git-svn-id: trunk@42069 -
This commit is contained in:
svenbarth 2019-05-15 05:28:48 +00:00
parent 68c9b83d87
commit 1c58ef49f3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/libffi/src/ffi.manager.pp
View File

@ -496,7 +496,10 @@ begin
else else
kind := tkUnknown; kind := tkUnknown;
aData.Indirect[0] := ArgIsIndirect(kind, aArgInfos[0].ParamFlags, False); aData.Indirect[0] := ArgIsIndirect(kind, aArgInfos[0].ParamFlags, False);
aData.Values[0] := ValueToFFIValue(aArgValues[0], kind, aArgInfos[0].ParamFlags, False); if aData.Indirect[0] then
aData.Values[0] := @aArgValues[0]
else
aData.Values[0] := aArgValues[0];
if retparam then if retparam then
Inc(aData.ResultIndex); Inc(aData.ResultIndex);
argstart := 1; argstart := 1;
@ -512,13 +515,19 @@ begin
else else
kind := tkUnknown; kind := tkUnknown;
aData.Indirect[i + argoffset] := ArgIsIndirect(kind, aArgInfos[i].ParamFlags, False); aData.Indirect[i + argoffset] := ArgIsIndirect(kind, aArgInfos[i].ParamFlags, False);
aData.Values[i + argoffset] := ValueToFFIValue(aArgValues[i], kind, aArgInfos[i].ParamFlags, False); if aData.Indirect[i + argoffset] then
aData.Values[i + argoffset] := @aArgValues[i]
else
aData.Values[i + argoffset] := aArgValues[i];
end; end;
if retparam then begin if retparam then begin
aData.Types[aData.ResultIndex] := TypeInfoToFFIType(aResultType, []); aData.Types[aData.ResultIndex] := TypeInfoToFFIType(aResultType, []);
aData.Indirect[aData.ResultIndex] := ArgIsIndirect(aResultType^.Kind, [], True); aData.Indirect[aData.ResultIndex] := ArgIsIndirect(aResultType^.Kind, [], True);
aData.Values[aData.ResultIndex] := ValueToFFIValue(aResultValue, aResultType^.Kind, [], True); if aData.Indirect[aData.ResultIndex] then
aData.Values[aData.ResultIndex] := @aResultValue
else
aData.Values[aData.ResultIndex] := aResultValue;
aData.ResultType := @ffi_type_void; aData.ResultType := @ffi_type_void;
aData.ResultValue := Nil; aData.ResultValue := Nil;
{$ifdef USE_EXTENDED_AS_COMP_CURRENCY_RES} {$ifdef USE_EXTENDED_AS_COMP_CURRENCY_RES}