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

* 64bit fixes

Browse Source
This commit is contained in:
peter 2004-05-03 21:12:54 +00:00
parent fef0938d43
commit 10f1ac6b0e
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/fpviews.pas
View File

@ -881,6 +881,7 @@ end;
function GetAsmReservedWordCount: integer; function GetAsmReservedWordCount: integer;
begin begin
GetAsmReservedWordCount:=ord(lastop) - ord(firstop) GetAsmReservedWordCount:=ord(lastop) - ord(firstop)
{$ifndef x86_64}
{$ifndef powerpc} {$ifndef powerpc}
{$ifndef arm} {$ifndef arm}
+ CondAsmOps*(ord(high(TasmCond))-ord(low(TasmCond))); + CondAsmOps*(ord(high(TasmCond))-ord(low(TasmCond)));
@ -892,6 +893,7 @@ begin
{$else powerpc} {$else powerpc}
+ CondAsmOps*(ord(high(TAsmCondFlag))-ord(low(TAsmCondFlag))); + CondAsmOps*(ord(high(TAsmCondFlag))-ord(low(TAsmCondFlag)));
{$endif powerpc} {$endif powerpc}
{$endif x86_64}
end; end;
@ -2066,7 +2068,7 @@ begin
else if Editor^.GetModified and (Editor^.Core^.GetBindingCount=1) then else if Editor^.GetModified and (Editor^.Core^.GetBindingCount=1) then
begin begin
PA[1]:=@AFileName; PA[1]:=@AFileName;
longint(PA[2]):={Editor^.ChangedLine}-1; Ptrint(PA[2]):={Editor^.ChangedLine}-1;
EditorDialog(edChangedOnloading,@PA); EditorDialog(edChangedOnloading,@PA);
end; end;
end; end;
@ -4580,7 +4582,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.43 2004-03-20 22:02:41 florian Revision 1.44 2004-05-03 21:12:54 peter
* 64bit fixes
Revision 1.43 2004/03/20 22:02:41 florian
* compilation on arm fixed * compilation on arm fixed
Revision 1.42 2003/05/07 21:33:22 peter Revision 1.42 2003/05/07 21:33:22 peter

7
ide/wcedit.pas
View File

@ -1778,7 +1778,7 @@ begin
if GetModified and (Core^.GetBindingCount=1) then if GetModified and (Core^.GetBindingCount=1) then
begin begin
PA[1]:=@FileName; PA[1]:=@FileName;
longint(PA[2]):=Core^.GetChangedLine; Ptrint(PA[2]):=Core^.GetChangedLine;
EditorDialog(edChangedOnloading,@PA); EditorDialog(edChangedOnloading,@PA);
end; end;
Core^.OnDiskLoadTime:=Cardinal(GetFileTime(FileName)); Core^.OnDiskLoadTime:=Cardinal(GetFileTime(FileName));
@ -2071,7 +2071,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.18 2003-06-19 15:20:29 pierre Revision 1.19 2004-05-03 21:12:54 peter
* 64bit fixes
Revision 1.18 2003/06/19 15:20:29 pierre
* add explicit typecast to OnDiskLoadTime assignments * add explicit typecast to OnDiskLoadTime assignments
Revision 1.17 2002/12/18 16:10:01 pierre Revision 1.17 2002/12/18 16:10:01 pierre

11
ide/wnghelp.pas
View File

@ -283,7 +283,7 @@ begin
S:=StrPas(LineP); S:=StrPas(LineP);
ParamS:=NGDecompressStr(S); ParamS:=NGDecompressStr(S);
CallPointerLocal(LineEnumProc,PreviousFramePointer,@ParamS); CallPointerLocal(LineEnumProc,PreviousFramePointer,@ParamS);
Inc(longint(LineP),length(S)+1); Inc(Ptrint(LineP),length(S)+1);
end; end;
if Assigned(LinkEnumProc) and (SeeAlsoOfs>0) then if Assigned(LinkEnumProc) and (SeeAlsoOfs>0) then
begin begin
@ -297,8 +297,8 @@ begin
LR.Name:=S; LR.Name:=S;
Move(NextLinkOfsPtr^,LR.FilePos,4); Move(NextLinkOfsPtr^,LR.FilePos,4);
CallPointerLocal(LinkEnumProc,PreviousFramePointer,@LR); CallPointerLocal(LinkEnumProc,PreviousFramePointer,@LR);
Inc(longint(NextLinkNamePtr),length(S)+1); Inc(Ptrint(NextLinkNamePtr),length(S)+1);
Inc(longint(NextLinkOfsPtr),4); Inc(Ptrint(NextLinkOfsPtr),4);
end; end;
end; end;
end; end;
@ -520,7 +520,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.3 2002-09-07 15:40:50 peter Revision 1.4 2004-05-03 21:12:54 peter
* 64bit fixes
Revision 1.3 2002/09/07 15:40:50 peter
* old logs removed and tabs fixed * old logs removed and tabs fixed
} }