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

hw: minor 64-bit fixes

Browse Source
This commit is contained in:
Norman Feske 2015-02-06 17:23:41 +01:00 committed by Christian Helmuth
parent 7cb4d7bf41
commit cb579ec8d7
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/base-hw/include/base/pager.h
View File

@ -135,7 +135,7 @@ class Genode::Pager_object : public Object_pool<Pager_object>::Entry,
Thread_capability _thread_cap; Thread_capability _thread_cap;
bool _signal_valid; bool _signal_valid;
char _signal_buf[sizeof(Signal)]; char _signal_buf[sizeof(Signal)];
unsigned const _badge; unsigned long const _badge;
/** /**
* Remember an incoming fault for handling * Remember an incoming fault for handling
@ -196,7 +196,7 @@ class Genode::Pager_object : public Object_pool<Pager_object>::Entry,
/** /**
* User identification of pager object * User identification of pager object
*/ */
unsigned badge() const { return _badge; } unsigned long badge() const { return _badge; }
/** /**
* Resume faulter * Resume faulter

4
repos/base-hw/include/kernel/log.h
View File

@ -55,7 +55,7 @@ namespace Kernel
/** /**
* Print an unsigned integer x as hexadecimal value * Print an unsigned integer x as hexadecimal value
*/ */
Log & operator << (unsigned int const x) Log & operator << (unsigned long const x)
{ {
enum { enum {
BYTE_WIDTH = 8, BYTE_WIDTH = 8,
@ -101,7 +101,7 @@ namespace Kernel
/** /**
* Print a pointer p as hexadecimal value * Print a pointer p as hexadecimal value
*/ */
Log & operator << (void * const p) { return *this << (unsigned)p; } Log & operator << (void * const p) { return *this << (unsigned long)p; }
}; };
/** /**

2
repos/base-hw/src/base/signal/signal.cc
View File

@ -150,7 +150,7 @@ Signal_context_capability Signal_receiver::manage(Signal_context * const c)
Signal_connection * const s = signal_connection(); Signal_connection * const s = signal_connection();
while (1) { while (1) {
try { try {
c->_cap = s->alloc_context(_cap, (unsigned)c); c->_cap = s->alloc_context(_cap, (unsigned long)c);
c->_receiver = this; c->_receiver = this;
_contexts.insert(&c->_receiver_le); _contexts.insert(&c->_receiver_le);
return c->_cap; return c->_cap;

6
repos/base-hw/src/core/core_rm_session.cc
View File

@ -39,12 +39,12 @@ Core_rm_session::attach(Dataspace_capability ds_cap, size_t size,
if (use_local_addr) { if (use_local_addr) {
PERR("Parameter 'use_local_addr' not supported within core"); PERR("Parameter 'use_local_addr' not supported within core");
return 0; return 0UL;
} }
if (offset) { if (offset) {
PERR("Parameter 'offset' not supported within core"); PERR("Parameter 'offset' not supported within core");
return 0; return 0UL;
} }
/* allocate range in core's virtual address space */ /* allocate range in core's virtual address space */
@ -63,7 +63,7 @@ Core_rm_session::attach(Dataspace_capability ds_cap, size_t size,
ds.object()->cacheability(), ds.object()->cacheability(),
ds.object()->is_io_mem()); ds.object()->is_io_mem());
if (!map_local(ds->phys_addr(), (addr_t)virt_addr, num_pages, flags)) if (!map_local(ds->phys_addr(), (addr_t)virt_addr, num_pages, flags))
return 0; return 0UL;
return virt_addr; return virt_addr;
} }

2
repos/base-hw/src/core/include/kernel/core_interface.h
View File

@ -58,7 +58,7 @@ namespace Kernel
* \retval >0 kernel name of the new domain * \retval >0 kernel name of the new domain
* \retval 0 failed * \retval 0 failed
*/ */
inline unsigned new_pd(void * const dst, Platform_pd * const pd) inline unsigned long new_pd(void * const dst, Platform_pd * const pd)
{ {
return call(call_id_new_pd(), (Call_arg)dst, (Call_arg)pd); return call(call_id_new_pd(), (Call_arg)dst, (Call_arg)pd);
} }

2
repos/base-hw/src/core/include/platform_thread.h
View File

@ -156,7 +156,7 @@ namespace Genode {
/** /**
* Return unique identification of this thread as faulter * Return unique identification of this thread as faulter
*/ */
unsigned pager_object_badge() { return (unsigned)this; } unsigned long pager_object_badge() { return (unsigned long)this; }
/** /**
* Set the executing CPU for this thread * Set the executing CPU for this thread

4
repos/base-hw/src/core/rm_session_support.cc
View File

@ -82,8 +82,8 @@ int Pager_activation_base::apply_mapping()
} catch(Allocator::Out_of_memory) { } catch(Allocator::Out_of_memory) {
PERR("Translation table needs to much RAM"); PERR("Translation table needs to much RAM");
} catch(...) { } catch(...) {
PERR("Invalid mapping %p -> %p (%zx)", (void*)_mapping.phys_address, PERR("Invalid mapping %p -> %p (%lx)", (void*)_mapping.phys_address,
(void*)_mapping.virt_address, 1 << _mapping.size_log2); (void*)_mapping.virt_address, 1UL << _mapping.size_log2);
} }
return -1; return -1;
} }