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

* for callbacks argument values are not needed, so make the need for aArgValues optional

Browse Source 
git-svn-id: trunk@42070 -
This commit is contained in:
svenbarth 2019-05-15 05:28:51 +00:00
parent 1c58ef49f3
commit 0d6d3a1529
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,14 +431,14 @@ procedure CreateCIF(constref aArgInfos: array of TFunctionCallParameterInfo; con
var var
abi: ffi_abi; abi: ffi_abi;
i, arglen, argoffset, argstart: LongInt; i, arglen, argoffset, argstart: LongInt;
retparam: Boolean; usevalues, retparam: Boolean;
kind: TTypeKind; kind: TTypeKind;
types: ppffi_type; types: ppffi_type;
begin begin
if not (fcfStatic in aFlags) and (Length(aArgInfos) = 0) then if not (fcfStatic in aFlags) and (Length(aArgInfos) = 0) then
raise EInvocationError.Create(SErrMissingSelfParam); raise EInvocationError.Create(SErrMissingSelfParam);
Assert((Length(aArgInfos) = Length(aArgValues)), 'Amount of arguments does not match needed arguments'); Assert((Length(aArgInfos) = Length(aArgValues)) or (Length(aArgValues) = 0), 'Amount of arguments does not match needed arguments');
case aCallConv of case aCallConv of
{$if defined(CPUI386)} {$if defined(CPUI386)}
@ -471,11 +471,16 @@ begin
raise EInvocationError.CreateFmt(SErrCallConvNotSupported, [CallConvName]); raise EInvocationError.CreateFmt(SErrCallConvNotSupported, [CallConvName]);
end; end;
{ if no values are provided we are called to prepare a callback, otherwise
we are asked to prepare a invokation }
usevalues := (Length(aArgInfos) > 0) and (Length(aArgValues) > 0);
retparam := RetInParam(aCallConv, aResultType); retparam := RetInParam(aCallConv, aResultType);
arglen := Length(aArgInfos); arglen := Length(aArgInfos);
if retparam then begin if retparam then begin
Inc(arglen); Inc(arglen);
usevalues := True;
argoffset := 1; argoffset := 1;
aData.ResultIndex := 0; aData.ResultIndex := 0;
end else begin end else begin
@ -485,7 +490,8 @@ begin
SetLength(aData.Types, arglen); SetLength(aData.Types, arglen);
SetLength(aData.Indirect, arglen); SetLength(aData.Indirect, arglen);
SetLength(aData.Values, arglen); if usevalues then
SetLength(aData.Values, arglen);
{ the order is Self/Vmt (if any), Result param (if any), other params } { the order is Self/Vmt (if any), Result param (if any), other params }
@ -496,10 +502,11 @@ 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);
if aData.Indirect[0] then if usevalues then
aData.Values[0] := @aArgValues[0] if aData.Indirect[0] then
else aData.Values[0] := @aArgValues[0]
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;
@ -515,19 +522,21 @@ 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);
if aData.Indirect[i + argoffset] then if usevalues then
aData.Values[i + argoffset] := @aArgValues[i] if aData.Indirect[i + argoffset] then
else aData.Values[i + argoffset] := @aArgValues[i]
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);
if aData.Indirect[aData.ResultIndex] then if usevalues then
aData.Values[aData.ResultIndex] := @aResultValue if aData.Indirect[aData.ResultIndex] then
else aData.Values[aData.ResultIndex] := @aResultValue
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}