Delphi/pascalscript
Delphi/pascalscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix constructor 64bit (#167)

Browse Source 
* use 64bit variant

* Fix registers for FPC constructor

* fix only fpc 3.0.0 and up
This commit is contained in:
Martin 2017-10-28 16:12:13 +01:00 committed by Carlo Kok
parent 627cf28b33
commit fa55490db0
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/uPSRuntime.pas
View File

@ -10261,7 +10261,7 @@ begin
// the VMT class pointer in EDX so they are effectively swaped
// using register calling convention
{$IFDEF CPU64}
PPSVariantU32(IntVal).Data := Int64(FSelf);
PPSVariantS64(IntVal).Data := Int64(FSelf);
{$ELSE}
PPSVariantU32(IntVal).Data := Cardinal(FSelf);
{$ENDIF}

23
Source/x64.inc
View File

@ -340,6 +340,9 @@ _XMM0: Double;
Registers: TRegisters;
{$IFNDEF WINDOWS}
RegUsageFloat: Byte;
{$ENDIF}
{$IFDEF FPC}
IsConstructor,IsVirtualCons: Boolean;
{$ENDIF}
RegUsage: Byte;
CallData: TPSList;
@ -628,6 +631,19 @@ _XMM0: Double;
Result := True;
end;
begin
{$IFDEF FPC}
if (Integer(CallingConv) and 128) <> 0 then begin
IsVirtualCons := true;
CAllingConv := TPSCallingConvention(Integer(CallingConv) and not 128);
end else
IsVirtualCons:= false;
if (Integer(CallingConv) and 64) <> 0 then begin
IsConstructor := true;
CAllingConv := TPSCallingConvention(Integer(CallingConv) and not 64);
end else
IsConstructor := false;
{$ENDIF}
InnerfuseCall := False;
if Address = nil then
exit; // need address
@ -650,6 +666,13 @@ begin
FillChar(Registers, Sizeof(REgisters), 0);
_RAX := 0;
RegUsage := 0;
{$IF DEFINED (fpc) and (fpc_version >= 3)} // FIX FOR FPC constructor calls
if IsConstructor then begin
if not GetPtr(rp(Params[0])) then exit; // this goes first
DisposePPSVariantIFC(Params[0]);
Params.Delete(0);
end;
{$ENDIF}
if assigned(_Self) then begin
StoreReg(IPointer(_Self));
end;