ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-21 18:06:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: fix memory mapping calc. for big regions

Browse Source 
Fixes #2063
This commit is contained in:
Alexander Boettcher 2016-08-19 16:44:39 +02:00 committed by Christian Helmuth
parent 57b90e8d75
commit 9c098752b0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
repos/base/src/core/region_map_component.cc
View File

@ -36,7 +36,7 @@ struct Genode::Region_map_component::Fault_area
size_t _size_log2; size_t _size_log2;
addr_t _upper_bound() const { addr_t _upper_bound() const {
return (_size_log2 == ~0UL) ? ~0 : (_base + (1 << _size_log2) - 1); } return (_size_log2 == ~0UL) ? ~0UL : (_base + (1UL << _size_log2) - 1); }
/** /**
* Default constructor, constructs invalid fault area * Default constructor, constructs invalid fault area
@ -47,7 +47,7 @@ struct Genode::Region_map_component::Fault_area
* Constructor, fault area spans the maximum address-space size * Constructor, fault area spans the maximum address-space size
*/ */
Fault_area(addr_t fault_addr) : Fault_area(addr_t fault_addr) :
_fault_addr(fault_addr), _base(0), _size_log2(~0) { } _fault_addr(fault_addr), _base(0), _size_log2(~0UL) { }
/** /**
* Constrain fault area to specified region * Constrain fault area to specified region
@ -84,7 +84,7 @@ struct Genode::Region_map_component::Fault_area
break; break;
/* check against upper bound of region */ /* check against upper bound of region */
if (try_base + (1 << try_size_log2) - 1 > region_base + region_size - 1) if (try_base + (1UL << try_size_log2) - 1 > region_base + region_size - 1)
break; break;
/* flexpage is compatible with fault area, use it */ /* flexpage is compatible with fault area, use it */
@ -110,7 +110,7 @@ struct Genode::Region_map_component::Fault_area
if (size_log2 >= _size_log2) if (size_log2 >= _size_log2)
return; return;
_base = _fault_addr & ~((1 << size_log2) - 1); _base = _fault_addr & ~((1UL << size_log2) - 1);
_size_log2 = size_log2; _size_log2 = size_log2;
} }
@ -136,7 +136,7 @@ struct Genode::Region_map_component::Fault_area
*/ */
size_t n = get_page_size_log2(); size_t n = get_page_size_log2();
size_t const min_size_log2 = min(a1._size_log2, a2._size_log2); size_t const min_size_log2 = min(a1._size_log2, a2._size_log2);
for (; n < min_size_log2 && !(diff & (1 << n)); n++); for (; n < min_size_log2 && !(diff & (1UL << n)); n++);
return n; return n;
} }