i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VMUserAddressSpace: Use align_address() instead of ROUNDUP()

Browse Source 
Mainly for aesthetical reasons.
This commit is contained in:
Ingo Weinhold
2013-12-01 00:46:41 +01:00
parent 6c41755609
commit 97a4e3202f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/VMUserAddressSpace.cpp
+4 -4
View File
@@ -565,7 +565,7 @@ VMUserAddressSpace::_InsertAreaSlot(addr_t start, addr_t size, addr_t end,
alignment <<= 1; alignment <<= 1;
} }
start = ROUNDUP(start, alignment); start = align_address(start, alignment);
if (addressSpec == B_RANDOMIZED_BASE_ADDRESS) { if (addressSpec == B_RANDOMIZED_BASE_ADDRESS) {
originalStart = start; originalStart = start;
@@ -598,7 +598,7 @@ second_chance:
// find a hole big enough for a new area // find a hole big enough for a new area
if (last == NULL) { if (last == NULL) {
// see if we can build it at the beginning of the virtual map // see if we can build it at the beginning of the virtual map
addr_t alignedBase = ROUNDUP(start, alignment); addr_t alignedBase = align_address(start, alignment);
addr_t nextBase = next == NULL addr_t nextBase = next == NULL
? end : std::min(next->Base() - 1, end); ? end : std::min(next->Base() - 1, end);
if (is_valid_spot(start, alignedBase, size, nextBase)) { if (is_valid_spot(start, alignedBase, size, nextBase)) {
@@ -688,7 +688,7 @@ second_chance:
// TODO: take free space after the reserved area into // TODO: take free space after the reserved area into
// account! // account!
addr_t alignedBase = ROUNDUP(next->Base(), alignment); addr_t alignedBase = align_address(next->Base(), alignment);
if (next->Base() == alignedBase && next->Size() == size) { if (next->Base() == alignedBase && next->Size() == size) {
// The reserved area is entirely covered, and thus, // The reserved area is entirely covered, and thus,
// removed // removed
@@ -729,7 +729,7 @@ second_chance:
// to make space // to make space
if (is_randomized(addressSpec)) { if (is_randomized(addressSpec)) {
addr_t alignedNextBase = ROUNDUP(next->Base(), addr_t alignedNextBase = align_address(next->Base(),
alignment); alignment);
addr_t startRange = next->Base() + next->Size(); addr_t startRange = next->Base() + next->Size();