* fixed aligntoptr

This commit is contained in:
florian 2004-10-10 19:18:31 +00:00
parent e71d0d3670
commit 2f291713e1
2 changed files with 12 additions and 6 deletions

View File

@ -132,8 +132,8 @@
{$ifdef FPC_REQUIRES_PROPER_ALIGNMENT} {$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
if (ptrint(p) mod sizeof(ptrint))<>0 then if (ptrint(p) mod sizeof(ptrint))<>0 then
inc(ptrint(p),sizeof(ptrint)-ptrint(p) mod sizeof(ptrint)); inc(ptrint(p),sizeof(ptrint)-ptrint(p) mod sizeof(ptrint));
result:=p;
{$endif FPC_REQUIRES_PROPER_ALIGNMENT} {$endif FPC_REQUIRES_PROPER_ALIGNMENT}
result:=p;
end; end;
@ -758,7 +758,10 @@
{ {
$Log$ $Log$
Revision 1.40 2004-10-05 20:21:23 florian Revision 1.41 2004-10-10 19:18:31 florian
* fixed aligntoptr
Revision 1.40 2004/10/05 20:21:23 florian
* bootstrapping with rtti alignment fixed * bootstrapping with rtti alignment fixed
Revision 1.39 2004/10/04 21:26:16 florian Revision 1.39 2004/10/04 21:26:16 florian
@ -808,4 +811,4 @@
Revision 1.25 2002/08/31 13:11:11 florian Revision 1.25 2002/08/31 13:11:11 florian
* several fixes for Linux/PPC compilation * several fixes for Linux/PPC compilation
} }

View File

@ -290,8 +290,8 @@ function aligntoptr(p : pointer) : pointer;
{$ifdef FPC_REQUIRES_PROPER_ALIGNMENT} {$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
if (ptrint(p) mod sizeof(ptrint))<>0 then if (ptrint(p) mod sizeof(ptrint))<>0 then
inc(ptrint(p),sizeof(ptrint)-ptrint(p) mod sizeof(ptrint)); inc(ptrint(p),sizeof(ptrint)-ptrint(p) mod sizeof(ptrint));
result:=p;
{$endif FPC_REQUIRES_PROPER_ALIGNMENT} {$endif FPC_REQUIRES_PROPER_ALIGNMENT}
result:=p;
end; end;
@ -1490,7 +1490,10 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.29 2004-10-04 21:26:16 florian Revision 1.30 2004-10-10 19:18:31 florian
* fixed aligntoptr
Revision 1.29 2004/10/04 21:26:16 florian
* rtti alignment fixed * rtti alignment fixed
Revision 1.28 2004/08/16 16:12:28 peter Revision 1.28 2004/08/16 16:12:28 peter
@ -1542,4 +1545,4 @@ end.
Revision 1.13 2002/04/04 18:32:59 peter Revision 1.13 2002/04/04 18:32:59 peter
* merged getpropinfo fix * merged getpropinfo fix
} }