diff options
| author | Hristian Kirtchev <kirtchev@adacore.com> | 2011-08-29 12:56:22 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-29 14:56:22 +0200 |
| commit | e9c9d12236905df71cc9d5132d9fb632fb8f269e (patch) | |
| tree | b33454031b68ec2466ea87b1e2491a78d2f32494 | |
| parent | 09fae88db5dd9b8ce4d7cc774eac42921da851e5 (diff) | |
| download | gcc-e9c9d12236905df71cc9d5132d9fb632fb8f269e.zip gcc-e9c9d12236905df71cc9d5132d9fb632fb8f269e.tar.gz gcc-e9c9d12236905df71cc9d5132d9fb632fb8f269e.tar.bz2 | |
s-stposu.adb (Allocate_Any_Controlled): Reimplement the mechanism which accounts for size vs alignment issues and...
2011-08-29 Hristian Kirtchev <kirtchev@adacore.com>
* s-stposu.adb (Allocate_Any_Controlled): Reimplement the mechanism
which accounts for size vs alignment issues and calculates the size of
the list header.
(Deallocate_Any_Controlled): Ditto.
(Nearest_Multiple_Rounded_Up): New routine.
From-SVN: r178218
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/s-stposu.adb | 48 |
2 files changed, 46 insertions, 10 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index c84d523..5ff1db5 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2011-08-29 Hristian Kirtchev <kirtchev@adacore.com> + + * s-stposu.adb (Allocate_Any_Controlled): Reimplement the mechanism + which accounts for size vs alignment issues and calculates the size of + the list header. + (Deallocate_Any_Controlled): Ditto. + (Nearest_Multiple_Rounded_Up): New routine. + 2011-08-29 Tristan Gingold <gingold@adacore.com> * a-exstat.adb (String_To_EO): Do no set Cleanup_Flag. diff --git a/gcc/ada/s-stposu.adb b/gcc/ada/s-stposu.adb index e1ec423..d52625f 100644 --- a/gcc/ada/s-stposu.adb +++ b/gcc/ada/s-stposu.adb @@ -46,6 +46,12 @@ package body System.Storage_Pools.Subpools is procedure Detach (N : not null SP_Node_Ptr); -- Unhook a subpool node from an arbitrary subpool list + function Nearest_Multiple_Rounded_Up + (Size : Storage_Count; + Alignment : Storage_Count) return Storage_Count; + -- Given arbitrary values of storage size and alignment, calculate the + -- nearest multiple of the alignment rounded up where size can fit. + -------------- -- Allocate -- -------------- @@ -191,11 +197,10 @@ package body System.Storage_Pools.Subpools is -- Account for possible padding space before the header due to a -- larger alignment. - if Alignment > Header_Size then - Header_And_Padding := Alignment; - else - Header_And_Padding := Header_Size; - end if; + Header_And_Padding := + Nearest_Multiple_Rounded_Up + (Size => Header_Size, + Alignment => Alignment); N_Size := Storage_Size + Header_And_Padding; @@ -307,11 +312,14 @@ package body System.Storage_Pools.Subpools is -- Step 1: Detachment if Is_Controlled then - if Alignment > Header_Size then - Header_And_Padding := Alignment; - else - Header_And_Padding := Header_Size; - end if; + + -- Account for possible padding space before the header due to a + -- larger alignment. + + Header_And_Padding := + Nearest_Multiple_Rounded_Up + (Size => Header_Size, + Alignment => Alignment); -- N_Addr N_Ptr Addr (from input) -- | | | @@ -497,6 +505,26 @@ package body System.Storage_Pools.Subpools is Pool.Subpools.Prev := Pool.Subpools'Unchecked_Access; end Initialize_Pool; + --------------------------------- + -- Nearest_Multiple_Rounded_Up -- + --------------------------------- + + function Nearest_Multiple_Rounded_Up + (Size : Storage_Count; + Alignment : Storage_Count) return Storage_Count + is + begin + if Size mod Alignment = 0 then + return Size; + + -- Add enough padding to reach the nearest multiple of the alignment + -- rounding up. + + else + return ((Size + Alignment - 1) / Alignment) * Alignment; + end if; + end Nearest_Multiple_Rounded_Up; + --------------------- -- Pool_Of_Subpool -- --------------------- |