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

PascalScript: update to origin git f3cf602541b5e73ff93d583adae3b98e314dcd6f calling constructor in 64 bit

Browse Source 
git-svn-id: trunk@47388 -
This commit is contained in:
martin 2015-01-14 20:14:05 +00:00
parent d2c5176f59
commit 070da66a6a
1 changed files with 8 additions and 0 deletions

8
components/PascalScript/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;