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

Fix calling constructors on 64 bit

Browse Source
This commit is contained in:
User4martin 2015-01-14 19:49:21 +00:00
parent 466ab97b37
commit 40f888be2a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/uPSRuntime.pas
View File

@ -10243,7 +10243,11 @@ begin
Delete(s, 1, 1);
CurrStack := Cardinal(Stack.Count) - Cardinal(length(s)) -1;
if s[1] = #0 then inc(CurrStack);
{$IFDEF CPU64}
IntVal := CreateHeapVariant(Caller.FindType2(btS64));
{$ELSE}
IntVal := CreateHeapVariant(Caller.FindType2(btU32));
{$ENDIF}
if IntVal = nil then
begin
Result := False;
@ -10253,7 +10257,11 @@ begin
// under FPC a constructor it's called with self=0 (EAX) and
// the VMT class pointer in EDX so they are effectively swaped
// using register calling convention
{$IFDEF CPU64}
PPSVariantU32(IntVal).Data := Int64(FSelf);
{$ELSE}
PPSVariantU32(IntVal).Data := Cardinal(FSelf);
{$ENDIF}
FSelf := pointer(1);
{$ELSE}
PPSVariantU32(IntVal).Data := 1;