ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-31 14:40:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: tie quota_lim_downscale template to size_t

Browse Source 
* Always use size_t instead of template type
* Thereby we can remove 128-bit type from all architectures in base-hw

Ref genodelabs/genode#5310
This commit is contained in:
Stefan Kalkowski 2024-06-27 10:55:55 +02:00 committed by Christian Helmuth
parent 7770285aed
commit 6afe4f79a2
7 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base-hw/src/core/cpu_session_support.cc
View File

@ -33,7 +33,7 @@ Dataspace_capability Cpu_thread_component::utcb()
Cpu_session::Quota Cpu_session_component::quota() Cpu_session::Quota Cpu_session_component::quota()
{ {
size_t const spu = Kernel::cpu_quota_us; size_t const spu = Kernel::cpu_quota_us;
size_t const u = quota_lim_downscale<sizet_arithm_t>(_quota, spu); size_t const u = quota_lim_downscale(_quota, spu);
return { spu, u }; return { spu, u };
} }

3
repos/base-hw/src/core/kernel/main.cc
View File

@ -92,9 +92,6 @@ void Kernel::main_handle_kernel_entry()
void Kernel::main_initialize_and_handle_kernel_entry() void Kernel::main_initialize_and_handle_kernel_entry()
{ {
static_assert(sizeof(Core::sizet_arithm_t) >= 2 * sizeof(size_t),
"Bad result type for size_t arithmetics.");
using Boot_info = Hw::Boot_info<Board::Boot_info>; using Boot_info = Hw::Boot_info<Board::Boot_info>;
static volatile bool instance_initialized { false }; static volatile bool instance_initialized { false };

3
repos/base-hw/src/core/kernel/thread.cc
View File

@ -302,12 +302,11 @@ Cpu_job * Thread::helping_destination() {
size_t Thread::_core_to_kernel_quota(size_t const quota) const size_t Thread::_core_to_kernel_quota(size_t const quota) const
{ {
using Genode::Cpu_session; using Genode::Cpu_session;
using Core::sizet_arithm_t;
/* we assert at timer construction that cpu_quota_us in ticks fits size_t */ /* we assert at timer construction that cpu_quota_us in ticks fits size_t */
size_t const ticks = (size_t) size_t const ticks = (size_t)
_cpu->timer().us_to_ticks(Kernel::cpu_quota_us); _cpu->timer().us_to_ticks(Kernel::cpu_quota_us);
return Cpu_session::quota_lim_downscale<sizet_arithm_t>(quota, ticks); return Cpu_session::quota_lim_downscale(quota, ticks);
} }

3
repos/base-hw/src/core/spec/arm_v8/cpu.h
View File

@ -38,8 +38,7 @@ namespace Board { class Address_space_id_allocator; }
namespace Core { namespace Core {
struct Cpu; struct Cpu;
using sizet_arithm_t = __uint128_t; using uint128_t = __uint128_t;
using uint128_t = __uint128_t;
} }

2
repos/base-hw/src/core/spec/riscv/cpu.h
View File

@ -43,8 +43,6 @@ namespace Core {
* CPU driver for core * CPU driver for core
*/ */
class Cpu; class Cpu;
using sizet_arithm_t = __uint128_t;
} }

1
repos/base-hw/src/core/spec/x86_64/cpu.h
View File

@ -42,7 +42,6 @@ namespace Board { class Address_space_id_allocator; }
namespace Core { namespace Core {
class Cpu; class Cpu;
using sizet_arithm_t = __uint128_t;
} }

3
repos/base/include/cpu_session/cpu_session.h
View File

@ -204,9 +204,8 @@ struct Genode::Cpu_session : Session
/** /**
* Scale down 'value' from the 'QUOTA_LIMIT' space to a space with 'limit' * Scale down 'value' from the 'QUOTA_LIMIT' space to a space with 'limit'
*/ */
template<typename T = size_t>
static size_t quota_lim_downscale(size_t const value, size_t const limit) { static size_t quota_lim_downscale(size_t const value, size_t const limit) {
return (size_t)(((T)value * limit) >> Cpu_session::QUOTA_LIMIT_LOG2); } return (size_t)(((uint64_t)value * limit) >> Cpu_session::QUOTA_LIMIT_LOG2); }
/***************************************** /*****************************************