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

* patch by Rika: second part of #39496, resolves #30496

Browse Source 
+ extended test
This commit is contained in:
florian 2021-12-25 20:01:32 +01:00
parent abc4a0a4e6
commit 781b2d0a80
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rtl/inc/generic.inc
View File

@ -16,20 +16,29 @@
function align(addr : PtrUInt;alignment : PtrUInt) : PtrUInt;{$ifdef SYSTEMINLINE}inline;{$endif}
var
tmp: PtrUInt;
tmp,am1 : PtrUInt;
begin
tmp:=addr+PtrUInt(alignment-1);
result:=tmp-(tmp mod alignment)
am1:=alignment-1;
tmp:=addr+am1;
if alignment and am1=0 then
{ Alignment is a power of two. In practice alignments are powers of two 100% of the time. }
result:=tmp and not am1
else
result:=tmp-(tmp mod alignment);
end;
{$ifndef cpujvm}
function align(addr : Pointer;alignment : PtrUInt) : Pointer;{$ifdef SYSTEMINLINE}inline;{$endif}
var
tmp: PtrUInt;
tmp,am1 : PtrUInt;
begin
tmp:=PtrUInt(addr)+(alignment-1);
result:=pointer(ptruint(tmp-(tmp mod alignment)));
am1:=alignment-1;
tmp:=PtrUint(addr)+am1;
if alignment and am1=0 then
result:=pointer(tmp and not am1)
else
result:=pointer(ptruint(tmp-(tmp mod alignment)));
end;
{$endif}

18
tests/test/units/system/talign.pp
View File

@ -11,13 +11,29 @@ begin
for i:=0 to 39 do
if align(p+i,40)<>pointer(80) then
halt(2);
p:=pointer(1);
for i:=0 to 40 do
if align(p+i,41)<pointer(41) then
halt(3);
p:=pointer(42);
for i:=0 to 40 do
if align(p+i,41)<>pointer(82) then
halt(4);
u:=1;
for i:=0 to 15 do
if align(u+i,16)<>16 then
halt(3);
halt(101);
u:=41;
for i:=0 to 39 do
if align(u+i,40)<>80 then
halt(102);
u:=1;
for i:=0 to 40 do
if align(u+i,41)<>41 then
halt(103);
u:=42;
for i:=0 to 40 do
if align(u+i,41)<>82 then
halt(4);
end.