ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-23 04:25:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: avoid warnings about shift operations

Browse Source 
clang:
 warning: The result of the '<<' expression is undefined
This commit is contained in:
Alexander Boettcher 2018-10-25 11:42:11 +02:00 committed by Christian Helmuth
parent 4b62f091a9
commit 17f7147ac1
6 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
repos/base-nova/src/core/include/nova_util.h
View File

@ -164,6 +164,9 @@ inline int map_local(Genode::addr_t const pd, Nova::Utcb *utcb,
if ((to_end - to_curr) < (1UL << order))
order = log2(to_end - to_curr);
if (order >= sizeof(void *)*8)
return 1;
int const res = map_local(pd, utcb,
Mem_crd((from_curr >> 12), order - get_page_size_log2(), permission),
Mem_crd((to_curr >> 12), order - get_page_size_log2(), permission),

6
repos/base-nova/src/lib/base/cap_map.cc
View File

@ -178,6 +178,12 @@ void Capability_map::remove(Genode::addr_t const sel, uint8_t num_log_2,
while (last_sel > last_range) {
uint8_t left_log2 = log2(last_sel - last_range);
/* take care for a case which should not happen */
if (left_log2 >= sizeof(last_range)*8) {
error("cap remove error");
return;
}
remove(last_range, left_log2, revoke);
last_range += 1UL << left_log2;

13
repos/base-nova/src/lib/base/ipc.cc
View File

@ -40,8 +40,17 @@ Rpc_exception_code Genode::ipc_call(Native_capability dst,
if (rcv_caps != ~0UL) {
/* calculate max order of caps to be received during reply */
unsigned short log2_max = rcv_caps ? log2(rcv_caps) : 0;
if ((1U << log2_max) < rcv_caps) log2_max ++;
unsigned short log2_max = 0;
if (rcv_caps) {
log2_max = log2(rcv_caps);
/* if this happens, the call is bogus and invalid */
if ((log2_max >= sizeof(rcv_caps) * 8))
throw Ipc_error();
if ((1UL << log2_max) < rcv_caps)
log2_max ++;
}
rcv_window.rcv_wnd(log2_max);
}

3
repos/base/include/util/flex_iterator.h
View File

@ -106,6 +106,9 @@ class Genode::Flexpage_iterator
order = (order == ~0UL) ? 12 : order;
}
if (order >= sizeof(_offset) * 8)
return Flexpage();
/* advance offset by current flexpage size */
_offset += (1UL << order);

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

@ -400,10 +400,13 @@ Region_map_component::attach(Dataspace_capability ds_cap, size_t size,
* constraints.
*/
size_t align_log2 = log2(size);
if (align_log2 >= sizeof(void *)*8)
align_log2 = get_page_size_log2();
for (; align_log2 >= get_page_size_log2(); align_log2--) {
/*
* Don't use an aligment higher than the alignment of the backing
* Don't use an alignment higher than the alignment of the backing
* store. The backing store would constrain the mapping size
* anyway such that a higher alignment of the region is of no use.
*/

3
repos/os/src/init/utils.h
View File

@ -185,7 +185,8 @@ namespace Init {
{
long const prio_levels = config.attribute_value("prio_levels", 0UL);
if (prio_levels && (prio_levels != (1 << log2(prio_levels)))) {
if (prio_levels && ((prio_levels >= (long)sizeof(prio_levels)*8) ||
(prio_levels != (1L << log2(prio_levels))))) {
warning("prio levels is not power of two, priorities are disabled");
return Prio_levels { 0 };
}