From 2e6dd010aea4b29b8491e8211747f3d9d850b8de Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 1 Mar 2023 16:29:05 +0100 Subject: [PATCH] core: introduce 'Core' namespace The namespace draws a clear line between the base library and the core component. It is declared at the new core-local header , which is expected to be included by all code of the core component. It is thereby a natural place for kernel-agnostic general types like commonly used C++ utilities. Fixes #4777 --- repos/base-fiasco/src/core/core_log_out.cc | 2 +- .../base-fiasco/src/core/include/ipc_pager.h | 4 +- .../base-fiasco/src/core/include/map_local.h | 2 +- repos/base-fiasco/src/core/include/platform.h | 4 +- .../src/core/include/platform_pd.h | 4 +- .../src/core/include/platform_thread.h | 4 +- .../src/core/include/rpc_cap_factory.h | 7 +- repos/base-fiasco/src/core/include/util.h | 5 +- .../src/core/io_mem_session_support.cc | 2 +- .../src/core/irq_session_component.cc | 3 +- repos/base-fiasco/src/core/pager.cc | 5 +- repos/base-fiasco/src/core/pager_object.cc | 2 +- repos/base-fiasco/src/core/platform.cc | 3 +- repos/base-fiasco/src/core/platform_pd.cc | 2 +- repos/base-fiasco/src/core/platform_thread.cc | 4 +- .../src/core/ram_dataspace_support.cc | 2 +- .../src/core/spec/x86/platform_x86.cc | 2 +- repos/base-fiasco/src/core/thread_start.cc | 2 +- .../src/include/base/internal/native_thread.h | 8 +-- repos/base-foc/src/core/core_log_out.cc | 2 +- .../base-foc/src/core/include/cap_id_alloc.h | 7 +- repos/base-foc/src/core/include/cap_index.h | 9 ++- repos/base-foc/src/core/include/cap_mapping.h | 5 +- repos/base-foc/src/core/include/ipc_pager.h | 6 +- repos/base-foc/src/core/include/irq_object.h | 11 +-- repos/base-foc/src/core/include/map_local.h | 2 +- .../src/core/include/native_cpu_component.h | 9 ++- .../include/pager_object_exception_state.h | 4 +- repos/base-foc/src/core/include/platform.h | 6 +- repos/base-foc/src/core/include/platform_pd.h | 4 +- .../src/core/include/platform_thread.h | 4 +- .../src/core/include/rpc_cap_factory.h | 7 +- repos/base-foc/src/core/include/util.h | 15 +++-- .../src/core/include/vm_session_component.h | 8 +-- .../src/core/io_mem_session_support.cc | 2 +- repos/base-foc/src/core/ipc_pager.cc | 3 +- .../src/core/irq_session_component.cc | 11 ++- .../base-foc/src/core/native_cpu_component.cc | 5 +- repos/base-foc/src/core/pager.cc | 6 +- repos/base-foc/src/core/pager_object.cc | 2 +- repos/base-foc/src/core/platform.cc | 5 +- repos/base-foc/src/core/platform_pd.cc | 2 +- repos/base-foc/src/core/platform_thread.cc | 4 +- .../src/core/ram_dataspace_support.cc | 4 +- repos/base-foc/src/core/rpc_cap_factory.cc | 2 +- .../src/core/signal_source_component.cc | 7 +- repos/base-foc/src/core/spec/arm/ipc_pager.cc | 2 +- .../src/core/spec/arm/platform_arm.cc | 2 +- .../src/core/spec/arm_64/ipc_pager.cc | 2 +- repos/base-foc/src/core/spec/x86/ipc_pager.cc | 2 +- repos/base-foc/src/core/spec/x86/platform.cc | 8 +-- .../src/core/spec/x86/platform_services.cc | 8 +-- .../src/core/spec/x86_32/ipc_pager.cc | 2 +- .../src/core/spec/x86_64/ipc_pager.cc | 2 +- repos/base-foc/src/core/thread_start.cc | 16 ++--- .../base-foc/src/core/vm_session_component.cc | 8 +-- repos/base-hw/src/bootstrap/platform.cc | 4 +- .../base-hw/src/core/board/imx53_qsb/board.h | 2 +- .../src/core/board/imx6q_sabrelite/board.h | 2 +- .../src/core/board/imx7d_sabre/board.h | 2 +- .../base-hw/src/core/board/nit6_solox/board.h | 2 +- repos/base-hw/src/core/board/pbxa9/board.h | 2 +- repos/base-hw/src/core/board/pc/board.h | 2 +- .../base-hw/src/core/board/usb_armory/board.h | 2 +- .../src/core/board/virt_qemu_arm_v7a/board.h | 10 +-- .../src/core/board/virt_qemu_arm_v8a/board.h | 6 -- .../base-hw/src/core/board/wand_quad/board.h | 2 +- repos/base-hw/src/core/core_log_out.cc | 4 +- repos/base-hw/src/core/core_region_map.cc | 3 +- repos/base-hw/src/core/cpu_session_support.cc | 2 +- repos/base-hw/src/core/cpu_thread_allocator.h | 5 +- .../src/core/io_mem_session_support.cc | 2 +- .../base-hw/src/core/irq_session_component.cc | 2 +- .../base-hw/src/core/irq_session_component.h | 7 +- repos/base-hw/src/core/kernel/cpu.h | 4 +- .../base-hw/src/core/kernel/cpu_scheduler.cc | 2 +- repos/base-hw/src/core/kernel/irq.h | 14 ++-- repos/base-hw/src/core/kernel/lock.cc | 2 +- repos/base-hw/src/core/kernel/main.cc | 32 +++------ repos/base-hw/src/core/kernel/main.h | 2 +- repos/base-hw/src/core/kernel/object.h | 2 +- repos/base-hw/src/core/kernel/pd.h | 23 +++---- .../base-hw/src/core/kernel/signal_receiver.h | 10 +-- repos/base-hw/src/core/kernel/thread.cc | 24 +++---- repos/base-hw/src/core/kernel/thread.h | 30 ++++----- repos/base-hw/src/core/kernel/timer.cc | 2 +- repos/base-hw/src/core/kernel/vm.h | 12 ++-- repos/base-hw/src/core/kernel_log.cc | 2 +- repos/base-hw/src/core/map_local.h | 4 +- repos/base-hw/src/core/native_pd_component.cc | 2 +- repos/base-hw/src/core/native_pd_component.h | 6 +- repos/base-hw/src/core/object.h | 29 ++++---- repos/base-hw/src/core/pager.cc | 5 +- repos/base-hw/src/core/pager.h | 18 ++--- repos/base-hw/src/core/platform.cc | 10 ++- repos/base-hw/src/core/platform.h | 8 +-- repos/base-hw/src/core/platform_pd.cc | 2 +- repos/base-hw/src/core/platform_pd.h | 43 ++++++------ repos/base-hw/src/core/platform_thread.cc | 4 +- repos/base-hw/src/core/platform_thread.h | 14 ++-- .../base-hw/src/core/ram_dataspace_support.cc | 5 +- repos/base-hw/src/core/region_map_support.cc | 10 +-- repos/base-hw/src/core/rpc_cap_factory.h | 10 ++- repos/base-hw/src/core/signal_broker.h | 6 +- .../src/core/signal_source_component.h | 16 ++--- .../core/spec/arm/cortex_a9_global_timer.cc | 2 +- repos/base-hw/src/core/spec/arm/cpu.cc | 10 +-- repos/base-hw/src/core/spec/arm/cpu_support.h | 6 +- .../src/core/spec/arm/generic_timer.cc | 2 +- repos/base-hw/src/core/spec/arm/gicv2.cc | 2 +- repos/base-hw/src/core/spec/arm/gicv3.cc | 4 +- repos/base-hw/src/core/spec/arm/imx_epit.cc | 2 +- repos/base-hw/src/core/spec/arm/imx_tzic.cc | 2 +- .../base-hw/src/core/spec/arm/kernel/lock.cc | 2 +- .../base-hw/src/core/spec/arm/kernel/panic.cc | 2 +- .../src/core/spec/arm/kernel/thread.cc | 2 +- .../src/core/spec/arm/kernel/thread_caches.cc | 10 +-- .../src/core/spec/arm/platform_support.cc | 4 +- .../src/core/spec/arm/trustzone_board.h | 6 +- .../src/core/spec/arm/virtualization/board.h | 4 +- .../src/core/spec/arm/virtualization/gicv2.cc | 4 +- .../src/core/spec/arm/virtualization/gicv2.h | 14 ++-- .../src/core/spec/arm/virtualization/gicv3.h | 18 +++-- .../arm/virtualization/platform_services.cc | 15 ++--- .../virtualization/vm_session_component.cc | 10 +-- repos/base-hw/src/core/spec/arm_v6/cpu.h | 13 ++-- .../src/core/spec/arm_v6/translation_table.h | 2 +- .../src/core/spec/arm_v7/cpu_support.h | 11 ++- .../arm_v7/trustzone/platform_services.cc | 10 +-- .../arm_v7/trustzone/vm_session_component.cc | 2 +- .../spec/arm_v7/virtualization/hypervisor.h | 5 +- .../spec/arm_v7/virtualization/kernel/vm.cc | 1 - repos/base-hw/src/core/spec/arm_v8/cpu.cc | 67 +++++++++---------- repos/base-hw/src/core/spec/arm_v8/cpu.h | 24 +++---- .../core/spec/arm_v8/pd_session_support.cc | 2 +- .../spec/arm_v8/virtualization/kernel/vm.cc | 1 - repos/base-hw/src/core/spec/cortex_a15/cpu.cc | 18 ++--- repos/base-hw/src/core/spec/cortex_a15/cpu.h | 8 +-- repos/base-hw/src/core/spec/cortex_a8/cpu.h | 4 +- .../core/spec/cortex_a8/translation_table.h | 4 +- .../base-hw/src/core/spec/cortex_a9/board.cc | 3 +- repos/base-hw/src/core/spec/cortex_a9/cpu.cc | 6 +- repos/base-hw/src/core/spec/cortex_a9/cpu.h | 6 +- repos/base-hw/src/core/spec/riscv/cpu.cc | 30 ++++----- repos/base-hw/src/core/spec/riscv/cpu.h | 14 ++-- .../src/core/spec/riscv/kernel/interface.cc | 1 - .../base-hw/src/core/spec/riscv/kernel/pd.cc | 2 +- .../src/core/spec/riscv/kernel/thread.cc | 6 +- repos/base-hw/src/core/spec/riscv/pic.cc | 3 +- .../src/core/spec/riscv/platform_support.cc | 4 +- repos/base-hw/src/core/spec/riscv/timer.cc | 2 +- repos/base-hw/src/core/spec/riscv/timer.h | 2 + .../spec/x86_64/address_space_id_allocator.h | 5 +- .../src/core/spec/x86_64/bios_data_area.cc | 2 +- repos/base-hw/src/core/spec/x86_64/cpu.cc | 46 ++++++------- repos/base-hw/src/core/spec/x86_64/cpu.h | 11 ++- .../src/core/spec/x86_64/kernel/thread.cc | 4 +- .../core/spec/x86_64/pd_session_support.cc | 2 +- repos/base-hw/src/core/spec/x86_64/pic.cc | 2 +- repos/base-hw/src/core/spec/x86_64/pit.cc | 2 +- .../src/core/spec/x86_64/platform_support.cc | 6 +- .../spec/x86_64/platform_support_common.cc | 2 +- repos/base-hw/src/core/spec/x86_64/port_io.h | 5 +- repos/base-hw/src/core/thread_start.cc | 22 +++--- repos/base-hw/src/core/util.h | 4 +- .../base-hw/src/core/vm_session_component.cc | 9 ++- repos/base-hw/src/core/vm_session_component.h | 8 +-- .../src/include/base/internal/native_thread.h | 10 +-- .../base-hw/src/test/cpu_scheduler/target.mk | 2 + repos/base-linux/src/core/core_log_out.cc | 2 +- .../base-linux/src/core/core_rpc_cap_alloc.cc | 5 +- .../src/core/include/core_region_map.h | 7 +- .../src/core/include/dataspace_component.h | 12 ++-- .../core/include/io_mem_session_component.h | 4 +- .../base-linux/src/core/include/irq_object.h | 8 ++- .../src/core/include/irq_session_component.h | 9 ++- .../src/core/include/native_cpu_component.h | 10 ++- .../src/core/include/native_pd_component.h | 10 ++- repos/base-linux/src/core/include/pager.h | 11 +-- repos/base-linux/src/core/include/platform.h | 4 +- .../base-linux/src/core/include/platform_pd.h | 9 ++- .../src/core/include/platform_thread.h | 4 +- .../src/core/include/region_map_component.h | 9 +-- .../src/core/include/rpc_cap_factory.h | 9 ++- repos/base-linux/src/core/include/util.h | 3 + .../src/core/native_cpu_component.cc | 4 +- .../src/core/native_pd_component.cc | 9 ++- repos/base-linux/src/core/platform.cc | 2 +- repos/base-linux/src/core/platform_thread.cc | 9 ++- .../src/core/ram_dataspace_support.cc | 2 +- .../src/core/rom_session_component.cc | 2 +- .../src/core/rpc_cap_factory_linux.cc | 2 +- .../core/spec/linux/dataspace_component.cc | 4 +- .../spec/linux/io_mem_session_component.cc | 5 +- .../spec/linux/io_port_session_component.cc | 2 +- .../core/spec/linux/irq_session_component.cc | 5 +- .../src/core/spec/linux/platform_services.cc | 8 +-- .../src/core/spec/pc/dataspace_component.cc | 10 +-- .../core/spec/pc/io_mem_session_component.cc | 5 +- .../core/spec/pc/io_port_session_component.cc | 2 +- .../src/core/spec/pc/irq_session_component.cc | 5 +- .../src/core/spec/pc/platform_services.cc | 11 +-- repos/base-nova/src/core/core_log_out.cc | 2 +- repos/base-nova/src/core/core_region_map.cc | 6 +- .../base-nova/src/core/core_rpc_cap_alloc.cc | 4 +- repos/base-nova/src/core/include/ipc_pager.h | 22 +++--- repos/base-nova/src/core/include/irq_object.h | 7 +- repos/base-nova/src/core/include/map_local.h | 2 +- .../src/core/include/native_cpu_component.h | 9 ++- .../src/core/include/native_pd_component.h | 6 +- repos/base-nova/src/core/include/nova_util.h | 17 +++-- repos/base-nova/src/core/include/pager.h | 16 +++-- repos/base-nova/src/core/include/platform.h | 4 +- .../base-nova/src/core/include/platform_pd.h | 4 +- .../src/core/include/platform_thread.h | 4 +- .../src/core/include/rpc_cap_factory.h | 10 +-- .../src/core/include/signal_broker.h | 6 +- .../core/include/signal_source_component.h | 11 +-- repos/base-nova/src/core/include/util.h | 3 +- .../src/core/include/vm_session_component.h | 7 +- .../src/core/io_mem_session_support.cc | 3 +- repos/base-nova/src/core/ipc_pager.cc | 5 +- .../src/core/irq_session_component.cc | 5 +- .../src/core/native_cpu_component.cc | 9 +-- .../base-nova/src/core/native_pd_component.cc | 5 +- repos/base-nova/src/core/pager.cc | 4 +- .../base-nova/src/core/pd_session_support.cc | 4 +- repos/base-nova/src/core/platform.cc | 6 +- repos/base-nova/src/core/platform_pd.cc | 10 +-- repos/base-nova/src/core/platform_services.cc | 8 +-- repos/base-nova/src/core/platform_thread.cc | 5 +- .../src/core/ram_dataspace_support.cc | 2 +- repos/base-nova/src/core/rpc_cap_factory.cc | 4 +- repos/base-nova/src/core/spec/x86_32/pager.cc | 4 +- repos/base-nova/src/core/spec/x86_64/pager.cc | 4 +- repos/base-nova/src/core/thread_start.cc | 17 +++-- .../src/core/vm_session_component.cc | 8 +-- repos/base-okl4/src/core/core_log_out.cc | 2 +- repos/base-okl4/src/core/core_region_map.cc | 2 +- repos/base-okl4/src/core/include/ipc_pager.h | 6 +- repos/base-okl4/src/core/include/map_local.h | 5 +- repos/base-okl4/src/core/include/platform.h | 4 +- .../base-okl4/src/core/include/platform_pd.h | 4 +- .../src/core/include/platform_thread.h | 4 +- .../src/core/include/rpc_cap_factory.h | 8 ++- repos/base-okl4/src/core/include/util.h | 7 +- .../src/core/io_mem_session_support.cc | 2 +- .../src/core/irq_session_component.cc | 7 +- repos/base-okl4/src/core/pager.cc | 5 +- repos/base-okl4/src/core/pager_object.cc | 2 +- repos/base-okl4/src/core/platform.cc | 3 +- repos/base-okl4/src/core/platform_pd.cc | 6 +- repos/base-okl4/src/core/platform_thread.cc | 4 +- .../src/core/ram_dataspace_support.cc | 2 +- .../src/core/spec/x86/platform_thread_x86.cc | 2 +- repos/base-okl4/src/core/thread_start.cc | 8 +-- .../src/include/base/internal/native_thread.h | 9 ++- repos/base-pistachio/src/core/core_log_out.cc | 2 +- .../src/core/include/ipc_pager.h | 8 +-- .../src/core/include/map_local.h | 2 +- .../src/core/include/platform.h | 4 +- .../src/core/include/platform_pd.h | 4 +- .../src/core/include/platform_thread.h | 4 +- .../src/core/include/print_l4_thread_id.h | 7 +- .../src/core/include/rpc_cap_factory.h | 8 ++- repos/base-pistachio/src/core/include/util.h | 9 +-- .../src/core/io_mem_session_support.cc | 2 +- .../src/core/irq_session_component.cc | 5 +- repos/base-pistachio/src/core/kip.cc | 2 +- repos/base-pistachio/src/core/pager.cc | 6 +- repos/base-pistachio/src/core/pager_object.cc | 2 +- repos/base-pistachio/src/core/platform.cc | 5 +- repos/base-pistachio/src/core/platform_pd.cc | 2 +- .../src/core/platform_thread.cc | 6 +- .../src/core/ram_dataspace_support.cc | 2 +- .../src/core/spec/x86/platform_x86.cc | 4 +- repos/base-pistachio/src/core/thread_start.cc | 11 +-- .../src/include/base/internal/native_thread.h | 10 ++- repos/base-sel4/src/core/capability_space.cc | 2 +- repos/base-sel4/src/core/core_log_out.cc | 2 +- repos/base-sel4/src/core/core_region_map.cc | 9 +-- .../src/core/include/cap_sel_alloc.h | 7 +- repos/base-sel4/src/core/include/cnode.h | 7 +- .../src/core/include/core_capability_data.h | 7 +- .../base-sel4/src/core/include/core_cspace.h | 4 +- .../src/core/include/initial_untyped_pool.h | 8 +-- .../src/core/include/install_mapping.h | 6 +- repos/base-sel4/src/core/include/ipc_pager.h | 6 +- repos/base-sel4/src/core/include/irq_object.h | 14 ++-- .../src/core/include/kernel_object.h | 2 +- repos/base-sel4/src/core/include/map_local.h | 3 +- .../src/core/include/page_table_registry.h | 11 ++- repos/base-sel4/src/core/include/pager.h | 13 ++-- repos/base-sel4/src/core/include/platform.h | 8 ++- .../base-sel4/src/core/include/platform_pd.h | 4 +- .../src/core/include/platform_thread.h | 4 +- .../src/core/include/rpc_cap_factory.h | 8 ++- .../src/core/include/sel4_boot_info.h | 5 +- .../base-sel4/src/core/include/thread_sel4.h | 20 +++--- .../src/core/include/untyped_memory.h | 6 +- repos/base-sel4/src/core/include/util.h | 3 +- .../src/core/include/vm_session_component.h | 5 +- repos/base-sel4/src/core/include/vm_space.h | 6 +- .../src/core/io_mem_session_support.cc | 2 +- .../src/core/irq_session_component.cc | 6 +- repos/base-sel4/src/core/pager.cc | 6 +- repos/base-sel4/src/core/platform.cc | 11 ++- repos/base-sel4/src/core/platform_pd.cc | 5 +- repos/base-sel4/src/core/platform_thread.cc | 10 +-- .../src/core/ram_dataspace_support.cc | 2 +- repos/base-sel4/src/core/rpc_cap_factory.cc | 2 +- .../src/core/signal_source_component.cc | 10 +-- .../src/core/spec/arm/arch_kernel_object.h | 5 +- .../base-sel4/src/core/spec/arm/boot_info.cc | 10 +-- repos/base-sel4/src/core/spec/arm/irq.cc | 7 +- repos/base-sel4/src/core/spec/arm/platform.cc | 17 ++--- .../src/core/spec/arm/platform_thread.cc | 5 +- repos/base-sel4/src/core/spec/arm/thread.cc | 16 +++-- repos/base-sel4/src/core/spec/arm/vm_space.cc | 29 ++++---- .../core/spec/x86/io_port_session_support.cc | 29 ++++---- repos/base-sel4/src/core/spec/x86/irq.cc | 8 ++- .../src/core/spec/x86/platform_services.cc | 8 +-- .../src/core/spec/x86/platform_thread.cc | 14 ++-- .../src/core/spec/x86/vm_session_component.cc | 27 ++++---- repos/base-sel4/src/core/spec/x86/vm_space.cc | 37 +++++----- .../src/core/spec/x86_32/arch_kernel_object.h | 2 +- .../src/core/spec/x86_32/boot_info.cc | 7 +- .../src/core/spec/x86_32/platform.cc | 14 ++-- .../src/core/spec/x86_32/platform_pd.cc | 6 +- .../base-sel4/src/core/spec/x86_32/thread.cc | 16 +++-- .../src/core/spec/x86_32/vm_space.cc | 13 ++-- .../src/core/spec/x86_64/arch_kernel_object.h | 2 +- .../src/core/spec/x86_64/boot_info.cc | 6 +- .../src/core/spec/x86_64/platform.cc | 13 ++-- .../src/core/spec/x86_64/platform_pd.cc | 7 +- .../base-sel4/src/core/spec/x86_64/thread.cc | 16 +++-- .../src/core/spec/x86_64/vm_space.cc | 21 +++--- repos/base-sel4/src/core/stack_area.cc | 11 +-- repos/base-sel4/src/core/thread_start.cc | 17 +++-- repos/base/src/core/capability_space.cc | 8 ++- repos/base/src/core/core_log.cc | 14 ++-- repos/base/src/core/core_mem_alloc.cc | 8 +-- repos/base/src/core/core_region_map.cc | 2 +- repos/base/src/core/core_rpc_cap_alloc.cc | 4 +- repos/base/src/core/cpu_session_component.cc | 5 +- repos/base/src/core/cpu_session_support.cc | 5 +- repos/base/src/core/cpu_thread_component.cc | 2 +- repos/base/src/core/dataspace_component.cc | 2 +- repos/base/src/core/default_log.cc | 3 +- repos/base/src/core/include/account.h | 8 ++- repos/base/src/core/include/address_space.h | 11 +-- repos/base/src/core/include/boot_modules.h | 15 +++-- .../src/core/include/constrained_core_ram.h | 10 ++- .../src/core/include/core_capability_space.h | 11 ++- repos/base/src/core/include/core_env.h | 4 +- repos/base/src/core/include/core_log.h | 7 +- repos/base/src/core/include/core_mem_alloc.h | 17 +++-- repos/base/src/core/include/core_region_map.h | 4 +- repos/base/src/core/include/core_service.h | 7 +- repos/base/src/core/include/cpu_root.h | 4 +- .../src/core/include/cpu_session_component.h | 6 +- .../src/core/include/cpu_thread_allocator.h | 5 +- .../src/core/include/cpu_thread_component.h | 8 +-- .../src/core/include/dataspace_component.h | 6 +- repos/base/src/core/include/io_mem_root.h | 7 +- .../core/include/io_mem_session_component.h | 4 +- repos/base/src/core/include/io_port_root.h | 11 +-- .../core/include/io_port_session_component.h | 4 +- repos/base/src/core/include/irq_args.h | 8 ++- repos/base/src/core/include/irq_object.h | 7 +- repos/base/src/core/include/irq_root.h | 6 +- .../src/core/include/irq_session_component.h | 7 +- repos/base/src/core/include/log_root.h | 7 +- .../src/core/include/log_session_component.h | 11 +-- repos/base/src/core/include/mapping.h | 7 +- .../src/core/include/native_cpu_component.h | 6 +- .../src/core/include/native_pd_component.h | 6 +- repos/base/src/core/include/pager.h | 12 ++-- .../include/pager_object_exception_state.h | 5 +- repos/base/src/core/include/pd_root.h | 7 +- .../src/core/include/pd_session_component.h | 7 +- .../base/src/core/include/platform_generic.h | 4 +- .../base/src/core/include/platform_services.h | 5 +- .../src/core/include/ram_dataspace_factory.h | 6 +- .../src/core/include/region_map_component.h | 21 +++--- repos/base/src/core/include/rm_root.h | 6 +- .../src/core/include/rm_session_component.h | 4 +- repos/base/src/core/include/rom_fs.h | 14 ++-- repos/base/src/core/include/rom_root.h | 8 ++- .../src/core/include/rom_session_component.h | 8 ++- repos/base/src/core/include/rpc_cap_factory.h | 7 +- repos/base/src/core/include/signal_broker.h | 5 +- .../src/core/include/signal_context_slab.h | 7 +- .../src/core/include/signal_delivery_proxy.h | 11 +-- .../core/include/signal_source_component.h | 13 ++-- .../src/core/include/signal_transmitter.h | 9 ++- .../src/core/include/synced_ram_allocator.h | 7 +- .../src/core/include/synced_range_allocator.h | 7 +- .../src/core/include/trace/policy_registry.h | 11 +-- repos/base/src/core/include/trace/root.h | 4 +- .../core/include/trace/session_component.h | 6 +- .../src/core/include/trace/source_registry.h | 19 ++++-- .../src/core/include/trace/subject_registry.h | 23 ++++--- repos/base/src/core/include/types.h | 24 +++++++ repos/base/src/core/include/vm_root.h | 4 +- .../base/src/core/io_mem_session_component.cc | 9 +-- repos/base/src/core/main.cc | 32 ++++----- repos/base/src/core/pager_ep.cc | 4 +- repos/base/src/core/pager_object.cc | 5 +- repos/base/src/core/pd_session_component.cc | 5 +- repos/base/src/core/pd_session_support.cc | 4 +- repos/base/src/core/platform_rom_modules.cc | 2 +- repos/base/src/core/platform_services.cc | 6 +- repos/base/src/core/ram_dataspace_factory.cc | 5 +- repos/base/src/core/region_map_component.cc | 9 ++- repos/base/src/core/rom_session_component.cc | 7 +- repos/base/src/core/rpc_cap_factory.cc | 6 +- repos/base/src/core/rpc_cap_factory_l4.cc | 8 +-- repos/base/src/core/signal_receiver.cc | 6 +- .../base/src/core/signal_source_component.cc | 2 +- .../src/core/signal_transmitter_noinit.cc | 7 +- .../base/src/core/signal_transmitter_proxy.cc | 6 +- .../spec/x86/io_port_session_component.cc | 6 +- .../core/spec/x86/io_port_session_support.cc | 2 +- .../src/core/spec/x86/platform_services.cc | 8 +-- repos/base/src/core/stack_area.cc | 5 +- .../base/src/core/trace_session_component.cc | 9 +-- repos/base/src/core/vm_session_common.cc | 12 ++-- repos/base/src/include/pager/capability.h | 11 --- 429 files changed, 1631 insertions(+), 1505 deletions(-) create mode 100644 repos/base/src/core/include/types.h diff --git a/repos/base-fiasco/src/core/core_log_out.cc b/repos/base-fiasco/src/core/core_log_out.cc index 7ccdcd68b5..732d9cf84e 100644 --- a/repos/base-fiasco/src/core/core_log_out.cc +++ b/repos/base-fiasco/src/core/core_log_out.cc @@ -17,7 +17,7 @@ /* L4/Fiasco includes */ #include -using namespace Genode; +using namespace Core; void Core_log::out(char const c) { Fiasco::outchar(c); } diff --git a/repos/base-fiasco/src/core/include/ipc_pager.h b/repos/base-fiasco/src/core/include/ipc_pager.h index fd97211a29..454186b666 100644 --- a/repos/base-fiasco/src/core/include/ipc_pager.h +++ b/repos/base-fiasco/src/core/include/ipc_pager.h @@ -30,10 +30,10 @@ /* L4/Fiasco includes */ #include -namespace Genode { class Ipc_pager; } +namespace Core { class Ipc_pager; } -class Genode::Ipc_pager +class Core::Ipc_pager { private: diff --git a/repos/base-fiasco/src/core/include/map_local.h b/repos/base-fiasco/src/core/include/map_local.h index dc0d7063ce..d1dfefeb03 100644 --- a/repos/base-fiasco/src/core/include/map_local.h +++ b/repos/base-fiasco/src/core/include/map_local.h @@ -21,7 +21,7 @@ /* L4/Fiasco includes */ #include -namespace Genode { +namespace Core { /** * Map page locally within core diff --git a/repos/base-fiasco/src/core/include/platform.h b/repos/base-fiasco/src/core/include/platform.h index 918c6fd799..180b3fc04f 100644 --- a/repos/base-fiasco/src/core/include/platform.h +++ b/repos/base-fiasco/src/core/include/platform.h @@ -29,10 +29,10 @@ #include #include -namespace Genode { class Platform; } +namespace Core { class Platform; } -class Genode::Platform : public Platform_generic +class Core::Platform : public Platform_generic { private: diff --git a/repos/base-fiasco/src/core/include/platform_pd.h b/repos/base-fiasco/src/core/include/platform_pd.h index d1ee34b88d..b0dd150f8d 100644 --- a/repos/base-fiasco/src/core/include/platform_pd.h +++ b/repos/base-fiasco/src/core/include/platform_pd.h @@ -27,14 +27,14 @@ /* L4/Fiasco includes */ #include -namespace Genode { +namespace Core { class Platform_thread; class Platform_pd; } -class Genode::Platform_pd : public Address_space +class Core::Platform_pd : public Address_space { private: diff --git a/repos/base-fiasco/src/core/include/platform_thread.h b/repos/base-fiasco/src/core/include/platform_thread.h index 5832fdbb12..0971847345 100644 --- a/repos/base-fiasco/src/core/include/platform_thread.h +++ b/repos/base-fiasco/src/core/include/platform_thread.h @@ -27,14 +27,14 @@ /* L4/Fiasco includes */ #include -namespace Genode { +namespace Core { class Platform_pd; class Platform_thread; } -class Genode::Platform_thread : Interface +class Core::Platform_thread : Interface { private: diff --git a/repos/base-fiasco/src/core/include/rpc_cap_factory.h b/repos/base-fiasco/src/core/include/rpc_cap_factory.h index 4ef13ade6e..d42c364a6d 100644 --- a/repos/base-fiasco/src/core/include/rpc_cap_factory.h +++ b/repos/base-fiasco/src/core/include/rpc_cap_factory.h @@ -18,10 +18,13 @@ #include #include -namespace Genode { class Rpc_cap_factory; } +/* core includes */ +#include + +namespace Core { class Rpc_cap_factory; } -class Genode::Rpc_cap_factory +class Core::Rpc_cap_factory { private: diff --git a/repos/base-fiasco/src/core/include/util.h b/repos/base-fiasco/src/core/include/util.h index d6bac861e4..33143a462a 100644 --- a/repos/base-fiasco/src/core/include/util.h +++ b/repos/base-fiasco/src/core/include/util.h @@ -28,7 +28,10 @@ /* L4/Fiasco includes */ #include -namespace Genode { +/* core includes */ +#include + +namespace Core { inline void log_event(const char *s) { diff --git a/repos/base-fiasco/src/core/io_mem_session_support.cc b/repos/base-fiasco/src/core/io_mem_session_support.cc index 64ef0a753d..79738876a4 100644 --- a/repos/base-fiasco/src/core/io_mem_session_support.cc +++ b/repos/base-fiasco/src/core/io_mem_session_support.cc @@ -19,7 +19,7 @@ /* L4/Fiasco includes */ #include -using namespace Genode; +using namespace Core; void Io_mem_session_component::_unmap_local(addr_t base, size_t) diff --git a/repos/base-fiasco/src/core/irq_session_component.cc b/repos/base-fiasco/src/core/irq_session_component.cc index b5f7e9293f..87c2cb93a6 100644 --- a/repos/base-fiasco/src/core/irq_session_component.cc +++ b/repos/base-fiasco/src/core/irq_session_component.cc @@ -12,7 +12,6 @@ */ /* Genode includes */ -#include #include /* core includes */ @@ -22,7 +21,7 @@ /* L4/Fiasco includes */ #include -using namespace Genode; +using namespace Core; bool Irq_object::_associate() diff --git a/repos/base-fiasco/src/core/pager.cc b/repos/base-fiasco/src/core/pager.cc index 544ee6f83c..e6c1d9257f 100644 --- a/repos/base-fiasco/src/core/pager.cc +++ b/repos/base-fiasco/src/core/pager.cc @@ -11,9 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include @@ -25,7 +22,7 @@ /* L4/Fiasco includes */ #include -using namespace Genode; +using namespace Core; using namespace Fiasco; diff --git a/repos/base-fiasco/src/core/pager_object.cc b/repos/base-fiasco/src/core/pager_object.cc index 794ec818d6..3d68da8819 100644 --- a/repos/base-fiasco/src/core/pager_object.cc +++ b/repos/base-fiasco/src/core/pager_object.cc @@ -20,7 +20,7 @@ /* L4/Fiasco includes */ #include -using namespace Genode; +using namespace Core; void Pager_object::wake_up() diff --git a/repos/base-fiasco/src/core/platform.cc b/repos/base-fiasco/src/core/platform.cc index 632151e353..4c760d9371 100644 --- a/repos/base-fiasco/src/core/platform.cc +++ b/repos/base-fiasco/src/core/platform.cc @@ -12,7 +12,6 @@ */ /* Genode includes */ -#include #include #include #include @@ -35,7 +34,7 @@ /* L4/Fiasco includes */ #include -using namespace Genode; +using namespace Core; using namespace Fiasco; diff --git a/repos/base-fiasco/src/core/platform_pd.cc b/repos/base-fiasco/src/core/platform_pd.cc index c3196ba628..7fd53d44e6 100644 --- a/repos/base-fiasco/src/core/platform_pd.cc +++ b/repos/base-fiasco/src/core/platform_pd.cc @@ -29,7 +29,7 @@ #include using namespace Fiasco; -using namespace Genode; +using namespace Core; static bool _init = false; diff --git a/repos/base-fiasco/src/core/platform_thread.cc b/repos/base-fiasco/src/core/platform_thread.cc index 65fdd25249..79b01382d0 100644 --- a/repos/base-fiasco/src/core/platform_thread.cc +++ b/repos/base-fiasco/src/core/platform_thread.cc @@ -15,8 +15,6 @@ */ /* Genode includes */ -#include -#include #include /* core includes */ @@ -28,7 +26,7 @@ /* L4/Fiasco includes */ #include -using namespace Genode; +using namespace Core; using namespace Fiasco; diff --git a/repos/base-fiasco/src/core/ram_dataspace_support.cc b/repos/base-fiasco/src/core/ram_dataspace_support.cc index 75e15507ab..f4f79bd11c 100644 --- a/repos/base-fiasco/src/core/ram_dataspace_support.cc +++ b/repos/base-fiasco/src/core/ram_dataspace_support.cc @@ -17,7 +17,7 @@ /* core includes */ #include -using namespace Genode; +using namespace Core; void Ram_dataspace_factory::_export_ram_ds(Dataspace_component &) { } diff --git a/repos/base-fiasco/src/core/spec/x86/platform_x86.cc b/repos/base-fiasco/src/core/spec/x86/platform_x86.cc index c8f691b55a..b52e1d8699 100644 --- a/repos/base-fiasco/src/core/spec/x86/platform_x86.cc +++ b/repos/base-fiasco/src/core/spec/x86/platform_x86.cc @@ -21,7 +21,7 @@ /* L4/Fiasco includes */ #include -using namespace Genode; +using namespace Core; using namespace Fiasco; diff --git a/repos/base-fiasco/src/core/thread_start.cc b/repos/base-fiasco/src/core/thread_start.cc index 29ccc8d1f9..2e1180c420 100644 --- a/repos/base-fiasco/src/core/thread_start.cc +++ b/repos/base-fiasco/src/core/thread_start.cc @@ -22,7 +22,7 @@ #include #include -using namespace Genode; +using namespace Core; void Thread::_thread_start() diff --git a/repos/base-fiasco/src/include/base/internal/native_thread.h b/repos/base-fiasco/src/include/base/internal/native_thread.h index fb94535ede..1234c529e5 100644 --- a/repos/base-fiasco/src/include/base/internal/native_thread.h +++ b/repos/base-fiasco/src/include/base/internal/native_thread.h @@ -20,11 +20,9 @@ /* L4/Fiasco includes */ #include -namespace Genode { +namespace Core { struct Platform_thread; } - struct Platform_thread; - struct Native_thread; -} +namespace Genode { struct Native_thread; } struct Genode::Native_thread @@ -38,7 +36,7 @@ struct Genode::Native_thread * thread object, which is going to be destroyed on destruction of the * 'Thread'. */ - Platform_thread *pt; + Core::Platform_thread *pt; }; #endif /* _INCLUDE__BASE__INTERNAL__NATIVE_THREAD_H_ */ diff --git a/repos/base-foc/src/core/core_log_out.cc b/repos/base-foc/src/core/core_log_out.cc index 1ac63a5181..aadbf1c99e 100644 --- a/repos/base-foc/src/core/core_log_out.cc +++ b/repos/base-foc/src/core/core_log_out.cc @@ -17,7 +17,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; void Core_log::out(char const c) diff --git a/repos/base-foc/src/core/include/cap_id_alloc.h b/repos/base-foc/src/core/include/cap_id_alloc.h index dc3c84a10a..39c34ca571 100644 --- a/repos/base-foc/src/core/include/cap_id_alloc.h +++ b/repos/base-foc/src/core/include/cap_id_alloc.h @@ -20,10 +20,13 @@ #include #include -namespace Genode { class Cap_id_allocator; } +/* core includes */ +#include + +namespace Core { class Cap_id_allocator; } -class Genode::Cap_id_allocator +class Core::Cap_id_allocator { public: diff --git a/repos/base-foc/src/core/include/cap_index.h b/repos/base-foc/src/core/include/cap_index.h index 5f885020a8..be813d34ab 100644 --- a/repos/base-foc/src/core/include/cap_index.h +++ b/repos/base-foc/src/core/include/cap_index.h @@ -18,15 +18,18 @@ #include #include -namespace Genode { +/* core includes */ +#include +namespace Core { + + class Core_cap_index; class Platform_thread; class Pd_session_component; - class Core_cap_index; } -class Genode::Core_cap_index : public Native_capability::Data +class Core::Core_cap_index : public Native_capability::Data { private: diff --git a/repos/base-foc/src/core/include/cap_mapping.h b/repos/base-foc/src/core/include/cap_mapping.h index 05a43d61ff..8e2c863d34 100644 --- a/repos/base-foc/src/core/include/cap_mapping.h +++ b/repos/base-foc/src/core/include/cap_mapping.h @@ -16,16 +16,15 @@ /* core includes */ #include -#include -namespace Genode { class Cap_mapping; } +namespace Core { class Cap_mapping; } /** * A Cap_mapping embodies a capability of core, and its mapped * copy in another protection domain. */ -class Genode::Cap_mapping : Noncopyable +class Core::Cap_mapping : Noncopyable { private: diff --git a/repos/base-foc/src/core/include/ipc_pager.h b/repos/base-foc/src/core/include/ipc_pager.h index b9ba858afd..8786d8cfed 100644 --- a/repos/base-foc/src/core/include/ipc_pager.h +++ b/repos/base-foc/src/core/include/ipc_pager.h @@ -27,16 +27,16 @@ /* base-internal includes */ #include -/* core-local includes */ +/* core includes */ #include /* Fiasco.OC includes */ #include -namespace Genode { class Ipc_pager; } +namespace Core { class Ipc_pager; } -class Genode::Ipc_pager : public Native_capability +class Core::Ipc_pager : public Native_capability { public: diff --git a/repos/base-foc/src/core/include/irq_object.h b/repos/base-foc/src/core/include/irq_object.h index ef1604e2cc..8694cc8f57 100644 --- a/repos/base-foc/src/core/include/irq_object.h +++ b/repos/base-foc/src/core/include/irq_object.h @@ -20,10 +20,13 @@ #include #include -namespace Genode { class Irq_object; } +/* core includes */ +#include + +namespace Core { class Irq_object; } -class Genode::Irq_object +class Core::Irq_object { private: @@ -56,8 +59,8 @@ class Genode::Irq_object uint64_t msi_address() const { return _msi_addr; } addr_t msi_value() const { return _msi_data; } - void sigh(Genode::Signal_context_capability cap) { _sig_cap = cap; } - void notify() { Genode::Signal_transmitter(_sig_cap).submit(1); } + void sigh(Signal_context_capability cap) { _sig_cap = cap; } + void notify() { Signal_transmitter(_sig_cap).submit(1); } bool associate(unsigned irq, bool msi, Irq_session::Trigger, Irq_session::Polarity); diff --git a/repos/base-foc/src/core/include/map_local.h b/repos/base-foc/src/core/include/map_local.h index 4bfbacfe0b..05c8bc9be0 100644 --- a/repos/base-foc/src/core/include/map_local.h +++ b/repos/base-foc/src/core/include/map_local.h @@ -22,7 +22,7 @@ /* Fiasco.OC includes */ #include -namespace Genode { +namespace Core { /** * Map pages locally within core diff --git a/repos/base-foc/src/core/include/native_cpu_component.h b/repos/base-foc/src/core/include/native_cpu_component.h index 8fd21ad7f9..79c7e0fe5c 100644 --- a/repos/base-foc/src/core/include/native_cpu_component.h +++ b/repos/base-foc/src/core/include/native_cpu_component.h @@ -18,15 +18,18 @@ #include #include -namespace Genode { +/* core includes */ +#include + +namespace Core { class Cpu_session_component; class Native_cpu_component; } -class Genode::Native_cpu_component : public Rpc_object +class Core::Native_cpu_component : public Rpc_object { private: diff --git a/repos/base-foc/src/core/include/pager_object_exception_state.h b/repos/base-foc/src/core/include/pager_object_exception_state.h index a2ecb8b11d..82e49c0b89 100644 --- a/repos/base-foc/src/core/include/pager_object_exception_state.h +++ b/repos/base-foc/src/core/include/pager_object_exception_state.h @@ -17,10 +17,10 @@ #include #include -namespace Genode { struct Pager_object_exception_state; } +namespace Core { struct Pager_object_exception_state; } -struct Genode::Pager_object_exception_state +struct Core::Pager_object_exception_state { Mutex mutex { }; unsigned exceptions; /* counts exceptions raised by the thread */ diff --git a/repos/base-foc/src/core/include/platform.h b/repos/base-foc/src/core/include/platform.h index 274e0a4408..690b417b1d 100644 --- a/repos/base-foc/src/core/include/platform.h +++ b/repos/base-foc/src/core/include/platform.h @@ -21,7 +21,7 @@ #include #include -/* Core includes */ +/* core includes */ #include #include #include @@ -32,10 +32,10 @@ namespace Foc { struct l4_kernel_info_t; } -namespace Genode { class Platform; } +namespace Core { class Platform; } -class Genode::Platform : public Platform_generic +class Core::Platform : public Platform_generic { private: diff --git a/repos/base-foc/src/core/include/platform_pd.h b/repos/base-foc/src/core/include/platform_pd.h index bfa9f734be..a2aee59b7b 100644 --- a/repos/base-foc/src/core/include/platform_pd.h +++ b/repos/base-foc/src/core/include/platform_pd.h @@ -36,14 +36,14 @@ /* Fiasco.OC includes */ #include -namespace Genode { +namespace Core { class Platform_thread; class Platform_pd; } -class Genode::Platform_pd : public Address_space +class Core::Platform_pd : public Address_space { private: diff --git a/repos/base-foc/src/core/include/platform_thread.h b/repos/base-foc/src/core/include/platform_thread.h index 55e5b10afe..5837b7344e 100644 --- a/repos/base-foc/src/core/include/platform_thread.h +++ b/repos/base-foc/src/core/include/platform_thread.h @@ -26,14 +26,14 @@ #include #include -namespace Genode { +namespace Core { class Platform_pd; class Platform_thread; } -class Genode::Platform_thread : Interface +class Core::Platform_thread : Interface { private: diff --git a/repos/base-foc/src/core/include/rpc_cap_factory.h b/repos/base-foc/src/core/include/rpc_cap_factory.h index 3299b7cd62..0355c75922 100644 --- a/repos/base-foc/src/core/include/rpc_cap_factory.h +++ b/repos/base-foc/src/core/include/rpc_cap_factory.h @@ -23,10 +23,13 @@ /* base-internal includes */ #include +/* core includes */ +#include -namespace Genode { class Rpc_cap_factory; } +namespace Core { class Rpc_cap_factory; } -class Genode::Rpc_cap_factory + +class Core::Rpc_cap_factory { private: diff --git a/repos/base-foc/src/core/include/util.h b/repos/base-foc/src/core/include/util.h index 6103f9eec5..4656521e6a 100644 --- a/repos/base-foc/src/core/include/util.h +++ b/repos/base-foc/src/core/include/util.h @@ -18,8 +18,6 @@ #define _CORE__INCLUDE__UTIL_H_ /* Genode includes */ -#include -#include #include #include @@ -29,7 +27,10 @@ /* Fiasco.OC includes */ #include -namespace Genode { +/* core includes */ +#include + +namespace Core { inline void panic(const char *s) { @@ -44,8 +45,8 @@ namespace Genode { unsigned char const volatile *bptr; unsigned char const *eptr; - bptr = (unsigned char const volatile *)(((Genode::addr_t)addr) & L4_PAGEMASK); - eptr = (unsigned char const *)(((Genode::addr_t)addr + size - 1) & L4_PAGEMASK); + bptr = (unsigned char const volatile *)(((addr_t)addr) & L4_PAGEMASK); + eptr = (unsigned char const *)(((addr_t)addr + size - 1) & L4_PAGEMASK); for ( ; bptr <= eptr; bptr += L4_PAGESIZE) touch_read(bptr); } @@ -57,8 +58,8 @@ namespace Genode { unsigned char volatile *bptr; unsigned char const *eptr; - bptr = (unsigned char volatile *)(((Genode::addr_t)addr) & L4_PAGEMASK); - eptr = (unsigned char const *)(((Genode::addr_t)addr + size - 1) & L4_PAGEMASK); + bptr = (unsigned char volatile *)(((addr_t)addr) & L4_PAGEMASK); + eptr = (unsigned char const *)(((addr_t)addr + size - 1) & L4_PAGEMASK); for (; bptr <= eptr; bptr += L4_PAGESIZE) touch_read_write(bptr); } diff --git a/repos/base-foc/src/core/include/vm_session_component.h b/repos/base-foc/src/core/include/vm_session_component.h index 848f728102..2a02ba3ac5 100644 --- a/repos/base-foc/src/core/include/vm_session_component.h +++ b/repos/base-foc/src/core/include/vm_session_component.h @@ -28,8 +28,8 @@ #include #include -namespace Genode -{ +namespace Core { + class Vm_session_component; struct Vcpu; @@ -39,7 +39,7 @@ namespace Genode } -struct Genode::Vcpu : Rpc_object +struct Core::Vcpu : Rpc_object { private: @@ -69,7 +69,7 @@ struct Genode::Vcpu : Rpc_object }; -class Genode::Vm_session_component +class Core::Vm_session_component : private Ram_quota_guard, private Cap_quota_guard, diff --git a/repos/base-foc/src/core/io_mem_session_support.cc b/repos/base-foc/src/core/io_mem_session_support.cc index 891a300dbb..add5548d15 100644 --- a/repos/base-foc/src/core/io_mem_session_support.cc +++ b/repos/base-foc/src/core/io_mem_session_support.cc @@ -18,7 +18,7 @@ #include #include -using namespace Genode; +using namespace Core; void Io_mem_session_component::_unmap_local(addr_t base, size_t) diff --git a/repos/base-foc/src/core/ipc_pager.cc b/repos/base-foc/src/core/ipc_pager.cc index 0be90ad79b..322928f36c 100644 --- a/repos/base-foc/src/core/ipc_pager.cc +++ b/repos/base-foc/src/core/ipc_pager.cc @@ -12,7 +12,6 @@ */ /* Genode includes */ -#include #include /* core includes */ @@ -25,7 +24,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; using namespace Foc; diff --git a/repos/base-foc/src/core/irq_session_component.cc b/repos/base-foc/src/core/irq_session_component.cc index 302cd42b0d..bd1b06e8fa 100644 --- a/repos/base-foc/src/core/irq_session_component.cc +++ b/repos/base-foc/src/core/irq_session_component.cc @@ -14,7 +14,6 @@ */ /* Genode includes */ -#include #include #include @@ -28,15 +27,15 @@ /* Fiasco.OC includes */ #include -namespace Genode { class Interrupt_handler; } +namespace Core { class Interrupt_handler; } -using namespace Genode; +using namespace Core; /** * Dispatches interrupts from kernel */ -class Genode::Interrupt_handler : public Thread +class Core::Interrupt_handler : public Thread { private: @@ -239,7 +238,7 @@ void Irq_session_component::ack_irq() } -void Irq_session_component::sigh(Genode::Signal_context_capability cap) +void Irq_session_component::sigh(Signal_context_capability cap) { _irq_object.sigh(cap); } @@ -251,7 +250,7 @@ Irq_session::Info Irq_session_component::info() return { .type = Info::Type::INVALID, .address = 0, .value = 0 }; return { - .type = Genode::Irq_session::Info::Type::MSI, + .type = Irq_session::Info::Type::MSI, .address = (addr_t)_irq_object.msi_address(), .value = _irq_object.msi_value() }; diff --git a/repos/base-foc/src/core/native_cpu_component.cc b/repos/base-foc/src/core/native_cpu_component.cc index 20eff8b9dd..a3bc2388fd 100644 --- a/repos/base-foc/src/core/native_cpu_component.cc +++ b/repos/base-foc/src/core/native_cpu_component.cc @@ -11,9 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include @@ -22,7 +19,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; Native_capability Native_cpu_component::native_cap(Thread_capability cap) diff --git a/repos/base-foc/src/core/pager.cc b/repos/base-foc/src/core/pager.cc index fb10cc06a4..9ce4db4e5f 100644 --- a/repos/base-foc/src/core/pager.cc +++ b/repos/base-foc/src/core/pager.cc @@ -13,10 +13,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include -#include - /* core includes */ #include @@ -26,7 +22,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; void Pager_entrypoint::entry() diff --git a/repos/base-foc/src/core/pager_object.cc b/repos/base-foc/src/core/pager_object.cc index fc46e2efec..1b8f912ba5 100644 --- a/repos/base-foc/src/core/pager_object.cc +++ b/repos/base-foc/src/core/pager_object.cc @@ -20,7 +20,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; void Pager_object::wake_up() diff --git a/repos/base-foc/src/core/platform.cc b/repos/base-foc/src/core/platform.cc index 0c99efffb0..9d1d922822 100644 --- a/repos/base-foc/src/core/platform.cc +++ b/repos/base-foc/src/core/platform.cc @@ -13,7 +13,6 @@ */ /* Genode includes */ -#include #include #include #include @@ -38,7 +37,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; /*********************************** @@ -288,7 +287,7 @@ void Platform::_setup_mem_alloc() * prevent sigma0 from handing out those page as anonymous memory. */ volatile const char *beg, *end; - beg = (const char *)(((Genode::addr_t)&_prog_img_beg) & L4_PAGEMASK); + beg = (const char *)(((addr_t)&_prog_img_beg) & L4_PAGEMASK); end = (const char *)&_prog_img_end; for ( ; beg < end; beg += L4_PAGESIZE) (void)(*beg); diff --git a/repos/base-foc/src/core/platform_pd.cc b/repos/base-foc/src/core/platform_pd.cc index 17e7ae4c12..bf76ecc5e7 100644 --- a/repos/base-foc/src/core/platform_pd.cc +++ b/repos/base-foc/src/core/platform_pd.cc @@ -26,7 +26,7 @@ #include using namespace Foc; -using namespace Genode; +using namespace Core; static addr_t core_utcb_base() diff --git a/repos/base-foc/src/core/platform_thread.cc b/repos/base-foc/src/core/platform_thread.cc index cc613b95e6..5e626941bd 100644 --- a/repos/base-foc/src/core/platform_thread.cc +++ b/repos/base-foc/src/core/platform_thread.cc @@ -13,8 +13,6 @@ /* Genode includes */ #include -#include -#include #include /* core includes */ @@ -25,7 +23,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; using namespace Foc; diff --git a/repos/base-foc/src/core/ram_dataspace_support.cc b/repos/base-foc/src/core/ram_dataspace_support.cc index ac92a526ee..56d75d8633 100644 --- a/repos/base-foc/src/core/ram_dataspace_support.cc +++ b/repos/base-foc/src/core/ram_dataspace_support.cc @@ -11,14 +11,14 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* core-local includes */ +/* core includes */ #include #include /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; void Ram_dataspace_factory::_export_ram_ds(Dataspace_component &) { } diff --git a/repos/base-foc/src/core/rpc_cap_factory.cc b/repos/base-foc/src/core/rpc_cap_factory.cc index afcb7b0dab..fa0c2ea5a0 100644 --- a/repos/base-foc/src/core/rpc_cap_factory.cc +++ b/repos/base-foc/src/core/rpc_cap_factory.cc @@ -29,7 +29,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; /*************************** diff --git a/repos/base-foc/src/core/signal_source_component.cc b/repos/base-foc/src/core/signal_source_component.cc index b25a9019a0..a1d82f097f 100644 --- a/repos/base-foc/src/core/signal_source_component.cc +++ b/repos/base-foc/src/core/signal_source_component.cc @@ -13,7 +13,6 @@ */ /* Genode includes */ -#include #include /* core includes */ @@ -23,13 +22,9 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; -/***************************** - ** Signal-source component ** - *****************************/ - void Signal_source_component::release(Signal_context_component &context) { if (context.enqueued()) diff --git a/repos/base-foc/src/core/spec/arm/ipc_pager.cc b/repos/base-foc/src/core/spec/arm/ipc_pager.cc index 465ea28ab6..75dc814abc 100644 --- a/repos/base-foc/src/core/spec/arm/ipc_pager.cc +++ b/repos/base-foc/src/core/spec/arm/ipc_pager.cc @@ -19,7 +19,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; enum Exceptions { EX_REGS = 0x500000 }; diff --git a/repos/base-foc/src/core/spec/arm/platform_arm.cc b/repos/base-foc/src/core/spec/arm/platform_arm.cc index 97634cb6de..5df54494d7 100644 --- a/repos/base-foc/src/core/spec/arm/platform_arm.cc +++ b/repos/base-foc/src/core/spec/arm/platform_arm.cc @@ -13,7 +13,7 @@ #include -using namespace Genode; +using namespace Core; void Platform::_setup_io_port_alloc() { } diff --git a/repos/base-foc/src/core/spec/arm_64/ipc_pager.cc b/repos/base-foc/src/core/spec/arm_64/ipc_pager.cc index e22e5f8190..fb0c6dca8c 100644 --- a/repos/base-foc/src/core/spec/arm_64/ipc_pager.cc +++ b/repos/base-foc/src/core/spec/arm_64/ipc_pager.cc @@ -19,7 +19,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; enum Exceptions { EX_REGS = 0x500000 }; diff --git a/repos/base-foc/src/core/spec/x86/ipc_pager.cc b/repos/base-foc/src/core/spec/x86/ipc_pager.cc index 6c40f3a5e4..28e6c23bc8 100644 --- a/repos/base-foc/src/core/spec/x86/ipc_pager.cc +++ b/repos/base-foc/src/core/spec/x86/ipc_pager.cc @@ -17,7 +17,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; enum Exceptions { EX_REGS = 0xff }; diff --git a/repos/base-foc/src/core/spec/x86/platform.cc b/repos/base-foc/src/core/spec/x86/platform.cc index 42e3d7abb6..38fddfaaaf 100644 --- a/repos/base-foc/src/core/spec/x86/platform.cc +++ b/repos/base-foc/src/core/spec/x86/platform.cc @@ -13,17 +13,17 @@ */ /* Genode includes */ -#include #include #include -#include "platform.h" -#include "util.h" +/* core includes */ +#include +#include /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; void Platform::_setup_io_port_alloc() diff --git a/repos/base-foc/src/core/spec/x86/platform_services.cc b/repos/base-foc/src/core/spec/x86/platform_services.cc index 09386b3cba..8e4888c65a 100644 --- a/repos/base-foc/src/core/spec/x86/platform_services.cc +++ b/repos/base-foc/src/core/spec/x86/platform_services.cc @@ -20,10 +20,10 @@ /* * Add x86 specific services */ -void Genode::platform_add_local_services(Rpc_entrypoint &ep, - Sliced_heap &heap, - Registry &services, - Trace::Source_registry &trace_sources) +void Core::platform_add_local_services(Rpc_entrypoint &ep, + Sliced_heap &heap, + Registry &services, + Trace::Source_registry &trace_sources) { static Vm_root vm_root(ep, heap, core_env().ram_allocator(), core_env().local_rm(), trace_sources); diff --git a/repos/base-foc/src/core/spec/x86_32/ipc_pager.cc b/repos/base-foc/src/core/spec/x86_32/ipc_pager.cc index 98b8f5e02c..2b4b0fc477 100644 --- a/repos/base-foc/src/core/spec/x86_32/ipc_pager.cc +++ b/repos/base-foc/src/core/spec/x86_32/ipc_pager.cc @@ -16,7 +16,7 @@ /* core includes */ #include -using namespace Genode; +using namespace Core; void Ipc_pager::get_regs(Foc_thread_state &state) const diff --git a/repos/base-foc/src/core/spec/x86_64/ipc_pager.cc b/repos/base-foc/src/core/spec/x86_64/ipc_pager.cc index 5f8ab39ba6..6184f46992 100644 --- a/repos/base-foc/src/core/spec/x86_64/ipc_pager.cc +++ b/repos/base-foc/src/core/spec/x86_64/ipc_pager.cc @@ -16,7 +16,7 @@ /* core includes */ #include -using namespace Genode; +using namespace Core; void Ipc_pager::get_regs(Foc_thread_state &state) const diff --git a/repos/base-foc/src/core/thread_start.cc b/repos/base-foc/src/core/thread_start.cc index 4e14b56af3..5ea31a67cb 100644 --- a/repos/base-foc/src/core/thread_start.cc +++ b/repos/base-foc/src/core/thread_start.cc @@ -27,7 +27,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; void Thread::_deinit_platform_thread() @@ -65,9 +65,9 @@ void Thread::start() pt.start((void *)_thread_start, stack_top()); - struct Core_trace_source : public Trace::Source::Info_accessor, - private Trace::Control, - private Trace::Source + struct Core_trace_source : public Core::Trace::Source::Info_accessor, + private Core::Trace::Control, + private Core::Trace::Source { Thread &thread; Platform_thread &platform_thread; @@ -101,16 +101,16 @@ void Thread::start() thread._affinity }; } - Core_trace_source(Trace::Source_registry ®istry, Thread &t, + Core_trace_source(Core::Trace::Source_registry ®istry, Thread &t, Platform_thread &pt) : - Trace::Control(), - Trace::Source(*this, *this), thread(t), platform_thread(pt) + Core::Trace::Control(), + Core::Trace::Source(*this, *this), thread(t), platform_thread(pt) { registry.insert(this); } }; - new (platform().core_mem_alloc()) Core_trace_source(Trace::sources(), + new (platform().core_mem_alloc()) Core_trace_source(Core::Trace::sources(), *this, pt); } diff --git a/repos/base-foc/src/core/vm_session_component.cc b/repos/base-foc/src/core/vm_session_component.cc index f38f72fe4c..ab9a21e4b9 100644 --- a/repos/base-foc/src/core/vm_session_component.cc +++ b/repos/base-foc/src/core/vm_session_component.cc @@ -23,7 +23,7 @@ /* Fiasco.OC includes */ #include -using namespace Genode; +using namespace Core; struct Vcpu_creation_error : Exception { }; @@ -44,7 +44,7 @@ Vcpu::Vcpu(Rpc_entrypoint &ep, Foc::l4_msgtag_t msg = l4_factory_create_irq(Foc::L4_BASE_FACTORY_CAP, _recall.local.data()->kcap()); if (l4_error(msg)) { - Genode::error("vcpu irq creation failed", l4_error(msg)); + error("vcpu irq creation failed", l4_error(msg)); throw Vcpu_creation_error(); } @@ -108,7 +108,7 @@ Vm_session_component::Vm_session_component(Rpc_entrypoint &ep, l4_msgtag_t msg = l4_factory_create_vm(L4_BASE_FACTORY_CAP, _task_vcpu.local.data()->kcap()); if (l4_error(msg)) { - Genode::error("create_vm failed ", l4_error(msg)); + error("create_vm failed ", l4_error(msg)); throw Service_denied(); } @@ -194,7 +194,7 @@ void Vm_session_component::_attach_vm_memory(Dataspace_component &dsc, L4_MAP_ITEM_MAP)); if (l4_error(msg)) - Genode::error("task map failed ", l4_error(msg)); + error("task map failed ", l4_error(msg)); page = flex.page(); } diff --git a/repos/base-hw/src/bootstrap/platform.cc b/repos/base-hw/src/bootstrap/platform.cc index 8f56824ac3..d5d39978ba 100644 --- a/repos/base-hw/src/bootstrap/platform.cc +++ b/repos/base-hw/src/bootstrap/platform.cc @@ -157,9 +157,9 @@ void Platform::start_core(unsigned cpu_id) } -static constexpr Genode::Boot_modules_header & header() +static constexpr Core::Boot_modules_header &header() { - return *((Genode::Boot_modules_header*) &_boot_modules_headers_begin); + return *((Core::Boot_modules_header*) &_boot_modules_headers_begin); } diff --git a/repos/base-hw/src/core/board/imx53_qsb/board.h b/repos/base-hw/src/core/board/imx53_qsb/board.h index 962cc85be4..b52725447b 100644 --- a/repos/base-hw/src/core/board/imx53_qsb/board.h +++ b/repos/base-hw/src/core/board/imx53_qsb/board.h @@ -19,7 +19,7 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include diff --git a/repos/base-hw/src/core/board/imx6q_sabrelite/board.h b/repos/base-hw/src/core/board/imx6q_sabrelite/board.h index f9aff439c5..1fa42eb3f2 100644 --- a/repos/base-hw/src/core/board/imx6q_sabrelite/board.h +++ b/repos/base-hw/src/core/board/imx6q_sabrelite/board.h @@ -18,7 +18,7 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include diff --git a/repos/base-hw/src/core/board/imx7d_sabre/board.h b/repos/base-hw/src/core/board/imx7d_sabre/board.h index 06feed0330..3cc36b534a 100644 --- a/repos/base-hw/src/core/board/imx7d_sabre/board.h +++ b/repos/base-hw/src/core/board/imx7d_sabre/board.h @@ -17,7 +17,7 @@ /* base-hw internal includes */ #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include diff --git a/repos/base-hw/src/core/board/nit6_solox/board.h b/repos/base-hw/src/core/board/nit6_solox/board.h index 54594b30f8..b6ce29d5b9 100644 --- a/repos/base-hw/src/core/board/nit6_solox/board.h +++ b/repos/base-hw/src/core/board/nit6_solox/board.h @@ -18,7 +18,7 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include diff --git a/repos/base-hw/src/core/board/pbxa9/board.h b/repos/base-hw/src/core/board/pbxa9/board.h index 2bd2291d4f..e39d046502 100644 --- a/repos/base-hw/src/core/board/pbxa9/board.h +++ b/repos/base-hw/src/core/board/pbxa9/board.h @@ -18,7 +18,7 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include diff --git a/repos/base-hw/src/core/board/pc/board.h b/repos/base-hw/src/core/board/pc/board.h index ea23d11889..69602e5855 100644 --- a/repos/base-hw/src/core/board/pc/board.h +++ b/repos/base-hw/src/core/board/pc/board.h @@ -25,7 +25,7 @@ */ namespace Board { using namespace Hw::Pc_board; }; -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include diff --git a/repos/base-hw/src/core/board/usb_armory/board.h b/repos/base-hw/src/core/board/usb_armory/board.h index d0f5d14745..3931899037 100644 --- a/repos/base-hw/src/core/board/usb_armory/board.h +++ b/repos/base-hw/src/core/board/usb_armory/board.h @@ -19,7 +19,7 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include diff --git a/repos/base-hw/src/core/board/virt_qemu_arm_v7a/board.h b/repos/base-hw/src/core/board/virt_qemu_arm_v7a/board.h index 1bc91cf43e..194cb4ecc8 100644 --- a/repos/base-hw/src/core/board/virt_qemu_arm_v7a/board.h +++ b/repos/base-hw/src/core/board/virt_qemu_arm_v7a/board.h @@ -14,19 +14,13 @@ #ifndef _SRC__CORE__SPEC__VIRT__QEMU_H_ #define _SRC__CORE__SPEC__VIRT__QEMU_H_ -/* base-hw internal includes */ +/* base-hw core includes */ #include - -/* base-hw Core includes */ #include #include - -/* base-hw includes */ -#include - -/* base-hw Core includes */ #include #include +#include namespace Kernel { class Cpu; } diff --git a/repos/base-hw/src/core/board/virt_qemu_arm_v8a/board.h b/repos/base-hw/src/core/board/virt_qemu_arm_v8a/board.h index c79aaf5c66..064e7af7a6 100644 --- a/repos/base-hw/src/core/board/virt_qemu_arm_v8a/board.h +++ b/repos/base-hw/src/core/board/virt_qemu_arm_v8a/board.h @@ -16,15 +16,9 @@ /* base-hw internal includes */ #include - -/* base-hw Core includes */ #include #include - -/* base-hw includes */ #include - -/* base-hw Core includes */ #include #include #include diff --git a/repos/base-hw/src/core/board/wand_quad/board.h b/repos/base-hw/src/core/board/wand_quad/board.h index 288b9b0bc8..149e115a20 100644 --- a/repos/base-hw/src/core/board/wand_quad/board.h +++ b/repos/base-hw/src/core/board/wand_quad/board.h @@ -19,7 +19,7 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include diff --git a/repos/base-hw/src/core/core_log_out.cc b/repos/base-hw/src/core/core_log_out.cc index bced5302fd..a8d63f8869 100644 --- a/repos/base-hw/src/core/core_log_out.cc +++ b/repos/base-hw/src/core/core_log_out.cc @@ -13,18 +13,18 @@ */ /* Genode includes */ -#include #include /* base-internal includes */ #include #include +/* core includes */ #include #include #include -using namespace Genode; +using namespace Core; void Core_log::out(char const c) { Kernel::log(c); } diff --git a/repos/base-hw/src/core/core_region_map.cc b/repos/base-hw/src/core/core_region_map.cc index 0ceb40217e..4f48f89252 100644 --- a/repos/base-hw/src/core/core_region_map.cc +++ b/repos/base-hw/src/core/core_region_map.cc @@ -19,9 +19,8 @@ #include #include #include -#include -using namespace Genode; +using namespace Core; Region_map::Local_addr diff --git a/repos/base-hw/src/core/cpu_session_support.cc b/repos/base-hw/src/core/cpu_session_support.cc index caf2257c53..9b7bc77292 100644 --- a/repos/base-hw/src/core/cpu_session_support.cc +++ b/repos/base-hw/src/core/cpu_session_support.cc @@ -21,7 +21,7 @@ /* base-internal includes */ #include -using namespace Genode; +using namespace Core; Dataspace_capability Cpu_thread_component::utcb() diff --git a/repos/base-hw/src/core/cpu_thread_allocator.h b/repos/base-hw/src/core/cpu_thread_allocator.h index c0e4038836..885ef1b62d 100644 --- a/repos/base-hw/src/core/cpu_thread_allocator.h +++ b/repos/base-hw/src/core/cpu_thread_allocator.h @@ -15,13 +15,12 @@ #define _CORE__CPU_THREAD_ALLOCATOR_H_ /* Genode includes */ -#include #include /* core includes */ #include -namespace Genode { class Cpu_thread_allocator; } +namespace Core { class Cpu_thread_allocator; } /** @@ -31,7 +30,7 @@ namespace Genode { class Cpu_thread_allocator; } * are tiny objects, but in 'base-hw' they contain the whole kernel * object in addition. Thus we use the given allocator directly. */ -class Genode::Cpu_thread_allocator : public Allocator +class Core::Cpu_thread_allocator : public Allocator { private: diff --git a/repos/base-hw/src/core/io_mem_session_support.cc b/repos/base-hw/src/core/io_mem_session_support.cc index 90dde90a64..d408750c5d 100644 --- a/repos/base-hw/src/core/io_mem_session_support.cc +++ b/repos/base-hw/src/core/io_mem_session_support.cc @@ -15,7 +15,7 @@ /* core includes */ #include -using namespace Genode; +using namespace Core; void Io_mem_session_component::_unmap_local(addr_t, size_t) { } diff --git a/repos/base-hw/src/core/irq_session_component.cc b/repos/base-hw/src/core/irq_session_component.cc index 4f710b1df2..16d988749a 100644 --- a/repos/base-hw/src/core/irq_session_component.cc +++ b/repos/base-hw/src/core/irq_session_component.cc @@ -23,7 +23,7 @@ /* base-internal includes */ #include -using namespace Genode; +using namespace Core; unsigned Irq_session_component::_find_irq_number(const char * const args) diff --git a/repos/base-hw/src/core/irq_session_component.h b/repos/base-hw/src/core/irq_session_component.h index 74ca09fa84..58cd896733 100644 --- a/repos/base-hw/src/core/irq_session_component.h +++ b/repos/base-hw/src/core/irq_session_component.h @@ -19,15 +19,16 @@ #include #include +/* core includes */ #include #include #include -namespace Genode { class Irq_session_component; } +namespace Core { class Irq_session_component; } -class Genode::Irq_session_component : public Rpc_object, - private List::Element +class Core::Irq_session_component : public Rpc_object, + private List::Element { private: diff --git a/repos/base-hw/src/core/kernel/cpu.h b/repos/base-hw/src/core/kernel/cpu.h index 3040aa6e2b..490759c7b5 100644 --- a/repos/base-hw/src/core/kernel/cpu.h +++ b/repos/base-hw/src/core/kernel/cpu.h @@ -15,8 +15,6 @@ #ifndef _CORE__KERNEL__CPU_H_ #define _CORE__KERNEL__CPU_H_ -#include - /* core includes */ #include #include @@ -66,7 +64,7 @@ namespace Kernel { */ #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" -class Kernel::Cpu : public Genode::Cpu, private Irq::Pool, private Timeout +class Kernel::Cpu : public Core::Cpu, private Irq::Pool, private Timeout { private: diff --git a/repos/base-hw/src/core/kernel/cpu_scheduler.cc b/repos/base-hw/src/core/kernel/cpu_scheduler.cc index c97d49285d..91ca63e258 100644 --- a/repos/base-hw/src/core/kernel/cpu_scheduler.cc +++ b/repos/base-hw/src/core/kernel/cpu_scheduler.cc @@ -11,7 +11,7 @@ * under the terms of the GNU Affero General Public License version 3. */ -#include +#include #include #include diff --git a/repos/base-hw/src/core/kernel/irq.h b/repos/base-hw/src/core/kernel/irq.h index 4472cb8cb8..9b8be0bf65 100644 --- a/repos/base-hw/src/core/kernel/irq.h +++ b/repos/base-hw/src/core/kernel/irq.h @@ -42,7 +42,7 @@ namespace Kernel { } -namespace Genode { +namespace Core { /** * Core front-end of a user interrupt @@ -182,11 +182,11 @@ class Kernel::User_irq : public Kernel::Irq * \param polarity low or high * \param sig capability of signal context */ - static capid_t syscall_create(Genode::Kernel_object & irq, - unsigned nr, - Genode::Irq_session::Trigger trigger, - Genode::Irq_session::Polarity polarity, - capid_t sig) + static capid_t syscall_create(Core::Kernel_object &irq, + unsigned nr, + Genode::Irq_session::Trigger trigger, + Genode::Irq_session::Polarity polarity, + capid_t sig) { return (capid_t)call(call_id_new_irq(), (Call_arg)&irq, nr, (trigger << 2) | polarity, sig); @@ -197,7 +197,7 @@ class Kernel::User_irq : public Kernel::Irq * * \param irq reference to constructible object */ - static void syscall_destroy(Genode::Kernel_object &irq) { + static void syscall_destroy(Core::Kernel_object &irq) { call(call_id_delete_irq(), (Call_arg) &irq); } Object &kernel_object() { return _kernel_object; } diff --git a/repos/base-hw/src/core/kernel/lock.cc b/repos/base-hw/src/core/kernel/lock.cc index 21ed98b44d..e5b199dec6 100644 --- a/repos/base-hw/src/core/kernel/lock.cc +++ b/repos/base-hw/src/core/kernel/lock.cc @@ -15,7 +15,7 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include diff --git a/repos/base-hw/src/core/kernel/main.cc b/repos/base-hw/src/core/kernel/main.cc index c9b371a0d1..c1788806b8 100644 --- a/repos/base-hw/src/core/kernel/main.cc +++ b/repos/base-hw/src/core/kernel/main.cc @@ -12,13 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* base includes */ -#include - -/* base Core includes */ +/* core includes */ #include - -/* base-hw Core includes */ #include #include #include @@ -28,11 +23,7 @@ /* base-hw-internal includes */ #include - -namespace Kernel { - - class Main; -} +namespace Kernel { class Main; } class Kernel::Main @@ -52,10 +43,10 @@ class Kernel::Main Cpu_pool _cpu_pool; Irq::Pool _user_irq_pool { }; Board::Address_space_id_allocator _addr_space_id_alloc { }; - Genode::Core_platform_pd _core_platform_pd { _addr_space_id_alloc }; + Core::Core_platform_pd _core_platform_pd { _addr_space_id_alloc }; Genode::Constructible _core_main_thread { }; Board::Global_interrupt_controller _global_irq_ctrl { }; - Board::Serial _serial { Genode::Platform::mmio_to_virt(Board::UART_BASE), + Board::Serial _serial { Core::Platform::mmio_to_virt(Board::UART_BASE), Board::UART_CLOCK, SERIAL_BAUD_RATE }; @@ -65,7 +56,7 @@ class Kernel::Main public: - static Genode::Platform_pd &core_platform_pd(); + static Core::Platform_pd &core_platform_pd(); }; @@ -101,7 +92,7 @@ void Kernel::main_handle_kernel_entry() void Kernel::main_initialize_and_handle_kernel_entry() { - static_assert(sizeof(Genode::sizet_arithm_t) >= 2 * sizeof(size_t), + static_assert(sizeof(Core::sizet_arithm_t) >= 2 * sizeof(size_t), "Bad result type for size_t arithmetics."); using Boot_info = Hw::Boot_info; @@ -226,7 +217,7 @@ void Kernel::main_initialize_and_handle_kernel_entry() } -Genode::Platform_pd &Kernel::Main::core_platform_pd() +Core::Platform_pd &Kernel::Main::core_platform_pd() { return _instance->_core_platform_pd; } @@ -244,15 +235,14 @@ Kernel::time_t Kernel::main_read_idle_thread_execution_time(unsigned cpu_idx) } -Genode::Platform_pd & -Genode::Platform_thread::_kernel_main_get_core_platform_pd() +Core::Platform_pd &Core::Platform_thread::_kernel_main_get_core_platform_pd() { return Kernel::Main::core_platform_pd(); } -bool Genode::map_local(addr_t from_phys, addr_t to_virt, size_t num_pages, - Page_flags flags) +bool Core::map_local(addr_t from_phys, addr_t to_virt, size_t num_pages, + Page_flags flags) { return Kernel::Main::core_platform_pd().insert_translation( @@ -260,7 +250,7 @@ bool Genode::map_local(addr_t from_phys, addr_t to_virt, size_t num_pages, } -bool Genode::unmap_local(addr_t virt_addr, size_t num_pages) +bool Core::unmap_local(addr_t virt_addr, size_t num_pages) { Kernel::Main::core_platform_pd().flush( virt_addr, num_pages * get_page_size()); diff --git a/repos/base-hw/src/core/kernel/main.h b/repos/base-hw/src/core/kernel/main.h index fe5a8d3367..dd728ad2f6 100644 --- a/repos/base-hw/src/core/kernel/main.h +++ b/repos/base-hw/src/core/kernel/main.h @@ -14,7 +14,7 @@ #ifndef _KERNEL__MAIN_H_ #define _KERNEL__MAIN_H_ -/* base-hw Core includes */ +/* base-hw core includes */ #include namespace Kernel { diff --git a/repos/base-hw/src/core/kernel/object.h b/repos/base-hw/src/core/kernel/object.h index d54ece909d..441ce618a3 100644 --- a/repos/base-hw/src/core/kernel/object.h +++ b/repos/base-hw/src/core/kernel/object.h @@ -18,9 +18,9 @@ #include #include #include -#include /* core includes */ +#include #include #include diff --git a/repos/base-hw/src/core/kernel/pd.h b/repos/base-hw/src/core/kernel/pd.h index 4a82c0b71f..e2658b4b73 100644 --- a/repos/base-hw/src/core/kernel/pd.h +++ b/repos/base-hw/src/core/kernel/pd.h @@ -15,16 +15,13 @@ #ifndef _CORE__KERNEL__PD_H_ #define _CORE__KERNEL__PD_H_ -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include #include -/* base includes */ -#include - -namespace Genode { class Platform_pd; } +namespace Core { class Platform_pd; } namespace Kernel { @@ -50,13 +47,13 @@ class Kernel::Pd Kernel::Object _kernel_object { *this }; Hw::Page_table &_table; - Genode::Platform_pd &_platform_pd; + Core::Platform_pd &_platform_pd; Capid_allocator _capid_alloc { }; Object_identity_reference_tree _cap_tree { }; public: - Genode::Cpu::Mmu_context mmu_regs; + Core::Cpu::Mmu_context mmu_regs; /** * Constructor @@ -65,7 +62,7 @@ class Kernel::Pd * \param platform_pd core object of the PD */ Pd(Hw::Page_table &table, - Genode::Platform_pd &platform_pd, + Core::Platform_pd &platform_pd, Board::Address_space_id_allocator &addr_space_id_alloc) : _table(table), @@ -82,15 +79,15 @@ class Kernel::Pd oir->~Object_identity_reference(); } - static capid_t syscall_create(Genode::Kernel_object &p, - Hw::Page_table &tt, - Genode::Platform_pd &pd) + static capid_t syscall_create(Core::Kernel_object &p, + Hw::Page_table &tt, + Core::Platform_pd &pd) { return (capid_t)call(call_id_new_pd(), (Call_arg)&p, (Call_arg)&tt, (Call_arg)&pd); } - static void syscall_destroy(Genode::Kernel_object & p) { + static void syscall_destroy(Core::Kernel_object & p) { call(call_id_delete_pd(), (Call_arg)&p); } /** @@ -105,7 +102,7 @@ class Kernel::Pd ***************/ Object &kernel_object() { return _kernel_object; } - Genode::Platform_pd &platform_pd() { return _platform_pd; } + Core::Platform_pd &platform_pd() { return _platform_pd; } Hw::Page_table &translation_table() { return _table; } Capid_allocator &capid_alloc() { return _capid_alloc; } Object_identity_reference_tree &cap_tree() { return _cap_tree; } diff --git a/repos/base-hw/src/core/kernel/signal_receiver.h b/repos/base-hw/src/core/kernel/signal_receiver.h index 2aabe24ef5..b583876253 100644 --- a/repos/base-hw/src/core/kernel/signal_receiver.h +++ b/repos/base-hw/src/core/kernel/signal_receiver.h @@ -16,8 +16,8 @@ /* Genode includes */ #include -#include +/* core includes */ #include #include @@ -199,7 +199,7 @@ class Kernel::Signal_context * * \retval capability id of the new kernel object */ - static capid_t syscall_create(Genode::Kernel_object &c, + static capid_t syscall_create(Core::Kernel_object &c, Signal_receiver & receiver, addr_t const imprint) { @@ -212,7 +212,7 @@ class Kernel::Signal_context * * \param context pointer to signal context kernel object */ - static void syscall_destroy(Genode::Kernel_object &c) { + static void syscall_destroy(Core::Kernel_object &c) { call(call_id_delete_signal_context(), (Call_arg)&c); } Object &kernel_object() { return _kernel_object; } @@ -282,7 +282,7 @@ class Kernel::Signal_receiver * * \retval capability id of the new kernel object */ - static capid_t syscall_create(Genode::Kernel_object &r) { + static capid_t syscall_create(Core::Kernel_object &r) { return (capid_t)call(call_id_new_signal_receiver(), (Call_arg)&r); } /** @@ -290,7 +290,7 @@ class Kernel::Signal_receiver * * \param receiver pointer to signal receiver kernel object */ - static void syscall_destroy(Genode::Kernel_object &r) { + static void syscall_destroy(Core::Kernel_object &r) { call(call_id_delete_signal_receiver(), (Call_arg)&r); } Object &kernel_object() { return _kernel_object; } diff --git a/repos/base-hw/src/core/kernel/thread.cc b/repos/base-hw/src/core/kernel/thread.cc index b11ce7deca..9371cab310 100644 --- a/repos/base-hw/src/core/kernel/thread.cc +++ b/repos/base-hw/src/core/kernel/thread.cc @@ -159,7 +159,7 @@ Tlb_invalidation::Tlb_invalidation(Inter_processor_work_list &global_work_list, } -Thread::Destroy::Destroy(Thread & caller, Genode::Kernel_object & to_delete) +Thread::Destroy::Destroy(Thread & caller, Core::Kernel_object & to_delete) : caller(caller), thread_to_destroy(to_delete) { @@ -302,7 +302,7 @@ Cpu_job * Thread::helping_destination() { size_t Thread::_core_to_kernel_quota(size_t const quota) const { using Genode::Cpu_session; - using Genode::sizet_arithm_t; + using Core::sizet_arithm_t; /* we assert at timer construction that cpu_quota_us in ticks fits size_t */ size_t const ticks = (size_t) @@ -445,8 +445,8 @@ void Thread::_call_yield_thread() void Thread::_call_delete_thread() { - Genode::Kernel_object & to_delete = - *(Genode::Kernel_object*)user_arg_1(); + Core::Kernel_object & to_delete = + *(Core::Kernel_object*)user_arg_1(); /** * Delete a thread immediately if it has no cpu assigned yet, @@ -469,8 +469,8 @@ void Thread::_call_delete_thread() void Thread::_call_delete_pd() { - Genode::Kernel_object & pd = - *(Genode::Kernel_object*)user_arg_1(); + Core::Kernel_object & pd = + *(Core::Kernel_object*)user_arg_1(); if (_cpu->active(pd->mmu_regs)) _cpu->switch_to(_core_pd.mmu_regs); @@ -851,8 +851,8 @@ void Thread::_call() case call_id_thread_pager(): _call_pager(); return; case call_id_invalidate_tlb(): _call_invalidate_tlb(); return; case call_id_new_pd(): - _call_new(*(Hw::Page_table *) user_arg_2(), - *(Genode::Platform_pd *) user_arg_3(), + _call_new(*(Hw::Page_table *) user_arg_2(), + *(Core::Platform_pd *) user_arg_3(), _addr_space_id_alloc); return; case call_id_delete_pd(): _call_delete_pd(); return; @@ -951,11 +951,11 @@ Core_main_thread(Board::Address_space_id_allocator &addr_space_id_alloc, Core_object( core_pd, addr_space_id_alloc, user_irq_pool, cpu_pool, core_pd, "core") { - using namespace Genode; + using namespace Core; - Genode::map_local(Platform::core_phys_addr((addr_t)&_utcb_instance), - (addr_t)utcb_main_thread(), - sizeof(Native_utcb) / get_page_size()); + map_local(Platform::core_phys_addr((addr_t)&_utcb_instance), + (addr_t)utcb_main_thread(), + sizeof(Native_utcb) / get_page_size()); _utcb_instance.cap_add(core_capid()); _utcb_instance.cap_add(cap_id_invalid()); diff --git a/repos/base-hw/src/core/kernel/thread.h b/repos/base-hw/src/core/kernel/thread.h index 604deba6bd..6cf4119b4e 100644 --- a/repos/base-hw/src/core/kernel/thread.h +++ b/repos/base-hw/src/core/kernel/thread.h @@ -14,12 +14,10 @@ #ifndef _CORE__KERNEL__THREAD_H_ #define _CORE__KERNEL__THREAD_H_ - /* Genode includes */ #include -#include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include @@ -101,7 +99,7 @@ class Kernel::Thread : private Kernel::Object, public Cpu_job, private Timeout */ struct Destroy : Inter_processor_work { - using Kthread = Genode::Kernel_object; + using Kthread = Core::Kernel_object; Thread & caller; /* the caller gets blocked till the end */ Kthread & thread_to_destroy; /* thread to be destroyed */ @@ -300,8 +298,7 @@ class Kernel::Thread : private Kernel::Object, public Cpu_job, private Timeout template void _call_new(ARGS &&... args) { - Genode::Kernel_object & kobj = - *(Genode::Kernel_object*)user_arg_1(); + Core::Kernel_object & kobj = *(Core::Kernel_object*)user_arg_1(); kobj.construct(_core_pd, args...); user_arg_0(kobj->core_capid()); } @@ -310,8 +307,7 @@ class Kernel::Thread : private Kernel::Object, public Cpu_job, private Timeout template void _call_delete() { - Genode::Kernel_object & kobj = - *(Genode::Kernel_object*)user_arg_1(); + Core::Kernel_object & kobj = *(Core::Kernel_object*)user_arg_1(); kobj.destruct(); } @@ -321,7 +317,7 @@ class Kernel::Thread : private Kernel::Object, public Cpu_job, private Timeout public: - Genode::Align_at regs; + Genode::Align_at regs; /** * Constructor @@ -388,10 +384,10 @@ class Kernel::Thread : private Kernel::Object, public Cpu_job, private Timeout * * \retval capability id of the new kernel object */ - static capid_t syscall_create(Genode::Kernel_object & t, - unsigned const priority, - size_t const quota, - char const * const label) + static capid_t syscall_create(Core::Kernel_object &t, + unsigned const priority, + size_t const quota, + char const * const label) { return (capid_t)call(call_id_new_thread(), (Call_arg)&t, (Call_arg)priority, (Call_arg)quota, @@ -406,8 +402,8 @@ class Kernel::Thread : private Kernel::Object, public Cpu_job, private Timeout * * \retval capability id of the new kernel object */ - static capid_t syscall_create(Genode::Kernel_object & t, - char const * const label) + static capid_t syscall_create(Core::Kernel_object &t, + char const * const label) { return (capid_t)call(call_id_new_core_thread(), (Call_arg)&t, (Call_arg)label); @@ -418,11 +414,13 @@ class Kernel::Thread : private Kernel::Object, public Cpu_job, private Timeout * * \param thread pointer to thread kernel object */ - static void syscall_destroy(Genode::Kernel_object & t) { + static void syscall_destroy(Core::Kernel_object &t) { call(call_id_delete_thread(), (Call_arg)&t); } + void print(Genode::Output &out) const; + /************** ** Ipc_node ** **************/ diff --git a/repos/base-hw/src/core/kernel/timer.cc b/repos/base-hw/src/core/kernel/timer.cc index 9337aca95f..3e3bff6113 100644 --- a/repos/base-hw/src/core/kernel/timer.cc +++ b/repos/base-hw/src/core/kernel/timer.cc @@ -11,7 +11,7 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Core includes */ +/* core includes */ #include #include #include diff --git a/repos/base-hw/src/core/kernel/vm.h b/repos/base-hw/src/core/kernel/vm.h index 040d92f893..3951981842 100644 --- a/repos/base-hw/src/core/kernel/vm.h +++ b/repos/base-hw/src/core/kernel/vm.h @@ -97,11 +97,11 @@ class Kernel::Vm : private Kernel::Object, public Cpu_job * * \retval cap id when successful, otherwise invalid cap id */ - static capid_t syscall_create(Genode::Kernel_object & vm, - unsigned cpu, - void * const state, - capid_t const signal_context_id, - Identity & id) + static capid_t syscall_create(Core::Kernel_object &vm, + unsigned cpu, + void * const state, + capid_t const signal_context_id, + Identity &id) { return (capid_t)call(call_id_new_vm(), (Call_arg)&vm, (Call_arg)cpu, (Call_arg)state, (Call_arg)&id, signal_context_id); @@ -114,7 +114,7 @@ class Kernel::Vm : private Kernel::Object, public Cpu_job * * \retval 0 when successful, otherwise !=0 */ - static void syscall_destroy(Genode::Kernel_object & vm) { + static void syscall_destroy(Core::Kernel_object & vm) { call(call_id_delete_vm(), (Call_arg) &vm); } Object &kernel_object() { return _kernel_object; } diff --git a/repos/base-hw/src/core/kernel_log.cc b/repos/base-hw/src/core/kernel_log.cc index ba8a59c91e..51c1ca28df 100644 --- a/repos/base-hw/src/core/kernel_log.cc +++ b/repos/base-hw/src/core/kernel_log.cc @@ -12,7 +12,7 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* base-hw Core includes */ +/* core includes */ #include #include diff --git a/repos/base-hw/src/core/map_local.h b/repos/base-hw/src/core/map_local.h index bfd701c8cd..214a91077e 100644 --- a/repos/base-hw/src/core/map_local.h +++ b/repos/base-hw/src/core/map_local.h @@ -14,9 +14,11 @@ #ifndef _CORE__MAP_LOCAL_H_ #define _CORE__MAP_LOCAL_H_ +/* core includes */ +#include #include -namespace Genode { +namespace Core { using Hw::Page_flags; diff --git a/repos/base-hw/src/core/native_pd_component.cc b/repos/base-hw/src/core/native_pd_component.cc index 710c28d792..7b8291e083 100644 --- a/repos/base-hw/src/core/native_pd_component.cc +++ b/repos/base-hw/src/core/native_pd_component.cc @@ -14,7 +14,7 @@ #include #include -using namespace Genode; +using namespace Core; void Native_pd_component::upgrade_cap_slab() diff --git a/repos/base-hw/src/core/native_pd_component.h b/repos/base-hw/src/core/native_pd_component.h index 36589cd75a..64cc1e41c7 100644 --- a/repos/base-hw/src/core/native_pd_component.h +++ b/repos/base-hw/src/core/native_pd_component.h @@ -18,17 +18,17 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ #include -namespace Genode { +namespace Core { class Pd_session_component; class Native_pd_component; } -class Genode::Native_pd_component : public Rpc_object +class Core::Native_pd_component : public Rpc_object { private: diff --git a/repos/base-hw/src/core/object.h b/repos/base-hw/src/core/object.h index 4267b4b7a0..e143c3aff9 100644 --- a/repos/base-hw/src/core/object.h +++ b/repos/base-hw/src/core/object.h @@ -14,29 +14,26 @@ #ifndef _CORE__OBJECT_H_ #define _CORE__OBJECT_H_ -/* Genode includes */ -#include - /* base-internal includes */ #include +/* core includes */ +#include + /* base-hw includes */ #include #include -namespace Genode { - - /** - * Represents a kernel object in core - * - * \param T type of the kernel object - */ - template class Kernel_object; -} +namespace Core { template class Kernel_object; } +/** + * Represents a kernel object in core + * + * \param T type of the kernel object + */ template -class Genode::Kernel_object : public Genode::Constructible> +class Core::Kernel_object : public Constructible> { protected: @@ -66,12 +63,12 @@ class Genode::Kernel_object : public Genode::Constructible>::construct(args...); + Constructible>::construct(args...); } ~Kernel_object() { - if (Genode::Constructible>::constructed()) + if (Constructible>::constructed()) T::syscall_destroy(*this); } @@ -83,7 +80,7 @@ class Genode::Kernel_object : public Genode::Constructible bool create(ARGS &&... args) { - if (Genode::Constructible>::constructed()) + if (Constructible>::constructed()) return false; _cap = Capability_space::import(T::syscall_create(*this, args...)); diff --git a/repos/base-hw/src/core/pager.cc b/repos/base-hw/src/core/pager.cc index e5cc671c91..a8e2b30d11 100644 --- a/repos/base-hw/src/core/pager.cc +++ b/repos/base-hw/src/core/pager.cc @@ -11,9 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes*/ #include #include @@ -23,7 +20,7 @@ /* base-internal includes */ #include -using namespace Genode; +using namespace Core; /*************** diff --git a/repos/base-hw/src/core/pager.h b/repos/base-hw/src/core/pager.h index 3387ae1f07..60c9a24474 100644 --- a/repos/base-hw/src/core/pager.h +++ b/repos/base-hw/src/core/pager.h @@ -21,14 +21,14 @@ #include #include -/* core-local includes */ +/* core includes */ #include #include #include #include #include -namespace Genode { +namespace Core { /** * Interface used by generic region_map code @@ -50,11 +50,13 @@ namespace Genode { */ class Pager_entrypoint; + using Pager_capability = Capability; + enum { PAGER_EP_STACK_SIZE = sizeof(addr_t) * 2048 }; } -class Genode::Ipc_pager +class Core::Ipc_pager { protected: @@ -91,8 +93,8 @@ class Genode::Ipc_pager }; -class Genode::Pager_object : private Object_pool::Entry, - private Genode::Kernel_object +class Core::Pager_object : private Object_pool::Entry, + private Kernel_object { friend class Pager_entrypoint; friend class Object_pool; @@ -171,9 +173,9 @@ class Genode::Pager_object : private Object_pool::Entry, }; -class Genode::Pager_entrypoint : public Object_pool, - public Thread, - private Ipc_pager +class Core::Pager_entrypoint : public Object_pool, + public Thread, + private Ipc_pager { private: diff --git a/repos/base-hw/src/core/platform.cc b/repos/base-hw/src/core/platform.cc index 71779a5fe8..a87b3dffce 100644 --- a/repos/base-hw/src/core/platform.cc +++ b/repos/base-hw/src/core/platform.cc @@ -13,11 +13,11 @@ */ -/* base Core includes */ +/* core includes */ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include @@ -34,10 +34,9 @@ #include /* base includes */ -#include #include -using namespace Genode; +using namespace Core; /************** @@ -155,8 +154,7 @@ void Platform::_init_platform_info() return; } - Genode::Xml_generator xml(reinterpret_cast(virt_addr), - rom_size, rom_name, [&] () + Xml_generator xml(reinterpret_cast(virt_addr), rom_size, rom_name, [&] () { xml.node("kernel", [&] () { xml.attribute("name", "hw"); diff --git a/repos/base-hw/src/core/platform.h b/repos/base-hw/src/core/platform.h index acbf059d0e..1a42cb13dd 100644 --- a/repos/base-hw/src/core/platform.h +++ b/repos/base-hw/src/core/platform.h @@ -30,20 +30,20 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include #include #include -namespace Genode { +namespace Core { class Address_space; class Platform; }; -class Genode::Platform : public Genode::Platform_generic +class Core::Platform : public Platform_generic { private: @@ -79,7 +79,7 @@ class Genode::Platform : public Genode::Platform_generic /** * Add additional platform-specific information. */ - void _init_additional_platform_info(Genode::Xml_generator &); + void _init_additional_platform_info(Xml_generator &); void _init_rom_modules(); diff --git a/repos/base-hw/src/core/platform_pd.cc b/repos/base-hw/src/core/platform_pd.cc index 3d258c1d3d..42109b09ae 100644 --- a/repos/base-hw/src/core/platform_pd.cc +++ b/repos/base-hw/src/core/platform_pd.cc @@ -21,7 +21,7 @@ #include #include -using namespace Genode; +using namespace Core; using Hw::Page_table; diff --git a/repos/base-hw/src/core/platform_pd.h b/repos/base-hw/src/core/platform_pd.h index db3383713e..5438f069db 100644 --- a/repos/base-hw/src/core/platform_pd.h +++ b/repos/base-hw/src/core/platform_pd.h @@ -15,7 +15,7 @@ #ifndef _CORE__PLATFORM_PD_H_ #define _CORE__PLATFORM_PD_H_ -/* base-hw Core includes */ +/* core includes */ #include #include #include @@ -29,7 +29,7 @@ namespace Hw { using namespace Kernel; - using namespace Genode; + using namespace Core; /** * Memory virtualization interface of a protection domain @@ -38,19 +38,19 @@ namespace Hw { } -namespace Genode { +namespace Core { class Platform_thread; /* forward declaration */ class Cap_space; /** - * Platform specific part of a Genode protection domain + * Platform specific part of a protection domain */ class Platform_pd; /** - * Platform specific part of Core's protection domain + * Platform specific part of core's protection domain */ class Core_platform_pd; @@ -58,7 +58,7 @@ namespace Genode { } -class Hw::Address_space : public Genode::Address_space +class Hw::Address_space : public Core::Address_space { private: @@ -68,19 +68,19 @@ class Hw::Address_space : public Genode::Address_space Address_space(Address_space const &); Address_space &operator = (Address_space const &); - friend class Genode::Platform; - friend class Genode::Mapped_mem_allocator; + friend class Core::Platform; + friend class Core::Mapped_mem_allocator; using Table = Hw::Page_table; using Array = Table::Allocator::Array; - Genode::Mutex _mutex { }; /* table lock */ + Mutex _mutex { }; /* table lock */ Table &_tt; /* table virt addr */ - Genode::addr_t _tt_phys; /* table phys addr */ + addr_t _tt_phys; /* table phys addr */ Array *_tt_array = nullptr; Table::Allocator &_tt_alloc; /* table allocator */ - static inline Genode::Core_mem_allocator &_cma(); + static inline Core_mem_allocator &_cma(); static inline void *_table_alloc(); @@ -119,11 +119,11 @@ class Hw::Address_space : public Genode::Address_space * \param size size of memory region * \param flags translation table flags (e.g. caching attributes) */ - bool insert_translation(Genode::addr_t virt, Genode::addr_t phys, - Genode::size_t size, Genode::Page_flags flags); + bool insert_translation(addr_t virt, addr_t phys, + size_t size, Page_flags flags); + + bool lookup_rw_translation(addr_t const virt, addr_t & phys); - bool lookup_rw_translation(Genode::addr_t const virt, - Genode::addr_t & phys); /***************************** ** Address-space interface ** @@ -138,13 +138,13 @@ class Hw::Address_space : public Genode::Address_space ** Accessors ** ***************/ - Kernel::Pd & kernel_pd() { return *_kobj; } - Hw::Page_table & translation_table() { return _tt; } - Genode::addr_t translation_table_phys() { return _tt_phys; } + Kernel::Pd &kernel_pd() { return *_kobj; } + Hw::Page_table &translation_table() { return _tt; } + addr_t translation_table_phys() { return _tt_phys; } }; -class Genode::Cap_space +class Core::Cap_space { private: @@ -166,8 +166,7 @@ class Genode::Cap_space }; -class Genode::Platform_pd : public Hw::Address_space, - private Cap_space +class Core::Platform_pd : public Hw::Address_space, private Cap_space { private: @@ -230,7 +229,7 @@ class Genode::Platform_pd : public Hw::Address_space, }; -struct Genode::Core_platform_pd : Genode::Platform_pd +struct Core::Core_platform_pd : Platform_pd { Core_platform_pd(Board::Address_space_id_allocator &addr_space_id_alloc); }; diff --git a/repos/base-hw/src/core/platform_thread.cc b/repos/base-hw/src/core/platform_thread.cc index fac3d8551c..d625457c16 100644 --- a/repos/base-hw/src/core/platform_thread.cc +++ b/repos/base-hw/src/core/platform_thread.cc @@ -27,7 +27,7 @@ #include #include -using namespace Genode; +using namespace Core; void Platform_thread::_init() { } @@ -199,7 +199,7 @@ void Platform_thread::pager(Pager_object &pager) } -Genode::Pager_object &Platform_thread::pager() +Core::Pager_object &Platform_thread::pager() { if (_pager) return *_pager; diff --git a/repos/base-hw/src/core/platform_thread.h b/repos/base-hw/src/core/platform_thread.h index e7e5b5e259..6b30135abb 100644 --- a/repos/base-hw/src/core/platform_thread.h +++ b/repos/base-hw/src/core/platform_thread.h @@ -31,17 +31,19 @@ #include #include -namespace Genode { +namespace Core { class Pager_object; - class Thread_state; class Rm_client; class Platform_thread; class Platform_pd; } -class Genode::Platform_thread : Noncopyable +namespace Genode { class Thread_state; } + + +class Core::Platform_thread : Noncopyable { private: @@ -130,9 +132,7 @@ class Genode::Platform_thread : Noncopyable /** * Join a protection domain * - * \param pd platform pd object pointer - * \param main_thread wether thread is the first in protection domain - * \param address_space corresponding Genode address space + * \param main_thread whether thread is the first in protection domain * * This function has no effect when called more twice for a * given thread. @@ -207,7 +207,7 @@ class Genode::Platform_thread : Noncopyable */ Trace::Execution_time execution_time() const { - Genode::uint64_t execution_time = + uint64_t execution_time = const_cast(this)->_kobj->execution_time(); return { execution_time, 0, _quota, _priority }; } diff --git a/repos/base-hw/src/core/ram_dataspace_support.cc b/repos/base-hw/src/core/ram_dataspace_support.cc index 74e86ca880..39c617a4b8 100644 --- a/repos/base-hw/src/core/ram_dataspace_support.cc +++ b/repos/base-hw/src/core/ram_dataspace_support.cc @@ -12,15 +12,12 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include #include -using namespace Genode; +using namespace Core; void Ram_dataspace_factory::_export_ram_ds(Dataspace_component &) { } diff --git a/repos/base-hw/src/core/region_map_support.cc b/repos/base-hw/src/core/region_map_support.cc index a90926a355..3f6620bf8f 100644 --- a/repos/base-hw/src/core/region_map_support.cc +++ b/repos/base-hw/src/core/region_map_support.cc @@ -12,18 +12,14 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include -using namespace Genode; +using namespace Core; -/********************** - ** Pager_entrypoint ** - **********************/ - void Pager_entrypoint::entry() { Untyped_capability cap; @@ -43,7 +39,7 @@ void Pager_entrypoint::entry() /* fetch fault data */ Platform_thread * const pt = (Platform_thread *)po->badge(); if (!pt) { - Genode::warning("failed to get platform thread of faulter"); + warning("failed to get platform thread of faulter"); continue; } diff --git a/repos/base-hw/src/core/rpc_cap_factory.h b/repos/base-hw/src/core/rpc_cap_factory.h index d8cfb3839c..078ecfc6a1 100644 --- a/repos/base-hw/src/core/rpc_cap_factory.h +++ b/repos/base-hw/src/core/rpc_cap_factory.h @@ -20,27 +20,25 @@ #include #include #include -#include -/* core-local includes */ +/* core includes */ #include #include /* base-internal includes */ #include -namespace Genode { class Rpc_cap_factory; } +namespace Core { class Rpc_cap_factory; } -class Genode::Rpc_cap_factory +class Core::Rpc_cap_factory { private: /** * Kernel object placeholder held in a list */ - struct Kobject - : List::Element + struct Kobject : List::Element { using O = Kernel::Core_object_identity; diff --git a/repos/base-hw/src/core/signal_broker.h b/repos/base-hw/src/core/signal_broker.h index 29460fc762..673a1ada01 100644 --- a/repos/base-hw/src/core/signal_broker.h +++ b/repos/base-hw/src/core/signal_broker.h @@ -17,13 +17,13 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ #include -namespace Genode { class Signal_broker; } +namespace Core { class Signal_broker; } -class Genode::Signal_broker +class Core::Signal_broker { private: diff --git a/repos/base-hw/src/core/signal_source_component.h b/repos/base-hw/src/core/signal_source_component.h index c5d49a9e2a..ba732dff13 100644 --- a/repos/base-hw/src/core/signal_source_component.h +++ b/repos/base-hw/src/core/signal_source_component.h @@ -17,12 +17,12 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ #include #include #include -namespace Genode { +namespace Core { class Signal_context_component; class Signal_source_component; @@ -32,8 +32,8 @@ namespace Genode { } -struct Genode::Signal_context_component : private Kernel_object, - public Signal_context_pool::Entry +struct Core::Signal_context_component : private Kernel_object, + public Signal_context_pool::Entry { friend class Object_pool; @@ -46,8 +46,8 @@ struct Genode::Signal_context_component : private Kernel_object, - public Signal_source_pool::Entry +struct Core::Signal_source_component : private Kernel_object, + public Signal_source_pool::Entry { friend class Object_pool; friend class Signal_context_component; @@ -67,8 +67,8 @@ struct Genode::Signal_source_component : private Kernel_object(CALLED_FROM_CORE, s.signal_receiver(), diff --git a/repos/base-hw/src/core/spec/arm/cortex_a9_global_timer.cc b/repos/base-hw/src/core/spec/arm/cortex_a9_global_timer.cc index 3f188d8d7c..ad18867824 100644 --- a/repos/base-hw/src/core/spec/arm/cortex_a9_global_timer.cc +++ b/repos/base-hw/src/core/spec/arm/cortex_a9_global_timer.cc @@ -19,7 +19,7 @@ #include #include -using namespace Genode; +using namespace Core; using namespace Kernel; using Device = Board::Timer; diff --git a/repos/base-hw/src/core/spec/arm/cpu.cc b/repos/base-hw/src/core/spec/arm/cpu.cc index 7c8c722e31..e30604871a 100644 --- a/repos/base-hw/src/core/spec/arm/cpu.cc +++ b/repos/base-hw/src/core/spec/arm/cpu.cc @@ -14,12 +14,12 @@ /* base includes */ #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include -using namespace Genode; +using namespace Core; Arm_cpu::Context::Context(bool privileged) @@ -46,7 +46,7 @@ Mmu_context(addr_t table, { } -Genode::Arm_cpu::Mmu_context::~Mmu_context() +Core::Arm_cpu::Mmu_context::~Mmu_context() { /* flush TLB by ASID */ Cpu::Tlbiasid::write(id()); @@ -147,8 +147,8 @@ void Arm_cpu::cache_coherent_region(addr_t const base, }; /* take the smallest cacheline, either from I-, or D-cache */ - size_t const cache_line_size = Genode::min(Cpu::instruction_cache_line_size(), - Cpu::data_cache_line_size()); + size_t const cache_line_size = min(Cpu::instruction_cache_line_size(), + Cpu::data_cache_line_size()); cache_maintainance(base, size, cache_line_size, lambda); } diff --git a/repos/base-hw/src/core/spec/arm/cpu_support.h b/repos/base-hw/src/core/spec/arm/cpu_support.h index 33d63848be..76ba1aca30 100644 --- a/repos/base-hw/src/core/spec/arm/cpu_support.h +++ b/repos/base-hw/src/core/spec/arm/cpu_support.h @@ -32,13 +32,13 @@ namespace Kernel { struct Thread_fault; } -namespace Genode { - using sizet_arithm_t = Genode::uint64_t; +namespace Core { + using sizet_arithm_t = uint64_t; struct Arm_cpu; } -struct Genode::Arm_cpu : public Hw::Arm_cpu +struct Core::Arm_cpu : public Hw::Arm_cpu { struct Fpu_context { diff --git a/repos/base-hw/src/core/spec/arm/generic_timer.cc b/repos/base-hw/src/core/spec/arm/generic_timer.cc index 18695b6306..efdc010751 100644 --- a/repos/base-hw/src/core/spec/arm/generic_timer.cc +++ b/repos/base-hw/src/core/spec/arm/generic_timer.cc @@ -21,7 +21,7 @@ using namespace Kernel; unsigned Timer::interrupt_id() const { return Board::TIMER_IRQ; } -unsigned long Board::Timer::_freq() { return Genode::Cpu::Cntfrq::read(); } +unsigned long Board::Timer::_freq() { return Core::Cpu::Cntfrq::read(); } Board::Timer::Timer(unsigned) : ticks_per_ms((unsigned)(_freq() / 1000)) diff --git a/repos/base-hw/src/core/spec/arm/gicv2.cc b/repos/base-hw/src/core/spec/arm/gicv2.cc index ff6ab9ff7b..8dd4c05ac0 100644 --- a/repos/base-hw/src/core/spec/arm/gicv2.cc +++ b/repos/base-hw/src/core/spec/arm/gicv2.cc @@ -15,7 +15,7 @@ #include #include -using namespace Genode; +using namespace Core; Hw::Gicv2::Gicv2() diff --git a/repos/base-hw/src/core/spec/arm/gicv3.cc b/repos/base-hw/src/core/spec/arm/gicv3.cc index 6ca86a3842..54e3fe2ef1 100644 --- a/repos/base-hw/src/core/spec/arm/gicv3.cc +++ b/repos/base-hw/src/core/spec/arm/gicv3.cc @@ -15,10 +15,10 @@ #include #include -using namespace Genode; +using namespace Core; -static inline Genode::addr_t redistributor_addr() +static inline addr_t redistributor_addr() { return Platform::mmio_to_virt(Board::Cpu_mmio::IRQ_CONTROLLER_REDIST_BASE + (Cpu::executing_id() * 0x20000)); diff --git a/repos/base-hw/src/core/spec/arm/imx_epit.cc b/repos/base-hw/src/core/spec/arm/imx_epit.cc index 34e3b126ac..9dae247282 100644 --- a/repos/base-hw/src/core/spec/arm/imx_epit.cc +++ b/repos/base-hw/src/core/spec/arm/imx_epit.cc @@ -19,7 +19,7 @@ #include -using namespace Genode; +using namespace Core; using namespace Kernel; diff --git a/repos/base-hw/src/core/spec/arm/imx_tzic.cc b/repos/base-hw/src/core/spec/arm/imx_tzic.cc index a0c9a2eade..1eef97f6ec 100644 --- a/repos/base-hw/src/core/spec/arm/imx_tzic.cc +++ b/repos/base-hw/src/core/spec/arm/imx_tzic.cc @@ -15,7 +15,7 @@ #include #include -using namespace Genode; +using namespace Core; Hw::Pic::Pic() : Mmio(Platform::mmio_to_virt(Board::IRQ_CONTROLLER_BASE)) { } diff --git a/repos/base-hw/src/core/spec/arm/kernel/lock.cc b/repos/base-hw/src/core/spec/arm/kernel/lock.cc index f017b7e93d..5815eb209d 100644 --- a/repos/base-hw/src/core/spec/arm/kernel/lock.cc +++ b/repos/base-hw/src/core/spec/arm/kernel/lock.cc @@ -15,7 +15,7 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include diff --git a/repos/base-hw/src/core/spec/arm/kernel/panic.cc b/repos/base-hw/src/core/spec/arm/kernel/panic.cc index 95da36f159..04dfa6094a 100644 --- a/repos/base-hw/src/core/spec/arm/kernel/panic.cc +++ b/repos/base-hw/src/core/spec/arm/kernel/panic.cc @@ -11,7 +11,7 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* base-hw Core includes */ +/* base-hw core includes */ #include diff --git a/repos/base-hw/src/core/spec/arm/kernel/thread.cc b/repos/base-hw/src/core/spec/arm/kernel/thread.cc index 9628aedff3..c353745e46 100644 --- a/repos/base-hw/src/core/spec/arm/kernel/thread.cc +++ b/repos/base-hw/src/core/spec/arm/kernel/thread.cc @@ -15,7 +15,7 @@ /* base includes */ #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include diff --git a/repos/base-hw/src/core/spec/arm/kernel/thread_caches.cc b/repos/base-hw/src/core/spec/arm/kernel/thread_caches.cc index d73d8848fc..c9c7d4c38e 100644 --- a/repos/base-hw/src/core/spec/arm/kernel/thread_caches.cc +++ b/repos/base-hw/src/core/spec/arm/kernel/thread_caches.cc @@ -11,7 +11,7 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include @@ -54,7 +54,7 @@ void Kernel::Thread::_call_cache_coherent_region() { for_cachelines((addr_t)user_arg_1(), (size_t)user_arg_2(), *this, [] (addr_t addr, size_t size) { - Genode::Cpu::cache_coherent_region(addr, size); }); + Core::Cpu::cache_coherent_region(addr, size); }); } @@ -62,7 +62,7 @@ void Kernel::Thread::_call_cache_clean_invalidate_data_region() { for_cachelines((addr_t)user_arg_1(), (size_t)user_arg_2(), *this, [] (addr_t addr, size_t size) { - Genode::Cpu::cache_clean_invalidate_data_region(addr, size); }); + Core::Cpu::cache_clean_invalidate_data_region(addr, size); }); } @@ -70,12 +70,12 @@ void Kernel::Thread::_call_cache_invalidate_data_region() { for_cachelines((addr_t)user_arg_1(), (size_t)user_arg_2(), *this, [] (addr_t addr, size_t size) { - Genode::Cpu::cache_invalidate_data_region(addr, size); }); + Core::Cpu::cache_invalidate_data_region(addr, size); }); } void Kernel::Thread::_call_cache_line_size() { - size_t const cache_line_size = Genode::Cpu::cache_line_size(); + size_t const cache_line_size = Core::Cpu::cache_line_size(); user_arg_0(cache_line_size); } diff --git a/repos/base-hw/src/core/spec/arm/platform_support.cc b/repos/base-hw/src/core/spec/arm/platform_support.cc index 8890fb0d3d..7d952ffe85 100644 --- a/repos/base-hw/src/core/spec/arm/platform_support.cc +++ b/repos/base-hw/src/core/spec/arm/platform_support.cc @@ -14,13 +14,13 @@ /* core includes */ #include -using namespace Genode; +using namespace Core; void Platform::_init_io_port_alloc() { }; -void Platform::_init_additional_platform_info(Genode::Xml_generator&) { } +void Platform::_init_additional_platform_info(Xml_generator&) { } long Platform::irq(long const user_irq) { return user_irq; } diff --git a/repos/base-hw/src/core/spec/arm/trustzone_board.h b/repos/base-hw/src/core/spec/arm/trustzone_board.h index a40e3e791f..d49287f960 100644 --- a/repos/base-hw/src/core/spec/arm/trustzone_board.h +++ b/repos/base-hw/src/core/spec/arm/trustzone_board.h @@ -14,13 +14,17 @@ #ifndef _CORE__SPEC__ARM_TRUSTZONE_BOARD_H_ #define _CORE__SPEC__ARM_TRUSTZONE_BOARD_H_ +/* Genode includes */ #include +/* core includes */ +#include + namespace Kernel { class Cpu; } namespace Board { - using Genode::Vm_state; + using Core::Vm_state; enum { VCPU_MAX = 1 }; diff --git a/repos/base-hw/src/core/spec/arm/virtualization/board.h b/repos/base-hw/src/core/spec/arm/virtualization/board.h index e89c563e6f..028f063d82 100644 --- a/repos/base-hw/src/core/spec/arm/virtualization/board.h +++ b/repos/base-hw/src/core/spec/arm/virtualization/board.h @@ -14,13 +14,15 @@ #ifndef _CORE__SPEC__ARM__VIRTUALIZATION__BOARD_H_ #define _CORE__SPEC__ARM__VIRTUALIZATION__BOARD_H_ -/* base-hw Core includes */ +/* core includes */ #include #include /* base-hw internal includes */ #include +namespace Genode { struct Vm_state; } + namespace Board { using Vm_page_table = Hw::Level_1_stage_2_translation_table; diff --git a/repos/base-hw/src/core/spec/arm/virtualization/gicv2.cc b/repos/base-hw/src/core/spec/arm/virtualization/gicv2.cc index 39e7687c06..14db8b4f6f 100644 --- a/repos/base-hw/src/core/spec/arm/virtualization/gicv2.cc +++ b/repos/base-hw/src/core/spec/arm/virtualization/gicv2.cc @@ -11,8 +11,10 @@ * under the terms of the GNU Affero General Public License version 3. */ +/* Genode includes */ #include +/* core includes */ #include #include @@ -21,7 +23,7 @@ using Board::Pic; Pic::Gich::Gich() : - Genode::Mmio(Genode::Platform::mmio_to_virt(Board::Cpu_mmio::IRQ_CONTROLLER_VT_CTRL_BASE)) + Genode::Mmio(Core::Platform::mmio_to_virt(Board::Cpu_mmio::IRQ_CONTROLLER_VT_CTRL_BASE)) { } diff --git a/repos/base-hw/src/core/spec/arm/virtualization/gicv2.h b/repos/base-hw/src/core/spec/arm/virtualization/gicv2.h index 3044f69789..cbd28ecafb 100644 --- a/repos/base-hw/src/core/spec/arm/virtualization/gicv2.h +++ b/repos/base-hw/src/core/spec/arm/virtualization/gicv2.h @@ -27,6 +27,8 @@ class Board::Pic : public Hw::Gicv2 { private: + using uint32_t = Genode::uint32_t; + struct Gich : Genode::Mmio { struct Gich_hcr : Register<0x00, 32> { }; @@ -44,12 +46,12 @@ class Board::Pic : public Hw::Gicv2 struct Virtual_context { - Genode::uint32_t lr { 0 }; - Genode::uint32_t apr { 0 }; - Genode::uint32_t vmcr { 0x4c0000 }; - Genode::uint32_t misr { 0 }; - Genode::uint32_t eisr { 0 }; - Genode::uint32_t elrsr { 0xffffffff }; + uint32_t lr { 0 }; + uint32_t apr { 0 }; + uint32_t vmcr { 0x4c0000 }; + uint32_t misr { 0 }; + uint32_t eisr { 0 }; + uint32_t elrsr { 0xffffffff }; }; bool ack_virtual_irq(Virtual_context & c); diff --git a/repos/base-hw/src/core/spec/arm/virtualization/gicv3.h b/repos/base-hw/src/core/spec/arm/virtualization/gicv3.h index 459ff18f5d..f8f11cbf1e 100644 --- a/repos/base-hw/src/core/spec/arm/virtualization/gicv3.h +++ b/repos/base-hw/src/core/spec/arm/virtualization/gicv3.h @@ -27,13 +27,17 @@ class Board::Pic : public Hw::Pic { public: - struct Virtual_context { - Genode::uint64_t lr { 0 }; - Genode::uint32_t apr { 0 }; - Genode::uint32_t vmcr { 0x4c0000 }; - Genode::uint32_t misr { 0 }; - Genode::uint32_t eisr { 0 }; - Genode::uint32_t elrsr { 0xffffffff }; + using uint32_t = Genode::uint32_t; + using uint64_t = Genode::uint64_t; + + struct Virtual_context + { + uint64_t lr { 0 }; + uint32_t apr { 0 }; + uint32_t vmcr { 0x4c0000 }; + uint32_t misr { 0 }; + uint32_t eisr { 0 }; + uint32_t elrsr { 0xffffffff }; }; bool ack_virtual_irq(Virtual_context & c) diff --git a/repos/base-hw/src/core/spec/arm/virtualization/platform_services.cc b/repos/base-hw/src/core/spec/arm/virtualization/platform_services.cc index 3053a6047b..67c15ca117 100644 --- a/repos/base-hw/src/core/spec/arm/virtualization/platform_services.cc +++ b/repos/base-hw/src/core/spec/arm/virtualization/platform_services.cc @@ -13,7 +13,6 @@ /* Genode includes */ #include -#include /* core includes */ #include @@ -24,20 +23,20 @@ #include #include +using namespace Core; -extern Genode::addr_t hypervisor_exception_vector; + +extern addr_t hypervisor_exception_vector; /* * Add ARM virtualization specific vm service */ -void Genode::platform_add_local_services(Rpc_entrypoint &ep, - Sliced_heap &sh, - Registry &services, - Trace::Source_registry &trace_sources) +void Core::platform_add_local_services(Rpc_entrypoint &ep, + Sliced_heap &sh, + Registry &services, + Core::Trace::Source_registry &trace_sources) { - using namespace Genode; - map_local(Platform::core_phys_addr((addr_t)&hypervisor_exception_vector), Hw::Mm::hypervisor_exception_vector().base, Hw::Mm::hypervisor_exception_vector().size / get_page_size(), diff --git a/repos/base-hw/src/core/spec/arm/virtualization/vm_session_component.cc b/repos/base-hw/src/core/spec/arm/virtualization/vm_session_component.cc index 8edbc971f3..94fc8886c5 100644 --- a/repos/base-hw/src/core/spec/arm/virtualization/vm_session_component.cc +++ b/repos/base-hw/src/core/spec/arm/virtualization/vm_session_component.cc @@ -24,7 +24,7 @@ #include #include -using namespace Genode; +using namespace Core; static Core_mem_allocator & cma() { @@ -42,10 +42,10 @@ void Vm_session_component::_attach(addr_t phys_addr, addr_t vm_addr, size_t size _table_array.alloc()); return; } catch(Hw::Out_of_tables &) { - Genode::error("Translation table needs to much RAM"); + error("Translation table needs to much RAM"); } catch(...) { - Genode::error("Invalid mapping ", Genode::Hex(phys_addr), " -> ", - Genode::Hex(vm_addr), " (", size, ")"); + error("Invalid mapping ", Hex(phys_addr), " -> ", + Hex(vm_addr), " (", size, ")"); } } @@ -87,7 +87,7 @@ void * Vm_session_component::_alloc_table() } -using Vmid_allocator = Genode::Bit_allocator<256>; +using Vmid_allocator = Bit_allocator<256>; static Vmid_allocator &alloc() { diff --git a/repos/base-hw/src/core/spec/arm_v6/cpu.h b/repos/base-hw/src/core/spec/arm_v6/cpu.h index fae5dcc532..042c9a6eac 100644 --- a/repos/base-hw/src/core/spec/arm_v6/cpu.h +++ b/repos/base-hw/src/core/spec/arm_v6/cpu.h @@ -15,20 +15,20 @@ #ifndef _CORE__SPEC__ARM_V6__CPU_H_ #define _CORE__SPEC__ARM_V6__CPU_H_ -/* base-hw Core includes */ +/* base-hw core includes */ #include #include -namespace Genode { struct Cpu; } +namespace Core { struct Cpu; } -struct Genode::Cpu : Arm_cpu +struct Core::Cpu : Arm_cpu { static inline void synchronization_barrier() {} static inline size_t data_cache_line_size() { - struct Ctr : Genode::Register<32> { + struct Ctr : Register<32> { struct D_min_line : Bitfield<12,2> {}; }; @@ -44,7 +44,7 @@ struct Genode::Cpu : Arm_cpu static inline size_t instruction_cache_line_size() { - struct Ctr : Genode::Register<32> { + struct Ctr : Register<32> { struct I_min_line : Bitfield<0,2> {}; }; @@ -59,8 +59,7 @@ struct Genode::Cpu : Arm_cpu } static inline size_t cache_line_size() { - return Genode::min(data_cache_line_size(), - instruction_cache_line_size()); } + return min(data_cache_line_size(), instruction_cache_line_size()); } }; #endif /* _CORE__SPEC__ARM_V6__CPU_H_ */ diff --git a/repos/base-hw/src/core/spec/arm_v6/translation_table.h b/repos/base-hw/src/core/spec/arm_v6/translation_table.h index 11fb9ba0b4..fb2e2446bc 100644 --- a/repos/base-hw/src/core/spec/arm_v6/translation_table.h +++ b/repos/base-hw/src/core/spec/arm_v6/translation_table.h @@ -29,7 +29,7 @@ constexpr bool Hw::Page_table::Descriptor_base::_smp() { return false; } void Hw::Page_table::_table_changed(unsigned long addr, unsigned long size) { - Genode::Arm_cpu::cache_clean_data_region(addr, size); + Core::Arm_cpu::cache_clean_data_region(addr, size); } #endif /* _CORE__SPEC__ARM_V6__TRANSLATION_TABLE_H_ */ diff --git a/repos/base-hw/src/core/spec/arm_v7/cpu_support.h b/repos/base-hw/src/core/spec/arm_v7/cpu_support.h index 8b0ddf515b..b798999e30 100644 --- a/repos/base-hw/src/core/spec/arm_v7/cpu_support.h +++ b/repos/base-hw/src/core/spec/arm_v7/cpu_support.h @@ -17,10 +17,10 @@ /* core includes */ #include -namespace Genode { struct Arm_v7_cpu; } +namespace Core { struct Arm_v7_cpu; } -struct Genode::Arm_v7_cpu : Arm_cpu +struct Core::Arm_v7_cpu : Arm_cpu { /** * Returns whether this cpu implements the multiprocessor extensions @@ -50,7 +50,7 @@ struct Genode::Arm_v7_cpu : Arm_cpu static inline size_t data_cache_line_size() { - struct Ctr : Genode::Register<32> { + struct Ctr : Register<32> { struct D_min_line : Bitfield<16,4> {}; }; @@ -66,7 +66,7 @@ struct Genode::Arm_v7_cpu : Arm_cpu static inline size_t instruction_cache_line_size() { - struct Ctr : Genode::Register<32> { + struct Ctr : Register<32> { struct I_min_line : Bitfield<0,4> {}; }; @@ -82,8 +82,7 @@ struct Genode::Arm_v7_cpu : Arm_cpu static inline size_t cache_line_size() { - return Genode::min(data_cache_line_size(), - instruction_cache_line_size()); } + return min(data_cache_line_size(), instruction_cache_line_size()); } }; #endif /* _CORE__SPEC__ARM_V7__CPU_SUPPORT_H_ */ diff --git a/repos/base-hw/src/core/spec/arm_v7/trustzone/platform_services.cc b/repos/base-hw/src/core/spec/arm_v7/trustzone/platform_services.cc index 1b3fa24c08..8b5e07f7c8 100644 --- a/repos/base-hw/src/core/spec/arm_v7/trustzone/platform_services.cc +++ b/repos/base-hw/src/core/spec/arm_v7/trustzone/platform_services.cc @@ -15,7 +15,7 @@ #include #include -/* Core includes */ +/* core includes */ #include #include #include @@ -30,10 +30,10 @@ extern int monitor_mode_exception_vector; /* * Add TrustZone specific vm service */ -void Genode::platform_add_local_services(Rpc_entrypoint &ep, - Sliced_heap &sliced_heap, - Registry &local_services, - Trace::Source_registry &trace_sources) +void Core::platform_add_local_services(Rpc_entrypoint &ep, + Sliced_heap &sliced_heap, + Registry &local_services, + Core::Trace::Source_registry &trace_sources) { static addr_t const phys_base = Platform::core_phys_addr((addr_t)&monitor_mode_exception_vector); diff --git a/repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.cc b/repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.cc index eb2e462221..33b8546c8d 100644 --- a/repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.cc +++ b/repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.cc @@ -18,7 +18,7 @@ #include #include -using namespace Genode; +using namespace Core; static Board::Vm_page_table_array & dummy_array() diff --git a/repos/base-hw/src/core/spec/arm_v7/virtualization/hypervisor.h b/repos/base-hw/src/core/spec/arm_v7/virtualization/hypervisor.h index 0be63044db..c60890a614 100644 --- a/repos/base-hw/src/core/spec/arm_v7/virtualization/hypervisor.h +++ b/repos/base-hw/src/core/spec/arm_v7/virtualization/hypervisor.h @@ -14,7 +14,8 @@ #ifndef _SPEC__ARM_V7__VIRTUALIZATION_HYPERVISOR_H_ #define _SPEC__ARM_V7__VIRTUALIZATION_HYPERVISOR_H_ -#include +/* core includes */ +#include #include namespace Hypervisor { @@ -43,7 +44,7 @@ namespace Hypervisor { } - inline void switch_world(Genode::Vm_state & vm_state, + inline void switch_world(Core::Vm_state & vm_state, Host_context & host_state) { hypervisor_call(WORLD_SWITCH, diff --git a/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc b/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc index 65ada78c56..dc0f45d846 100644 --- a/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc +++ b/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc @@ -11,7 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -#include #include #include diff --git a/repos/base-hw/src/core/spec/arm_v8/cpu.cc b/repos/base-hw/src/core/spec/arm_v8/cpu.cc index 617b7fd70b..7db1cd9bdb 100644 --- a/repos/base-hw/src/core/spec/arm_v8/cpu.cc +++ b/repos/base-hw/src/core/spec/arm_v8/cpu.cc @@ -15,31 +15,32 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include +using namespace Core; -Genode::Cpu::Context::Context(bool privileged) + +Cpu::Context::Context(bool privileged) { Spsr::El::set(pstate, privileged ? 1 : 0); } -bool Genode::Cpu::active(Mmu_context & mmu_context) +bool Cpu::active(Mmu_context & mmu_context) { return (mmu_context.id() == Ttbr::Asid::get(Ttbr0_el1::read())); } -void Genode::Cpu::switch_to(Mmu_context & mmu_context) +void Cpu::switch_to(Mmu_context & mmu_context) { Ttbr0_el1::write(mmu_context.ttbr); } -void Genode::Cpu::mmu_fault(Genode::Cpu::Context &, - Kernel::Thread_fault & fault) +void Cpu::mmu_fault(Cpu::Context &, Kernel::Thread_fault & fault) { Esr::access_t esr = Esr_el1::read(); @@ -54,57 +55,55 @@ void Genode::Cpu::mmu_fault(Genode::Cpu::Context &, ? Kernel::Thread_fault::WRITE : Kernel::Thread_fault::EXEC; return; default: - Genode::raw("MMU-fault not handled ESR=", Genode::Hex(esr)); + raw("MMU-fault not handled ESR=", Hex(esr)); fault.type = Kernel::Thread_fault::UNKNOWN; }; } -Genode::Cpu::Mmu_context:: -Mmu_context(addr_t table, - Board::Address_space_id_allocator &addr_space_id_alloc) +Cpu::Mmu_context::Mmu_context(addr_t table, + Board::Address_space_id_allocator &id_alloc) : - _addr_space_id_alloc(addr_space_id_alloc), + _addr_space_id_alloc(id_alloc), ttbr(Ttbr::Baddr::masked(table)) { - Ttbr::Asid::set(ttbr, (Genode::uint16_t)_addr_space_id_alloc.alloc()); + Ttbr::Asid::set(ttbr, (uint16_t)_addr_space_id_alloc.alloc()); } -Genode::Cpu::Mmu_context::~Mmu_context() +Cpu::Mmu_context::~Mmu_context() { _addr_space_id_alloc.free(id()); } -Genode::size_t Genode::Cpu::cache_line_size() +size_t Cpu::cache_line_size() { - static Genode::size_t cache_line_size = 0; + static size_t cache_line_size = 0; if (!cache_line_size) { - Genode::size_t i = 1 << Ctr_el0::I_min_line::get(Ctr_el0::read()); - Genode::size_t d = 1 << Ctr_el0::D_min_line::get(Ctr_el0::read()); - cache_line_size = Genode::min(i,d) * 4; /* word size is fixed in ARM */ + size_t i = 1 << Ctr_el0::I_min_line::get(Ctr_el0::read()); + size_t d = 1 << Ctr_el0::D_min_line::get(Ctr_el0::read()); + cache_line_size = min(i,d) * 4; /* word size is fixed in ARM */ } return cache_line_size; } template -static inline void cache_maintainance(Genode::addr_t const base, - Genode::size_t const size, +static inline void cache_maintainance(addr_t const base, + size_t const size, FUNC & func) { - Genode::addr_t start = (Genode::addr_t) base; - Genode::addr_t const end = base + size; - for (; start < end; start += Genode::Cpu::cache_line_size()) func(start); + addr_t start = (addr_t) base; + addr_t const end = base + size; + for (; start < end; start += Cpu::cache_line_size()) func(start); } -void Genode::Cpu::cache_coherent_region(addr_t const base, - size_t const size) +void Cpu::cache_coherent_region(addr_t const base, size_t const size) { - Genode::memory_barrier(); + memory_barrier(); auto lambda = [] (addr_t const base) { asm volatile("dc cvau, %0" :: "r" (base)); @@ -118,10 +117,10 @@ void Genode::Cpu::cache_coherent_region(addr_t const base, } -void Genode::Cpu::cache_clean_invalidate_data_region(addr_t const base, - size_t const size) +void Cpu::cache_clean_invalidate_data_region(addr_t const base, + size_t const size) { - Genode::memory_barrier(); + memory_barrier(); auto lambda = [] (addr_t const base) { asm volatile("dc civac, %0" :: "r" (base)); }; @@ -133,10 +132,9 @@ void Genode::Cpu::cache_clean_invalidate_data_region(addr_t const base, } -void Genode::Cpu::cache_invalidate_data_region(addr_t const base, - size_t const size) +void Cpu::cache_invalidate_data_region(addr_t const base, size_t const size) { - Genode::memory_barrier(); + memory_barrier(); auto lambda = [] (addr_t const base) { asm volatile("dc ivac, %0" :: "r" (base)); }; @@ -148,11 +146,10 @@ void Genode::Cpu::cache_invalidate_data_region(addr_t const base, } -void Genode::Cpu::clear_memory_region(addr_t const addr, - size_t const size, +void Cpu::clear_memory_region(addr_t const addr, size_t const size, bool changed_cache_properties) { - Genode::memory_barrier(); + memory_barrier(); /* normal memory is cleared by D-cache zeroing */ auto normal = [] (addr_t const base) { diff --git a/repos/base-hw/src/core/spec/arm_v8/cpu.h b/repos/base-hw/src/core/spec/arm_v8/cpu.h index b9ff4dbde6..473652b8b2 100644 --- a/repos/base-hw/src/core/spec/arm_v8/cpu.h +++ b/repos/base-hw/src/core/spec/arm_v8/cpu.h @@ -21,10 +21,11 @@ /* base internal includes */ #include +/* core includes */ +#include + /* base-hw internal includes */ #include - -/* base-hw Core includes */ #include #include @@ -34,7 +35,7 @@ namespace Kernel { struct Thread_fault; } namespace Board { class Address_space_id_allocator; } -namespace Genode { +namespace Core { struct Cpu; using sizet_arithm_t = __uint128_t; @@ -42,7 +43,7 @@ namespace Genode { } -struct Genode::Cpu : Hw::Arm_64_cpu +struct Core::Cpu : Hw::Arm_64_cpu { enum Exception_entry { SYNC_LEVEL_EL1 = 0x000, @@ -66,16 +67,16 @@ struct Genode::Cpu : Hw::Arm_64_cpu struct alignas(16) Fpu_state { - Genode::uint128_t q[32]; - Genode::uint64_t fpsr; - Genode::uint64_t fpcr; + uint128_t q[32]; + uint64_t fpsr; + uint64_t fpcr; }; struct alignas(16) Context : Cpu_state { - Genode::uint64_t pstate { }; - Genode::uint64_t exception_type { RESET }; - Fpu_state fpu_state { }; + uint64_t pstate { }; + uint64_t exception_type { RESET }; + Fpu_state fpu_state { }; Context(bool privileged); }; @@ -95,8 +96,7 @@ struct Genode::Cpu : Hw::Arm_64_cpu ~Mmu_context(); - Genode::uint16_t id() { - return Ttbr::Asid::get(ttbr) & 0xffff; } + uint16_t id() { return Ttbr::Asid::get(ttbr) & 0xffff; } }; bool active(Mmu_context &); diff --git a/repos/base-hw/src/core/spec/arm_v8/pd_session_support.cc b/repos/base-hw/src/core/spec/arm_v8/pd_session_support.cc index c23e68c7ab..dcc06a59a2 100644 --- a/repos/base-hw/src/core/spec/arm_v8/pd_session_support.cc +++ b/repos/base-hw/src/core/spec/arm_v8/pd_session_support.cc @@ -15,7 +15,7 @@ #include #include -using namespace Genode; +using namespace Core; using State = Genode::Pd_session::Managing_system_state; diff --git a/repos/base-hw/src/core/spec/arm_v8/virtualization/kernel/vm.cc b/repos/base-hw/src/core/spec/arm_v8/virtualization/kernel/vm.cc index cc07859602..f196f4bb1a 100644 --- a/repos/base-hw/src/core/spec/arm_v8/virtualization/kernel/vm.cc +++ b/repos/base-hw/src/core/spec/arm_v8/virtualization/kernel/vm.cc @@ -11,7 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -#include #include #include diff --git a/repos/base-hw/src/core/spec/cortex_a15/cpu.cc b/repos/base-hw/src/core/spec/cortex_a15/cpu.cc index 7a582d49ef..0bd9ffea7a 100644 --- a/repos/base-hw/src/core/spec/cortex_a15/cpu.cc +++ b/repos/base-hw/src/core/spec/cortex_a15/cpu.cc @@ -11,23 +11,24 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* base-hw Core includes */ +/* base-hw core includes */ #include #include +using namespace Core; -Genode::Cpu::Mmu_context:: -Mmu_context(addr_t table, - Board::Address_space_id_allocator &addr_space_id_alloc) + +Cpu::Mmu_context::Mmu_context(addr_t table, + Board::Address_space_id_allocator &id_alloc) : - _addr_space_id_alloc(addr_space_id_alloc), + _addr_space_id_alloc(id_alloc), ttbr0(Ttbr_64bit::Ba::masked((Ttbr_64bit::access_t)table)) { - Ttbr_64bit::Asid::set(ttbr0, (Genode::uint8_t)addr_space_id_alloc.alloc()); + Ttbr_64bit::Asid::set(ttbr0, (uint8_t)_addr_space_id_alloc.alloc()); } -Genode::Cpu::Mmu_context::~Mmu_context() +Cpu::Mmu_context::~Mmu_context() { /* flush TLB by ASID */ Cpu::Tlbiasid::write(id()); @@ -35,8 +36,7 @@ Genode::Cpu::Mmu_context::~Mmu_context() } -void Genode::Cpu::mmu_fault_status(Genode::Cpu::Fsr::access_t fsr, - Kernel::Thread_fault & fault) +void Cpu::mmu_fault_status(Cpu::Fsr::access_t fsr, Kernel::Thread_fault &fault) { enum { FAULT_MASK = 0b111100, diff --git a/repos/base-hw/src/core/spec/cortex_a15/cpu.h b/repos/base-hw/src/core/spec/cortex_a15/cpu.h index fe49dd58b9..0e75037d21 100644 --- a/repos/base-hw/src/core/spec/cortex_a15/cpu.h +++ b/repos/base-hw/src/core/spec/cortex_a15/cpu.h @@ -15,14 +15,14 @@ #ifndef _CORE__SPEC__CORTEX_A15__CPU_H_ #define _CORE__SPEC__CORTEX_A15__CPU_H_ -/* base-hw Core includes */ +/* base-hw core includes */ #include #include -namespace Genode { class Cpu; } +namespace Core { class Cpu; } -class Genode::Cpu : public Arm_v7_cpu +class Core::Cpu : public Arm_v7_cpu { public: @@ -101,7 +101,7 @@ class Genode::Cpu : public Arm_v7_cpu ~Mmu_context(); - Genode::uint8_t id() const + uint8_t id() const { return (uint8_t)Ttbr_64bit::Asid::get(ttbr0); } diff --git a/repos/base-hw/src/core/spec/cortex_a8/cpu.h b/repos/base-hw/src/core/spec/cortex_a8/cpu.h index b59b787248..1132b6e901 100644 --- a/repos/base-hw/src/core/spec/cortex_a8/cpu.h +++ b/repos/base-hw/src/core/spec/cortex_a8/cpu.h @@ -15,10 +15,10 @@ #ifndef _CORE__SPEC__CORTEX_A8__CPU_H_ #define _CORE__SPEC__CORTEX_A8__CPU_H_ -/* base-hw Core includes */ +/* base-hw core includes */ #include #include -namespace Genode { using Cpu = Arm_v7_cpu; } +namespace Core { using Cpu = Arm_v7_cpu; } #endif /* _CORE__SPEC__CORTEX_A8__CPU_H_ */ diff --git a/repos/base-hw/src/core/spec/cortex_a8/translation_table.h b/repos/base-hw/src/core/spec/cortex_a8/translation_table.h index 1898f5261f..e1fb29b0a5 100644 --- a/repos/base-hw/src/core/spec/cortex_a8/translation_table.h +++ b/repos/base-hw/src/core/spec/cortex_a8/translation_table.h @@ -18,7 +18,7 @@ /* base-hw internal includes */ #include -/* base-hw Core includes */ +/* base-hw core includes */ #include @@ -38,7 +38,7 @@ void Hw::Page_table::_table_changed(unsigned long addr, unsigned long size) * page table entry is added. We only do this as core as the kernel * adds translations solely before MMU and caches are enabled. */ - Genode::Arm_cpu::cache_clean_data_region(addr, size); + Core::Arm_cpu::cache_clean_data_region(addr, size); } #endif /* _CORE__SPEC__CORTEX_A8__TRANSLATION_TABLE_H_ */ diff --git a/repos/base-hw/src/core/spec/cortex_a9/board.cc b/repos/base-hw/src/core/spec/cortex_a9/board.cc index c0dcf9b7dd..d603998330 100644 --- a/repos/base-hw/src/core/spec/cortex_a9/board.cc +++ b/repos/base-hw/src/core/spec/cortex_a9/board.cc @@ -11,13 +11,14 @@ * under the terms of the GNU Affero General Public License version 3. */ +/* core includes */ #include #include Board::L2_cache & Board::l2_cache() { - using namespace Genode; + using namespace Core; static L2_cache cache(Platform::mmio_to_virt(Board::PL310_MMIO_BASE)); return cache; diff --git a/repos/base-hw/src/core/spec/cortex_a9/cpu.cc b/repos/base-hw/src/core/spec/cortex_a9/cpu.cc index 0272eb5d6a..aff904f29e 100644 --- a/repos/base-hw/src/core/spec/cortex_a9/cpu.cc +++ b/repos/base-hw/src/core/spec/cortex_a9/cpu.cc @@ -12,13 +12,13 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* base-hw Core includes */ +/* base-hw core includes */ #include #include -void Genode::Cpu::cache_clean_invalidate_data_region(addr_t const base, - size_t const size) +void Core::Cpu::cache_clean_invalidate_data_region(addr_t const base, + size_t const size) { Arm_cpu::cache_clean_invalidate_data_region(base, size); Board::l2_cache().clean_invalidate(); diff --git a/repos/base-hw/src/core/spec/cortex_a9/cpu.h b/repos/base-hw/src/core/spec/cortex_a9/cpu.h index 18fe5c246d..62fcc75144 100644 --- a/repos/base-hw/src/core/spec/cortex_a9/cpu.h +++ b/repos/base-hw/src/core/spec/cortex_a9/cpu.h @@ -15,14 +15,14 @@ #ifndef _CORE__SPEC__CORTEX_A9__CPU_H_ #define _CORE__SPEC__CORTEX_A9__CPU_H_ -/* base-hw Core includes */ +/* base-hw core includes */ #include #include -namespace Genode { struct Cpu; } +namespace Core { struct Cpu; } -struct Genode::Cpu : Arm_v7_cpu +struct Core::Cpu : Arm_v7_cpu { /** * Clean and invalidate data-cache for virtual region diff --git a/repos/base-hw/src/core/spec/riscv/cpu.cc b/repos/base-hw/src/core/spec/riscv/cpu.cc index e2e77f2aa5..df9495c743 100644 --- a/repos/base-hw/src/core/spec/riscv/cpu.cc +++ b/repos/base-hw/src/core/spec/riscv/cpu.cc @@ -15,15 +15,17 @@ /* base-hw internal includes */ #include -/* base-hw Core includes */ +/* base-hw core includes */ #include #include #include -using Mmu_context = Genode::Cpu::Mmu_context; +using Mmu_context = Core::Cpu::Mmu_context; + +using namespace Core; -Genode::Cpu::Context::Context(bool) +Cpu::Context::Context(bool) { /* * initialize cpu_exception with something that gets ignored in @@ -33,13 +35,12 @@ Genode::Cpu::Context::Context(bool) } -Mmu_context:: -Mmu_context(addr_t page_table_base, - Board::Address_space_id_allocator &addr_space_id_alloc) +Mmu_context::Mmu_context(addr_t page_table_base, + Board::Address_space_id_allocator &id_alloc) : - _addr_space_id_alloc(addr_space_id_alloc) + _addr_space_id_alloc(id_alloc) { - Satp::Asid::set(satp, (Genode::uint8_t)_addr_space_id_alloc.alloc()); + Satp::Asid::set(satp, (uint8_t)_addr_space_id_alloc.alloc()); Satp::Ppn::set(satp, page_table_base >> 12); Satp::Mode::set(satp, 8); } @@ -53,31 +54,30 @@ Mmu_context::~Mmu_context() } -bool Genode::Cpu::active(Mmu_context & context) +bool Cpu::active(Mmu_context &context) { return Satp::read() == context.satp; } -void Genode::Cpu::switch_to(Mmu_context & context) +void Cpu::switch_to(Mmu_context &context) { Satp::write(context.satp); sfence(); } -void Genode::Cpu::mmu_fault(Context &, Kernel::Thread_fault & f) +void Cpu::mmu_fault(Context &, Kernel::Thread_fault &f) { - f.addr = Genode::Cpu::Stval::read(); + f.addr = Cpu::Stval::read(); f.type = Kernel::Thread_fault::PAGE_MISSING; } -void Genode::Cpu::clear_memory_region(addr_t const addr, - size_t const size, bool) +void Cpu::clear_memory_region(addr_t const addr, size_t const size, bool) { memset((void*)addr, 0, size); /* FIXME: is this really necessary? */ - Genode::Cpu::sfence(); + Cpu::sfence(); } diff --git a/repos/base-hw/src/core/spec/riscv/cpu.h b/repos/base-hw/src/core/spec/riscv/cpu.h index d719abcb1c..3b1b79fff0 100644 --- a/repos/base-hw/src/core/spec/riscv/cpu.h +++ b/repos/base-hw/src/core/spec/riscv/cpu.h @@ -26,7 +26,8 @@ #include #include -/* base-hw Core includes */ +/* base-hw core includes */ +#include #include #include @@ -36,7 +37,7 @@ namespace Kernel { struct Thread_fault; } namespace Board { class Address_space_id_allocator; } -namespace Genode { +namespace Core { /** * CPU driver for core @@ -50,11 +51,11 @@ namespace Genode { namespace Kernel { class Pd; } -class Genode::Cpu : public Hw::Riscv_cpu +class Core::Cpu : public Hw::Riscv_cpu { public: - struct alignas(8) Context : Cpu_state + struct alignas(8) Context : Genode::Cpu_state { Context(bool); }; @@ -69,8 +70,7 @@ class Genode::Cpu : public Hw::Riscv_cpu Satp::access_t satp = 0; - Mmu_context(addr_t page_table_base, - Board::Address_space_id_allocator &addr_space_id_alloc); + Mmu_context(addr_t page_table_base, Board::Address_space_id_allocator &); ~Mmu_context(); }; @@ -112,7 +112,7 @@ class Genode::Cpu : public Hw::Riscv_cpu template void Sv39::Level_x_translation_table::_translation_added(addr_t, size_t) { - Genode::Cpu::sfence(); + Core::Cpu::sfence(); } diff --git a/repos/base-hw/src/core/spec/riscv/kernel/interface.cc b/repos/base-hw/src/core/spec/riscv/kernel/interface.cc index 5e2d2f3d11..65691bf312 100644 --- a/repos/base-hw/src/core/spec/riscv/kernel/interface.cc +++ b/repos/base-hw/src/core/spec/riscv/kernel/interface.cc @@ -21,7 +21,6 @@ /* Genode includes */ #include -#include #include using namespace Kernel; diff --git a/repos/base-hw/src/core/spec/riscv/kernel/pd.cc b/repos/base-hw/src/core/spec/riscv/kernel/pd.cc index 8f7d00d38f..d2396b990b 100644 --- a/repos/base-hw/src/core/spec/riscv/kernel/pd.cc +++ b/repos/base-hw/src/core/spec/riscv/kernel/pd.cc @@ -16,7 +16,7 @@ bool Kernel::Pd::invalidate_tlb(Kernel::Cpu&, addr_t, size_t) { - Genode::Cpu::sfence(); + Core::Cpu::sfence(); return false; } diff --git a/repos/base-hw/src/core/spec/riscv/kernel/thread.cc b/repos/base-hw/src/core/spec/riscv/kernel/thread.cc index 4f95ff17e7..fbbd300cc6 100644 --- a/repos/base-hw/src/core/spec/riscv/kernel/thread.cc +++ b/repos/base-hw/src/core/spec/riscv/kernel/thread.cc @@ -30,8 +30,8 @@ void Cpu::Halt_job::proceed(Kernel::Cpu &) { } void Thread::exception(Cpu & cpu) { - using Context = Genode::Cpu::Context; - using Stval = Genode::Cpu::Stval; + using Context = Core::Cpu::Context; + using Stval = Core::Cpu::Stval; if (regs->is_irq()) { /* cpu-local timer interrupt */ @@ -89,7 +89,7 @@ void Thread::exception(Cpu & cpu) default: Genode::raw(*this, ": unhandled exception ", regs->cpu_exception, " at ip=", (void*)regs->ip, - " addr=", Genode::Hex(Genode::Cpu::Stval::read())); + " addr=", Genode::Hex(Core::Cpu::Stval::read())); _die(); } } diff --git a/repos/base-hw/src/core/spec/riscv/pic.cc b/repos/base-hw/src/core/spec/riscv/pic.cc index a08b09daf4..d915e338d3 100644 --- a/repos/base-hw/src/core/spec/riscv/pic.cc +++ b/repos/base-hw/src/core/spec/riscv/pic.cc @@ -11,14 +11,13 @@ * under the terms of the GNU Affero General Public License version 3. */ - #include #include #include Board::Pic::Pic(Global_interrupt_controller &) : - _plic(Genode::Platform::mmio_to_virt(Board::PLIC_BASE)) + _plic(Core::Platform::mmio_to_virt(Board::PLIC_BASE)) { /* enable external interrupts */ enum { SEIE = 0x200 }; diff --git a/repos/base-hw/src/core/spec/riscv/platform_support.cc b/repos/base-hw/src/core/spec/riscv/platform_support.cc index d9cb1ada00..6cba39462c 100644 --- a/repos/base-hw/src/core/spec/riscv/platform_support.cc +++ b/repos/base-hw/src/core/spec/riscv/platform_support.cc @@ -16,13 +16,13 @@ #include #include -using namespace Genode; +using namespace Core; void Platform::_init_io_port_alloc() { } -void Platform::_init_additional_platform_info(Genode::Xml_generator&) { } +void Platform::_init_additional_platform_info(Xml_generator &) { } long Platform::irq(long const user_irq ) { return user_irq; } diff --git a/repos/base-hw/src/core/spec/riscv/timer.cc b/repos/base-hw/src/core/spec/riscv/timer.cc index 5a8c84b6c1..06ba8b1457 100644 --- a/repos/base-hw/src/core/spec/riscv/timer.cc +++ b/repos/base-hw/src/core/spec/riscv/timer.cc @@ -11,7 +11,7 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Core includes */ +/* core includes */ #include #include #include diff --git a/repos/base-hw/src/core/spec/riscv/timer.h b/repos/base-hw/src/core/spec/riscv/timer.h index b1d4c37aab..38f9f2bf58 100644 --- a/repos/base-hw/src/core/spec/riscv/timer.h +++ b/repos/base-hw/src/core/spec/riscv/timer.h @@ -16,6 +16,8 @@ /* Genode includes */ #include + +/* core includes */ #include namespace Board { class Timer; } diff --git a/repos/base-hw/src/core/spec/x86_64/address_space_id_allocator.h b/repos/base-hw/src/core/spec/x86_64/address_space_id_allocator.h index e87f581b9b..cb1c4b52b7 100644 --- a/repos/base-hw/src/core/spec/x86_64/address_space_id_allocator.h +++ b/repos/base-hw/src/core/spec/x86_64/address_space_id_allocator.h @@ -17,9 +17,6 @@ /* base includes */ #include -namespace Board { - - class Address_space_id_allocator { }; -} +namespace Board { class Address_space_id_allocator { }; } #endif /* _X86_64__ADDRESS_SPACE_ID_ALLOCATOR_H_ */ diff --git a/repos/base-hw/src/core/spec/x86_64/bios_data_area.cc b/repos/base-hw/src/core/spec/x86_64/bios_data_area.cc index 79ca36d108..d93f6a6254 100644 --- a/repos/base-hw/src/core/spec/x86_64/bios_data_area.cc +++ b/repos/base-hw/src/core/spec/x86_64/bios_data_area.cc @@ -18,4 +18,4 @@ using namespace Genode; -addr_t Bios_data_area::_mmio_base_virt() { return Platform::mmio_to_virt(0); } +addr_t Bios_data_area::_mmio_base_virt() { return Core::Platform::mmio_to_virt(0); } diff --git a/repos/base-hw/src/core/spec/x86_64/cpu.cc b/repos/base-hw/src/core/spec/x86_64/cpu.cc index 689e4f9e3d..d1e240568c 100644 --- a/repos/base-hw/src/core/spec/x86_64/cpu.cc +++ b/repos/base-hw/src/core/spec/x86_64/cpu.cc @@ -19,6 +19,8 @@ extern int __idt; extern int __idt_end; +using namespace Core; + /** * Pseudo Descriptor @@ -27,15 +29,15 @@ extern int __idt_end; */ struct Pseudo_descriptor { - Genode::uint16_t const limit = 0; - Genode::uint64_t const base = 0; + uint16_t const limit = 0; + uint64_t const base = 0; + + constexpr Pseudo_descriptor(uint16_t l, uint64_t b) : limit(l), base(b) {} - constexpr Pseudo_descriptor(Genode::uint16_t l, Genode::uint64_t b) - : limit(l), base(b) {} } __attribute__((packed)); -Genode::Cpu::Context::Context(bool core) +Cpu::Context::Context(bool core) { eflags = EFLAGS_IF_SET; cs = core ? 0x8 : 0x1b; @@ -43,19 +45,18 @@ Genode::Cpu::Context::Context(bool core) } -Genode::Cpu::Mmu_context::Mmu_context(addr_t table, - Board::Address_space_id_allocator &) +Cpu::Mmu_context::Mmu_context(addr_t table, Board::Address_space_id_allocator &) : cr3(Cr3::Pdb::masked(table)) { } -void Genode::Cpu::Tss::init() +void Cpu::Tss::init() { enum { TSS_SELECTOR = 0x28, }; asm volatile ("ltr %w0" : : "r" (TSS_SELECTOR)); } -void Genode::Cpu::Idt::init() +void Cpu::Idt::init() { Pseudo_descriptor descriptor { (uint16_t)((addr_t)&__idt_end - (addr_t)&__idt), @@ -64,7 +65,7 @@ void Genode::Cpu::Idt::init() } -void Genode::Cpu::Gdt::init(addr_t tss_addr) +void Cpu::Gdt::init(addr_t tss_addr) { tss_desc[0] = ((((tss_addr >> 24) & 0xff) << 24 | ((tss_addr >> 16) & 0xff) | @@ -79,7 +80,7 @@ void Genode::Cpu::Gdt::init(addr_t tss_addr) } -void Genode::Cpu::mmu_fault(Context & regs, Kernel::Thread_fault & fault) +void Cpu::mmu_fault(Context ®s, Kernel::Thread_fault &fault) { using Fault = Kernel::Thread_fault::Type; @@ -102,30 +103,30 @@ void Genode::Cpu::mmu_fault(Context & regs, Kernel::Thread_fault & fault) else return Fault::UNKNOWN; }; - fault.addr = Genode::Cpu::Cr2::read(); + fault.addr = Cpu::Cr2::read(); fault.type = fault_lambda(regs.errcode); } extern void const * const kernel_stack; -extern Genode::size_t const kernel_stack_size; +extern size_t const kernel_stack_size; -bool Genode::Cpu::active(Mmu_context &mmu_context) +bool Cpu::active(Mmu_context &mmu_context) { return (mmu_context.cr3 == Cr3::read()); } -void Genode::Cpu::switch_to(Mmu_context &mmu_context) +void Cpu::switch_to(Mmu_context &mmu_context) { Cr3::write(mmu_context.cr3); } -void Genode::Cpu::switch_to(Context & context) +void Cpu::switch_to(Context &context) { - tss.ist[0] = (addr_t)&context + sizeof(Genode::Cpu_state); + tss.ist[0] = (addr_t)&context + sizeof(Cpu_state); addr_t const stack_base = reinterpret_cast(&kernel_stack); context.kernel_stack = stack_base + @@ -134,7 +135,7 @@ void Genode::Cpu::switch_to(Context & context) } -unsigned Genode::Cpu::executing_id() +unsigned Cpu::executing_id() { void * const stack_ptr = nullptr; addr_t const stack_addr = reinterpret_cast(&stack_ptr); @@ -146,15 +147,14 @@ unsigned Genode::Cpu::executing_id() } -void Genode::Cpu::clear_memory_region(Genode::addr_t const addr, - Genode::size_t const size, bool) +void Cpu::clear_memory_region(addr_t const addr, size_t const size, bool) { if (align_addr(addr, 3) == addr && align_addr(size, 3) == size) { - Genode::addr_t start = addr; - Genode::size_t count = size / 8; + addr_t start = addr; + size_t count = size / 8; asm volatile ("rep stosq" : "+D" (start), "+c" (count) : "a" (0) : "memory"); } else { - Genode::memset((void*)addr, 0, size); + memset((void*)addr, 0, size); } } diff --git a/repos/base-hw/src/core/spec/x86_64/cpu.h b/repos/base-hw/src/core/spec/x86_64/cpu.h index 781fa38373..b303a3b51b 100644 --- a/repos/base-hw/src/core/spec/x86_64/cpu.h +++ b/repos/base-hw/src/core/spec/x86_64/cpu.h @@ -27,7 +27,8 @@ /* base internal includes */ #include -/* base-hw Core includes */ +/* core includes */ +#include #include #include #include @@ -38,14 +39,14 @@ namespace Kernel { struct Thread_fault; } namespace Board { class Address_space_id_allocator; } -namespace Genode { +namespace Core { class Cpu; using sizet_arithm_t = __uint128_t; } -class Genode::Cpu : public Hw::X86_64_cpu +class Core::Cpu : public Hw::X86_64_cpu { public: @@ -136,9 +137,7 @@ class Genode::Cpu : public Hw::X86_64_cpu /** * Invalidate the whole TLB */ - static void invalidate_tlb() { - Genode::Cpu::Cr3::write(Genode::Cpu::Cr3::read()); } - + static void invalidate_tlb() { Cr3::write(Cr3::read()); } static void clear_memory_region(addr_t const addr, size_t const size, diff --git a/repos/base-hw/src/core/spec/x86_64/kernel/thread.cc b/repos/base-hw/src/core/spec/x86_64/kernel/thread.cc index 3d0c2c61ea..361246bd5a 100644 --- a/repos/base-hw/src/core/spec/x86_64/kernel/thread.cc +++ b/repos/base-hw/src/core/spec/x86_64/kernel/thread.cc @@ -63,7 +63,7 @@ void Kernel::Cpu::Halt_job::Halt_job::proceed(Kernel::Cpu &cpu) asm volatile ("hlt"); } break; case SUSPEND: - using Genode::Platform; + using Core::Platform; Platform::apply_with_boot_info([&](auto const &boot_info) { auto table = boot_info.plat_info.acpi_fadt; @@ -102,7 +102,7 @@ void Kernel::Cpu::Halt_job::Halt_job::proceed(Kernel::Cpu &cpu) void Kernel::Thread::_call_suspend() { using Genode::uint8_t; - using Genode::Platform; + using Core::Platform; Hw::Acpi_generic * acpi_fadt_table { }; unsigned cpu_count { }; diff --git a/repos/base-hw/src/core/spec/x86_64/pd_session_support.cc b/repos/base-hw/src/core/spec/x86_64/pd_session_support.cc index d3b32ff266..87b9085ccc 100644 --- a/repos/base-hw/src/core/spec/x86_64/pd_session_support.cc +++ b/repos/base-hw/src/core/spec/x86_64/pd_session_support.cc @@ -14,7 +14,7 @@ #include #include -using namespace Genode; +using namespace Core; using State = Genode::Pd_session::Managing_system_state; diff --git a/repos/base-hw/src/core/spec/x86_64/pic.cc b/repos/base-hw/src/core/spec/x86_64/pic.cc index a151b1482a..6a6c67c3cf 100644 --- a/repos/base-hw/src/core/spec/x86_64/pic.cc +++ b/repos/base-hw/src/core/spec/x86_64/pic.cc @@ -21,7 +21,7 @@ #include #include -using namespace Genode; +using namespace Core; using namespace Board; enum { diff --git a/repos/base-hw/src/core/spec/x86_64/pit.cc b/repos/base-hw/src/core/spec/x86_64/pit.cc index bb07ae6f77..3c594f47df 100644 --- a/repos/base-hw/src/core/spec/x86_64/pit.cc +++ b/repos/base-hw/src/core/spec/x86_64/pit.cc @@ -22,7 +22,7 @@ #include #include -using namespace Genode; +using namespace Core; using namespace Kernel; diff --git a/repos/base-hw/src/core/spec/x86_64/platform_support.cc b/repos/base-hw/src/core/spec/x86_64/platform_support.cc index ef53e5dec2..0aba3437ca 100644 --- a/repos/base-hw/src/core/spec/x86_64/platform_support.cc +++ b/repos/base-hw/src/core/spec/x86_64/platform_support.cc @@ -17,7 +17,7 @@ #include #include -using namespace Genode; +using namespace Core; void Platform::_init_additional_platform_info(Xml_generator &xml) @@ -61,9 +61,9 @@ void Platform::_init_additional_platform_info(Xml_generator &xml) } -Genode::Bit_allocator<64> & msi_allocator() +Bit_allocator<64> &msi_allocator() { - static Genode::Bit_allocator<64> msi_allocator; + static Bit_allocator<64> msi_allocator; return msi_allocator; } diff --git a/repos/base-hw/src/core/spec/x86_64/platform_support_common.cc b/repos/base-hw/src/core/spec/x86_64/platform_support_common.cc index e3fe495a18..136459a4f9 100644 --- a/repos/base-hw/src/core/spec/x86_64/platform_support_common.cc +++ b/repos/base-hw/src/core/spec/x86_64/platform_support_common.cc @@ -17,7 +17,7 @@ #include #include -using namespace Genode; +using namespace Core; void Platform::_init_io_port_alloc() diff --git a/repos/base-hw/src/core/spec/x86_64/port_io.h b/repos/base-hw/src/core/spec/x86_64/port_io.h index 10798a8650..ebfcf2095c 100644 --- a/repos/base-hw/src/core/spec/x86_64/port_io.h +++ b/repos/base-hw/src/core/spec/x86_64/port_io.h @@ -14,9 +14,10 @@ #ifndef _CORE__SPEC__X86_64__PORT_IO_H_ #define _CORE__SPEC__X86_64__PORT_IO_H_ -#include +/* core includes */ +#include -namespace Genode { +namespace Core { /** * Read byte from I/O port diff --git a/repos/base-hw/src/core/thread_start.cc b/repos/base-hw/src/core/thread_start.cc index 0246501d6c..e8dace0d45 100644 --- a/repos/base-hw/src/core/thread_start.cc +++ b/repos/base-hw/src/core/thread_start.cc @@ -27,7 +27,7 @@ #include #include -using namespace Genode; +using namespace Core; namespace Hw { extern Untyped_capability _main_thread_cap; } @@ -40,9 +40,9 @@ void Thread::start() return; } - struct Trace_source : public Trace::Source::Info_accessor, - private Trace::Control, - private Trace::Source + struct Trace_source : public Core::Trace::Source::Info_accessor, + private Core::Trace::Control, + private Core::Trace::Source { Genode::Thread &thread; @@ -61,10 +61,10 @@ void Thread::start() execution_time, thread.affinity() }; } - Trace_source(Trace::Source_registry ®istry, Genode::Thread &thread) + Trace_source(Core::Trace::Source_registry ®istry, Genode::Thread &thread) : - Trace::Control(), - Trace::Source(*this, *this), + Core::Trace::Control(), + Core::Trace::Source(*this, *this), thread(thread) { registry.insert(this); @@ -72,7 +72,7 @@ void Thread::start() }; /* create trace sources for core threads */ - new (platform().core_mem_alloc()) Trace_source(Trace::sources(), *this); + new (platform().core_mem_alloc()) Trace_source(Core::Trace::sources(), *this); } @@ -92,9 +92,9 @@ void Thread::_init_platform_thread(size_t, Type type) } /* remap initial main-thread UTCB according to stack-area spec */ - Genode::map_local(Platform::core_main_thread_phys_utcb(), - (addr_t)&_stack->utcb(), - max(sizeof(Native_utcb) / get_page_size(), (size_t)1)); + map_local(Platform::core_main_thread_phys_utcb(), + (addr_t)&_stack->utcb(), + max(sizeof(Native_utcb) / get_page_size(), (size_t)1)); /* adjust initial object state in case of a main thread */ native_thread().cap = Hw::_main_thread_cap; diff --git a/repos/base-hw/src/core/util.h b/repos/base-hw/src/core/util.h index 78e1a3f4b4..99e22b48cf 100644 --- a/repos/base-hw/src/core/util.h +++ b/repos/base-hw/src/core/util.h @@ -15,9 +15,11 @@ #ifndef _CORE__UTIL_H_ #define _CORE__UTIL_H_ +/* core includes */ +#include #include -namespace Genode { +namespace Core { using Hw::get_page_mask; using Hw::trunc_page; diff --git a/repos/base-hw/src/core/vm_session_component.cc b/repos/base-hw/src/core/vm_session_component.cc index 22449aee6a..74293bb736 100644 --- a/repos/base-hw/src/core/vm_session_component.cc +++ b/repos/base-hw/src/core/vm_session_component.cc @@ -21,7 +21,7 @@ #include #include -using namespace Genode; +using namespace Core; size_t Vm_session_component::_ds_size() { @@ -31,20 +31,19 @@ size_t Vm_session_component::_ds_size() { void Vm_session_component::Vcpu::exception_handler(Signal_context_capability handler) { if (!handler.valid()) { - Genode::warning("invalid signal"); + warning("invalid signal"); return; } if (kobj.constructed()) { - Genode::warning("Cannot register vcpu handler twice"); + warning("Cannot register vcpu handler twice"); return; } unsigned const cpu = location.xpos(); if (!kobj.create(cpu, ds_addr, Capability_space::capid(handler), id)) - Genode::warning("Cannot instantiate vm kernel object, ", - "invalid signal context?"); + warning("Cannot instantiate vm kernel object, invalid signal context?"); } diff --git a/repos/base-hw/src/core/vm_session_component.h b/repos/base-hw/src/core/vm_session_component.h index 09d7206706..48845f3fa2 100644 --- a/repos/base-hw/src/core/vm_session_component.h +++ b/repos/base-hw/src/core/vm_session_component.h @@ -24,18 +24,16 @@ /* base-hw includes */ #include -/* base-hw Core includes */ +/* core includes */ #include #include #include - -/* base Core includes */ #include -namespace Genode { class Vm_session_component; } +namespace Core { class Vm_session_component; } -class Genode::Vm_session_component +class Core::Vm_session_component : private Ram_quota_guard, private Cap_quota_guard, diff --git a/repos/base-hw/src/include/base/internal/native_thread.h b/repos/base-hw/src/include/base/internal/native_thread.h index c2a1e7a4d1..fa412db38e 100644 --- a/repos/base-hw/src/include/base/internal/native_thread.h +++ b/repos/base-hw/src/include/base/internal/native_thread.h @@ -17,15 +17,15 @@ #include #include -namespace Genode { - struct Native_thread; - class Platform_thread; -} +namespace Genode { struct Native_thread; } + + +namespace Core { class Platform_thread; } struct Genode::Native_thread { - Platform_thread *platform_thread; + Core::Platform_thread *platform_thread; Native_capability cap; }; diff --git a/repos/base-hw/src/test/cpu_scheduler/target.mk b/repos/base-hw/src/test/cpu_scheduler/target.mk index f5baeca810..21ac7ad2e7 100644 --- a/repos/base-hw/src/test/cpu_scheduler/target.mk +++ b/repos/base-hw/src/test/cpu_scheduler/target.mk @@ -9,5 +9,7 @@ SRC_CC = main.cc cpu_scheduler.cc INC_DIR += $(REP_DIR)/src/core $(REP_DIR)/src/include $(BASE_DIR)/src/include LIBS = base +REP_INC_DIR += src/core/include + vpath main.cc $(PRG_DIR) vpath %.cc $(REP_DIR)/src/core/kernel diff --git a/repos/base-linux/src/core/core_log_out.cc b/repos/base-linux/src/core/core_log_out.cc index 0a8b1703e8..46909013fe 100644 --- a/repos/base-linux/src/core/core_log_out.cc +++ b/repos/base-linux/src/core/core_log_out.cc @@ -17,4 +17,4 @@ /* Linux syscall bindings */ #include -void Genode::Core_log::out(char const c) { lx_write(1, &c, sizeof(c)); } +void Core::Core_log::out(char const c) { lx_write(1, &c, sizeof(c)); } diff --git a/repos/base-linux/src/core/core_rpc_cap_alloc.cc b/repos/base-linux/src/core/core_rpc_cap_alloc.cc index ea3359ea54..eab7e2a804 100644 --- a/repos/base-linux/src/core/core_rpc_cap_alloc.cc +++ b/repos/base-linux/src/core/core_rpc_cap_alloc.cc @@ -17,7 +17,10 @@ /* base-internal includes */ #include -using namespace Genode; +/* core includes */ +#include + +using namespace Core; Native_capability Rpc_entrypoint::_alloc_rpc_cap(Pd_session &, Native_capability, diff --git a/repos/base-linux/src/core/include/core_region_map.h b/repos/base-linux/src/core/include/core_region_map.h index 92946ef424..98954ef094 100644 --- a/repos/base-linux/src/core/include/core_region_map.h +++ b/repos/base-linux/src/core/include/core_region_map.h @@ -17,10 +17,13 @@ /* base-internal includes */ #include -namespace Genode { class Core_region_map; } +/* core includes */ +#include + +namespace Core { class Core_region_map; } -struct Genode::Core_region_map : Region_map_mmap +struct Core::Core_region_map : Region_map_mmap { Core_region_map(Rpc_entrypoint &) : Region_map_mmap(false) { } }; diff --git a/repos/base-linux/src/core/include/dataspace_component.h b/repos/base-linux/src/core/include/dataspace_component.h index a49e42eafc..c0a013e9f8 100644 --- a/repos/base-linux/src/core/include/dataspace_component.h +++ b/repos/base-linux/src/core/include/dataspace_component.h @@ -19,15 +19,19 @@ #ifndef _CORE__INCLUDE__DATASPACE_COMPONENT_H_ #define _CORE__INCLUDE__DATASPACE_COMPONENT_H_ +/* Genode includes */ #include -#include #include #include /* base-internal includes */ #include -namespace Genode { +/* core includes */ +#include + +namespace Core { + class Dataspace_owner; class Dataspace_component; } @@ -36,10 +40,10 @@ namespace Genode { /** * Deriving classes can own a dataspace to implement conditional behavior */ -class Genode::Dataspace_owner : Interface { }; +class Core::Dataspace_owner : Interface { }; -class Genode::Dataspace_component : public Rpc_object +class Core::Dataspace_component : public Rpc_object { private: diff --git a/repos/base-linux/src/core/include/io_mem_session_component.h b/repos/base-linux/src/core/include/io_mem_session_component.h index 5c8c2bf2f2..3445367501 100644 --- a/repos/base-linux/src/core/include/io_mem_session_component.h +++ b/repos/base-linux/src/core/include/io_mem_session_component.h @@ -22,10 +22,10 @@ /* core includes */ #include -namespace Genode { class Io_mem_session_component; } +namespace Core { class Io_mem_session_component; } -class Genode::Io_mem_session_component : public Rpc_object +class Core::Io_mem_session_component : public Rpc_object { private: diff --git a/repos/base-linux/src/core/include/irq_object.h b/repos/base-linux/src/core/include/irq_object.h index c6aac790f3..c5a3d3d423 100644 --- a/repos/base-linux/src/core/include/irq_object.h +++ b/repos/base-linux/src/core/include/irq_object.h @@ -14,12 +14,16 @@ #ifndef _IRQ_OBJECT_H_ #define _IRQ_OBJECT_H_ +/* Genode includes */ #include -namespace Genode { class Irq_object; }; +/* core includes */ +#include + +namespace Core { class Irq_object; }; -class Genode::Irq_object : public Thread +class Core::Irq_object : public Thread { private: diff --git a/repos/base-linux/src/core/include/irq_session_component.h b/repos/base-linux/src/core/include/irq_session_component.h index cb28ef0ff4..72d319dbc8 100644 --- a/repos/base-linux/src/core/include/irq_session_component.h +++ b/repos/base-linux/src/core/include/irq_session_component.h @@ -14,17 +14,20 @@ #ifndef _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_ #define _CORE__INCLUDE__IRQ_SESSION_COMPONENT_H_ +/* Genode includes */ #include #include #include #include + +/* core includes */ #include -namespace Genode { class Irq_session_component; } +namespace Core { class Irq_session_component; } -class Genode::Irq_session_component : public Rpc_object, - private List::Element +class Core::Irq_session_component : public Rpc_object, + private List::Element { private: diff --git a/repos/base-linux/src/core/include/native_cpu_component.h b/repos/base-linux/src/core/include/native_cpu_component.h index adf2927cc5..12cc9c5192 100644 --- a/repos/base-linux/src/core/include/native_cpu_component.h +++ b/repos/base-linux/src/core/include/native_cpu_component.h @@ -19,14 +19,18 @@ /* Genode includes */ #include -namespace Genode { +/* core includes */ +#include + +namespace Core { + class Cpu_session_component; class Native_cpu_component; } -class Genode::Native_cpu_component : public Rpc_object +class Core::Native_cpu_component : public Rpc_object { private: diff --git a/repos/base-linux/src/core/include/native_pd_component.h b/repos/base-linux/src/core/include/native_pd_component.h index 654d0187e4..22a4c83427 100644 --- a/repos/base-linux/src/core/include/native_pd_component.h +++ b/repos/base-linux/src/core/include/native_pd_component.h @@ -17,15 +17,19 @@ /* Genode includes */ #include -namespace Genode { +/* core includes */ +#include + +namespace Core { + class Dataspace_component; class Pd_session_component; class Native_pd_component; } -class Genode::Native_pd_component : public Rpc_object +class Core::Native_pd_component : public Rpc_object { private: diff --git a/repos/base-linux/src/core/include/pager.h b/repos/base-linux/src/core/include/pager.h index c58d8a0bdd..4e806da244 100644 --- a/repos/base-linux/src/core/include/pager.h +++ b/repos/base-linux/src/core/include/pager.h @@ -20,16 +20,19 @@ #include /* for 'Thread_capability' type */ #include -/* core-local includes */ +/* core includes */ #include -namespace Genode { +namespace Core { + struct Pager_object; struct Pager_entrypoint; + + using Pager_capability = Capability; } -struct Genode::Pager_object +struct Core::Pager_object { Thread_capability _thread_cap { }; Signal_context_capability _sigh { }; @@ -47,7 +50,7 @@ struct Genode::Pager_object }; -struct Genode::Pager_entrypoint +struct Core::Pager_entrypoint { Pager_entrypoint(Rpc_cap_factory &) { } diff --git a/repos/base-linux/src/core/include/platform.h b/repos/base-linux/src/core/include/platform.h index 0cad618cf5..69a35861e1 100644 --- a/repos/base-linux/src/core/include/platform.h +++ b/repos/base-linux/src/core/include/platform.h @@ -19,7 +19,7 @@ #include #include -/* core-local includes */ +/* core includes */ #include #include #include @@ -51,7 +51,7 @@ static unsigned long ram_quota_from_env() } -class Genode::Platform : public Platform_generic +class Core::Platform : public Platform_generic { private: diff --git a/repos/base-linux/src/core/include/platform_pd.h b/repos/base-linux/src/core/include/platform_pd.h index 6e69925082..fd5c522e10 100644 --- a/repos/base-linux/src/core/include/platform_pd.h +++ b/repos/base-linux/src/core/include/platform_pd.h @@ -14,16 +14,21 @@ #ifndef _CORE__INCLUDE__PLATFORM_PD_H_ #define _CORE__INCLUDE__PLATFORM_PD_H_ +/* Genode includes */ #include #include -namespace Genode { +/* core includes */ +#include + +namespace Core { + struct Platform_pd; struct Platform_thread; } -struct Genode::Platform_pd +struct Core::Platform_pd { Platform_pd(Allocator &, char const *) { } diff --git a/repos/base-linux/src/core/include/platform_thread.h b/repos/base-linux/src/core/include/platform_thread.h index 4264b1685d..cd3449f433 100644 --- a/repos/base-linux/src/core/include/platform_thread.h +++ b/repos/base-linux/src/core/include/platform_thread.h @@ -23,7 +23,7 @@ /* core includes */ #include -namespace Genode { class Platform_thread; } +namespace Core { class Platform_thread; } /* @@ -34,7 +34,7 @@ namespace Genode { class Platform_thread; } * turn, we find the exception handler's 'Signal_context_capability'. */ -class Genode::Platform_thread : public List::Element +class Core::Platform_thread : public List::Element { private: diff --git a/repos/base-linux/src/core/include/region_map_component.h b/repos/base-linux/src/core/include/region_map_component.h index aa0bddd726..5d219d1e6b 100644 --- a/repos/base-linux/src/core/include/region_map_component.h +++ b/repos/base-linux/src/core/include/region_map_component.h @@ -25,15 +25,16 @@ #include #include -namespace Genode { +namespace Core { + struct Rm_client; struct Rm_member; class Region_map_component; } -class Genode::Region_map_component : public Rpc_object, - private List::Element +class Core::Region_map_component : public Rpc_object, + private List::Element { private: @@ -74,7 +75,7 @@ class Genode::Region_map_component : public Rpc_object, }; -struct Genode::Rm_client : Pager_object +struct Core::Rm_client : Pager_object { Rm_client(Cpu_session_capability, Thread_capability, Region_map_component &, unsigned long, diff --git a/repos/base-linux/src/core/include/rpc_cap_factory.h b/repos/base-linux/src/core/include/rpc_cap_factory.h index f28c36414d..d42c364a6d 100644 --- a/repos/base-linux/src/core/include/rpc_cap_factory.h +++ b/repos/base-linux/src/core/include/rpc_cap_factory.h @@ -14,12 +14,17 @@ #ifndef _CORE__INCLUDE__RPC_CAP_FACTORY_H_ #define _CORE__INCLUDE__RPC_CAP_FACTORY_H_ +/* Genode includes */ #include #include -namespace Genode { class Rpc_cap_factory; } +/* core includes */ +#include -class Genode::Rpc_cap_factory +namespace Core { class Rpc_cap_factory; } + + +class Core::Rpc_cap_factory { private: diff --git a/repos/base-linux/src/core/include/util.h b/repos/base-linux/src/core/include/util.h index 538527b7f5..5f725add7c 100644 --- a/repos/base-linux/src/core/include/util.h +++ b/repos/base-linux/src/core/include/util.h @@ -17,4 +17,7 @@ /* base-internal includes */ #include +/* core includes */ +#include + #endif /* _CORE__INCLUDE__UTIL_H_ */ diff --git a/repos/base-linux/src/core/native_cpu_component.cc b/repos/base-linux/src/core/native_cpu_component.cc index 08910d953c..0a083e997c 100644 --- a/repos/base-linux/src/core/native_cpu_component.cc +++ b/repos/base-linux/src/core/native_cpu_component.cc @@ -11,14 +11,14 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* core-local includes */ +/* core includes */ #include #include /* base-internal includes */ #include -using namespace Genode; +using namespace Core; void Native_cpu_component::thread_id(Thread_capability thread_cap, int pid, int tid) diff --git a/repos/base-linux/src/core/native_pd_component.cc b/repos/base-linux/src/core/native_pd_component.cc index 7602552c07..b16511a23f 100644 --- a/repos/base-linux/src/core/native_pd_component.cc +++ b/repos/base-linux/src/core/native_pd_component.cc @@ -13,11 +13,10 @@ /* Genode includes */ #include -#include #include #include -/* core-local includes */ +/* core includes */ #include #include @@ -28,7 +27,7 @@ /* Linux includes */ #include -using namespace Genode; +using namespace Core; /*************** @@ -122,7 +121,7 @@ void Native_pd_component::_start(Dataspace_component &ds) * the dataspace content into a temporary file whose path is passed to * 'execve()'. */ - if (strcmp(filename, "") == 0) { + if (Genode::strcmp(filename, "") == 0) { filename = tmp_filename; @@ -174,7 +173,7 @@ void Native_pd_component::_start(Dataspace_component &ds) _pid = lx_create_process((int (*)())_exec_child, _execve_args_and_stack().initial_sp()); - if (strcmp(filename, tmp_filename) == 0) + if (Genode::strcmp(filename, tmp_filename) == 0) lx_unlink(filename); } diff --git a/repos/base-linux/src/core/platform.cc b/repos/base-linux/src/core/platform.cc index da2251bc69..4dd5fa4181 100644 --- a/repos/base-linux/src/core/platform.cc +++ b/repos/base-linux/src/core/platform.cc @@ -27,7 +27,7 @@ /* Linux includes */ #include -using namespace Genode; +using namespace Core; /** diff --git a/repos/base-linux/src/core/platform_thread.cc b/repos/base-linux/src/core/platform_thread.cc index 219ea4d20b..d909017eeb 100644 --- a/repos/base-linux/src/core/platform_thread.cc +++ b/repos/base-linux/src/core/platform_thread.cc @@ -14,13 +14,12 @@ /* Genode includes */ #include #include -#include -/* local includes */ -#include "platform_thread.h" +/* core includes */ +#include #include -using namespace Genode; +using namespace Core; typedef Token Tid_token; @@ -77,7 +76,7 @@ Platform_thread::Registry &Platform_thread::_registry() Platform_thread::Platform_thread(size_t, const char *name, unsigned, Affinity::Location, addr_t) { - copy_cstring(_name, name, min(sizeof(_name), strlen(name) + 1)); + copy_cstring(_name, name, min(sizeof(_name), Genode::strlen(name) + 1)); _registry().insert(this); } diff --git a/repos/base-linux/src/core/ram_dataspace_support.cc b/repos/base-linux/src/core/ram_dataspace_support.cc index f4f3126b02..8ff4103c6e 100644 --- a/repos/base-linux/src/core/ram_dataspace_support.cc +++ b/repos/base-linux/src/core/ram_dataspace_support.cc @@ -28,7 +28,7 @@ #include -using namespace Genode; +using namespace Core; static int ram_ds_cnt = 0; /* counter for creating unique dataspace IDs */ diff --git a/repos/base-linux/src/core/rom_session_component.cc b/repos/base-linux/src/core/rom_session_component.cc index fad600f1a3..e9f4ce0d62 100644 --- a/repos/base-linux/src/core/rom_session_component.cc +++ b/repos/base-linux/src/core/rom_session_component.cc @@ -30,7 +30,7 @@ /* local includes */ #include "rom_session_component.h" -using namespace Genode; +using namespace Core; /** diff --git a/repos/base-linux/src/core/rpc_cap_factory_linux.cc b/repos/base-linux/src/core/rpc_cap_factory_linux.cc index 09bf63fe62..84a37a8c69 100644 --- a/repos/base-linux/src/core/rpc_cap_factory_linux.cc +++ b/repos/base-linux/src/core/rpc_cap_factory_linux.cc @@ -14,7 +14,7 @@ /* core includes */ #include -using namespace Genode; +using namespace Core; Native_capability Rpc_cap_factory::alloc(Native_capability) diff --git a/repos/base-linux/src/core/spec/linux/dataspace_component.cc b/repos/base-linux/src/core/spec/linux/dataspace_component.cc index a869e4a12e..54f50407ee 100644 --- a/repos/base-linux/src/core/spec/linux/dataspace_component.cc +++ b/repos/base-linux/src/core/spec/linux/dataspace_component.cc @@ -29,7 +29,7 @@ /* local includes */ #include "dataspace_component.h" -using namespace Genode; +using namespace Core; Linux_dataspace::Filename Dataspace_component::_file_name(const char *args) @@ -54,7 +54,7 @@ Linux_dataspace::Filename Dataspace_component::_file_name(const char *args) size_t Dataspace_component::_file_size() { - uint64_t size = 0; + Genode::uint64_t size = 0; if (lx_stat_size(_fname.buf, size) < 0) throw Service_denied(); diff --git a/repos/base-linux/src/core/spec/linux/io_mem_session_component.cc b/repos/base-linux/src/core/spec/linux/io_mem_session_component.cc index 244ece4d86..f56f76f8ca 100644 --- a/repos/base-linux/src/core/spec/linux/io_mem_session_component.cc +++ b/repos/base-linux/src/core/spec/linux/io_mem_session_component.cc @@ -12,17 +12,16 @@ */ /* Genode includes */ -#include #include #include /* base-internal includes */ #include -/* core-local includes */ +/* core includes */ #include -using namespace Genode; +using namespace Core; size_t Io_mem_session_component::get_arg_size(const char *) diff --git a/repos/base-linux/src/core/spec/linux/io_port_session_component.cc b/repos/base-linux/src/core/spec/linux/io_port_session_component.cc index 25bc3ba57e..2be691e645 100644 --- a/repos/base-linux/src/core/spec/linux/io_port_session_component.cc +++ b/repos/base-linux/src/core/spec/linux/io_port_session_component.cc @@ -13,7 +13,7 @@ #include -using namespace Genode; +using namespace Core; Io_port_session_component::Io_port_session_component(Range_allocator &io_port_alloc, diff --git a/repos/base-linux/src/core/spec/linux/irq_session_component.cc b/repos/base-linux/src/core/spec/linux/irq_session_component.cc index 5b83f6eb72..fc17abaea1 100644 --- a/repos/base-linux/src/core/spec/linux/irq_session_component.cc +++ b/repos/base-linux/src/core/spec/linux/irq_session_component.cc @@ -14,14 +14,13 @@ */ /* Genode includes */ -#include #include #include -/* core-local includes */ +/* core includes */ #include -using namespace Genode; +using namespace Core; Irq_session_component::Irq_session_component(Range_allocator &, const char *) diff --git a/repos/base-linux/src/core/spec/linux/platform_services.cc b/repos/base-linux/src/core/spec/linux/platform_services.cc index 4d579c89d4..700f0c1248 100644 --- a/repos/base-linux/src/core/spec/linux/platform_services.cc +++ b/repos/base-linux/src/core/spec/linux/platform_services.cc @@ -19,8 +19,8 @@ #include -void Genode::platform_add_local_services(Rpc_entrypoint &, - Sliced_heap &, - Registry &, - Trace::Source_registry &) +void Core::platform_add_local_services(Rpc_entrypoint &, + Sliced_heap &, + Registry &, + Trace::Source_registry &) { } diff --git a/repos/base-linux/src/core/spec/pc/dataspace_component.cc b/repos/base-linux/src/core/spec/pc/dataspace_component.cc index 39f3645a36..0fccdef262 100644 --- a/repos/base-linux/src/core/spec/pc/dataspace_component.cc +++ b/repos/base-linux/src/core/spec/pc/dataspace_component.cc @@ -25,10 +25,10 @@ #include #include -/* local includes */ -#include "dataspace_component.h" +/* core includes */ +#include -using namespace Genode; +using namespace Core; Linux_dataspace::Filename Dataspace_component::_file_name(const char *args) @@ -51,9 +51,9 @@ Linux_dataspace::Filename Dataspace_component::_file_name(const char *args) } -Genode::size_t Dataspace_component::_file_size() +size_t Dataspace_component::_file_size() { - uint64_t size = 0; + Genode::uint64_t size = 0; if (lx_stat_size(_fname.buf, size) < 0) throw Service_denied(); diff --git a/repos/base-linux/src/core/spec/pc/io_mem_session_component.cc b/repos/base-linux/src/core/spec/pc/io_mem_session_component.cc index 3dcaeef938..1510a23d2c 100644 --- a/repos/base-linux/src/core/spec/pc/io_mem_session_component.cc +++ b/repos/base-linux/src/core/spec/pc/io_mem_session_component.cc @@ -12,15 +12,14 @@ */ /* Genode includes */ -#include #include #include #include -/* core-local includes */ +/* core includes */ #include -using namespace Genode; +using namespace Core; size_t Io_mem_session_component::get_arg_size(const char *args) diff --git a/repos/base-linux/src/core/spec/pc/io_port_session_component.cc b/repos/base-linux/src/core/spec/pc/io_port_session_component.cc index bb772b0eb5..2708941ac6 100644 --- a/repos/base-linux/src/core/spec/pc/io_port_session_component.cc +++ b/repos/base-linux/src/core/spec/pc/io_port_session_component.cc @@ -14,7 +14,7 @@ #include #include -using namespace Genode; +using namespace Core; Io_port_session_component::Io_port_session_component(Range_allocator &io_port_alloc, diff --git a/repos/base-linux/src/core/spec/pc/irq_session_component.cc b/repos/base-linux/src/core/spec/pc/irq_session_component.cc index 3f4dd7de43..ffd1032e9c 100644 --- a/repos/base-linux/src/core/spec/pc/irq_session_component.cc +++ b/repos/base-linux/src/core/spec/pc/irq_session_component.cc @@ -13,15 +13,14 @@ */ /* Genode includes */ -#include #include -/* core-local includes */ +/* core includes */ #include #include #include -using namespace Genode; +using namespace Core; Irq_session_component::Irq_session_component(Range_allocator &, const char *args) diff --git a/repos/base-linux/src/core/spec/pc/platform_services.cc b/repos/base-linux/src/core/spec/pc/platform_services.cc index a3334c29ee..2a9dae0ddd 100644 --- a/repos/base-linux/src/core/spec/pc/platform_services.cc +++ b/repos/base-linux/src/core/spec/pc/platform_services.cc @@ -22,10 +22,13 @@ #include #include -void Genode::platform_add_local_services(Rpc_entrypoint &, - Sliced_heap &md, - Registry ®, - Trace::Source_registry &) +using namespace Core; + + +void Core::platform_add_local_services(Rpc_entrypoint &, + Sliced_heap &md, + Registry ®, + Core::Trace::Source_registry &) { if (!lx_iopl(3)) { static Io_port_root io_port_root(*core_env().pd_session(), diff --git a/repos/base-nova/src/core/core_log_out.cc b/repos/base-nova/src/core/core_log_out.cc index 0571e83c16..7596abbebe 100644 --- a/repos/base-nova/src/core/core_log_out.cc +++ b/repos/base-nova/src/core/core_log_out.cc @@ -18,7 +18,7 @@ #include #include -void Genode::Core_log::out(char const c) +void Core::Core_log::out(char const c) { enum { CLOCK = 0, BAUDRATE = 115200 }; diff --git a/repos/base-nova/src/core/core_region_map.cc b/repos/base-nova/src/core/core_region_map.cc index 7bacb30091..83e9b72c8e 100644 --- a/repos/base-nova/src/core/core_region_map.cc +++ b/repos/base-nova/src/core/core_region_map.cc @@ -11,9 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include @@ -23,7 +20,8 @@ /* NOVA includes */ #include -using namespace Genode; +using namespace Core; + /** * Map dataspace core-locally diff --git a/repos/base-nova/src/core/core_rpc_cap_alloc.cc b/repos/base-nova/src/core/core_rpc_cap_alloc.cc index 395cabf125..039eb24bff 100644 --- a/repos/base-nova/src/core/core_rpc_cap_alloc.cc +++ b/repos/base-nova/src/core/core_rpc_cap_alloc.cc @@ -14,12 +14,12 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ #include #include #include -using namespace Genode; +using namespace Core; static Rpc_cap_factory &rpc_cap_factory() diff --git a/repos/base-nova/src/core/include/ipc_pager.h b/repos/base-nova/src/core/include/ipc_pager.h index 98d9d5307d..090be57c27 100644 --- a/repos/base-nova/src/core/include/ipc_pager.h +++ b/repos/base-nova/src/core/include/ipc_pager.h @@ -19,41 +19,41 @@ #include #include -/* core-local includes */ +/* core includes */ #include /* NOVA includes */ #include -namespace Genode { class Ipc_pager; } +namespace Core { class Ipc_pager; } -namespace Genode { enum { PAGE_SIZE_LOG2 = 12 }; } +namespace Core { enum { PAGE_SIZE_LOG2 = 12 }; } -static inline Nova::Rights nova_map_rights(Genode::Mapping const &mapping) +static inline Nova::Rights nova_map_rights(Core::Mapping const &mapping) { return Nova::Rights(true, mapping.writeable, mapping.executable); } -static inline Nova::Mem_crd nova_src_crd(Genode::Mapping const &mapping) +static inline Nova::Mem_crd nova_src_crd(Core::Mapping const &mapping) { - return Nova::Mem_crd(mapping.src_addr >> Genode::PAGE_SIZE_LOG2, - mapping.size_log2 - Genode::PAGE_SIZE_LOG2, + return Nova::Mem_crd(mapping.src_addr >> Core::PAGE_SIZE_LOG2, + mapping.size_log2 - Core::PAGE_SIZE_LOG2, nova_map_rights(mapping)); } -static inline Nova::Mem_crd nova_dst_crd(Genode::Mapping const &mapping) +static inline Nova::Mem_crd nova_dst_crd(Core::Mapping const &mapping) { - return Nova::Mem_crd(mapping.dst_addr >> Genode::PAGE_SIZE_LOG2, - mapping.size_log2 - Genode::PAGE_SIZE_LOG2, + return Nova::Mem_crd(mapping.dst_addr >> Core::PAGE_SIZE_LOG2, + mapping.size_log2 - Core::PAGE_SIZE_LOG2, nova_map_rights(mapping)); } -class Genode::Ipc_pager +class Core::Ipc_pager { private: diff --git a/repos/base-nova/src/core/include/irq_object.h b/repos/base-nova/src/core/include/irq_object.h index fbdce58f78..5dd118a94c 100644 --- a/repos/base-nova/src/core/include/irq_object.h +++ b/repos/base-nova/src/core/include/irq_object.h @@ -15,10 +15,13 @@ #include /* Gsi_flags */ -namespace Genode { class Irq_object; class Irq_args; } +/* core includes */ +#include + +namespace Core { class Irq_object; class Irq_args; } -class Genode::Irq_object +class Core::Irq_object { private: diff --git a/repos/base-nova/src/core/include/map_local.h b/repos/base-nova/src/core/include/map_local.h index b8ee65928f..a19afa4d79 100644 --- a/repos/base-nova/src/core/include/map_local.h +++ b/repos/base-nova/src/core/include/map_local.h @@ -20,7 +20,7 @@ /* core includes */ #include -namespace Genode { +namespace Core { /** * Map pages locally within core diff --git a/repos/base-nova/src/core/include/native_cpu_component.h b/repos/base-nova/src/core/include/native_cpu_component.h index 2a2ea83677..df1291fcd4 100644 --- a/repos/base-nova/src/core/include/native_cpu_component.h +++ b/repos/base-nova/src/core/include/native_cpu_component.h @@ -18,15 +18,18 @@ #include #include -namespace Genode { +/* core includes */ +#include + +namespace Core { class Cpu_session_component; class Native_cpu_component; } -class Genode::Native_cpu_component : public Rpc_object +class Core::Native_cpu_component : public Rpc_object { private: diff --git a/repos/base-nova/src/core/include/native_pd_component.h b/repos/base-nova/src/core/include/native_pd_component.h index 98c1fcdde9..93836c0c73 100644 --- a/repos/base-nova/src/core/include/native_pd_component.h +++ b/repos/base-nova/src/core/include/native_pd_component.h @@ -17,17 +17,17 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ #include -namespace Genode { +namespace Core { class Pd_session_component; class Native_pd_component; } -class Genode::Native_pd_component : public Rpc_object +class Core::Native_pd_component : public Rpc_object { private: diff --git a/repos/base-nova/src/core/include/nova_util.h b/repos/base-nova/src/core/include/nova_util.h index f5dca5ca15..5abb027133 100644 --- a/repos/base-nova/src/core/include/nova_util.h +++ b/repos/base-nova/src/core/include/nova_util.h @@ -16,15 +16,14 @@ #ifndef _CORE__INCLUDE__NOVA_UTIL_H_ #define _CORE__INCLUDE__NOVA_UTIL_H_ -/* Genode includes */ -#include - /* NOVA includes */ #include -/* local includes */ +/* core includes */ +#include #include + /** * Return boot CPU number. It is required if threads in core should be placed * on the same CPU as the main thread. @@ -221,7 +220,7 @@ inline void unmap_local(Nova::Utcb &, Genode::addr_t start, template -inline Nova::uint8_t syscall_retry(Genode::Pager_object &pager, FUNC func) +inline Nova::uint8_t syscall_retry(Core::Pager_object &pager, FUNC func) { Nova::uint8_t res; do { @@ -231,7 +230,7 @@ inline Nova::uint8_t syscall_retry(Genode::Pager_object &pager, FUNC func) return res; } -inline Nova::uint8_t async_map(Genode::Pager_object &pager, +inline Nova::uint8_t async_map(Core::Pager_object &pager, Genode::addr_t const source_pd, Genode::addr_t const target_pd, Nova::Obj_crd const &source_initial_caps, @@ -251,7 +250,7 @@ inline Nova::uint8_t async_map(Genode::Pager_object &pager, }); } -inline Nova::uint8_t map_vcpu_portals(Genode::Pager_object &pager, +inline Nova::uint8_t map_vcpu_portals(Core::Pager_object &pager, Genode::addr_t const source_exc_base, Genode::addr_t const target_exc_base, Nova::Utcb &utcb, @@ -267,7 +266,7 @@ inline Nova::uint8_t map_vcpu_portals(Genode::Pager_object &pager, source_initial_caps, target_initial_caps, utcb); } -inline Nova::uint8_t map_pagefault_portal(Genode::Pager_object &pager, +inline Nova::uint8_t map_pagefault_portal(Core::Pager_object &pager, Genode::addr_t const source_exc_base, Genode::addr_t const target_exc_base, Genode::addr_t const target_pd, @@ -276,7 +275,7 @@ inline Nova::uint8_t map_pagefault_portal(Genode::Pager_object &pager, using Nova::Obj_crd; using Nova::PT_SEL_PAGE_FAULT; - Genode::addr_t const source_pd = Genode::platform_specific().core_pd_sel(); + Genode::addr_t const source_pd = Core::platform_specific().core_pd_sel(); Obj_crd const source_initial_caps(source_exc_base + PT_SEL_PAGE_FAULT, 0); Obj_crd const target_initial_caps(target_exc_base + PT_SEL_PAGE_FAULT, 0); diff --git a/repos/base-nova/src/core/include/pager.h b/repos/base-nova/src/core/include/pager.h index f29df601ef..f2aece3fae 100644 --- a/repos/base-nova/src/core/include/pager.h +++ b/repos/base-nova/src/core/include/pager.h @@ -25,21 +25,23 @@ /* NOVA includes */ #include -/* core-local includes */ +/* core includes */ #include #include -namespace Genode { +namespace Core { typedef Cpu_session::Thread_creation_failed Invalid_thread; class Pager_entrypoint; class Pager_object; class Exception_handlers; + + using Pager_capability = Capability; } -class Genode::Exception_handlers +class Core::Exception_handlers { private: @@ -56,7 +58,7 @@ class Genode::Exception_handlers }; -class Genode::Pager_object : public Object_pool::Entry +class Core::Pager_object : public Object_pool::Entry { private: @@ -168,7 +170,7 @@ class Genode::Pager_object : public Object_pool::Entry Pager_object(Cpu_session_capability cpu_session_cap, Thread_capability thread_cap, unsigned long badge, Affinity::Location location, - Genode::Session_label const &, + Session_label const &, Cpu_session::Name const &); virtual ~Pager_object(); @@ -176,7 +178,7 @@ class Genode::Pager_object : public Object_pool::Entry unsigned long badge() const { return _badge; } void reset_badge() { - Genode::Mutex::Guard guard(_state_lock); + Mutex::Guard guard(_state_lock); _badge = 0; } @@ -381,7 +383,7 @@ class Genode::Pager_object : public Object_pool::Entry * For a paging entry point can hold only one activation. So, paging is * strictly serialized for one entry point. */ -class Genode::Pager_entrypoint : public Object_pool +class Core::Pager_entrypoint : public Object_pool { public: diff --git a/repos/base-nova/src/core/include/platform.h b/repos/base-nova/src/core/include/platform.h index c38a3925f0..b914a81f85 100644 --- a/repos/base-nova/src/core/include/platform.h +++ b/repos/base-nova/src/core/include/platform.h @@ -20,10 +20,10 @@ #include #include -namespace Genode { class Platform; } +namespace Core { class Platform; } -class Genode::Platform : public Platform_generic +class Core::Platform : public Platform_generic { public: diff --git a/repos/base-nova/src/core/include/platform_pd.h b/repos/base-nova/src/core/include/platform_pd.h index 179d1157d0..846a224770 100644 --- a/repos/base-nova/src/core/include/platform_pd.h +++ b/repos/base-nova/src/core/include/platform_pd.h @@ -18,14 +18,14 @@ #include #include -namespace Genode { +namespace Core { class Platform_thread; class Platform_pd; } -class Genode::Platform_pd : public Address_space +class Core::Platform_pd : public Address_space { private: diff --git a/repos/base-nova/src/core/include/platform_thread.h b/repos/base-nova/src/core/include/platform_thread.h index 102cfe1dcd..a572e80abe 100644 --- a/repos/base-nova/src/core/include/platform_thread.h +++ b/repos/base-nova/src/core/include/platform_thread.h @@ -28,14 +28,14 @@ #include #include -namespace Genode { +namespace Core { class Platform_pd; class Platform_thread; } -class Genode::Platform_thread +class Core::Platform_thread { private: diff --git a/repos/base-nova/src/core/include/rpc_cap_factory.h b/repos/base-nova/src/core/include/rpc_cap_factory.h index 25179eecfd..78b37267cd 100644 --- a/repos/base-nova/src/core/include/rpc_cap_factory.h +++ b/repos/base-nova/src/core/include/rpc_cap_factory.h @@ -19,18 +19,20 @@ #include #include #include -#include -namespace Genode { class Rpc_cap_factory; } +/* core includes */ +#include + +namespace Core { class Rpc_cap_factory; } -class Genode::Rpc_cap_factory +class Core::Rpc_cap_factory { private: struct Cap_object : List::Element { - Genode::addr_t _cap_sel; + addr_t _cap_sel; Cap_object(addr_t cap_sel) : _cap_sel(cap_sel) {} }; diff --git a/repos/base-nova/src/core/include/signal_broker.h b/repos/base-nova/src/core/include/signal_broker.h index b61ee82e9f..89edffdbae 100644 --- a/repos/base-nova/src/core/include/signal_broker.h +++ b/repos/base-nova/src/core/include/signal_broker.h @@ -20,16 +20,16 @@ /* NOVA includes */ #include -/* core-local includes */ +/* core includes */ #include #include #include #include -namespace Genode { class Signal_broker; } +namespace Core { class Signal_broker; } -class Genode::Signal_broker +class Core::Signal_broker { private: diff --git a/repos/base-nova/src/core/include/signal_source_component.h b/repos/base-nova/src/core/include/signal_source_component.h index 5eccabb9e6..65f9042241 100644 --- a/repos/base-nova/src/core/include/signal_source_component.h +++ b/repos/base-nova/src/core/include/signal_source_component.h @@ -14,18 +14,21 @@ #ifndef _CORE__INCLUDE__SIGNAL_SOURCE_COMPONENT_H_ #define _CORE__INCLUDE__SIGNAL_SOURCE_COMPONENT_H_ +/* Genode includes */ #include + +/* core includes */ #include #include -namespace Genode { +namespace Core { class Signal_context_component; class Signal_source_component; } -struct Genode::Signal_context_component : Object_pool::Entry +struct Core::Signal_context_component : Object_pool::Entry { Signal_context_component(Signal_context_capability cap) : Object_pool::Entry(cap) { } @@ -34,8 +37,8 @@ struct Genode::Signal_context_component : Object_pool: }; -class Genode::Signal_source_component : public Rpc_object +class Core::Signal_source_component : public Rpc_object { private: diff --git a/repos/base-nova/src/core/include/util.h b/repos/base-nova/src/core/include/util.h index a504ecbe22..9bb1c50969 100644 --- a/repos/base-nova/src/core/include/util.h +++ b/repos/base-nova/src/core/include/util.h @@ -16,13 +16,12 @@ /* Genode includes */ #include -#include /* base-internal includes */ #include #include -namespace Genode { +namespace Core { constexpr size_t get_super_page_size_log2() { return 22; } constexpr size_t get_super_page_size() { return 1 << get_super_page_size_log2(); } diff --git a/repos/base-nova/src/core/include/vm_session_component.h b/repos/base-nova/src/core/include/vm_session_component.h index c0fb988d46..249f041d13 100644 --- a/repos/base-nova/src/core/include/vm_session_component.h +++ b/repos/base-nova/src/core/include/vm_session_component.h @@ -22,10 +22,13 @@ #include #include -namespace Genode { class Vm_session_component; } +/* core includes */ +#include + +namespace Core { class Vm_session_component; } -class Genode::Vm_session_component +class Core::Vm_session_component : private Ram_quota_guard, private Cap_quota_guard, diff --git a/repos/base-nova/src/core/io_mem_session_support.cc b/repos/base-nova/src/core/io_mem_session_support.cc index 92f7cc6b3b..287a3ac2a5 100644 --- a/repos/base-nova/src/core/io_mem_session_support.cc +++ b/repos/base-nova/src/core/io_mem_session_support.cc @@ -18,7 +18,8 @@ #include #include -using namespace Genode; +using namespace Core; + void Io_mem_session_component::_unmap_local(addr_t, size_t) { } diff --git a/repos/base-nova/src/core/ipc_pager.cc b/repos/base-nova/src/core/ipc_pager.cc index 7ca36b1a75..92f1419494 100644 --- a/repos/base-nova/src/core/ipc_pager.cc +++ b/repos/base-nova/src/core/ipc_pager.cc @@ -14,14 +14,13 @@ /* Genode includes */ #include -/* Core includes */ +/* core includes */ #include /* NOVA includes */ #include - -using namespace Genode; +using namespace Core; void Mapping::prepare_map_operation() const { } diff --git a/repos/base-nova/src/core/irq_session_component.cc b/repos/base-nova/src/core/irq_session_component.cc index 2d98d3f5bc..be8dc9c989 100644 --- a/repos/base-nova/src/core/irq_session_component.cc +++ b/repos/base-nova/src/core/irq_session_component.cc @@ -13,9 +13,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include @@ -25,7 +22,7 @@ #include #include -using namespace Genode; +using namespace Core; static bool irq_ctrl(addr_t irq_sel, addr_t &msi_addr, addr_t &msi_data, diff --git a/repos/base-nova/src/core/native_cpu_component.cc b/repos/base-nova/src/core/native_cpu_component.cc index f40b38e385..a809117365 100644 --- a/repos/base-nova/src/core/native_cpu_component.cc +++ b/repos/base-nova/src/core/native_cpu_component.cc @@ -11,14 +11,11 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - -/* core-local includes */ +/* core includes */ #include #include -using namespace Genode; +using namespace Core; void Native_cpu_component::thread_type(Thread_capability thread_cap, @@ -43,7 +40,7 @@ Native_cpu_component::Native_cpu_component(Cpu_session_component &cpu_session, c } -Genode::Native_cpu_component::~Native_cpu_component() +Core::Native_cpu_component::~Native_cpu_component() { _thread_ep.dissolve(this); } diff --git a/repos/base-nova/src/core/native_pd_component.cc b/repos/base-nova/src/core/native_pd_component.cc index 5de829aaee..79eb442af8 100644 --- a/repos/base-nova/src/core/native_pd_component.cc +++ b/repos/base-nova/src/core/native_pd_component.cc @@ -11,13 +11,12 @@ * under the terms of the GNU Affero General Public License version 3. */ +/* core includes */ #include #include - -/* core-local includes */ #include -using namespace Genode; +using namespace Core; Native_capability Native_pd_component::alloc_rpc_cap(Native_capability ep, diff --git a/repos/base-nova/src/core/pager.cc b/repos/base-nova/src/core/pager.cc index 231d4c918e..95b38bb372 100644 --- a/repos/base-nova/src/core/pager.cc +++ b/repos/base-nova/src/core/pager.cc @@ -19,7 +19,7 @@ /* base-internal includes */ #include -/* core-local includes */ +/* core includes */ #include #include #include @@ -34,7 +34,7 @@ static bool verbose_oom = false; -using namespace Genode; +using namespace Core; using namespace Nova; diff --git a/repos/base-nova/src/core/pd_session_support.cc b/repos/base-nova/src/core/pd_session_support.cc index 344a623d15..6bd0a71529 100644 --- a/repos/base-nova/src/core/pd_session_support.cc +++ b/repos/base-nova/src/core/pd_session_support.cc @@ -11,11 +11,11 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* core */ +/* core includes */ #include #include -using namespace Genode; +using namespace Core; bool Pd_session_component::assign_pci(addr_t pci_config_memory, uint16_t bdf) diff --git a/repos/base-nova/src/core/platform.cc b/repos/base-nova/src/core/platform.cc index e3e5a6e258..69fd20a9a9 100644 --- a/repos/base-nova/src/core/platform.cc +++ b/repos/base-nova/src/core/platform.cc @@ -40,7 +40,7 @@ #include #include -using namespace Genode; +using namespace Core; using namespace Nova; @@ -280,7 +280,7 @@ static Affinity::Space setup_affinity_space(Hip const &hip) { unsigned cpus = 0; unsigned ids_thread = 0; - Genode::Bit_array<1 << (sizeof(Hip::Cpu_desc::thread) * 8)> threads; + Bit_array<1 << (sizeof(Hip::Cpu_desc::thread) * 8)> threads; hip.for_each_enabled_cpu([&](Hip::Cpu_desc const &cpu, unsigned) { cpus ++; @@ -1009,7 +1009,7 @@ bool Mapped_mem_allocator::_map_local(addr_t virt_addr, addr_t phys_addr, size_t { /* platform_specific()->core_pd_sel() deadlocks if called from platform constructor */ Hip const &hip = *(Hip const *)__initial_sp; - Genode::addr_t const core_pd_sel = hip.sel_exc; + addr_t const core_pd_sel = hip.sel_exc; map_local(core_pd_sel, *(Utcb *)Thread::myself()->utcb(), phys_addr, diff --git a/repos/base-nova/src/core/platform_pd.cc b/repos/base-nova/src/core/platform_pd.cc index 705889e8e1..70ae4d0fa2 100644 --- a/repos/base-nova/src/core/platform_pd.cc +++ b/repos/base-nova/src/core/platform_pd.cc @@ -12,20 +12,15 @@ */ /* Genode includes */ -#include #include /* core includes */ #include #include -using namespace Genode; +using namespace Core; -/*************************** - ** Public object members ** - ***************************/ - bool Platform_pd::bind_thread(Platform_thread &thread) { thread.bind_to_pd(this, _thread_cnt == 0); @@ -48,7 +43,8 @@ void Platform_pd::assign_parent(Native_capability parent) Platform_pd::Platform_pd(Allocator &, char const *label, signed, bool) -: _thread_cnt(0), _pd_sel(cap_map().insert()), _label(label) +: + _thread_cnt(0), _pd_sel(cap_map().insert()), _label(label) { if (_pd_sel == Native_thread::INVALID_INDEX) { error("platform pd creation failed "); diff --git a/repos/base-nova/src/core/platform_services.cc b/repos/base-nova/src/core/platform_services.cc index 94b42c59dd..f0df7a79a5 100644 --- a/repos/base-nova/src/core/platform_services.cc +++ b/repos/base-nova/src/core/platform_services.cc @@ -20,10 +20,10 @@ /* * Add x86 specific services */ -void Genode::platform_add_local_services(Rpc_entrypoint &ep, - Sliced_heap &heap, - Registry &services, - Trace::Source_registry &trace_sources) +void Core::platform_add_local_services(Rpc_entrypoint &ep, + Sliced_heap &heap, + Registry &services, + Trace::Source_registry &trace_sources) { static Vm_root vm_root(ep, heap, core_env().ram_allocator(), core_env().local_rm(), trace_sources); diff --git a/repos/base-nova/src/core/platform_thread.cc b/repos/base-nova/src/core/platform_thread.cc index dede726d2e..3aa8c095db 100644 --- a/repos/base-nova/src/core/platform_thread.cc +++ b/repos/base-nova/src/core/platform_thread.cc @@ -13,9 +13,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include @@ -31,7 +28,7 @@ #include #include -using namespace Genode; +using namespace Core; static uint8_t map_thread_portals(Pager_object &pager, diff --git a/repos/base-nova/src/core/ram_dataspace_support.cc b/repos/base-nova/src/core/ram_dataspace_support.cc index a850892905..fbc0cb1c62 100644 --- a/repos/base-nova/src/core/ram_dataspace_support.cc +++ b/repos/base-nova/src/core/ram_dataspace_support.cc @@ -23,7 +23,7 @@ /* NOVA includes */ #include -using namespace Genode; +using namespace Core; void Ram_dataspace_factory::_revoke_ram_ds(Dataspace_component &) { } diff --git a/repos/base-nova/src/core/rpc_cap_factory.cc b/repos/base-nova/src/core/rpc_cap_factory.cc index d929b7aac4..8e77e6611d 100644 --- a/repos/base-nova/src/core/rpc_cap_factory.cc +++ b/repos/base-nova/src/core/rpc_cap_factory.cc @@ -11,14 +11,14 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* core-local includes */ +/* core includes */ #include #include /* NOVA includes */ #include -using namespace Genode; +using namespace Core; Native_capability Rpc_cap_factory::alloc(Native_capability ep, addr_t entry, addr_t mtd) diff --git a/repos/base-nova/src/core/spec/x86_32/pager.cc b/repos/base-nova/src/core/spec/x86_32/pager.cc index e0bb2652c4..f70b62162e 100644 --- a/repos/base-nova/src/core/spec/x86_32/pager.cc +++ b/repos/base-nova/src/core/spec/x86_32/pager.cc @@ -11,13 +11,13 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Core includes */ +/* core includes */ #include /* NOVA includes */ #include -using namespace Genode; +using namespace Core; void Pager_object::_copy_state_from_utcb(Nova::Utcb const &utcb) { diff --git a/repos/base-nova/src/core/spec/x86_64/pager.cc b/repos/base-nova/src/core/spec/x86_64/pager.cc index 68b7ad5559..fd675e2614 100644 --- a/repos/base-nova/src/core/spec/x86_64/pager.cc +++ b/repos/base-nova/src/core/spec/x86_64/pager.cc @@ -11,13 +11,13 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Core includes */ +/* core includes */ #include /* NOVA includes */ #include -using namespace Genode; +using namespace Core; void Pager_object::_copy_state_from_utcb(Nova::Utcb const &utcb) { diff --git a/repos/base-nova/src/core/thread_start.cc b/repos/base-nova/src/core/thread_start.cc index e600464c91..062b9edda2 100644 --- a/repos/base-nova/src/core/thread_start.cc +++ b/repos/base-nova/src/core/thread_start.cc @@ -15,7 +15,6 @@ /* Genode includes */ #include -#include /* base-internal includes */ #include @@ -28,7 +27,7 @@ #include #include -using namespace Genode; +using namespace Core; void Thread::_init_platform_thread(size_t, Type type) @@ -116,9 +115,9 @@ void Thread::start() throw Cpu_session::Thread_creation_failed(); } - struct Core_trace_source : public Trace::Source::Info_accessor, - private Trace::Control, - private Trace::Source + struct Core_trace_source : public Core::Trace::Source::Info_accessor, + private Core::Trace::Control, + private Core::Trace::Source { Thread &thread; @@ -137,15 +136,15 @@ void Thread::start() Trace::Execution_time(ec_time, 0), thread._affinity }; } - Core_trace_source(Trace::Source_registry ®istry, Thread &t) + Core_trace_source(Core::Trace::Source_registry ®istry, Thread &t) : - Trace::Control(), - Trace::Source(*this, *this), thread(t) + Core::Trace::Control(), + Core::Trace::Source(*this, *this), thread(t) { registry.insert(this); } }; new (platform().core_mem_alloc()) - Core_trace_source(Trace::sources(), *this); + Core_trace_source(Core::Trace::sources(), *this); } diff --git a/repos/base-nova/src/core/vm_session_component.cc b/repos/base-nova/src/core/vm_session_component.cc index 7d3d72c3e1..1093db09e1 100644 --- a/repos/base-nova/src/core/vm_session_component.cc +++ b/repos/base-nova/src/core/vm_session_component.cc @@ -12,13 +12,13 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Base includes */ +/* Genode includes */ #include #include #include #include -/* Core includes */ +/* core includes */ #include #include #include @@ -32,7 +32,7 @@ /* NOVA includes */ #include -using namespace Genode; +using namespace Core; enum { CAP_RANGE_LOG2 = 2, CAP_RANGE = 1 << CAP_RANGE_LOG2 }; @@ -83,7 +83,7 @@ static uint8_t _with_kernel_quota_upgrade(addr_t const pd_target, ** Vm_session_component::Vcpu ** ********************************/ -Trace::Source::Info Vm_session_component::Vcpu::trace_source_info() const +Core::Trace::Source::Info Vm_session_component::Vcpu::trace_source_info() const { uint64_t ec_time = 0; uint64_t sc_time = 0; diff --git a/repos/base-okl4/src/core/core_log_out.cc b/repos/base-okl4/src/core/core_log_out.cc index f601a07bc3..fcf503bbaa 100644 --- a/repos/base-okl4/src/core/core_log_out.cc +++ b/repos/base-okl4/src/core/core_log_out.cc @@ -17,7 +17,7 @@ /* base-internal includes */ #include -using namespace Genode; +using namespace Core; void Core_log::out(char const c) { Okl4::L4_KDB_PrintChar(c); } diff --git a/repos/base-okl4/src/core/core_region_map.cc b/repos/base-okl4/src/core/core_region_map.cc index 8540867422..0a915f63bc 100644 --- a/repos/base-okl4/src/core/core_region_map.cc +++ b/repos/base-okl4/src/core/core_region_map.cc @@ -16,7 +16,7 @@ #include #include -using namespace Genode; +using namespace Core; Region_map::Local_addr diff --git a/repos/base-okl4/src/core/include/ipc_pager.h b/repos/base-okl4/src/core/include/ipc_pager.h index 608522be02..7cd7f42849 100644 --- a/repos/base-okl4/src/core/include/ipc_pager.h +++ b/repos/base-okl4/src/core/include/ipc_pager.h @@ -20,13 +20,13 @@ /* base-internal includes */ #include -/* core-local includes */ +/* core includes */ #include -namespace Genode { class Ipc_pager; } +namespace Core { class Ipc_pager; } -class Genode::Ipc_pager +class Core::Ipc_pager { private: diff --git a/repos/base-okl4/src/core/include/map_local.h b/repos/base-okl4/src/core/include/map_local.h index 66fc2d48cd..794a1efaff 100644 --- a/repos/base-okl4/src/core/include/map_local.h +++ b/repos/base-okl4/src/core/include/map_local.h @@ -14,16 +14,13 @@ #ifndef _CORE__INCLUDE__MAP_LOCAL_H_ #define _CORE__INCLUDE__MAP_LOCAL_H_ -/* Genode includes */ -#include - /* core includes */ #include /* base-internal includes */ #include -namespace Genode { +namespace Core { inline void unmap_local_log2_range(Okl4::L4_Word_t base, Okl4::L4_Word_t size_log2) { diff --git a/repos/base-okl4/src/core/include/platform.h b/repos/base-okl4/src/core/include/platform.h index b096b3d698..4fc2479bfe 100644 --- a/repos/base-okl4/src/core/include/platform.h +++ b/repos/base-okl4/src/core/include/platform.h @@ -32,10 +32,10 @@ namespace Okl4 { extern "C" { #include } } -namespace Genode { class Platform; } +namespace Core { class Platform; } -class Genode::Platform : public Platform_generic +class Core::Platform : public Platform_generic { private: diff --git a/repos/base-okl4/src/core/include/platform_pd.h b/repos/base-okl4/src/core/include/platform_pd.h index 4152629695..a9100cd59c 100644 --- a/repos/base-okl4/src/core/include/platform_pd.h +++ b/repos/base-okl4/src/core/include/platform_pd.h @@ -23,7 +23,7 @@ /* base-internal includes */ #include -namespace Genode { +namespace Core { namespace Thread_id_bits { @@ -39,7 +39,7 @@ namespace Genode { } -class Genode::Platform_pd : public Address_space +class Core::Platform_pd : public Address_space { private: diff --git a/repos/base-okl4/src/core/include/platform_thread.h b/repos/base-okl4/src/core/include/platform_thread.h index bf6c33b0ea..38c23c3e6b 100644 --- a/repos/base-okl4/src/core/include/platform_thread.h +++ b/repos/base-okl4/src/core/include/platform_thread.h @@ -23,14 +23,14 @@ #include #include -namespace Genode { +namespace Core { class Platform_pd; class Platform_thread; } -class Genode::Platform_thread +class Core::Platform_thread { private: diff --git a/repos/base-okl4/src/core/include/rpc_cap_factory.h b/repos/base-okl4/src/core/include/rpc_cap_factory.h index 8514599aaf..d42c364a6d 100644 --- a/repos/base-okl4/src/core/include/rpc_cap_factory.h +++ b/repos/base-okl4/src/core/include/rpc_cap_factory.h @@ -14,13 +14,17 @@ #ifndef _CORE__INCLUDE__RPC_CAP_FACTORY_H_ #define _CORE__INCLUDE__RPC_CAP_FACTORY_H_ +/* Genode includes */ #include #include -namespace Genode { class Rpc_cap_factory; } +/* core includes */ +#include + +namespace Core { class Rpc_cap_factory; } -class Genode::Rpc_cap_factory +class Core::Rpc_cap_factory { private: diff --git a/repos/base-okl4/src/core/include/util.h b/repos/base-okl4/src/core/include/util.h index cde9413910..f838a7600e 100644 --- a/repos/base-okl4/src/core/include/util.h +++ b/repos/base-okl4/src/core/include/util.h @@ -16,14 +16,15 @@ /* Genode includes */ #include -#include -#include #include /* base-internal includes */ #include #include +/* core includes */ +#include + /* * The binding for 'L4_KDB_Enter' on ARM takes a 'char *' as argument, which * prevents us from passing a plain const "string". However, on x86, the @@ -37,7 +38,7 @@ #endif -namespace Genode { +namespace Core { inline void log_event(const char *) { } inline void log_event(const char *, unsigned, unsigned, unsigned) { } diff --git a/repos/base-okl4/src/core/io_mem_session_support.cc b/repos/base-okl4/src/core/io_mem_session_support.cc index 4b9c8c49ff..a169e79230 100644 --- a/repos/base-okl4/src/core/io_mem_session_support.cc +++ b/repos/base-okl4/src/core/io_mem_session_support.cc @@ -16,7 +16,7 @@ #include -using namespace Genode; +using namespace Core; void Io_mem_session_component::_unmap_local(addr_t, size_t) { } diff --git a/repos/base-okl4/src/core/irq_session_component.cc b/repos/base-okl4/src/core/irq_session_component.cc index c2d838c46e..1dcda2d6b2 100644 --- a/repos/base-okl4/src/core/irq_session_component.cc +++ b/repos/base-okl4/src/core/irq_session_component.cc @@ -13,7 +13,6 @@ */ /* Genode includes */ -#include #include /* core includes */ @@ -25,7 +24,7 @@ #include using namespace Okl4; -using namespace Genode; +using namespace Core; /* bit to use for IRQ notifications */ @@ -108,7 +107,7 @@ void Irq_object::entry() if (!_sig_cap.valid()) continue; - Genode::Signal_transmitter(_sig_cap).submit(1); + Signal_transmitter(_sig_cap).submit(1); _sync_ack.block(); } @@ -159,7 +158,7 @@ void Irq_session_component::ack_irq() } -void Irq_session_component::sigh(Genode::Signal_context_capability cap) +void Irq_session_component::sigh(Signal_context_capability cap) { _irq_object.sigh(cap); } diff --git a/repos/base-okl4/src/core/pager.cc b/repos/base-okl4/src/core/pager.cc index 17abffe3dd..f2549d8b68 100644 --- a/repos/base-okl4/src/core/pager.cc +++ b/repos/base-okl4/src/core/pager.cc @@ -11,9 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include @@ -29,7 +26,7 @@ static const bool verbose_page_fault = false; static const bool verbose_exception = false; -using namespace Genode; +using namespace Core; using namespace Okl4; /** diff --git a/repos/base-okl4/src/core/pager_object.cc b/repos/base-okl4/src/core/pager_object.cc index 661c052e9d..c90944d582 100644 --- a/repos/base-okl4/src/core/pager_object.cc +++ b/repos/base-okl4/src/core/pager_object.cc @@ -18,7 +18,7 @@ #include #include -using namespace Genode; +using namespace Core; void Pager_object::wake_up() diff --git a/repos/base-okl4/src/core/platform.cc b/repos/base-okl4/src/core/platform.cc index 170737f499..b9f05529bb 100644 --- a/repos/base-okl4/src/core/platform.cc +++ b/repos/base-okl4/src/core/platform.cc @@ -12,7 +12,6 @@ */ /* Genode includes */ -#include #include #include #include @@ -33,7 +32,7 @@ #include #include -using namespace Genode; +using namespace Core; /**************************************** diff --git a/repos/base-okl4/src/core/platform_pd.cc b/repos/base-okl4/src/core/platform_pd.cc index 29928f31c4..2a65959ff2 100644 --- a/repos/base-okl4/src/core/platform_pd.cc +++ b/repos/base-okl4/src/core/platform_pd.cc @@ -20,13 +20,9 @@ /* base-internal includes */ #include -using namespace Genode; +using namespace Core; -/**************************** - ** Private object members ** - ****************************/ - void Platform_pd::_create_pd(bool syscall) { using namespace Okl4; diff --git a/repos/base-okl4/src/core/platform_thread.cc b/repos/base-okl4/src/core/platform_thread.cc index 90e69e0aff..a266c79c2d 100644 --- a/repos/base-okl4/src/core/platform_thread.cc +++ b/repos/base-okl4/src/core/platform_thread.cc @@ -14,8 +14,6 @@ */ /* Genode includes */ -#include -#include #include /* core includes */ @@ -27,7 +25,7 @@ #include #include -using namespace Genode; +using namespace Core; using namespace Okl4; diff --git a/repos/base-okl4/src/core/ram_dataspace_support.cc b/repos/base-okl4/src/core/ram_dataspace_support.cc index afb346b0c7..37d8df0675 100644 --- a/repos/base-okl4/src/core/ram_dataspace_support.cc +++ b/repos/base-okl4/src/core/ram_dataspace_support.cc @@ -25,7 +25,7 @@ /* base-internal includes */ #include -using namespace Genode; +using namespace Core; void Ram_dataspace_factory::_export_ram_ds(Dataspace_component &) { } diff --git a/repos/base-okl4/src/core/spec/x86/platform_thread_x86.cc b/repos/base-okl4/src/core/spec/x86/platform_thread_x86.cc index 5ab3ffb730..91adb2fe63 100644 --- a/repos/base-okl4/src/core/spec/x86/platform_thread_x86.cc +++ b/repos/base-okl4/src/core/spec/x86/platform_thread_x86.cc @@ -17,7 +17,7 @@ /* base-internal includes */ #include -using namespace Genode; +using namespace Core; using namespace Okl4; diff --git a/repos/base-okl4/src/core/thread_start.cc b/repos/base-okl4/src/core/thread_start.cc index f3e03d1e5f..3a61f01163 100644 --- a/repos/base-okl4/src/core/thread_start.cc +++ b/repos/base-okl4/src/core/thread_start.cc @@ -37,10 +37,10 @@ void Thread::_thread_start() void Thread::start() { /* create and start platform thread */ - native_thread().pt = new (platform_specific().thread_slab()) - Platform_thread(_stack->name().string()); + native_thread().pt = new (Core::platform_specific().thread_slab()) + Core::Platform_thread(_stack->name().string()); - platform_specific().core_pd().bind_thread(*native_thread().pt); + Core::platform_specific().core_pd().bind_thread(*native_thread().pt); native_thread().pt->start((void *)_thread_start, stack_top()); } @@ -49,5 +49,5 @@ void Thread::start() void Thread::_deinit_platform_thread() { /* destruct platform thread */ - destroy(platform_specific().thread_slab(), native_thread().pt); + destroy(Core::platform_specific().thread_slab(), native_thread().pt); } diff --git a/repos/base-okl4/src/include/base/internal/native_thread.h b/repos/base-okl4/src/include/base/internal/native_thread.h index d05a9c421c..bd9c0668f0 100644 --- a/repos/base-okl4/src/include/base/internal/native_thread.h +++ b/repos/base-okl4/src/include/base/internal/native_thread.h @@ -20,11 +20,10 @@ /* base-internal includes */ #include -namespace Genode { +namespace Core { class Platform_thread; } - struct Native_thread; - class Platform_thread; -} + +namespace Genode { struct Native_thread; } struct Genode::Native_thread @@ -38,7 +37,7 @@ struct Genode::Native_thread * the physical thread object, which is going to be destroyed * on destruction of the 'Thread'. */ - Platform_thread *pt; + Core::Platform_thread *pt; }; #endif /* _INCLUDE__BASE__INTERNAL__NATIVE_THREAD_H_ */ diff --git a/repos/base-pistachio/src/core/core_log_out.cc b/repos/base-pistachio/src/core/core_log_out.cc index 80a66f810f..9971c13594 100644 --- a/repos/base-pistachio/src/core/core_log_out.cc +++ b/repos/base-pistachio/src/core/core_log_out.cc @@ -18,7 +18,7 @@ #include -void Genode::Core_log::out(char const c) +void Core::Core_log::out(char const c) { Pistachio::L4_KDB_PrintChar(c); } diff --git a/repos/base-pistachio/src/core/include/ipc_pager.h b/repos/base-pistachio/src/core/include/ipc_pager.h index 9d3589ffd8..5c46ba5f43 100644 --- a/repos/base-pistachio/src/core/include/ipc_pager.h +++ b/repos/base-pistachio/src/core/include/ipc_pager.h @@ -17,20 +17,20 @@ /* Genode includes */ #include #include -#include #include -/* core-local includes */ +/* core includes */ +#include #include #include /* base-internal includes */ #include -namespace Genode { class Ipc_pager; } +namespace Core { class Ipc_pager; } -class Genode::Ipc_pager +class Core::Ipc_pager { private: diff --git a/repos/base-pistachio/src/core/include/map_local.h b/repos/base-pistachio/src/core/include/map_local.h index 96a6114385..dd642677cb 100644 --- a/repos/base-pistachio/src/core/include/map_local.h +++ b/repos/base-pistachio/src/core/include/map_local.h @@ -21,7 +21,7 @@ /* base-internal includes */ #include -namespace Genode { +namespace Core { /** * Map page locally within core diff --git a/repos/base-pistachio/src/core/include/platform.h b/repos/base-pistachio/src/core/include/platform.h index 240038fb2c..fba112a6f4 100644 --- a/repos/base-pistachio/src/core/include/platform.h +++ b/repos/base-pistachio/src/core/include/platform.h @@ -27,10 +27,10 @@ #include #include -namespace Genode { class Platform; } +namespace Core { class Platform; } -class Genode::Platform : public Platform_generic +class Core::Platform : public Platform_generic { private: diff --git a/repos/base-pistachio/src/core/include/platform_pd.h b/repos/base-pistachio/src/core/include/platform_pd.h index 631cea8d79..9a0df523d3 100644 --- a/repos/base-pistachio/src/core/include/platform_pd.h +++ b/repos/base-pistachio/src/core/include/platform_pd.h @@ -24,14 +24,14 @@ #include #include -namespace Genode { +namespace Core { class Platform_thread; class Platform_pd; } -class Genode::Platform_pd : public Address_space +class Core::Platform_pd : public Address_space { private: diff --git a/repos/base-pistachio/src/core/include/platform_thread.h b/repos/base-pistachio/src/core/include/platform_thread.h index e201b8d941..6f31a4951d 100644 --- a/repos/base-pistachio/src/core/include/platform_thread.h +++ b/repos/base-pistachio/src/core/include/platform_thread.h @@ -27,7 +27,7 @@ /* base-internal includes */ #include -namespace Genode { +namespace Core { class Platform_pd; class Platform_thread; @@ -44,7 +44,7 @@ inline unsigned long convert_native_thread_id_to_badge(Pistachio::L4_ThreadId_t } -class Genode::Platform_thread : Interface +class Core::Platform_thread : Interface { private: diff --git a/repos/base-pistachio/src/core/include/print_l4_thread_id.h b/repos/base-pistachio/src/core/include/print_l4_thread_id.h index eafd22b6aa..76a58de439 100644 --- a/repos/base-pistachio/src/core/include/print_l4_thread_id.h +++ b/repos/base-pistachio/src/core/include/print_l4_thread_id.h @@ -14,15 +14,16 @@ #ifndef _CORE__INCLUDE__PRINT_L4_THREAD_ID_H_ #define _CORE__INCLUDE__PRINT_L4_THREAD_ID_H_ -#include +/* core includes */ +#include /* base-internal includes */ #include -namespace Genode { struct Formatted_tid; } +namespace Core { struct Formatted_tid; } -struct Genode::Formatted_tid +struct Core::Formatted_tid { Pistachio::L4_ThreadId_t tid; diff --git a/repos/base-pistachio/src/core/include/rpc_cap_factory.h b/repos/base-pistachio/src/core/include/rpc_cap_factory.h index 8514599aaf..d42c364a6d 100644 --- a/repos/base-pistachio/src/core/include/rpc_cap_factory.h +++ b/repos/base-pistachio/src/core/include/rpc_cap_factory.h @@ -14,13 +14,17 @@ #ifndef _CORE__INCLUDE__RPC_CAP_FACTORY_H_ #define _CORE__INCLUDE__RPC_CAP_FACTORY_H_ +/* Genode includes */ #include #include -namespace Genode { class Rpc_cap_factory; } +/* core includes */ +#include + +namespace Core { class Rpc_cap_factory; } -class Genode::Rpc_cap_factory +class Core::Rpc_cap_factory { private: diff --git a/repos/base-pistachio/src/core/include/util.h b/repos/base-pistachio/src/core/include/util.h index 7add6722a9..76fdd4e84f 100644 --- a/repos/base-pistachio/src/core/include/util.h +++ b/repos/base-pistachio/src/core/include/util.h @@ -15,8 +15,6 @@ #define _CORE__INCLUDE__UTIL_H_ /* Genode includes */ -#include -#include #include #include @@ -24,11 +22,14 @@ #include #include -/* core-local includes */ +/* core includes */ +#include #include #include -namespace Genode { +namespace Core { + + using Genode::get_page_size; inline void log_event(const char *) { } inline void log_event(const char *, unsigned, unsigned, unsigned) { } diff --git a/repos/base-pistachio/src/core/io_mem_session_support.cc b/repos/base-pistachio/src/core/io_mem_session_support.cc index 71a6c01e1f..95b0ce500e 100644 --- a/repos/base-pistachio/src/core/io_mem_session_support.cc +++ b/repos/base-pistachio/src/core/io_mem_session_support.cc @@ -21,7 +21,7 @@ /* base-internal includes */ #include -using namespace Genode; +using namespace Core; /* diff --git a/repos/base-pistachio/src/core/irq_session_component.cc b/repos/base-pistachio/src/core/irq_session_component.cc index 90292a0d6c..692ce37261 100644 --- a/repos/base-pistachio/src/core/irq_session_component.cc +++ b/repos/base-pistachio/src/core/irq_session_component.cc @@ -12,16 +12,13 @@ */ /* Genode includes */ -#include #include /* core includes */ #include #include -/* base-internal includes */ - -using namespace Genode; +using namespace Core; using namespace Pistachio; diff --git a/repos/base-pistachio/src/core/kip.cc b/repos/base-pistachio/src/core/kip.cc index 20712295f9..0d6882be7a 100644 --- a/repos/base-pistachio/src/core/kip.cc +++ b/repos/base-pistachio/src/core/kip.cc @@ -11,7 +11,7 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* core-local includes */ +/* core includes */ #include using namespace Pistachio; diff --git a/repos/base-pistachio/src/core/pager.cc b/repos/base-pistachio/src/core/pager.cc index 7942fbd0f9..636417bd1b 100644 --- a/repos/base-pistachio/src/core/pager.cc +++ b/repos/base-pistachio/src/core/pager.cc @@ -11,10 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include -#include - /* base-internal includes */ #include #include @@ -24,7 +20,7 @@ #include #include -using namespace Genode; +using namespace Core; using namespace Pistachio; diff --git a/repos/base-pistachio/src/core/pager_object.cc b/repos/base-pistachio/src/core/pager_object.cc index 37b4ff1d16..a6918918e1 100644 --- a/repos/base-pistachio/src/core/pager_object.cc +++ b/repos/base-pistachio/src/core/pager_object.cc @@ -18,7 +18,7 @@ #include #include -using namespace Genode; +using namespace Core; void Pager_object::wake_up() diff --git a/repos/base-pistachio/src/core/platform.cc b/repos/base-pistachio/src/core/platform.cc index 8399f96510..ac3c536add 100644 --- a/repos/base-pistachio/src/core/platform.cc +++ b/repos/base-pistachio/src/core/platform.cc @@ -12,7 +12,6 @@ */ /* Genode includes */ -#include #include #include #include @@ -37,7 +36,7 @@ #include #include -using namespace Genode; +using namespace Core; static const bool verbose = true; @@ -261,7 +260,7 @@ struct Region return (((base + size) > start) && (base < end)); } - void print(Genode::Output &out) const + void print(Output &out) const { size_t const size = end - start; Genode::print(out, Hex_range(start, size), " ", diff --git a/repos/base-pistachio/src/core/platform_pd.cc b/repos/base-pistachio/src/core/platform_pd.cc index 1305083880..a3ee44c76a 100644 --- a/repos/base-pistachio/src/core/platform_pd.cc +++ b/repos/base-pistachio/src/core/platform_pd.cc @@ -20,7 +20,7 @@ #include using namespace Pistachio; -using namespace Genode; +using namespace Core; /************************** diff --git a/repos/base-pistachio/src/core/platform_thread.cc b/repos/base-pistachio/src/core/platform_thread.cc index 722d0c0001..642e5c3ccc 100644 --- a/repos/base-pistachio/src/core/platform_thread.cc +++ b/repos/base-pistachio/src/core/platform_thread.cc @@ -11,10 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include -#include - /* base-internal includes */ #include #include @@ -25,7 +21,7 @@ #include #include -using namespace Genode; +using namespace Core; using namespace Pistachio; diff --git a/repos/base-pistachio/src/core/ram_dataspace_support.cc b/repos/base-pistachio/src/core/ram_dataspace_support.cc index 843f3e6ec0..b6f6fae203 100644 --- a/repos/base-pistachio/src/core/ram_dataspace_support.cc +++ b/repos/base-pistachio/src/core/ram_dataspace_support.cc @@ -16,7 +16,7 @@ #include -using namespace Genode; +using namespace Core; void Ram_dataspace_factory::_export_ram_ds(Dataspace_component &) { } diff --git a/repos/base-pistachio/src/core/spec/x86/platform_x86.cc b/repos/base-pistachio/src/core/spec/x86/platform_x86.cc index c7ec258f9d..d6ff5ef11d 100644 --- a/repos/base-pistachio/src/core/spec/x86/platform_x86.cc +++ b/repos/base-pistachio/src/core/spec/x86/platform_x86.cc @@ -14,12 +14,12 @@ /* base-internal includes */ #include -/* core-local includes */ +/* core includes */ #include #include #include -using namespace Genode; +using namespace Core; void Platform::_setup_io_port_alloc() diff --git a/repos/base-pistachio/src/core/thread_start.cc b/repos/base-pistachio/src/core/thread_start.cc index 29ccc8d1f9..a1fa2fc35e 100644 --- a/repos/base-pistachio/src/core/thread_start.cc +++ b/repos/base-pistachio/src/core/thread_start.cc @@ -15,14 +15,15 @@ #include #include +/* core includes */ +#include +#include +#include + /* base-internal includes */ #include -/* core includes */ -#include -#include - -using namespace Genode; +using namespace Core; void Thread::_thread_start() diff --git a/repos/base-pistachio/src/include/base/internal/native_thread.h b/repos/base-pistachio/src/include/base/internal/native_thread.h index 7ad8f52aa5..d867c9ede5 100644 --- a/repos/base-pistachio/src/include/base/internal/native_thread.h +++ b/repos/base-pistachio/src/include/base/internal/native_thread.h @@ -20,11 +20,9 @@ /* base-internal includes */ #include -namespace Genode { - - class Platform_thread; - struct Native_thread; -} +namespace Genode { struct Native_thread; } + +namespace Core { class Platform_thread; } struct Genode::Native_thread @@ -38,7 +36,7 @@ struct Genode::Native_thread * the physical thread object, which is going to be destroyed * on destruction of the 'Thread'. */ - Platform_thread *pt; + Core::Platform_thread *pt; }; #endif /* _INCLUDE__BASE__INTERNAL__NATIVE_THREAD_H_ */ diff --git a/repos/base-sel4/src/core/capability_space.cc b/repos/base-sel4/src/core/capability_space.cc index c30dd7359c..f13085c187 100644 --- a/repos/base-sel4/src/core/capability_space.cc +++ b/repos/base-sel4/src/core/capability_space.cc @@ -48,7 +48,7 @@ class Genode::Native_capability::Data : public Capability_data }; -using namespace Genode; +using namespace Core; /** diff --git a/repos/base-sel4/src/core/core_log_out.cc b/repos/base-sel4/src/core/core_log_out.cc index d334474115..dd3003f4c4 100644 --- a/repos/base-sel4/src/core/core_log_out.cc +++ b/repos/base-sel4/src/core/core_log_out.cc @@ -18,4 +18,4 @@ #include #include -void Genode::Core_log::out(char const c) { seL4_DebugPutChar(c); } +void Core::Core_log::out(char const c) { seL4_DebugPutChar(c); } diff --git a/repos/base-sel4/src/core/core_region_map.cc b/repos/base-sel4/src/core/core_region_map.cc index 63e923a6c0..50cc2bd0f7 100644 --- a/repos/base-sel4/src/core/core_region_map.cc +++ b/repos/base-sel4/src/core/core_region_map.cc @@ -11,15 +11,12 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include #include -using namespace Genode; +using namespace Core; Region_map::Local_addr @@ -71,8 +68,8 @@ void Core_region_map::detach(Local_addr core_local_addr) size_t size = platform_specific().region_alloc_size_at(core_local_addr); if (!unmap_local(core_local_addr, size >> get_page_size_log2())) { - Genode::error("could not unmap core virtual address ", - Hex(core_local_addr), " in ", __PRETTY_FUNCTION__); + error("could not unmap core virtual address ", + Hex(core_local_addr), " in ", __PRETTY_FUNCTION__); return; } diff --git a/repos/base-sel4/src/core/include/cap_sel_alloc.h b/repos/base-sel4/src/core/include/cap_sel_alloc.h index baaf531b10..37787a1eba 100644 --- a/repos/base-sel4/src/core/include/cap_sel_alloc.h +++ b/repos/base-sel4/src/core/include/cap_sel_alloc.h @@ -20,10 +20,13 @@ /* base-internal includes */ #include -namespace Genode { struct Cap_sel_alloc; } +/* core includes */ +#include + +namespace Core { struct Cap_sel_alloc; } -struct Genode::Cap_sel_alloc : Interface +struct Core::Cap_sel_alloc : Interface { struct Alloc_failed : Exception { }; diff --git a/repos/base-sel4/src/core/include/cnode.h b/repos/base-sel4/src/core/include/cnode.h index e905ed4f1b..31be281a87 100644 --- a/repos/base-sel4/src/core/include/cnode.h +++ b/repos/base-sel4/src/core/include/cnode.h @@ -15,21 +15,20 @@ #define _CORE__INCLUDE__CNODE_H_ /* Genode includes */ -#include #include #include /* core includes */ #include -namespace Genode { +namespace Core { class Cnode_base; class Cnode; } -class Genode::Cnode_base +class Core::Cnode_base { private: @@ -127,7 +126,7 @@ class Genode::Cnode_base }; -class Genode::Cnode : public Cnode_base, Noncopyable +class Core::Cnode : public Cnode_base, Noncopyable { private: diff --git a/repos/base-sel4/src/core/include/core_capability_data.h b/repos/base-sel4/src/core/include/core_capability_data.h index 50262492f3..dc15ad05de 100644 --- a/repos/base-sel4/src/core/include/core_capability_data.h +++ b/repos/base-sel4/src/core/include/core_capability_data.h @@ -17,14 +17,17 @@ /* base-internal includes */ #include -namespace Genode { +/* core includes */ +#include + +namespace Core { class Cap_session; class Core_capability_data; } -class Genode::Core_capability_data : public Capability_data +class Core::Core_capability_data : public Capability_data { private: diff --git a/repos/base-sel4/src/core/include/core_cspace.h b/repos/base-sel4/src/core/include/core_cspace.h index 509b06eea0..cef8599382 100644 --- a/repos/base-sel4/src/core/include/core_cspace.h +++ b/repos/base-sel4/src/core/include/core_cspace.h @@ -16,10 +16,10 @@ #include -namespace Genode { class Core_cspace; } +namespace Core { class Core_cspace; } -class Genode::Core_cspace +class Core::Core_cspace { public: diff --git a/repos/base-sel4/src/core/include/initial_untyped_pool.h b/repos/base-sel4/src/core/include/initial_untyped_pool.h index 024dfab5ce..c7bfa24615 100644 --- a/repos/base-sel4/src/core/include/initial_untyped_pool.h +++ b/repos/base-sel4/src/core/include/initial_untyped_pool.h @@ -16,18 +16,18 @@ /* Genode includes */ #include -#include -/* core-local includes */ +/* core includes */ +#include #include /* seL4 includes */ #include -namespace Genode { class Initial_untyped_pool; } +namespace Core { class Initial_untyped_pool; } -class Genode::Initial_untyped_pool +class Core::Initial_untyped_pool { private: diff --git a/repos/base-sel4/src/core/include/install_mapping.h b/repos/base-sel4/src/core/include/install_mapping.h index 8fb62c33a7..362e9f6117 100644 --- a/repos/base-sel4/src/core/include/install_mapping.h +++ b/repos/base-sel4/src/core/include/install_mapping.h @@ -14,13 +14,13 @@ #ifndef _CORE__INCLUDE__INSTALL_MAPPING_H_ #define _CORE__INCLUDE__INSTALL_MAPPING_H_ -/* Core includes */ +/* core includes */ #include #include -namespace Genode { +namespace Core { - bool install_mapping(Mapping const &mapping, unsigned long pager_object_badge); + bool install_mapping(Mapping const &, unsigned long pager_object_badge); } #endif /* _CORE__INCLUDE__INSTALL_MAPPING_H_ */ diff --git a/repos/base-sel4/src/core/include/ipc_pager.h b/repos/base-sel4/src/core/include/ipc_pager.h index c140aac982..1b7b874436 100644 --- a/repos/base-sel4/src/core/include/ipc_pager.h +++ b/repos/base-sel4/src/core/include/ipc_pager.h @@ -17,13 +17,13 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ #include -namespace Genode { class Ipc_pager; } +namespace Core { class Ipc_pager; } -class Genode::Ipc_pager : public Native_capability +class Core::Ipc_pager : public Native_capability { private: diff --git a/repos/base-sel4/src/core/include/irq_object.h b/repos/base-sel4/src/core/include/irq_object.h index 994bb36aab..a6945bbcf1 100644 --- a/repos/base-sel4/src/core/include/irq_object.h +++ b/repos/base-sel4/src/core/include/irq_object.h @@ -14,14 +14,20 @@ #ifndef _CORE__INCLUDE__IRQ_OBJECT_H_ #define _CORE__INCLUDE__IRQ_OBJECT_H_ +/* Genode includes */ #include -#include #include -namespace Genode { class Irq_object; } +/* base internal includes */ +#include + +/* core includes */ +#include + +namespace Core { class Irq_object; } -class Genode::Irq_object : public Thread { +class Core::Irq_object : public Thread { private: @@ -43,7 +49,7 @@ class Genode::Irq_object : public Thread { Irq_object(unsigned irq); void sigh(Signal_context_capability cap) { _sig_cap = cap; } - void notify() { Genode::Signal_transmitter(_sig_cap).submit(1); } + void notify() { Signal_transmitter(_sig_cap).submit(1); } void ack_irq(); void start() override; diff --git a/repos/base-sel4/src/core/include/kernel_object.h b/repos/base-sel4/src/core/include/kernel_object.h index 7b9fc31336..d32dc9b112 100644 --- a/repos/base-sel4/src/core/include/kernel_object.h +++ b/repos/base-sel4/src/core/include/kernel_object.h @@ -21,7 +21,7 @@ #include #include -namespace Genode { +namespace Core { /** * Index referring to a slot in a CNode diff --git a/repos/base-sel4/src/core/include/map_local.h b/repos/base-sel4/src/core/include/map_local.h index bc56afba76..18a86b52ae 100644 --- a/repos/base-sel4/src/core/include/map_local.h +++ b/repos/base-sel4/src/core/include/map_local.h @@ -18,8 +18,7 @@ #include #include - -namespace Genode { +namespace Core { /** * Map physical pages to core-local virtual address range diff --git a/repos/base-sel4/src/core/include/page_table_registry.h b/repos/base-sel4/src/core/include/page_table_registry.h index 739d132db0..a352fd8313 100644 --- a/repos/base-sel4/src/core/include/page_table_registry.h +++ b/repos/base-sel4/src/core/include/page_table_registry.h @@ -16,19 +16,18 @@ /* Genode includes */ #include -#include -#include #include +#include #include /* core includes */ #include #include -namespace Genode { class Page_table_registry; } +namespace Core { class Page_table_registry; } -class Genode::Page_table_registry +class Core::Page_table_registry { public: @@ -180,9 +179,9 @@ class Genode::Page_table_registry level_log2_size)); break; } - } catch (Genode::Allocator::Out_of_memory) { + } catch (Allocator::Out_of_memory) { throw Mapping_cache_full(Mapping_cache_full::Type::MEMORY); - } catch (Genode::Out_of_caps) { + } catch (Out_of_caps) { throw Mapping_cache_full(Mapping_cache_full::Type::CAPS); } } diff --git a/repos/base-sel4/src/core/include/pager.h b/repos/base-sel4/src/core/include/pager.h index c26f8960e9..b2f7939608 100644 --- a/repos/base-sel4/src/core/include/pager.h +++ b/repos/base-sel4/src/core/include/pager.h @@ -23,11 +23,11 @@ #include #include -/* core-local includes */ +/* core includes */ #include #include -namespace Genode { +namespace Core { /** * Special server object for paging @@ -43,11 +43,13 @@ namespace Genode { */ class Pager_entrypoint; + using Pager_capability = Capability; + enum { PAGER_EP_STACK_SIZE = sizeof(addr_t) * 2048 }; } -class Genode::Pager_object : public Object_pool::Entry +class Core::Pager_object : public Object_pool::Entry { protected: @@ -58,7 +60,7 @@ class Genode::Pager_object : public Object_pool::Entry Cpu_session_capability _cpu_session_cap; Thread_capability _thread_cap; - Genode::Cap_sel _reply_cap; + Cap_sel _reply_cap; /** * User-level signal handler registered for this pager object via @@ -155,8 +157,7 @@ class Genode::Pager_object : public Object_pool::Entry }; -class Genode::Pager_entrypoint : public Object_pool, - public Thread +class Core::Pager_entrypoint : public Object_pool, public Thread { private: diff --git a/repos/base-sel4/src/core/include/platform.h b/repos/base-sel4/src/core/include/platform.h index 6822fe1fca..fadbf6747c 100644 --- a/repos/base-sel4/src/core/include/platform.h +++ b/repos/base-sel4/src/core/include/platform.h @@ -22,7 +22,8 @@ #include #include -namespace Genode { +namespace Core { + class Platform; template class Static_allocator; class Address_space; @@ -37,7 +38,7 @@ namespace Genode { * The size of a single ELEM must be a multiple of sizeof(long). */ template -class Genode::Static_allocator : public Allocator +class Core::Static_allocator : public Allocator { private: @@ -76,7 +77,8 @@ class Genode::Static_allocator : public Allocator bool need_size_for_free() const override { return false; } }; -class Genode::Platform : public Platform_generic + +class Core::Platform : public Platform_generic { private: diff --git a/repos/base-sel4/src/core/include/platform_pd.h b/repos/base-sel4/src/core/include/platform_pd.h index 2eb1053602..87332c3d00 100644 --- a/repos/base-sel4/src/core/include/platform_pd.h +++ b/repos/base-sel4/src/core/include/platform_pd.h @@ -25,10 +25,10 @@ /* base-internal includes */ #include -namespace Genode { class Platform_pd; } +namespace Core { class Platform_pd; } -class Genode::Platform_pd : public Address_space +class Core::Platform_pd : public Address_space { private: diff --git a/repos/base-sel4/src/core/include/platform_thread.h b/repos/base-sel4/src/core/include/platform_thread.h index 28bbc797f3..50df72e582 100644 --- a/repos/base-sel4/src/core/include/platform_thread.h +++ b/repos/base-sel4/src/core/include/platform_thread.h @@ -26,14 +26,14 @@ #include #include -namespace Genode { +namespace Core { class Platform_pd; class Platform_thread; } -class Genode::Platform_thread : public List::Element +class Core::Platform_thread : public List::Element { private: diff --git a/repos/base-sel4/src/core/include/rpc_cap_factory.h b/repos/base-sel4/src/core/include/rpc_cap_factory.h index 8ffc9f7ea6..be357df6b5 100644 --- a/repos/base-sel4/src/core/include/rpc_cap_factory.h +++ b/repos/base-sel4/src/core/include/rpc_cap_factory.h @@ -14,13 +14,17 @@ #ifndef _CORE__INCLUDE__RPC_CAP_FACTORY_H_ #define _CORE__INCLUDE__RPC_CAP_FACTORY_H_ +/* Genode includes */ #include #include -namespace Genode { class Rpc_cap_factory; } +/* core includes */ +#include + +namespace Core { class Rpc_cap_factory; } -class Genode::Rpc_cap_factory +class Core::Rpc_cap_factory { private: diff --git a/repos/base-sel4/src/core/include/sel4_boot_info.h b/repos/base-sel4/src/core/include/sel4_boot_info.h index 66cbb14c06..3cd30e6f77 100644 --- a/repos/base-sel4/src/core/include/sel4_boot_info.h +++ b/repos/base-sel4/src/core/include/sel4_boot_info.h @@ -17,6 +17,9 @@ /* seL4 includes */ #include -namespace Genode { seL4_BootInfo const &sel4_boot_info(); } +/* core includes */ +#include + +namespace Core { seL4_BootInfo const &sel4_boot_info(); } #endif /* _CORE__INCLUDE__SEL4_BOOT_INFO_H_ */ diff --git a/repos/base-sel4/src/core/include/thread_sel4.h b/repos/base-sel4/src/core/include/thread_sel4.h index e22d998a27..ac02fb7a09 100644 --- a/repos/base-sel4/src/core/include/thread_sel4.h +++ b/repos/base-sel4/src/core/include/thread_sel4.h @@ -25,9 +25,9 @@ #include #include -namespace Genode { +namespace Genode { struct Thread_info; } - struct Thread_info; +namespace Core { /** * Set register values for the instruction pointer and stack pointer and @@ -52,19 +52,21 @@ struct Genode::Thread_info Thread_info() { } - inline void init_tcb(Platform &, Range_allocator &, + inline void init_tcb(Core::Platform &, Range_allocator &, unsigned const prio, unsigned const cpu); inline void init(addr_t const utcb_virt_addr, unsigned const prio); inline void destruct(); - bool init_vcpu(Platform &, Cap_sel ept); + bool init_vcpu(Core::Platform &, Cap_sel ept); }; -void Genode::Thread_info::init_tcb(Platform &platform, +void Genode::Thread_info::init_tcb(Core::Platform &platform, Range_allocator &phys_alloc, unsigned const prio, unsigned const cpu) { + using namespace Core; + /* allocate TCB within core's CNode */ addr_t const phys_addr = Untyped_memory::alloc_page(phys_alloc); seL4_Untyped const service = Untyped_memory::untyped_sel(phys_addr).value(); @@ -83,6 +85,8 @@ void Genode::Thread_info::init_tcb(Platform &platform, void Genode::Thread_info::init(addr_t const utcb_virt_addr, unsigned const prio) { + using namespace Core; + Platform &platform = platform_specific(); Range_allocator &phys_alloc = platform.ram_alloc(); @@ -125,6 +129,8 @@ void Genode::Thread_info::init(addr_t const utcb_virt_addr, unsigned const prio) void Genode::Thread_info::destruct() { + using namespace Core; + if (lock_sel.value()) { seL4_CNode_Delete(seL4_CapInitThreadCNode, lock_sel.value(), 32); platform_specific().core_sel_alloc().free(lock_sel); @@ -151,8 +157,4 @@ void Genode::Thread_info::destruct() } } - -void Genode::start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, - unsigned cpu); - #endif /* _CORE__INCLUDE__THREAD_SEL4_H_ */ diff --git a/repos/base-sel4/src/core/include/untyped_memory.h b/repos/base-sel4/src/core/include/untyped_memory.h index 8a15957b8f..2f811ff56b 100644 --- a/repos/base-sel4/src/core/include/untyped_memory.h +++ b/repos/base-sel4/src/core/include/untyped_memory.h @@ -24,10 +24,10 @@ /* seL4 includes */ #include -namespace Genode { struct Untyped_memory; } +namespace Core { struct Untyped_memory; } -struct Genode::Untyped_memory +struct Core::Untyped_memory { class Phys_alloc_failed : Exception { }; @@ -54,7 +54,7 @@ struct Genode::Untyped_memory } - static inline void free_page(Range_allocator &phys_alloc, Genode::addr_t addr) + static inline void free_page(Range_allocator &phys_alloc, addr_t addr) { phys_alloc.free(reinterpret_cast(addr)); } diff --git a/repos/base-sel4/src/core/include/util.h b/repos/base-sel4/src/core/include/util.h index 725b632b41..7703b95fb4 100644 --- a/repos/base-sel4/src/core/include/util.h +++ b/repos/base-sel4/src/core/include/util.h @@ -20,8 +20,7 @@ /* core includes */ #include - -namespace Genode { +namespace Core { constexpr addr_t get_page_mask() { return ~(get_page_size() - 1); } inline addr_t trunc_page(addr_t addr) { return addr & get_page_mask(); } diff --git a/repos/base-sel4/src/core/include/vm_session_component.h b/repos/base-sel4/src/core/include/vm_session_component.h index ad3c34362b..0fab6a153b 100644 --- a/repos/base-sel4/src/core/include/vm_session_component.h +++ b/repos/base-sel4/src/core/include/vm_session_component.h @@ -18,13 +18,14 @@ #include #include +/* core includes */ #include #include -namespace Genode { class Vm_session_component; } +namespace Core { class Vm_session_component; } -class Genode::Vm_session_component +class Core::Vm_session_component : private Ram_quota_guard, private Cap_quota_guard, diff --git a/repos/base-sel4/src/core/include/vm_space.h b/repos/base-sel4/src/core/include/vm_space.h index de3b53344d..4192022df1 100644 --- a/repos/base-sel4/src/core/include/vm_space.h +++ b/repos/base-sel4/src/core/include/vm_space.h @@ -16,8 +16,6 @@ /* Genode includes */ #include -#include -#include #include #include @@ -29,10 +27,10 @@ #include #include -namespace Genode { class Vm_space; } +namespace Core { class Vm_space; } -class Genode::Vm_space +class Core::Vm_space { private: diff --git a/repos/base-sel4/src/core/io_mem_session_support.cc b/repos/base-sel4/src/core/io_mem_session_support.cc index c83341aa9f..f1f005e409 100644 --- a/repos/base-sel4/src/core/io_mem_session_support.cc +++ b/repos/base-sel4/src/core/io_mem_session_support.cc @@ -15,7 +15,7 @@ #include -using namespace Genode; +using namespace Core; void Io_mem_session_component::_unmap_local(addr_t, size_t) { } diff --git a/repos/base-sel4/src/core/irq_session_component.cc b/repos/base-sel4/src/core/irq_session_component.cc index 973d465d69..80f037cfd8 100644 --- a/repos/base-sel4/src/core/irq_session_component.cc +++ b/repos/base-sel4/src/core/irq_session_component.cc @@ -11,17 +11,15 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include #include +/* sel4 includes */ #include -using namespace Genode; +using namespace Core; bool Irq_object::associate(Irq_session::Trigger const irq_trigger, diff --git a/repos/base-sel4/src/core/pager.cc b/repos/base-sel4/src/core/pager.cc index f67c775548..c9be14e971 100644 --- a/repos/base-sel4/src/core/pager.cc +++ b/repos/base-sel4/src/core/pager.cc @@ -25,7 +25,7 @@ /* seL4 includes */ #include -using namespace Genode; +using namespace Core; void Mapping::prepare_map_operation() const { } @@ -43,7 +43,7 @@ void Ipc_pager::wait_for_fault() uint8_t const depth = 32; int ret = seL4_CNode_SaveCaller(service, index, depth); if (ret != seL4_NoError) - Genode::error("saving reply cap failed with ", ret); + error("saving reply cap failed with ", ret); } _reply_sel = 0; _badge = 0; @@ -53,7 +53,7 @@ void Ipc_pager::wait_for_fault() bool Ipc_pager::install_mapping() { - _badge = Genode::install_mapping(_reply_mapping, _badge); + _badge = Core::install_mapping(_reply_mapping, _badge); return _badge; } diff --git a/repos/base-sel4/src/core/platform.cc b/repos/base-sel4/src/core/platform.cc index b15f09fa0f..f4fc8b9cf4 100644 --- a/repos/base-sel4/src/core/platform.cc +++ b/repos/base-sel4/src/core/platform.cc @@ -14,7 +14,6 @@ /* Genode includes */ #include #include -#include #include #include @@ -34,7 +33,7 @@ /* seL4 includes */ #include -using namespace Genode; +using namespace Core; static bool const verbose_boot_info = true; @@ -61,7 +60,7 @@ extern unsigned _prog_img_beg, _prog_img_end; bool Mapped_mem_allocator::_map_local(addr_t virt_addr, addr_t phys_addr, size_t size) { if (platform_in_construction) - Genode::warning("need physical memory, but Platform object not constructed yet"); + warning("need physical memory, but Platform object not constructed yet"); size_t const num_pages = size / get_page_size(); @@ -447,7 +446,7 @@ void Platform::_init_rom_modules() bool valid() const { const char sign[] = "RSD PTR "; - return signature == *(Genode::uint64_t *)sign; + return signature == *(uint64_t *)sign; } } __attribute__((packed)); @@ -556,7 +555,7 @@ Platform::Platform() { platform_in_construction = this; - /* start benchmarking for CPU utilization in Genode TRACE service */ + /* start benchmarking for CPU utilization in TRACE service */ seL4_BenchmarkResetLog(); /* create notification object for Genode::Lock used by this first thread */ @@ -618,7 +617,7 @@ Platform::Platform() */ Info trace_source_info() const override { - Genode::Thread &myself = *Genode::Thread::myself(); + Thread &myself = *Thread::myself(); addr_t const ipc_buffer = reinterpret_cast(myself.utcb()); seL4_IPCBuffer * ipcbuffer = reinterpret_cast(ipc_buffer); uint64_t const * buf = reinterpret_cast(ipcbuffer->msg); diff --git a/repos/base-sel4/src/core/platform_pd.cc b/repos/base-sel4/src/core/platform_pd.cc index c6044f03df..e656024008 100644 --- a/repos/base-sel4/src/core/platform_pd.cc +++ b/repos/base-sel4/src/core/platform_pd.cc @@ -11,9 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include @@ -24,7 +21,7 @@ /* base-internal includes */ #include -using namespace Genode; +using namespace Core; /***************************************** diff --git a/repos/base-sel4/src/core/platform_thread.cc b/repos/base-sel4/src/core/platform_thread.cc index 6d0a593941..bcd61b797e 100644 --- a/repos/base-sel4/src/core/platform_thread.cc +++ b/repos/base-sel4/src/core/platform_thread.cc @@ -11,10 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include -#include - /* core includes */ #include #include @@ -26,7 +22,7 @@ /* seL4 includes */ #include -using namespace Genode; +using namespace Core; /***************************************************** @@ -88,7 +84,7 @@ Platform_thread_registry &platform_thread_registry() } -bool Genode::install_mapping(Mapping const &mapping, unsigned long pager_object_badge) +bool Core::install_mapping(Mapping const &mapping, unsigned long pager_object_badge) { return platform_thread_registry().install_mapping(mapping, pager_object_badge); } @@ -278,7 +274,7 @@ Trace::Execution_time Platform_thread::execution_time() const void Platform_thread::setup_vcpu(Cap_sel ept, Cap_sel notification) { if (!_info.init_vcpu(platform_specific(), ept)) { - Genode::error("creating vCPU failed"); + error("creating vCPU failed"); return; } diff --git a/repos/base-sel4/src/core/ram_dataspace_support.cc b/repos/base-sel4/src/core/ram_dataspace_support.cc index 814db791ae..660eecb1de 100644 --- a/repos/base-sel4/src/core/ram_dataspace_support.cc +++ b/repos/base-sel4/src/core/ram_dataspace_support.cc @@ -17,7 +17,7 @@ #include #include -using namespace Genode; +using namespace Core; void Ram_dataspace_factory::_export_ram_ds(Dataspace_component &ds) diff --git a/repos/base-sel4/src/core/rpc_cap_factory.cc b/repos/base-sel4/src/core/rpc_cap_factory.cc index 806711d515..bcdc174062 100644 --- a/repos/base-sel4/src/core/rpc_cap_factory.cc +++ b/repos/base-sel4/src/core/rpc_cap_factory.cc @@ -23,7 +23,7 @@ /* base-internal include */ #include -using namespace Genode; +using namespace Core; static unsigned unique_id_cnt; diff --git a/repos/base-sel4/src/core/signal_source_component.cc b/repos/base-sel4/src/core/signal_source_component.cc index 69df522588..87a4953d6d 100644 --- a/repos/base-sel4/src/core/signal_source_component.cc +++ b/repos/base-sel4/src/core/signal_source_component.cc @@ -11,9 +11,6 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include #include @@ -21,13 +18,8 @@ /* base-internal include */ #include +using namespace Core; -using namespace Genode; - - -/***************************** - ** Signal-source component ** - *****************************/ void Signal_source_component::release(Signal_context_component &context) { diff --git a/repos/base-sel4/src/core/spec/arm/arch_kernel_object.h b/repos/base-sel4/src/core/spec/arm/arch_kernel_object.h index 83951b2817..9178ef3488 100644 --- a/repos/base-sel4/src/core/spec/arm/arch_kernel_object.h +++ b/repos/base-sel4/src/core/spec/arm/arch_kernel_object.h @@ -16,7 +16,10 @@ #include -namespace Genode { +/* core includes */ +#include + +namespace Core { enum { PAGE_TABLE_LOG2_SIZE = 20 /* 1M region */ diff --git a/repos/base-sel4/src/core/spec/arm/boot_info.cc b/repos/base-sel4/src/core/spec/arm/boot_info.cc index dc30965ae6..d72e924755 100644 --- a/repos/base-sel4/src/core/spec/arm/boot_info.cc +++ b/repos/base-sel4/src/core/spec/arm/boot_info.cc @@ -11,20 +11,20 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ +#include #include +using namespace Core; + /* provided by the assembly startup code */ -extern Genode::addr_t __initial_r0; +extern addr_t __initial_r0; /** * Obtain seL4 boot info structure */ -seL4_BootInfo const & Genode::sel4_boot_info() +seL4_BootInfo const &Core::sel4_boot_info() { return *(seL4_BootInfo const *)__initial_r0; } diff --git a/repos/base-sel4/src/core/spec/arm/irq.cc b/repos/base-sel4/src/core/spec/arm/irq.cc index 05eab2a132..a16be9edd6 100644 --- a/repos/base-sel4/src/core/spec/arm/irq.cc +++ b/repos/base-sel4/src/core/spec/arm/irq.cc @@ -8,8 +8,11 @@ #include -long Genode::Irq_object::_associate(Irq_session::Trigger const &, - Irq_session::Polarity const &) +using namespace Core; + + +long Irq_object::_associate(Irq_session::Trigger const &, + Irq_session::Polarity const &) { seL4_CNode const root = seL4_CapInitThreadCNode; seL4_Word const index = _kernel_irq_sel.value(); diff --git a/repos/base-sel4/src/core/spec/arm/platform.cc b/repos/base-sel4/src/core/spec/arm/platform.cc index 70f60d05d1..c61c98f4df 100644 --- a/repos/base-sel4/src/core/spec/arm/platform.cc +++ b/repos/base-sel4/src/core/spec/arm/platform.cc @@ -21,7 +21,8 @@ #include "arch_kernel_object.h" -using namespace Genode; +using namespace Core; + static Phys_allocator *_phys_alloc_16k_ptr; @@ -35,18 +36,18 @@ static Phys_allocator &phys_alloc_16k() } -seL4_Word Genode::Untyped_memory::smallest_page_type() { +seL4_Word Untyped_memory::smallest_page_type() { return seL4_ARM_SmallPageObject; } -void Genode::Platform::init_sel4_ipc_buffer() { } +void Platform::init_sel4_ipc_buffer() { } -long Genode::Platform::_unmap_page_frame(Cap_sel const &sel) { +long Platform::_unmap_page_frame(Cap_sel const &sel) { return seL4_ARM_Page_Unmap(sel.value()); } -void Genode::Platform::_init_core_page_table_registry() +void Platform::_init_core_page_table_registry() { seL4_BootInfo const &bi = sel4_boot_info(); @@ -68,7 +69,7 @@ void Genode::Platform::_init_core_page_table_registry() /* initialize 16k memory allocator */ { - static Genode::Phys_allocator inst(&core_mem_alloc()); + static Phys_allocator inst(&core_mem_alloc()); _phys_alloc_16k_ptr = &inst; } @@ -87,7 +88,7 @@ void Genode::Platform::_init_core_page_table_registry() } -Genode::addr_t Genode::Platform_pd::_init_page_directory() const +addr_t Platform_pd::_init_page_directory() const { /* page directory table contains 4096 elements of 32bits -> 16k required */ enum { PAGES_16K = (1UL << Page_directory_kobj::SIZE_LOG2) / 4096 }; @@ -109,7 +110,7 @@ Genode::addr_t Genode::Platform_pd::_init_page_directory() const } -void Genode::Platform_pd::_deinit_page_directory(addr_t phys_addr) const +void Platform_pd::_deinit_page_directory(addr_t phys_addr) const { int ret = seL4_CNode_Delete(seL4_CapInitThreadCNode, _page_directory_sel.value(), 32); diff --git a/repos/base-sel4/src/core/spec/arm/platform_thread.cc b/repos/base-sel4/src/core/spec/arm/platform_thread.cc index 2f7500487e..5b7a48fccd 100644 --- a/repos/base-sel4/src/core/spec/arm/platform_thread.cc +++ b/repos/base-sel4/src/core/spec/arm/platform_thread.cc @@ -13,7 +13,10 @@ #include -void Genode::Platform_thread::affinity(Affinity::Location const location) +using namespace Core; + + +void Platform_thread::affinity(Affinity::Location const location) { #if CONFIG_MAX_NUM_NODES > 1 seL4_Error const res = seL4_TCB_SetAffinity(tcb_sel().value(), location.xpos()); diff --git a/repos/base-sel4/src/core/spec/arm/thread.cc b/repos/base-sel4/src/core/spec/arm/thread.cc index 5ab1a951d1..f7f3d8ecb9 100644 --- a/repos/base-sel4/src/core/spec/arm/thread.cc +++ b/repos/base-sel4/src/core/spec/arm/thread.cc @@ -21,12 +21,14 @@ #include #include -void Genode::start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, - unsigned cpu) +using namespace Core; + + +void Core::start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, unsigned cpu) { /* set register values for the instruction pointer and stack pointer */ seL4_UserContext regs; - Genode::memset(®s, 0, sizeof(regs)); + memset(®s, 0, sizeof(regs)); size_t const num_regs = sizeof(regs)/sizeof(seL4_Word); regs.pc = ip; @@ -41,13 +43,15 @@ void Genode::start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, seL4_TCB_Resume(tcb_sel.value()); } -void Genode::affinity_sel4_thread(Cap_sel const &, unsigned cpu) + +void Core::affinity_sel4_thread(Cap_sel const &, unsigned cpu) { if (cpu != 0) error("could not set affinity of thread"); } -Genode::Thread_state Genode::Platform_thread::state() + +Thread_state Platform_thread::state() { seL4_TCB const thread = _info.tcb_sel.value(); seL4_Bool const suspend_source = false; @@ -63,7 +67,7 @@ Genode::Thread_state Genode::Platform_thread::state() } Thread_state state; - Genode::memset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.r0 = registers.r0; state.r1 = registers.r1; diff --git a/repos/base-sel4/src/core/spec/arm/vm_space.cc b/repos/base-sel4/src/core/spec/arm/vm_space.cc index 5d28c2eee0..5c6e8b6b99 100644 --- a/repos/base-sel4/src/core/spec/arm/vm_space.cc +++ b/repos/base-sel4/src/core/spec/arm/vm_space.cc @@ -15,19 +15,22 @@ #include #include -static long map_page_table(Genode::Cap_sel const pagetable, - Genode::Cap_sel const vroot, - Genode::addr_t const virt) +using namespace Core; + + +static long map_page_table(Cap_sel const pagetable, + Cap_sel const vroot, + addr_t const virt) { return seL4_ARM_PageTable_Map(pagetable.value(), vroot.value(), virt, seL4_ARM_Default_VMAttributes); } -long Genode::Vm_space::_map_page(Genode::Cap_sel const &idx, - Genode::addr_t const virt, - Map_attr const map_attr, - bool) +long Vm_space::_map_page(Cap_sel const &idx, + addr_t const virt, + Map_attr const map_attr, + bool) { seL4_ARM_Page const service = _idx_to_sel(idx.value()).value(); seL4_ARM_PageDirectory const pd = _pd_sel.value(); @@ -45,16 +48,16 @@ long Genode::Vm_space::_map_page(Genode::Cap_sel const &idx, } -long Genode::Vm_space::_unmap_page(Genode::Cap_sel const &idx) +long Vm_space::_unmap_page(Cap_sel const &idx) { seL4_ARM_Page const service = _idx_to_sel(idx.value()).value(); return seL4_ARM_Page_Unmap(service); } -long Genode::Vm_space::_invalidate_page(Genode::Cap_sel const &idx, - seL4_Word const start, - seL4_Word const end) +long Vm_space::_invalidate_page(Cap_sel const &idx, + seL4_Word const start, + seL4_Word const end) { seL4_ARM_Page const service = _idx_to_sel(idx.value()).value(); long error = seL4_ARM_Page_CleanInvalidate_Data(service, 0, end - start); @@ -68,8 +71,8 @@ long Genode::Vm_space::_invalidate_page(Genode::Cap_sel const &idx, } -void Genode::Vm_space::unsynchronized_alloc_page_tables(addr_t const start, - addr_t const size) +void Vm_space::unsynchronized_alloc_page_tables(addr_t const start, + addr_t const size) { addr_t constexpr PAGE_TABLE_AREA = 1UL << PAGE_TABLE_LOG2_SIZE; addr_t virt = start & ~(PAGE_TABLE_AREA - 1); diff --git a/repos/base-sel4/src/core/spec/x86/io_port_session_support.cc b/repos/base-sel4/src/core/spec/x86/io_port_session_support.cc index c8c039fbf2..bc78bb165b 100644 --- a/repos/base-sel4/src/core/spec/x86/io_port_session_support.cc +++ b/repos/base-sel4/src/core/spec/x86/io_port_session_support.cc @@ -11,16 +11,13 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include /* base-internal includes */ #include -using namespace Genode; +using namespace Core; unsigned char Io_port_session_component::inb(unsigned short address) @@ -32,7 +29,7 @@ unsigned char Io_port_session_component::inb(unsigned short address) if (v.error == seL4_NoError) return v.result; - Genode::error(__PRETTY_FUNCTION__, " failed ", v.error); + error(__PRETTY_FUNCTION__, " failed ", v.error); return 0; } @@ -46,7 +43,7 @@ unsigned short Io_port_session_component::inw(unsigned short address) if (v.error == seL4_NoError) return v.result; - Genode::error(__PRETTY_FUNCTION__, " failed ", v.error); + error(__PRETTY_FUNCTION__, " failed ", v.error); return 0; } @@ -60,7 +57,7 @@ unsigned Io_port_session_component::inl(unsigned short address) if (v.error == seL4_NoError) return v.result; - Genode::error(__PRETTY_FUNCTION__, " failed ", v.error); + error(__PRETTY_FUNCTION__, " failed ", v.error); return 0; } @@ -70,10 +67,10 @@ void Io_port_session_component::outb(unsigned short address, unsigned char value /* check boundaries */ if (!_in_bounds(address, sizeof(unsigned char))) return; - int error = seL4_X86_IOPort_Out8(seL4_CapIOPort, address, value); + int result = seL4_X86_IOPort_Out8(seL4_CapIOPort, address, value); - if (error != seL4_NoError) - Genode::error(__PRETTY_FUNCTION__, " failed ", error); + if (result != seL4_NoError) + error(__PRETTY_FUNCTION__, " failed ", result); } @@ -82,10 +79,10 @@ void Io_port_session_component::outw(unsigned short address, unsigned short valu /* check boundaries */ if (!_in_bounds(address, sizeof(unsigned short))) return; - int error = seL4_X86_IOPort_Out16(seL4_CapIOPort, address, value); + int result = seL4_X86_IOPort_Out16(seL4_CapIOPort, address, value); - if (error != seL4_NoError) - Genode::error(__PRETTY_FUNCTION__, " failed ", error); + if (result != seL4_NoError) + error(__PRETTY_FUNCTION__, " failed ", result); } @@ -94,8 +91,8 @@ void Io_port_session_component::outl(unsigned short address, unsigned value) /* check boundaries */ if (!_in_bounds(address, sizeof(unsigned))) return; - int error = seL4_X86_IOPort_Out32(seL4_CapIOPort, address, value); + int result = seL4_X86_IOPort_Out32(seL4_CapIOPort, address, value); - if (error != seL4_NoError) - Genode::error(__PRETTY_FUNCTION__, " failed ", error); + if (result != seL4_NoError) + error(__PRETTY_FUNCTION__, " failed ", result); } diff --git a/repos/base-sel4/src/core/spec/x86/irq.cc b/repos/base-sel4/src/core/spec/x86/irq.cc index 2ea442911a..e0f6c9715c 100644 --- a/repos/base-sel4/src/core/spec/x86/irq.cc +++ b/repos/base-sel4/src/core/spec/x86/irq.cc @@ -4,12 +4,16 @@ * \date 2017-07-07 */ +/* core includes */ #include #include -long Genode::Irq_object::_associate(Irq_session::Trigger const &irq_trigger, - Irq_session::Polarity const &irq_polarity) +using namespace Core; + + +long Irq_object::_associate(Irq_session::Trigger const &irq_trigger, + Irq_session::Polarity const &irq_polarity) { enum { IRQ_EDGE = 0, IRQ_LEVEL = 1 }; enum { IRQ_HIGH = 0, IRQ_LOW = 1 }; diff --git a/repos/base-sel4/src/core/spec/x86/platform_services.cc b/repos/base-sel4/src/core/spec/x86/platform_services.cc index b542eef89a..2e779a438d 100644 --- a/repos/base-sel4/src/core/spec/x86/platform_services.cc +++ b/repos/base-sel4/src/core/spec/x86/platform_services.cc @@ -20,10 +20,10 @@ /* * Add x86 specific services */ -void Genode::platform_add_local_services(Rpc_entrypoint &ep, - Sliced_heap &heap, - Registry &services, - Trace::Source_registry &trace_sources) +void Core::platform_add_local_services(Rpc_entrypoint &ep, + Sliced_heap &heap, + Registry &services, + Core::Trace::Source_registry &trace_sources) { static Vm_root vm_root(ep, heap, core_env().ram_allocator(), core_env().local_rm(), trace_sources); diff --git a/repos/base-sel4/src/core/spec/x86/platform_thread.cc b/repos/base-sel4/src/core/spec/x86/platform_thread.cc index 7da93a0e75..14057cd21d 100644 --- a/repos/base-sel4/src/core/spec/x86/platform_thread.cc +++ b/repos/base-sel4/src/core/spec/x86/platform_thread.cc @@ -14,23 +14,25 @@ #include #include -using Genode::Phys_allocator; -using Genode::Allocator; +using namespace Core; -Phys_allocator& Genode::phys_alloc_16k(Allocator * core_mem_alloc) + +Phys_allocator &Core::phys_alloc_16k(Allocator *core_mem_alloc) { - static Genode::Phys_allocator phys_alloc_16k(core_mem_alloc); + static Phys_allocator phys_alloc_16k(core_mem_alloc); return phys_alloc_16k; } -void Genode::Platform_thread::affinity(Affinity::Location const location) + +void Platform_thread::affinity(Affinity::Location const location) { seL4_Error const res = seL4_TCB_SetAffinity(tcb_sel().value(), location.xpos()); if (res == seL4_NoError) _location = location; } -bool Genode::Thread_info::init_vcpu(Platform &platform, Cap_sel ept) + +bool Thread_info::init_vcpu(Platform &platform, Cap_sel ept) { enum { PAGES_16K = (1UL << Vcpu_kobj::SIZE_LOG2) / 4096 }; diff --git a/repos/base-sel4/src/core/spec/x86/vm_session_component.cc b/repos/base-sel4/src/core/spec/x86/vm_session_component.cc index 3e29f2dbc8..5967a16911 100644 --- a/repos/base-sel4/src/core/spec/x86/vm_session_component.cc +++ b/repos/base-sel4/src/core/spec/x86/vm_session_component.cc @@ -22,8 +22,7 @@ #include #include - -using namespace Genode; +using namespace Core; /******************************** @@ -41,7 +40,7 @@ void Vm_session_component::Vcpu::_free_up() if (ret == seL4_NoError) platform_specific().core_sel_alloc().free(_notification); else - Genode::error(__func__, " cnode delete error ", ret); + error(__func__, " cnode delete error ", ret); } } @@ -53,7 +52,7 @@ Vm_session_component::Vcpu::Vcpu(Rpc_entrypoint &ep, : _ep(ep), _ram_alloc(ram_alloc), - _ds_cap (_ram_alloc.alloc(align_addr(sizeof(Genode::Vcpu_state), 12), + _ds_cap (_ram_alloc.alloc(align_addr(sizeof(Vcpu_state), 12), Cache::CACHED)) { try { @@ -232,7 +231,7 @@ Capability Vm_session_component::create_vcpu(Thread_cap free_up(); throw; } catch (...) { - Genode::error("unexpected exception occurred"); + error("unexpected exception occurred"); free_up(); return; } @@ -285,14 +284,14 @@ void Vm_session_component::_attach_vm_memory(Dataspace_component &dsc, return; } } catch (Vm_space::Selector_allocator::Out_of_indices) { - Genode::warning("run out of indices - flush all - cap=", - _cap_quota_guard().used(), "/", - _cap_quota_guard().avail(), "/", - _cap_quota_guard().limit(), " ram=", - _ram_quota_guard().used(), "/", - _ram_quota_guard().avail(), "/", - _ram_quota_guard().limit(), " guest=", - Genode::Hex(0UL - _map.avail())); + warning("run out of indices - flush all - cap=", + _cap_quota_guard().used(), "/", + _cap_quota_guard().avail(), "/", + _cap_quota_guard().limit(), " ram=", + _ram_quota_guard().used(), "/", + _ram_quota_guard().avail(), "/", + _ram_quota_guard().limit(), " guest=", + Hex(0UL - _map.avail())); /* drop all attachment to limit ram usage of this session */ while (true) { @@ -307,7 +306,7 @@ void Vm_session_component::_attach_vm_memory(Dataspace_component &dsc, _vm_space.map_guest(page.addr, page.hotspot, (1 << page.log2_order) / 4096, attr_flush); } catch (Vm_space::Alloc_page_table_failed) { - Genode::error("alloc page table failed"); + error("alloc page table failed"); return; } diff --git a/repos/base-sel4/src/core/spec/x86/vm_space.cc b/repos/base-sel4/src/core/spec/x86/vm_space.cc index ed06ab9f80..9016120cc5 100644 --- a/repos/base-sel4/src/core/spec/x86/vm_space.cc +++ b/repos/base-sel4/src/core/spec/x86/vm_space.cc @@ -14,10 +14,13 @@ /* core includes */ #include -long Genode::Vm_space::_map_page(Genode::Cap_sel const &idx, - Genode::addr_t const virt, - Map_attr const map_attr, - bool const ept) +using namespace Core; + + +long Vm_space::_map_page(Cap_sel const &idx, + addr_t const virt, + Map_attr const map_attr, + bool const ept) { seL4_X86_Page const service = _idx_to_sel(idx.value()).value(); seL4_X86_PageDirectory const pd = _pd_sel.value(); @@ -38,14 +41,13 @@ long Genode::Vm_space::_map_page(Genode::Cap_sel const &idx, return seL4_X86_Page_Map(service, pd, virt, rights, attr); } -long Genode::Vm_space::_unmap_page(Genode::Cap_sel const &idx) +long Vm_space::_unmap_page(Cap_sel const &idx) { seL4_X86_Page const service = _idx_to_sel(idx.value()).value(); return seL4_X86_Page_Unmap(service); } -long Genode::Vm_space::_invalidate_page(Genode::Cap_sel const &, - seL4_Word const, seL4_Word const) +long Vm_space::_invalidate_page(Cap_sel const &, seL4_Word const, seL4_Word const) { return seL4_NoError; } @@ -85,32 +87,31 @@ struct Ept_page_map_kobj static char const *name() { return "ept page-map level-4 table"; } }; -static long map_page_table(Genode::Cap_sel const pagetable, - Genode::Cap_sel const vroot, - Genode::addr_t const virt) +static long map_page_table(Cap_sel const pagetable, + Cap_sel const vroot, + addr_t const virt) { return seL4_X86_EPTPT_Map(pagetable.value(), vroot.value(), virt, seL4_X86_Default_VMAttributes); } -static long map_pdpt(Genode::Cap_sel const pdpt, - Genode::Cap_sel const vroot, - Genode::addr_t const virt) +static long map_pdpt(Cap_sel const pdpt, + Cap_sel const vroot, + addr_t const virt) { return seL4_X86_EPTPDPT_Map(pdpt.value(), vroot.value(), virt, seL4_X86_Default_VMAttributes); } -static long map_directory(Genode::Cap_sel const pd, - Genode::Cap_sel const vroot, - Genode::addr_t const virt) +static long map_directory(Cap_sel const pd, + Cap_sel const vroot, + addr_t const virt) { return seL4_X86_EPTPD_Map(pd.value(), vroot.value(), virt, seL4_X86_Default_VMAttributes); } -void Genode::Vm_space::unsynchronized_alloc_guest_page_tables(addr_t const start, - addr_t size) +void Vm_space::unsynchronized_alloc_guest_page_tables(addr_t const start, addr_t size) { addr_t constexpr PAGE_TABLE_AREA = 1UL << EPT_PAGE_TABLE_LOG2_SIZE; addr_t virt = start & ~(PAGE_TABLE_AREA - 1); diff --git a/repos/base-sel4/src/core/spec/x86_32/arch_kernel_object.h b/repos/base-sel4/src/core/spec/x86_32/arch_kernel_object.h index 1075b4003c..2a8a7ba7c3 100644 --- a/repos/base-sel4/src/core/spec/x86_32/arch_kernel_object.h +++ b/repos/base-sel4/src/core/spec/x86_32/arch_kernel_object.h @@ -17,7 +17,7 @@ #include #include -namespace Genode { +namespace Core { Phys_allocator &phys_alloc_16k(Allocator * core_mem_alloc = nullptr); diff --git a/repos/base-sel4/src/core/spec/x86_32/boot_info.cc b/repos/base-sel4/src/core/spec/x86_32/boot_info.cc index e0d6b4e824..5444b55904 100644 --- a/repos/base-sel4/src/core/spec/x86_32/boot_info.cc +++ b/repos/base-sel4/src/core/spec/x86_32/boot_info.cc @@ -17,14 +17,17 @@ /* core includes */ #include +using namespace Core; + /* provided by the assembly startup code */ -extern Genode::addr_t __initial_bx; +extern addr_t __initial_bx; + /** * Obtain seL4 boot info structure */ -seL4_BootInfo const & Genode::sel4_boot_info() +seL4_BootInfo const &Core::sel4_boot_info() { return *(seL4_BootInfo const *)__initial_bx; } diff --git a/repos/base-sel4/src/core/spec/x86_32/platform.cc b/repos/base-sel4/src/core/spec/x86_32/platform.cc index 006aa2560e..c88365509a 100644 --- a/repos/base-sel4/src/core/spec/x86_32/platform.cc +++ b/repos/base-sel4/src/core/spec/x86_32/platform.cc @@ -21,17 +21,23 @@ #include #include "arch_kernel_object.h" -seL4_Word Genode::Untyped_memory::smallest_page_type() { return seL4_X86_4K; } +using namespace Core; -void Genode::Platform::init_sel4_ipc_buffer() + +seL4_Word Untyped_memory::smallest_page_type() { return seL4_X86_4K; } + + +void Platform::init_sel4_ipc_buffer() { asm volatile ("movl %0, %%fs" :: "r"(IPCBUF_GDT_SELECTOR) : "memory"); } -long Genode::Platform::_unmap_page_frame(Cap_sel const &sel) { + +long Platform::_unmap_page_frame(Cap_sel const &sel) { return seL4_X86_Page_Unmap(sel.value()); } -void Genode::Platform::_init_core_page_table_registry() + +void Platform::_init_core_page_table_registry() { seL4_BootInfo const &bi = sel4_boot_info(); diff --git a/repos/base-sel4/src/core/spec/x86_32/platform_pd.cc b/repos/base-sel4/src/core/spec/x86_32/platform_pd.cc index 358cabb79d..9745a08ac6 100644 --- a/repos/base-sel4/src/core/spec/x86_32/platform_pd.cc +++ b/repos/base-sel4/src/core/spec/x86_32/platform_pd.cc @@ -16,8 +16,10 @@ #include "arch_kernel_object.h" +using namespace Core; -Genode::addr_t Genode::Platform_pd::_init_page_directory() const + +addr_t Platform_pd::_init_page_directory() const { addr_t const phys_addr = Untyped_memory::alloc_page(platform().ram_alloc()); seL4_Untyped const service = Untyped_memory::untyped_sel(phys_addr).value(); @@ -36,7 +38,7 @@ Genode::addr_t Genode::Platform_pd::_init_page_directory() const } -void Genode::Platform_pd::_deinit_page_directory(addr_t phys_addr) const +void Platform_pd::_deinit_page_directory(addr_t phys_addr) const { int ret = seL4_CNode_Delete(seL4_CapInitThreadCNode, _page_directory_sel.value(), 32); diff --git a/repos/base-sel4/src/core/spec/x86_32/thread.cc b/repos/base-sel4/src/core/spec/x86_32/thread.cc index 191f8a2b7a..79c419faef 100644 --- a/repos/base-sel4/src/core/spec/x86_32/thread.cc +++ b/repos/base-sel4/src/core/spec/x86_32/thread.cc @@ -21,12 +21,14 @@ #include #include -void Genode::start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, - unsigned cpu) +using namespace Genode; + + +void Core::start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, unsigned cpu) { /* set register values for the instruction pointer and stack pointer */ seL4_UserContext regs; - Genode::memset(®s, 0, sizeof(regs)); + memset(®s, 0, sizeof(regs)); size_t const num_regs = sizeof(regs)/sizeof(seL4_Word); regs.eip = ip; @@ -42,12 +44,14 @@ void Genode::start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, seL4_TCB_Resume(tcb_sel.value()); } -void Genode::affinity_sel4_thread(Cap_sel const &tcb_sel, unsigned cpu) + +void Core::affinity_sel4_thread(Cap_sel const &tcb_sel, unsigned cpu) { seL4_TCB_SetAffinity(tcb_sel.value(), cpu); } -Genode::Thread_state Genode::Platform_thread::state() + +Thread_state Core::Platform_thread::state() { seL4_TCB const thread = _info.tcb_sel.value(); seL4_Bool const suspend_source = false; @@ -63,7 +67,7 @@ Genode::Thread_state Genode::Platform_thread::state() } Thread_state state; - Genode::memset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.ip = registers.eip; state.sp = registers.esp; diff --git a/repos/base-sel4/src/core/spec/x86_32/vm_space.cc b/repos/base-sel4/src/core/spec/x86_32/vm_space.cc index c67a953e01..9fe2abfe4a 100644 --- a/repos/base-sel4/src/core/spec/x86_32/vm_space.cc +++ b/repos/base-sel4/src/core/spec/x86_32/vm_space.cc @@ -16,16 +16,19 @@ #include "arch_kernel_object.h" -static long map_page_table(Genode::Cap_sel const pagetable, - Genode::Cap_sel const vroot, - Genode::addr_t const virt) +using namespace Core; + + +static long map_page_table(Cap_sel const pagetable, + Cap_sel const vroot, + addr_t const virt) { return seL4_X86_PageTable_Map(pagetable.value(), vroot.value(), virt, seL4_X86_Default_VMAttributes); } -void Genode::Vm_space::unsynchronized_alloc_page_tables(addr_t const start, - addr_t const size) +void Vm_space::unsynchronized_alloc_page_tables(addr_t const start, + addr_t const size) { addr_t constexpr PAGE_TABLE_AREA = 1UL << PAGE_TABLE_LOG2_SIZE; addr_t virt = start & ~(PAGE_TABLE_AREA - 1); diff --git a/repos/base-sel4/src/core/spec/x86_64/arch_kernel_object.h b/repos/base-sel4/src/core/spec/x86_64/arch_kernel_object.h index bc3ce04ae0..ccf2673585 100644 --- a/repos/base-sel4/src/core/spec/x86_64/arch_kernel_object.h +++ b/repos/base-sel4/src/core/spec/x86_64/arch_kernel_object.h @@ -17,7 +17,7 @@ #include #include -namespace Genode { +namespace Core { Phys_allocator &phys_alloc_16k(Allocator * core_mem_alloc = nullptr); diff --git a/repos/base-sel4/src/core/spec/x86_64/boot_info.cc b/repos/base-sel4/src/core/spec/x86_64/boot_info.cc index f176d67cfc..cfa977497f 100644 --- a/repos/base-sel4/src/core/spec/x86_64/boot_info.cc +++ b/repos/base-sel4/src/core/spec/x86_64/boot_info.cc @@ -17,14 +17,16 @@ /* core includes */ #include +using namespace Core; + /* provided by the assembly startup code */ -extern Genode::addr_t __initial_di; +extern addr_t __initial_di; /** * Obtain seL4 boot info structure */ -seL4_BootInfo const & Genode::sel4_boot_info() +seL4_BootInfo const &Core::sel4_boot_info() { return *(seL4_BootInfo const *)__initial_di; } diff --git a/repos/base-sel4/src/core/spec/x86_64/platform.cc b/repos/base-sel4/src/core/spec/x86_64/platform.cc index 9e15b8e274..b5228eaafe 100644 --- a/repos/base-sel4/src/core/spec/x86_64/platform.cc +++ b/repos/base-sel4/src/core/spec/x86_64/platform.cc @@ -21,15 +21,20 @@ #include #include "arch_kernel_object.h" +using namespace Core; -seL4_Word Genode::Untyped_memory::smallest_page_type() { return seL4_X86_4K; } -void Genode::Platform::init_sel4_ipc_buffer() { } +seL4_Word Untyped_memory::smallest_page_type() { return seL4_X86_4K; } -long Genode::Platform::_unmap_page_frame(Cap_sel const &sel) { + +void Platform::init_sel4_ipc_buffer() { } + + +long Platform::_unmap_page_frame(Cap_sel const &sel) { return seL4_X86_Page_Unmap(sel.value()); } -void Genode::Platform::_init_core_page_table_registry() + +void Platform::_init_core_page_table_registry() { seL4_BootInfo const &bi = sel4_boot_info(); diff --git a/repos/base-sel4/src/core/spec/x86_64/platform_pd.cc b/repos/base-sel4/src/core/spec/x86_64/platform_pd.cc index bf14ba27ee..2c7d1c69ee 100644 --- a/repos/base-sel4/src/core/spec/x86_64/platform_pd.cc +++ b/repos/base-sel4/src/core/spec/x86_64/platform_pd.cc @@ -16,7 +16,10 @@ #include "arch_kernel_object.h" -Genode::addr_t Genode::Platform_pd::_init_page_directory() const +using namespace Core; + + +addr_t Platform_pd::_init_page_directory() const { addr_t const phys_addr = Untyped_memory::alloc_page(platform().ram_alloc()); seL4_Untyped const service = Untyped_memory::untyped_sel(phys_addr).value(); @@ -33,7 +36,7 @@ Genode::addr_t Genode::Platform_pd::_init_page_directory() const return phys_addr; } -void Genode::Platform_pd::_deinit_page_directory(addr_t phys_addr) const +void Platform_pd::_deinit_page_directory(addr_t phys_addr) const { int ret = seL4_CNode_Delete(seL4_CapInitThreadCNode, _page_directory_sel.value(), 32); diff --git a/repos/base-sel4/src/core/spec/x86_64/thread.cc b/repos/base-sel4/src/core/spec/x86_64/thread.cc index dce39cc3f7..249e423f30 100644 --- a/repos/base-sel4/src/core/spec/x86_64/thread.cc +++ b/repos/base-sel4/src/core/spec/x86_64/thread.cc @@ -21,12 +21,14 @@ #include #include -void Genode::start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, - unsigned cpu) +using namespace Core; + + +void Core::start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, unsigned cpu) { /* set register values for the instruction pointer and stack pointer */ seL4_UserContext regs; - Genode::memset(®s, 0, sizeof(regs)); + memset(®s, 0, sizeof(regs)); size_t const num_regs = sizeof(regs)/sizeof(seL4_Word); regs.rip = ip; @@ -41,12 +43,14 @@ void Genode::start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, seL4_TCB_Resume(tcb_sel.value()); } -void Genode::affinity_sel4_thread(Cap_sel const &tcb_sel, unsigned cpu) + +void Core::affinity_sel4_thread(Cap_sel const &tcb_sel, unsigned cpu) { seL4_TCB_SetAffinity(tcb_sel.value(), cpu); } -Genode::Thread_state Genode::Platform_thread::state() + +Thread_state Platform_thread::state() { seL4_TCB const thread = _info.tcb_sel.value(); seL4_Bool const suspend_source = false; @@ -62,7 +66,7 @@ Genode::Thread_state Genode::Platform_thread::state() } Thread_state state; - Genode::memset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.ip = registers.rip; state.sp = registers.rsp; diff --git a/repos/base-sel4/src/core/spec/x86_64/vm_space.cc b/repos/base-sel4/src/core/spec/x86_64/vm_space.cc index de206eeaa1..8e1d33380b 100644 --- a/repos/base-sel4/src/core/spec/x86_64/vm_space.cc +++ b/repos/base-sel4/src/core/spec/x86_64/vm_space.cc @@ -16,32 +16,35 @@ #include "arch_kernel_object.h" -static long map_page_table(Genode::Cap_sel const pagetable, - Genode::Cap_sel const vroot, - Genode::addr_t const virt) +using namespace Core; + + +static long map_page_table(Cap_sel const pagetable, + Cap_sel const vroot, + addr_t const virt) { return seL4_X86_PageTable_Map(pagetable.value(), vroot.value(), virt, seL4_X86_Default_VMAttributes); } -static long map_pdpt(Genode::Cap_sel const pdpt, - Genode::Cap_sel const vroot, +static long map_pdpt(Cap_sel const pdpt, + Cap_sel const vroot, seL4_Word const virt) { return seL4_X86_PDPT_Map(pdpt.value(), vroot.value(), virt, seL4_X86_Default_VMAttributes); } -static long map_directory(Genode::Cap_sel const pd, - Genode::Cap_sel const vroot, +static long map_directory(Cap_sel const pd, + Cap_sel const vroot, seL4_Word const virt) { return seL4_X86_PageDirectory_Map(pd.value(), vroot.value(), virt, seL4_X86_Default_VMAttributes); } -void Genode::Vm_space::unsynchronized_alloc_page_tables(addr_t const start, - addr_t const size) +void Vm_space::unsynchronized_alloc_page_tables(addr_t const start, + addr_t const size) { addr_t constexpr PAGE_TABLE_AREA = 1UL << PAGE_TABLE_LOG2_SIZE; addr_t virt = start & ~(PAGE_TABLE_AREA - 1); diff --git a/repos/base-sel4/src/core/stack_area.cc b/repos/base-sel4/src/core/stack_area.cc index ac0bebe97b..cc6b627628 100644 --- a/repos/base-sel4/src/core/stack_area.cc +++ b/repos/base-sel4/src/core/stack_area.cc @@ -15,7 +15,6 @@ /* Genode includes */ #include #include -#include #include #include @@ -47,10 +46,10 @@ class Stack_area_region_map : public Region_map { private: - using Ds_slab = Synced_allocator >; - Ds_slab _ds_slab { platform().core_mem_alloc() }; + Ds_slab _ds_slab { Core::platform().core_mem_alloc() }; public: @@ -60,10 +59,12 @@ class Stack_area_region_map : public Region_map Local_addr attach(Dataspace_capability, size_t size, off_t, bool, Local_addr local_addr, bool, bool) override { + using namespace Core; + size = round_page(size); /* allocate physical memory */ - Range_allocator &phys_alloc = platform_specific().ram_alloc(); + Range_allocator &phys_alloc = Core::platform_specific().ram_alloc(); size_t const num_pages = size >> get_page_size_log2(); addr_t const phys = Untyped_memory::alloc_pages(phys_alloc, num_pages); Untyped_memory::convert_to_page_frames(phys, num_pages); @@ -88,7 +89,7 @@ class Stack_area_region_map : public Region_map void detach(Local_addr local_addr) override { - using Genode::addr_t; + using namespace Core; if ((addr_t)local_addr >= stack_area_virtual_size()) return; diff --git a/repos/base-sel4/src/core/thread_start.cc b/repos/base-sel4/src/core/thread_start.cc index ba09822c7c..c93ac873a3 100644 --- a/repos/base-sel4/src/core/thread_start.cc +++ b/repos/base-sel4/src/core/thread_start.cc @@ -13,7 +13,6 @@ /* Genode includes */ #include -#include #include /* base-internal includes */ @@ -28,7 +27,7 @@ /* seL4 includes */ #include -using namespace Genode; +using namespace Core; void Thread::_init_platform_thread(size_t, Type type) @@ -105,9 +104,9 @@ void Thread::start() start_sel4_thread(Cap_sel(native_thread().tcb_sel), (addr_t)&_thread_start, (addr_t)stack_top(), _affinity.xpos()); - struct Core_trace_source : public Trace::Source::Info_accessor, - private Trace::Control, - private Trace::Source + struct Core_trace_source : public Core::Trace::Source::Info_accessor, + private Core::Trace::Control, + private Core::Trace::Source { Thread &_thread; @@ -129,17 +128,17 @@ void Thread::start() } - Core_trace_source(Trace::Source_registry ®istry, Thread &t) + Core_trace_source(Core::Trace::Source_registry ®istry, Thread &t) : - Trace::Control(), - Trace::Source(*this, *this), _thread(t) + Core::Trace::Control(), + Core::Trace::Source(*this, *this), _thread(t) { registry.insert(this); } }; new (platform().core_mem_alloc()) - Core_trace_source(Trace::sources(), *this); + Core_trace_source(Core::Trace::sources(), *this); } diff --git a/repos/base/src/core/capability_space.cc b/repos/base/src/core/capability_space.cc index ba16260cdf..4f714f2d85 100644 --- a/repos/base/src/core/capability_space.cc +++ b/repos/base/src/core/capability_space.cc @@ -11,13 +11,15 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* base includes */ +/* Genode includes */ #include -#include /* base-internal includes */ #include +/* core includes */ +#include + /** * Definition of capability meta data @@ -33,7 +35,7 @@ struct Genode::Native_capability::Data : Capability_data }; -using namespace Genode; +using namespace Core; /** diff --git a/repos/base/src/core/core_log.cc b/repos/base/src/core/core_log.cc index 8df8613bd3..88a043804c 100644 --- a/repos/base/src/core/core_log.cc +++ b/repos/base/src/core/core_log.cc @@ -12,11 +12,17 @@ * under the terms of the GNU Affero General Public License version 3. */ +/* Genode includes */ +#include + +/* core includes */ #include -static Genode::Core_log_range range { 0, 0 }; + +static Core::Core_log_range range { 0, 0 }; static unsigned range_pos { 0 }; + static void out_mem(char const c) { struct Log_memory @@ -25,7 +31,7 @@ static void out_mem(char const c) char data[1]; unsigned out(char const c, unsigned cur_pos, - Genode::Core_log_range const &range) + Core::Core_log_range const &range) { pos.value = cur_pos; data[cur_pos++] = c; @@ -40,10 +46,10 @@ static void out_mem(char const c) } -void Genode::init_core_log(Core_log_range const &r) { range = r; } +void Core::init_core_log(Core_log_range const &r) { range = r; } -void Genode::Core_log::output(char const * str) +void Core::Core_log::output(char const * str) { for (unsigned i = 0; i < Genode::strlen(str); i++) { out(str[i]); diff --git a/repos/base/src/core/core_mem_alloc.cc b/repos/base/src/core/core_mem_alloc.cc index e352ab6337..cbad2f1f61 100644 --- a/repos/base/src/core/core_mem_alloc.cc +++ b/repos/base/src/core/core_mem_alloc.cc @@ -13,13 +13,12 @@ */ /* Genode includes */ -#include #include /* local includes */ #include -using namespace Genode; +using namespace Core; void * Mapped_avl_allocator::map_addr(void * addr) @@ -83,8 +82,9 @@ void Mapped_mem_allocator::free(void *addr, size_t) if (!b) return; if (!_unmap_local((addr_t)addr, (addr_t)b->map_addr, b->size())) { - Genode::error("error on unmap virt=", addr, " phys=", - Hex_range((addr_t)b->map_addr, b->size())); + error("error on unmap virt=", addr, " phys=", + Hex_range((addr_t)b->map_addr, b->size())); + /* leak physical and virtual region because of unknown usage state */ return; } diff --git a/repos/base/src/core/core_region_map.cc b/repos/base/src/core/core_region_map.cc index 8fff99e350..b505d6f3a8 100644 --- a/repos/base/src/core/core_region_map.cc +++ b/repos/base/src/core/core_region_map.cc @@ -18,7 +18,7 @@ #include #include -using namespace Genode; +using namespace Core; Region_map::Local_addr diff --git a/repos/base/src/core/core_rpc_cap_alloc.cc b/repos/base/src/core/core_rpc_cap_alloc.cc index f26ffeee7c..b8203279b6 100644 --- a/repos/base/src/core/core_rpc_cap_alloc.cc +++ b/repos/base/src/core/core_rpc_cap_alloc.cc @@ -14,11 +14,11 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ #include #include -using namespace Genode; +using namespace Core; static Rpc_cap_factory &rpc_cap_factory() diff --git a/repos/base/src/core/cpu_session_component.cc b/repos/base/src/core/cpu_session_component.cc index 959e1ab113..626d0eb4e3 100644 --- a/repos/base/src/core/cpu_session_component.cc +++ b/repos/base/src/core/cpu_session_component.cc @@ -14,7 +14,6 @@ */ /* Genode includes */ -#include #include /* core includes */ @@ -23,7 +22,7 @@ #include #include -using namespace Genode; +using namespace Core; Thread_capability Cpu_session_component::create_thread(Capability pd_cap, @@ -378,7 +377,7 @@ size_t Cpu_session_component::_weight_to_quota(size_t const weight) const ** Trace::Source_registry ** ****************************/ -unsigned Trace::Source::_alloc_unique_id() +unsigned Core::Trace::Source::_alloc_unique_id() { static Mutex lock; static unsigned cnt; diff --git a/repos/base/src/core/cpu_session_support.cc b/repos/base/src/core/cpu_session_support.cc index 66f6523b81..7525b58dd3 100644 --- a/repos/base/src/core/cpu_session_support.cc +++ b/repos/base/src/core/cpu_session_support.cc @@ -11,13 +11,10 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include -using namespace Genode; +using namespace Core; Dataspace_capability Cpu_thread_component::utcb() diff --git a/repos/base/src/core/cpu_thread_component.cc b/repos/base/src/core/cpu_thread_component.cc index fdd21b198d..8d694ed299 100644 --- a/repos/base/src/core/cpu_thread_component.cc +++ b/repos/base/src/core/cpu_thread_component.cc @@ -14,7 +14,7 @@ /* core includes */ #include -using namespace Genode; +using namespace Core; void Cpu_thread_component::_update_exception_sigh() diff --git a/repos/base/src/core/dataspace_component.cc b/repos/base/src/core/dataspace_component.cc index 1ba4f5ead5..c109ac5c1e 100644 --- a/repos/base/src/core/dataspace_component.cc +++ b/repos/base/src/core/dataspace_component.cc @@ -15,7 +15,7 @@ #include #include -using namespace Genode; +using namespace Core; void Dataspace_component::attached_to(Rm_region ®ion) diff --git a/repos/base/src/core/default_log.cc b/repos/base/src/core/default_log.cc index 01a52833a9..1da89e4deb 100644 --- a/repos/base/src/core/default_log.cc +++ b/repos/base/src/core/default_log.cc @@ -13,7 +13,6 @@ */ /* Genode includes */ -#include #include /* base-internal includes */ @@ -28,7 +27,7 @@ Genode::Log &Genode::Log::log() { struct Buffer { - struct Write_fn : Core_log + struct Write_fn : Core::Core_log { void operator () (char const *s) { output(s); } } function { }; diff --git a/repos/base/src/core/include/account.h b/repos/base/src/core/include/account.h index fda6370ad6..763a8244a6 100644 --- a/repos/base/src/core/include/account.h +++ b/repos/base/src/core/include/account.h @@ -14,15 +14,17 @@ #ifndef _CORE__INCLUDE__ACCOUNT_H_ #define _CORE__INCLUDE__ACCOUNT_H_ -#include #include #include -namespace Genode { template class Account; } +/* core includes */ +#include + +namespace Core { template class Account; } template -class Genode::Account +class Core::Account { private: diff --git a/repos/base/src/core/include/address_space.h b/repos/base/src/core/include/address_space.h index 0df3ecfa0b..b0eaf525be 100644 --- a/repos/base/src/core/include/address_space.h +++ b/repos/base/src/core/include/address_space.h @@ -14,14 +14,17 @@ #ifndef _CORE__INCLUDE__ADDRESS_SPACE_H_ #define _CORE__INCLUDE__ADDRESS_SPACE_H_ -#include +/* Genode includes */ #include -namespace Genode { struct Address_space; } +/* core includes */ +#include + +namespace Core { struct Address_space; } -struct Genode::Address_space : private Weak_object, - public Interface +struct Core::Address_space : private Weak_object, + public Interface { friend class Locked_ptr; diff --git a/repos/base/src/core/include/boot_modules.h b/repos/base/src/core/include/boot_modules.h index b4ea90af33..5ec33fafe7 100644 --- a/repos/base/src/core/include/boot_modules.h +++ b/repos/base/src/core/include/boot_modules.h @@ -14,19 +14,22 @@ #ifndef _CORE__INCLUDE__BOOT_MODULES_H_ #define _CORE__INCLUDE__BOOT_MODULES_H_ -namespace Genode { struct Boot_modules_header; } +/* core includes */ +#include + +namespace Core { struct Boot_modules_header; } -struct Genode::Boot_modules_header +struct Core::Boot_modules_header { long name; /* physical address of null-terminated string */ long base; /* physical address of module data */ long size; /* size of module data in bytes */ }; -extern Genode::Boot_modules_header _boot_modules_headers_begin; -extern Genode::Boot_modules_header _boot_modules_headers_end; -extern int _boot_modules_binaries_begin; -extern int _boot_modules_binaries_end; +extern Core::Boot_modules_header _boot_modules_headers_begin; +extern Core::Boot_modules_header _boot_modules_headers_end; +extern int _boot_modules_binaries_begin; +extern int _boot_modules_binaries_end; #endif /* _CORE__INCLUDE__BOOT_MODULES_H_ */ diff --git a/repos/base/src/core/include/constrained_core_ram.h b/repos/base/src/core/include/constrained_core_ram.h index a5776bace0..393ed923c3 100644 --- a/repos/base/src/core/include/constrained_core_ram.h +++ b/repos/base/src/core/include/constrained_core_ram.h @@ -15,12 +15,16 @@ #ifndef _CORE__INCLUDE__CORE_CONSTRAINED_CORE_RAM_H_ #define _CORE__INCLUDE__CORE_CONSTRAINED_CORE_RAM_H_ +/* Genode includes */ #include -namespace Genode { class Constrained_core_ram; } +/* core includes */ +#include + +namespace Core { class Constrained_core_ram; } -class Genode::Constrained_core_ram : public Allocator +class Core::Constrained_core_ram : public Allocator { private: @@ -28,7 +32,7 @@ class Genode::Constrained_core_ram : public Allocator Cap_quota_guard &_cap_guard; Range_allocator &_core_mem; - uint64_t core_mem_allocated { 0 }; + Genode::uint64_t core_mem_allocated { 0 }; public: diff --git a/repos/base/src/core/include/core_capability_space.h b/repos/base/src/core/include/core_capability_space.h index 8bce5980ae..7185789760 100644 --- a/repos/base/src/core/include/core_capability_space.h +++ b/repos/base/src/core/include/core_capability_space.h @@ -17,10 +17,15 @@ /* base-internal includes */ #include -namespace Genode { class Cap_sel; class Pd_session; } +/* core includes */ +#include +namespace Genode { -namespace Genode { namespace Capability_space { + class Pd_session; + class Cap_sel; + + namespace Capability_space { /** * Create new RPC object capability for the specified entrypoint @@ -29,7 +34,7 @@ namespace Genode { namespace Capability_space { Pd_session const *, Rpc_obj_key); - Native_capability create_notification_cap(Genode::Cap_sel ¬ify_cap); + Native_capability create_notification_cap(Cap_sel ¬ify_cap); } } #endif /* _CORE__INCLUDE__CORE_CAPABILITY_SPACE_H_ */ diff --git a/repos/base/src/core/include/core_env.h b/repos/base/src/core/include/core_env.h index 9f7278ed9d..a152d34de7 100644 --- a/repos/base/src/core/include/core_env.h +++ b/repos/base/src/core/include/core_env.h @@ -29,14 +29,14 @@ #include #include -namespace Genode { +namespace Core { class Core_env; extern Core_env &core_env(); } -class Genode::Core_env : public Env_deprecated, Noncopyable +class Core::Core_env : public Env_deprecated, Noncopyable { private: diff --git a/repos/base/src/core/include/core_log.h b/repos/base/src/core/include/core_log.h index a60d42964f..88d1b92e7b 100644 --- a/repos/base/src/core/include/core_log.h +++ b/repos/base/src/core/include/core_log.h @@ -15,9 +15,10 @@ #ifndef _CORE_LOG_H_ #define _CORE_LOG_H_ -#include +/* core includes */ +#include -namespace Genode { +namespace Core { struct Core_log; @@ -30,7 +31,7 @@ namespace Genode { } -struct Genode::Core_log +struct Core::Core_log { void out(char const c); diff --git a/repos/base/src/core/include/core_mem_alloc.h b/repos/base/src/core/include/core_mem_alloc.h index dcd317e75f..783772b71c 100644 --- a/repos/base/src/core/include/core_mem_alloc.h +++ b/repos/base/src/core/include/core_mem_alloc.h @@ -15,12 +15,16 @@ #ifndef _CORE__INCLUDE__CORE_MEM_ALLOC_H_ #define _CORE__INCLUDE__CORE_MEM_ALLOC_H_ +/* Genode includes */ #include #include + +/* core includes */ #include #include -namespace Genode { +namespace Core { + class Core_mem_translator; class Core_mem_allocator; @@ -39,7 +43,7 @@ namespace Genode { * Interface of an allocator that allows to return physical addresses * of its used virtual address ranges, and vice versa. */ -class Genode::Core_mem_translator : public Genode::Range_allocator +class Core::Core_mem_translator : public Range_allocator { public: @@ -62,14 +66,13 @@ class Genode::Core_mem_translator : public Genode::Range_allocator /** * Metadata for allocator blocks that stores a related address */ -struct Genode::Metadata { void * map_addr; }; +struct Core::Metadata { void * map_addr; }; /** * Page-size granular allocator that links ranges to related ones. */ -class Genode::Mapped_avl_allocator -: public Genode::Allocator_avl_tpl +class Core::Mapped_avl_allocator : public Allocator_avl_tpl { friend class Mapped_mem_allocator; @@ -99,7 +102,7 @@ class Genode::Mapped_avl_allocator * meta-data allocator for the other allocators and as back end for core's * synchronized memory allocator. */ -class Genode::Mapped_mem_allocator : public Genode::Core_mem_translator +class Core::Mapped_mem_allocator : public Core_mem_translator { private: @@ -196,7 +199,7 @@ class Genode::Mapped_mem_allocator : public Genode::Core_mem_translator * The class itself implements a ready-to-use memory allocator for * core that allows to allocate memory at page granularity only. */ -class Genode::Core_mem_allocator : public Genode::Core_mem_translator +class Core::Core_mem_allocator : public Core_mem_translator { protected: diff --git a/repos/base/src/core/include/core_region_map.h b/repos/base/src/core/include/core_region_map.h index d322a0f35d..fee4e1dedc 100644 --- a/repos/base/src/core/include/core_region_map.h +++ b/repos/base/src/core/include/core_region_map.h @@ -21,10 +21,10 @@ /* core includes */ #include -namespace Genode { class Core_region_map; } +namespace Core { class Core_region_map; } -class Genode::Core_region_map : public Region_map +class Core::Core_region_map : public Region_map { private: diff --git a/repos/base/src/core/include/core_service.h b/repos/base/src/core/include/core_service.h index 4f0ef1185c..7d59099cc3 100644 --- a/repos/base/src/core/include/core_service.h +++ b/repos/base/src/core/include/core_service.h @@ -16,11 +16,14 @@ #include -namespace Genode { template struct Core_service; } +/* core includes */ +#include + +namespace Core { template struct Core_service; } template -struct Genode::Core_service : Local_service +struct Core::Core_service : Local_service { Registry::Element _element; diff --git a/repos/base/src/core/include/cpu_root.h b/repos/base/src/core/include/cpu_root.h index c9136bdd65..9d3cb0d1d1 100644 --- a/repos/base/src/core/include/cpu_root.h +++ b/repos/base/src/core/include/cpu_root.h @@ -20,10 +20,10 @@ /* Core includes */ #include -namespace Genode { class Cpu_root; } +namespace Core { class Cpu_root; } -class Genode::Cpu_root : public Root_component +class Core::Cpu_root : public Root_component { private: diff --git a/repos/base/src/core/include/cpu_session_component.h b/repos/base/src/core/include/cpu_session_component.h index 328a498911..c309210b80 100644 --- a/repos/base/src/core/include/cpu_session_component.h +++ b/repos/base/src/core/include/cpu_session_component.h @@ -32,11 +32,11 @@ #include #include -namespace Genode { class Cpu_session_component; } +namespace Core { class Cpu_session_component; } -class Genode::Cpu_session_component : public Session_object, - private List::Element +class Core::Cpu_session_component : public Session_object, + private List::Element { private: diff --git a/repos/base/src/core/include/cpu_thread_allocator.h b/repos/base/src/core/include/cpu_thread_allocator.h index a54a6724c1..69a82d5bf7 100644 --- a/repos/base/src/core/include/cpu_thread_allocator.h +++ b/repos/base/src/core/include/cpu_thread_allocator.h @@ -18,10 +18,13 @@ #include #include +/* core includes */ +#include + /* base-internal includes */ #include -namespace Genode { +namespace Core { class Cpu_thread_component; diff --git a/repos/base/src/core/include/cpu_thread_component.h b/repos/base/src/core/include/cpu_thread_component.h index e1b9652a5e..84cec38f21 100644 --- a/repos/base/src/core/include/cpu_thread_component.h +++ b/repos/base/src/core/include/cpu_thread_component.h @@ -28,12 +28,12 @@ #include #include -namespace Genode { class Cpu_thread_component; } +namespace Core { class Cpu_thread_component; } -class Genode::Cpu_thread_component : public Rpc_object, - private List::Element, - public Trace::Source::Info_accessor +class Core::Cpu_thread_component : public Rpc_object, + private List::Element, + public Trace::Source::Info_accessor { public: diff --git a/repos/base/src/core/include/dataspace_component.h b/repos/base/src/core/include/dataspace_component.h index 0c97032051..3e74475c3c 100644 --- a/repos/base/src/core/include/dataspace_component.h +++ b/repos/base/src/core/include/dataspace_component.h @@ -23,7 +23,7 @@ /* core includes */ #include -namespace Genode { +namespace Core { class Rm_region; class Dataspace_component; @@ -35,7 +35,7 @@ namespace Genode { } -class Genode::Dataspace_component : public Rpc_object +class Core::Dataspace_component : public Rpc_object { private: @@ -134,7 +134,7 @@ class Genode::Dataspace_component : public Rpc_object */ addr_t map_src_addr() const { - return Genode::map_src_addr(_core_local_addr, _phys_addr); + return Core::map_src_addr(_core_local_addr, _phys_addr); } void assign_core_local_addr(void *addr) { _core_local_addr = (addr_t)addr; } diff --git a/repos/base/src/core/include/io_mem_root.h b/repos/base/src/core/include/io_mem_root.h index b21b72ae23..4695f29578 100644 --- a/repos/base/src/core/include/io_mem_root.h +++ b/repos/base/src/core/include/io_mem_root.h @@ -16,12 +16,13 @@ #include -#include "io_mem_session_component.h" +/* core includes */ +#include -namespace Genode { class Io_mem_root; } +namespace Core { class Io_mem_root; } -class Genode::Io_mem_root : public Root_component +class Core::Io_mem_root : public Root_component { private: diff --git a/repos/base/src/core/include/io_mem_session_component.h b/repos/base/src/core/include/io_mem_session_component.h index 617df1300a..de7687380a 100644 --- a/repos/base/src/core/include/io_mem_session_component.h +++ b/repos/base/src/core/include/io_mem_session_component.h @@ -22,10 +22,10 @@ /* core includes */ #include -namespace Genode { class Io_mem_session_component; } +namespace Core { class Io_mem_session_component; } -class Genode::Io_mem_session_component : public Rpc_object +class Core::Io_mem_session_component : public Rpc_object { private: diff --git a/repos/base/src/core/include/io_port_root.h b/repos/base/src/core/include/io_port_root.h index c95ab573a6..76eae53aa3 100644 --- a/repos/base/src/core/include/io_port_root.h +++ b/repos/base/src/core/include/io_port_root.h @@ -16,15 +16,16 @@ #include -#include "io_port_session_component.h" +/* core includes */ +#include -namespace Genode { +namespace Core { class Io_port_handler; class Io_port_root; } -class Genode::Io_port_handler +class Core::Io_port_handler { private: @@ -41,8 +42,8 @@ class Genode::Io_port_handler }; -class Genode::Io_port_root : private Io_port_handler, - public Root_component +class Core::Io_port_root : private Io_port_handler, + public Root_component { private: diff --git a/repos/base/src/core/include/io_port_session_component.h b/repos/base/src/core/include/io_port_session_component.h index 2360cab220..b87ccc17d3 100644 --- a/repos/base/src/core/include/io_port_session_component.h +++ b/repos/base/src/core/include/io_port_session_component.h @@ -24,10 +24,10 @@ /* core includes */ #include -namespace Genode { class Io_port_session_component; } +namespace Core { class Io_port_session_component; } -class Genode::Io_port_session_component : public Rpc_object +class Core::Io_port_session_component : public Rpc_object { private: diff --git a/repos/base/src/core/include/irq_args.h b/repos/base/src/core/include/irq_args.h index 92ceb6f34a..06f9e24480 100644 --- a/repos/base/src/core/include/irq_args.h +++ b/repos/base/src/core/include/irq_args.h @@ -14,14 +14,16 @@ #ifndef _CORE__INCLUDE__IRQ_ARGS_H_ #define _CORE__INCLUDE__IRQ_ARGS_H_ -#include #include #include -namespace Genode { class Irq_args; } +/* core includes */ +#include + +namespace Core { class Irq_args; } -class Genode::Irq_args +class Core::Irq_args { private: diff --git a/repos/base/src/core/include/irq_object.h b/repos/base/src/core/include/irq_object.h index 8dc9f9b495..b39cb9beba 100644 --- a/repos/base/src/core/include/irq_object.h +++ b/repos/base/src/core/include/irq_object.h @@ -16,10 +16,13 @@ #include -namespace Genode { class Irq_object; } +/* core includes */ +#include + +namespace Core { class Irq_object; } -class Genode::Irq_object : public Thread +class Core::Irq_object : public Thread { private: diff --git a/repos/base/src/core/include/irq_root.h b/repos/base/src/core/include/irq_root.h index 9e909cbcd7..6db7b8510c 100644 --- a/repos/base/src/core/include/irq_root.h +++ b/repos/base/src/core/include/irq_root.h @@ -16,12 +16,14 @@ #define _CORE__INCLUDE__IRQ_ROOT_H_ #include + +/* core includes */ #include -namespace Genode { class Irq_root; } +namespace Core { class Irq_root; } -class Genode::Irq_root : public Root_component +class Core::Irq_root : public Root_component { private: diff --git a/repos/base/src/core/include/irq_session_component.h b/repos/base/src/core/include/irq_session_component.h index 0d2efa7f3f..4c049268e7 100644 --- a/repos/base/src/core/include/irq_session_component.h +++ b/repos/base/src/core/include/irq_session_component.h @@ -20,13 +20,14 @@ #include #include +/* core includes */ #include -namespace Genode { class Irq_session_component; } +namespace Core { class Irq_session_component; } -class Genode::Irq_session_component : public Rpc_object, - private List::Element +class Core::Irq_session_component : public Rpc_object, + private List::Element { private: diff --git a/repos/base/src/core/include/log_root.h b/repos/base/src/core/include/log_root.h index 466b5bb7f2..9731f9df19 100644 --- a/repos/base/src/core/include/log_root.h +++ b/repos/base/src/core/include/log_root.h @@ -17,12 +17,13 @@ #include #include -#include "log_session_component.h" +/* core includes */ +#include -namespace Genode { class Log_root; } +namespace Core { class Log_root; } -class Genode::Log_root : public Root_component +class Core::Log_root : public Root_component { protected: diff --git a/repos/base/src/core/include/log_session_component.h b/repos/base/src/core/include/log_session_component.h index 27bad22ed7..eaa45f96d5 100644 --- a/repos/base/src/core/include/log_session_component.h +++ b/repos/base/src/core/include/log_session_component.h @@ -14,16 +14,17 @@ #ifndef _CORE__INCLUDE__LOG_SESSION_COMPONENT_H_ #define _CORE__INCLUDE__LOG_SESSION_COMPONENT_H_ -#include -#include #include #include #include -namespace Genode { class Log_session_component; } +/* core includes */ +#include + +namespace Core { class Log_session_component; } -class Genode::Log_session_component : public Rpc_object +class Core::Log_session_component : public Rpc_object { private: @@ -58,7 +59,7 @@ class Genode::Log_session_component : public Rpc_object } char const * const string = string_buf.string(); - size_t const len = strlen(string); + size_t const len = Genode::strlen(string); unsigned from_i = 0; for (unsigned i = 0; i < len; i++) { diff --git a/repos/base/src/core/include/mapping.h b/repos/base/src/core/include/mapping.h index 2de2dae558..7a7f8590f2 100644 --- a/repos/base/src/core/include/mapping.h +++ b/repos/base/src/core/include/mapping.h @@ -14,12 +14,13 @@ #ifndef _CORE__INCLUDE__MAPPING_H_ #define _CORE__INCLUDE__MAPPING_H_ -#include +/* core includes */ +#include -namespace Genode { struct Mapping; } +namespace Core { struct Mapping; } -struct Genode::Mapping +struct Core::Mapping { addr_t dst_addr; addr_t src_addr; diff --git a/repos/base/src/core/include/native_cpu_component.h b/repos/base/src/core/include/native_cpu_component.h index b90cc39663..9df72b4eef 100644 --- a/repos/base/src/core/include/native_cpu_component.h +++ b/repos/base/src/core/include/native_cpu_component.h @@ -19,17 +19,17 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ #include -namespace Genode { +namespace Core { class Cpu_session_component; class Native_cpu_component; } -struct Genode::Native_cpu_component +struct Core::Native_cpu_component { Native_cpu_component(Cpu_session_component &, char const *) { } diff --git a/repos/base/src/core/include/native_pd_component.h b/repos/base/src/core/include/native_pd_component.h index 6a1d1ec2e5..9e8a6ba858 100644 --- a/repos/base/src/core/include/native_pd_component.h +++ b/repos/base/src/core/include/native_pd_component.h @@ -19,17 +19,17 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ #include -namespace Genode { +namespace Core { class Pd_session_component; class Native_pd_component; } -struct Genode::Native_pd_component +struct Core::Native_pd_component { Native_pd_component(Pd_session_component &, char const *) { } diff --git a/repos/base/src/core/include/pager.h b/repos/base/src/core/include/pager.h index 259c2cea14..29ac8b7c68 100644 --- a/repos/base/src/core/include/pager.h +++ b/repos/base/src/core/include/pager.h @@ -24,11 +24,11 @@ #include #include -/* core-local includes */ +/* core includes */ #include #include -namespace Genode { +namespace Core { typedef Cpu_session::Thread_creation_failed Invalid_thread; @@ -46,11 +46,13 @@ namespace Genode { */ class Pager_entrypoint; + using Pager_capability = Capability; + enum { PAGER_EP_STACK_SIZE = sizeof(addr_t) * 2048 }; } -class Genode::Pager_object : public Object_pool::Entry +class Core::Pager_object : public Object_pool::Entry { protected: @@ -162,8 +164,8 @@ class Genode::Pager_object : public Object_pool::Entry }; -class Genode::Pager_entrypoint : public Object_pool, - public Thread +class Core::Pager_entrypoint : public Object_pool, + public Thread { private: diff --git a/repos/base/src/core/include/pager_object_exception_state.h b/repos/base/src/core/include/pager_object_exception_state.h index 50ef55a7f7..a3d0a9f902 100644 --- a/repos/base/src/core/include/pager_object_exception_state.h +++ b/repos/base/src/core/include/pager_object_exception_state.h @@ -16,6 +16,9 @@ #include -namespace Genode { typedef Thread_state Pager_object_exception_state; } +/* core includes */ +#include + +namespace Core { typedef Thread_state Pager_object_exception_state; } #endif /* _CORE__INCLUDE__PAGER_OBJECT_EXCEPTION_STATE_H_ */ diff --git a/repos/base/src/core/include/pd_root.h b/repos/base/src/core/include/pd_root.h index 47b09b0161..908b8ea2fa 100644 --- a/repos/base/src/core/include/pd_root.h +++ b/repos/base/src/core/include/pd_root.h @@ -20,10 +20,10 @@ /* Core */ #include -namespace Genode { class Pd_root; } +namespace Core { class Pd_root; } -class Genode::Pd_root : public Genode::Root_component +class Core::Pd_root : public Root_component { private: @@ -58,7 +58,8 @@ class Genode::Pd_root : public Genode::Root_component #include #include #include @@ -38,10 +37,10 @@ #include #include -namespace Genode { class Pd_session_component; } +namespace Core { class Pd_session_component; } -class Genode::Pd_session_component : public Session_object +class Core::Pd_session_component : public Session_object { public: @@ -206,7 +205,7 @@ class Genode::Pd_session_component : public Session_object { _consume_cap(SIG_SOURCE_CAP); try { return _signal_broker.alloc_signal_source(); } - catch (Genode::Allocator::Out_of_memory) { + catch (Allocator::Out_of_memory) { _released_cap_silent(); throw Out_of_ram(); } diff --git a/repos/base/src/core/include/platform_generic.h b/repos/base/src/core/include/platform_generic.h index 0f11e90410..da3bbfe6c1 100644 --- a/repos/base/src/core/include/platform_generic.h +++ b/repos/base/src/core/include/platform_generic.h @@ -22,7 +22,7 @@ /* core includes */ #include -namespace Genode { +namespace Core { class Platform_generic; @@ -42,7 +42,7 @@ namespace Genode { } -class Genode::Platform_generic +class Core::Platform_generic { public: diff --git a/repos/base/src/core/include/platform_services.h b/repos/base/src/core/include/platform_services.h index 4cb70bed37..5193f7f892 100644 --- a/repos/base/src/core/include/platform_services.h +++ b/repos/base/src/core/include/platform_services.h @@ -14,15 +14,18 @@ #ifndef _CORE__INCLUDE__PLATFORM_SERVICES_H_ #define _CORE__INCLUDE__PLATFORM_SERVICES_H_ +/* core includes */ #include #include namespace Genode { - class Rpc_entrypoint; class Sliced_heap; +} +namespace Core { + /** * Register platform-specific services at entrypoint, and service * registry diff --git a/repos/base/src/core/include/ram_dataspace_factory.h b/repos/base/src/core/include/ram_dataspace_factory.h index 747372b01b..2bdb4b5ed6 100644 --- a/repos/base/src/core/include/ram_dataspace_factory.h +++ b/repos/base/src/core/include/ram_dataspace_factory.h @@ -24,11 +24,11 @@ /* core includes */ #include -namespace Genode { class Ram_dataspace_factory; } +namespace Core { class Ram_dataspace_factory; } -class Genode::Ram_dataspace_factory : public Ram_allocator, - public Dataspace_owner +class Core::Ram_dataspace_factory : public Ram_allocator, + public Dataspace_owner { public: diff --git a/repos/base/src/core/include/region_map_component.h b/repos/base/src/core/include/region_map_component.h index 4764eab865..7025259bc6 100644 --- a/repos/base/src/core/include/region_map_component.h +++ b/repos/base/src/core/include/region_map_component.h @@ -16,7 +16,6 @@ #define _CORE__INCLUDE__REGION_MAP_COMPONENT_H_ /* Genode includes */ -#include #include #include #include @@ -39,7 +38,7 @@ /* base-internal includes */ #include -namespace Genode { +namespace Core { class Cpu_thread_component; class Dataspace_component; class Region_map_component; @@ -51,7 +50,7 @@ namespace Genode { } -class Genode::Region_map_detach : Genode::Interface +class Core::Region_map_detach : Interface { public: @@ -69,7 +68,7 @@ class Genode::Region_map_detach : Genode::Interface * organized in a linked list. The head of the list is a member of the * 'Dataspace_component'. */ -class Genode::Rm_region : public List::Element +class Core::Rm_region : public List::Element { public: @@ -120,7 +119,7 @@ class Genode::Rm_region : public List::Element * be able to handle faults by arbitrary clients (not only its own * clients), it maintains the list head of faulters. */ -class Genode::Rm_faulter : Fifo::Element, Interface +class Core::Rm_faulter : Fifo::Element, Interface { private: @@ -180,8 +179,8 @@ class Genode::Rm_faulter : Fifo::Element, Interface * A region map can be used as address space for any number of threads. This * class represents the thread's role as member of this address space. */ -class Genode::Rm_client : public Pager_object, public Rm_faulter, - private List::Element +class Core::Rm_client : public Pager_object, public Rm_faulter, + private List::Element { private: @@ -219,10 +218,10 @@ class Genode::Rm_client : public Pager_object, public Rm_faulter, }; -class Genode::Region_map_component : private Weak_object, - public Rpc_object, - private List::Element, - public Region_map_detach +class Core::Region_map_component : private Weak_object, + public Rpc_object, + private List::Element, + public Region_map_detach { private: diff --git a/repos/base/src/core/include/rm_root.h b/repos/base/src/core/include/rm_root.h index 263564cc71..ec30be460d 100644 --- a/repos/base/src/core/include/rm_root.h +++ b/repos/base/src/core/include/rm_root.h @@ -17,14 +17,14 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ #include #include -namespace Genode { class Rm_root; } +namespace Core { class Rm_root; } -class Genode::Rm_root : public Root_component +class Core::Rm_root : public Root_component { private: diff --git a/repos/base/src/core/include/rm_session_component.h b/repos/base/src/core/include/rm_session_component.h index f90f3c4d7e..c3731b0f61 100644 --- a/repos/base/src/core/include/rm_session_component.h +++ b/repos/base/src/core/include/rm_session_component.h @@ -22,10 +22,10 @@ /* core includes */ #include -namespace Genode { class Rm_session_component; } +namespace Core { class Rm_session_component; } -class Genode::Rm_session_component : public Session_object +class Core::Rm_session_component : public Session_object { private: diff --git a/repos/base/src/core/include/rom_fs.h b/repos/base/src/core/include/rom_fs.h index 00bcc17691..a06a208835 100644 --- a/repos/base/src/core/include/rom_fs.h +++ b/repos/base/src/core/include/rom_fs.h @@ -15,16 +15,18 @@ #ifndef _CORE__INCLUDE__ROM_FS_H_ #define _CORE__INCLUDE__ROM_FS_H_ -#include #include -namespace Genode { +/* core includes */ +#include + +namespace Core { struct Rom_module; struct Rom_fs; } -struct Genode::Rom_module : Genode::Avl_string_base +struct Core::Rom_module : Avl_string_base { addr_t const addr = 0; size_t const size = 0; @@ -36,12 +38,12 @@ struct Genode::Rom_module : Genode::Avl_string_base bool valid() const { return size ? true : false; } - void print(Genode::Output & out) const { + void print(Output & out) const { Genode::print(out, Hex_range(addr, size), " ", name()); } }; -struct Genode::Rom_fs : Genode::Avl_tree +struct Core::Rom_fs : Avl_tree { Rom_module const * find(char const * const name) const { @@ -49,7 +51,7 @@ struct Genode::Rom_fs : Genode::Avl_tree : nullptr; } - void print(Genode::Output & out) const + void print(Output & out) const { if (!first()) Genode::print(out, "No modules in Rom_fs\n"); diff --git a/repos/base/src/core/include/rom_root.h b/repos/base/src/core/include/rom_root.h index 50260ed821..879c919c8b 100644 --- a/repos/base/src/core/include/rom_root.h +++ b/repos/base/src/core/include/rom_root.h @@ -15,12 +15,14 @@ #define _CORE__INCLUDE__ROM_ROOT_H_ #include -#include "rom_session_component.h" -namespace Genode { class Rom_root; } +/* Genode includes */ +#include + +namespace Core { class Rom_root; } -class Genode::Rom_root : public Root_component +class Core::Rom_root : public Root_component { private: diff --git a/repos/base/src/core/include/rom_session_component.h b/repos/base/src/core/include/rom_session_component.h index e8ab04d66a..e29f26f452 100644 --- a/repos/base/src/core/include/rom_session_component.h +++ b/repos/base/src/core/include/rom_session_component.h @@ -14,16 +14,18 @@ #ifndef _CORE__INCLUDE__ROM_SESSION_COMPONENT_H_ #define _CORE__INCLUDE__ROM_SESSION_COMPONENT_H_ -#include #include #include #include #include -namespace Genode { class Rom_session_component; } +/* core includes */ +#include + +namespace Core { class Rom_session_component; } -class Genode::Rom_session_component : public Rpc_object +class Core::Rom_session_component : public Rpc_object { private: diff --git a/repos/base/src/core/include/rpc_cap_factory.h b/repos/base/src/core/include/rpc_cap_factory.h index 6a28ceaa20..5cf81a215b 100644 --- a/repos/base/src/core/include/rpc_cap_factory.h +++ b/repos/base/src/core/include/rpc_cap_factory.h @@ -18,10 +18,13 @@ #include #include -namespace Genode { class Rpc_cap_factory; } +/* core includes */ +#include + +namespace Core { class Rpc_cap_factory; } -class Genode::Rpc_cap_factory +class Core::Rpc_cap_factory { private: diff --git a/repos/base/src/core/include/signal_broker.h b/repos/base/src/core/include/signal_broker.h index 4496b35b51..0dda81655d 100644 --- a/repos/base/src/core/include/signal_broker.h +++ b/repos/base/src/core/include/signal_broker.h @@ -14,15 +14,16 @@ #ifndef _CORE__INCLUDE__SIGNAL_BROKER_H_ #define _CORE__INCLUDE__SIGNAL_BROKER_H_ +/* core includes */ #include #include #include #include -namespace Genode { class Signal_broker; } +namespace Core { class Signal_broker; } -class Genode::Signal_broker +class Core::Signal_broker { private: diff --git a/repos/base/src/core/include/signal_context_slab.h b/repos/base/src/core/include/signal_context_slab.h index e66b48bf7e..fd733fa4bb 100644 --- a/repos/base/src/core/include/signal_context_slab.h +++ b/repos/base/src/core/include/signal_context_slab.h @@ -17,10 +17,11 @@ /* Genode includes */ #include -/* core-local includes */ +/* core includes */ +#include #include -namespace Genode { struct Signal_context_slab; } +namespace Core { struct Signal_context_slab; } /** @@ -32,7 +33,7 @@ namespace Genode { struct Signal_context_slab; } * uses the PD session itself as backing store (which would be in the middle of * construction). */ -struct Genode::Signal_context_slab : Slab +struct Core::Signal_context_slab : Slab { static constexpr size_t SBS = 960*sizeof(long); uint8_t _initial_sb[SBS]; diff --git a/repos/base/src/core/include/signal_delivery_proxy.h b/repos/base/src/core/include/signal_delivery_proxy.h index e86f61a98e..b648f3843f 100644 --- a/repos/base/src/core/include/signal_delivery_proxy.h +++ b/repos/base/src/core/include/signal_delivery_proxy.h @@ -14,21 +14,24 @@ #ifndef _CORE__INCLUDE__SIGNAL_DELIVERY_PROXY_H_ #define _CORE__INCLUDE__SIGNAL_DELIVERY_PROXY_H_ -namespace Genode { +/* core includes */ +#include + +namespace Core { struct Signal_delivery_proxy; struct Signal_delivery_proxy_component; } -struct Genode::Signal_delivery_proxy : Interface +struct Core::Signal_delivery_proxy : Interface { GENODE_RPC(Rpc_deliver, void, _deliver_from_ep, Signal_context_capability, unsigned); - GENODE_RPC(Rpc_release, void, _release_from_ep, Genode::addr_t); + GENODE_RPC(Rpc_release, void, _release_from_ep, addr_t); GENODE_RPC_INTERFACE(Rpc_deliver, Rpc_release); }; -struct Genode::Signal_delivery_proxy_component +struct Core::Signal_delivery_proxy_component : Rpc_object { diff --git a/repos/base/src/core/include/signal_source_component.h b/repos/base/src/core/include/signal_source_component.h index bd03fcaeb5..aff19f5dd1 100644 --- a/repos/base/src/core/include/signal_source_component.h +++ b/repos/base/src/core/include/signal_source_component.h @@ -21,7 +21,10 @@ #include #include -namespace Genode { +/* core includes */ +#include + +namespace Core { class Signal_context_component; class Signal_source_component; @@ -32,8 +35,8 @@ namespace Genode { } -class Genode::Signal_context_component : public Rpc_object, - private Signal_queue::Element +class Core::Signal_context_component : public Rpc_object, + private Signal_queue::Element { private: @@ -75,7 +78,7 @@ class Genode::Signal_context_component : public Rpc_object, }; -class Genode::Signal_source_component : public Signal_source_rpc_object +class Core::Signal_source_component : public Signal_source_rpc_object { private: @@ -105,7 +108,7 @@ class Genode::Signal_source_component : public Signal_source_rpc_object }; -Genode::Signal_context_component::~Signal_context_component() +Core::Signal_context_component::~Signal_context_component() { if (enqueued()) _source.release(*this); diff --git a/repos/base/src/core/include/signal_transmitter.h b/repos/base/src/core/include/signal_transmitter.h index b06a6f4072..a3e4711180 100644 --- a/repos/base/src/core/include/signal_transmitter.h +++ b/repos/base/src/core/include/signal_transmitter.h @@ -14,9 +14,14 @@ #ifndef _CORE__INCLUDE__SIGNAL_TRANSMITTER_H_ #define _CORE__INCLUDE__SIGNAL_TRANSMITTER_H_ -namespace Genode { +/* core includes */ +#include + +namespace Genode { class Rpc_entrypoint; } + + +namespace Core { - class Rpc_entrypoint; /* * Initialize the emission of signals originating from the component diff --git a/repos/base/src/core/include/synced_ram_allocator.h b/repos/base/src/core/include/synced_ram_allocator.h index a7cd605fc6..6b94e1dde6 100644 --- a/repos/base/src/core/include/synced_ram_allocator.h +++ b/repos/base/src/core/include/synced_ram_allocator.h @@ -18,10 +18,13 @@ #include #include -namespace Genode { class Synced_ram_allocator; } +/* core includes */ +#include + +namespace Core { class Synced_ram_allocator; } -class Genode::Synced_ram_allocator : public Ram_allocator +class Core::Synced_ram_allocator : public Ram_allocator { private: diff --git a/repos/base/src/core/include/synced_range_allocator.h b/repos/base/src/core/include/synced_range_allocator.h index f1c34215d9..d47ebfe7f3 100644 --- a/repos/base/src/core/include/synced_range_allocator.h +++ b/repos/base/src/core/include/synced_range_allocator.h @@ -18,7 +18,10 @@ #include #include -namespace Genode { +/* core includes */ +#include + +namespace Core { class Mapped_mem_allocator; template class Synced_range_allocator; } @@ -33,7 +36,7 @@ namespace Genode { * \param ALLOC class implementing the 'Range_allocator' interface */ template -class Genode::Synced_range_allocator : public Range_allocator +class Core::Synced_range_allocator : public Range_allocator { private: diff --git a/repos/base/src/core/include/trace/policy_registry.h b/repos/base/src/core/include/trace/policy_registry.h index 53ab02192b..8ac864646c 100644 --- a/repos/base/src/core/include/trace/policy_registry.h +++ b/repos/base/src/core/include/trace/policy_registry.h @@ -18,17 +18,20 @@ #include #include -namespace Genode { namespace Trace { +/* core includes */ +#include + +namespace Core { namespace Trace { class Policy_owner; class Policy; class Policy_registry; } } -class Genode::Trace::Policy_owner : Interface { }; +class Core::Trace::Policy_owner : Interface { }; -class Genode::Trace::Policy : public Genode::List::Element +class Core::Trace::Policy : public List::Element { friend class Policy_registry; @@ -70,7 +73,7 @@ class Genode::Trace::Policy : public Genode::List::Elemen /** * Global policy registry */ -class Genode::Trace::Policy_registry +class Core::Trace::Policy_registry { private: diff --git a/repos/base/src/core/include/trace/root.h b/repos/base/src/core/include/trace/root.h index 7477b8650b..fd52cedd65 100644 --- a/repos/base/src/core/include/trace/root.h +++ b/repos/base/src/core/include/trace/root.h @@ -20,10 +20,10 @@ /* core-internal includes */ #include -namespace Genode { namespace Trace { class Root; } } +namespace Core { namespace Trace { class Root; } } -class Genode::Trace::Root : public Genode::Root_component +class Core::Trace::Root : public Root_component { private: diff --git a/repos/base/src/core/include/trace/session_component.h b/repos/base/src/core/include/trace/session_component.h index dbdafbb847..9859c14941 100644 --- a/repos/base/src/core/include/trace/session_component.h +++ b/repos/base/src/core/include/trace/session_component.h @@ -21,14 +21,14 @@ #include #include -/* core-local includes */ +/* core includes */ #include #include -namespace Genode { namespace Trace { class Session_component; } } +namespace Core { namespace Trace { class Session_component; } } -class Genode::Trace::Session_component +class Core::Trace::Session_component : public Session_object, diff --git a/repos/base/src/core/include/trace/source_registry.h b/repos/base/src/core/include/trace/source_registry.h index 900b9e16c1..8a5f1e3969 100644 --- a/repos/base/src/core/include/trace/source_registry.h +++ b/repos/base/src/core/include/trace/source_registry.h @@ -14,8 +14,8 @@ #ifndef _CORE__INCLUDE__TRACE__SOURCE_REGISTRY_H_ #define _CORE__INCLUDE__TRACE__SOURCE_REGISTRY_H_ +/* Genode includes */ #include -#include #include #include #include @@ -23,7 +23,13 @@ /* base-internal include */ #include -namespace Genode { namespace Trace { +/* core-internal includes */ +#include + +namespace Core { namespace Trace { + + using namespace Genode::Trace; + class Source; class Source_owner; class Source_registry; @@ -35,7 +41,7 @@ namespace Genode { namespace Trace { } } -struct Genode::Trace::Source_owner { }; +struct Core::Trace::Source_owner { }; /** @@ -43,10 +49,9 @@ struct Genode::Trace::Source_owner { }; * * There is one instance per thread. */ -class Genode::Trace::Source +class Core::Trace::Source : - public Genode::Weak_object, - public Genode::List::Element + public Weak_object, public List::Element { public: @@ -148,7 +153,7 @@ class Genode::Trace::Source * * There is a single instance within core. */ -class Genode::Trace::Source_registry +class Core::Trace::Source_registry { private: diff --git a/repos/base/src/core/include/trace/subject_registry.h b/repos/base/src/core/include/trace/subject_registry.h index 92b17b2e74..e97284bfa5 100644 --- a/repos/base/src/core/include/trace/subject_registry.h +++ b/repos/base/src/core/include/trace/subject_registry.h @@ -21,20 +21,23 @@ /* Genode includes */ #include -#include #include #include #include #include #include -/* core includes */ -#include - /* base-internal include */ #include -namespace Genode { namespace Trace { +/* core includes */ +#include +#include + +namespace Core { namespace Trace { + + using namespace Genode::Trace; + class Subject; class Subject_registry; } } @@ -43,10 +46,10 @@ namespace Genode { namespace Trace { /** * Subject of tracing data */ -class Genode::Trace::Subject +class Core::Trace::Subject : - public Genode::List::Element, - public Genode::Trace::Source_owner + public List::Element, + public Source_owner { private: @@ -110,7 +113,7 @@ class Genode::Trace::Subject void *src = local_rm.attach(from_ds), *dst = local_rm.attach(_ds); - memcpy(dst, src, _size); + Genode::memcpy(dst, src, _size); local_rm.detach(src); local_rm.detach(dst); @@ -314,7 +317,7 @@ class Genode::Trace::Subject * * There exists one instance for each TRACE session. */ -class Genode::Trace::Subject_registry +class Core::Trace::Subject_registry { private: diff --git a/repos/base/src/core/include/types.h b/repos/base/src/core/include/types.h new file mode 100644 index 0000000000..279f3ccd66 --- /dev/null +++ b/repos/base/src/core/include/types.h @@ -0,0 +1,24 @@ +/* + * \brief Core namespace declaration and basic types + * \author Norman Feske + * \date 2023-03-01 + */ + +/* + * Copyright (C) 2023 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + +#ifndef _CORE__INCLUDE__TYPES_H_ +#define _CORE__INCLUDE__TYPES_H_ + +#include +#include +#include +#include + +namespace Core { using namespace Genode; } + +#endif /* _CORE__INCLUDE__TYPES_H_ */ diff --git a/repos/base/src/core/include/vm_root.h b/repos/base/src/core/include/vm_root.h index 2ae78bd778..ac559725b4 100644 --- a/repos/base/src/core/include/vm_root.h +++ b/repos/base/src/core/include/vm_root.h @@ -21,10 +21,10 @@ /* core includes */ #include -namespace Genode { class Vm_root; } +namespace Core { class Vm_root; } -class Genode::Vm_root : public Root_component +class Core::Vm_root : public Root_component { private: diff --git a/repos/base/src/core/io_mem_session_component.cc b/repos/base/src/core/io_mem_session_component.cc index 334d6e40e7..2ff47c1623 100644 --- a/repos/base/src/core/io_mem_session_component.cc +++ b/repos/base/src/core/io_mem_session_component.cc @@ -11,15 +11,16 @@ * under the terms of the GNU Affero General Public License version 3. */ -#include +/* Genode includes */ #include #include + +/* core includes */ +#include #include #include -#include -#include "util.h" -using namespace Genode; +using namespace Core; Io_mem_session_component::Dataspace_attr diff --git a/repos/base/src/core/main.cc b/repos/base/src/core/main.cc index 5455baac83..e0c3fb0f1e 100644 --- a/repos/base/src/core/main.cc +++ b/repos/base/src/core/main.cc @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2017 Genode Labs GmbH + * Copyright (C) 2006-2023 Genode Labs GmbH * * This file is part of the Genode OS framework, which is distributed * under the terms of the GNU Affero General Public License version 3. @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -40,14 +39,14 @@ #include #include -using namespace Genode; +using namespace Core; /*************************************** ** Core environment/platform support ** ***************************************/ -Core_env &Genode::core_env() +Core_env &Core::core_env() { /* * Make sure to initialize the platform before constructing the core @@ -79,14 +78,14 @@ Env_deprecated *Genode::env_deprecated() { return &core_env(); } -Platform &Genode::platform_specific() +Platform &Core::platform_specific() { static Platform _platform; return _platform; } -Platform_generic &Genode::platform() { return platform_specific(); } +Platform_generic &Core::platform() { return platform_specific(); } Thread_capability Genode::main_thread_cap() { return Thread_capability(); } @@ -203,9 +202,9 @@ void Genode::destroy_signal_thread() { } ** Trace support ** *******************/ -Trace::Source_registry &Trace::sources() +Core::Trace::Source_registry &Core::Trace::sources() { - static Trace::Source_registry inst; + static Source_registry inst; return inst; } @@ -229,7 +228,7 @@ int main() log("Genode ", Genode::version_string); - static Trace::Policy_registry trace_policies; + static Core::Trace::Policy_registry trace_policies; static Rpc_entrypoint &ep = core_env().entrypoint(); static Ram_allocator &core_ram_alloc = core_env().ram_allocator(); @@ -252,10 +251,13 @@ int main() static Pager_entrypoint pager_ep(rpc_cap_factory); + using Trace_root = Core::Trace::Root; + using Trace_session_component = Core::Trace::Session_component; + static Rom_root rom_root (ep, ep, platform().rom_fs(), sliced_heap); static Rm_root rm_root (ep, sliced_heap, core_ram_alloc, local_rm, pager_ep); static Cpu_root cpu_root (core_ram_alloc, local_rm, ep, ep, pager_ep, - sliced_heap, Trace::sources()); + sliced_heap, Core::Trace::sources()); static Pd_root pd_root (ep, core_env().signal_ep(), pager_ep, platform().ram_alloc(), local_rm, sliced_heap, @@ -265,8 +267,8 @@ int main() platform().ram_alloc(), sliced_heap); static Irq_root irq_root (*core_env().pd_session(), platform().irq_alloc(), sliced_heap); - static Trace::Root trace_root (core_ram_alloc, local_rm, ep, sliced_heap, - Trace::sources(), trace_policies); + static Trace_root trace_root (core_ram_alloc, local_rm, ep, sliced_heap, + Core::Trace::sources(), trace_policies); static Core_service rom_service (services, rom_root); static Core_service rm_service (services, rm_root); @@ -275,10 +277,10 @@ int main() static Core_service log_service (services, log_root); static Core_service io_mem_service (services, io_mem_root); static Core_service irq_service (services, irq_root); - static Core_service trace_service (services, trace_root); + static Core_service trace_service (services, trace_root); /* make platform-specific services known to service pool */ - platform_add_local_services(ep, sliced_heap, services, Trace::sources()); + platform_add_local_services(ep, sliced_heap, services, Core::Trace::sources()); size_t const avail_ram_quota = core_pd.avail_ram().value; size_t const avail_cap_quota = core_pd.avail_caps().value; @@ -305,7 +307,7 @@ int main() Session::Resources{{Cpu_connection::RAM_QUOTA}, {Cpu_session::CAP_QUOTA}}, "core", Session::Diag{false}, - core_ram_alloc, local_rm, ep, pager_ep, Trace::sources(), "", + core_ram_alloc, local_rm, ep, pager_ep, Core::Trace::sources(), "", Affinity::unrestricted(), Cpu_session::QUOTA_LIMIT); Cpu_session_capability core_cpu_cap = core_cpu.cap(); diff --git a/repos/base/src/core/pager_ep.cc b/repos/base/src/core/pager_ep.cc index aae61f8522..1bd1c7f8d2 100644 --- a/repos/base/src/core/pager_ep.cc +++ b/repos/base/src/core/pager_ep.cc @@ -12,10 +12,10 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Core includes */ +/* core includes */ #include -using namespace Genode; +using namespace Core; void Pager_entrypoint::entry() diff --git a/repos/base/src/core/pager_object.cc b/repos/base/src/core/pager_object.cc index 4806347e35..d26dc758d2 100644 --- a/repos/base/src/core/pager_object.cc +++ b/repos/base/src/core/pager_object.cc @@ -11,13 +11,10 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include -using namespace Genode; +using namespace Core; void Pager_object::wake_up() diff --git a/repos/base/src/core/pd_session_component.cc b/repos/base/src/core/pd_session_component.cc index acc607aed4..94984ec896 100644 --- a/repos/base/src/core/pd_session_component.cc +++ b/repos/base/src/core/pd_session_component.cc @@ -11,13 +11,10 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include -using namespace Genode; +using namespace Core; Ram_allocator::Alloc_result diff --git a/repos/base/src/core/pd_session_support.cc b/repos/base/src/core/pd_session_support.cc index e314181595..6e632a1679 100644 --- a/repos/base/src/core/pd_session_support.cc +++ b/repos/base/src/core/pd_session_support.cc @@ -13,10 +13,10 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* core-local includes */ +/* core includes */ #include -using namespace Genode; +using namespace Core; bool Pd_session_component::assign_pci(addr_t, uint16_t) { return true; } diff --git a/repos/base/src/core/platform_rom_modules.cc b/repos/base/src/core/platform_rom_modules.cc index a885038b3e..92128947de 100644 --- a/repos/base/src/core/platform_rom_modules.cc +++ b/repos/base/src/core/platform_rom_modules.cc @@ -15,7 +15,7 @@ #include #include -using namespace Genode; +using namespace Core; void Platform::_init_rom_modules() diff --git a/repos/base/src/core/platform_services.cc b/repos/base/src/core/platform_services.cc index a2cefe0c68..f925e1bcb2 100644 --- a/repos/base/src/core/platform_services.cc +++ b/repos/base/src/core/platform_services.cc @@ -15,6 +15,6 @@ #include -void Genode::platform_add_local_services(Rpc_entrypoint &, Sliced_heap &, - Registry &, - Trace::Source_registry &) { } +void Core::platform_add_local_services(Rpc_entrypoint &, Sliced_heap &, + Registry &, + Trace::Source_registry &) { } diff --git a/repos/base/src/core/ram_dataspace_factory.cc b/repos/base/src/core/ram_dataspace_factory.cc index 691b9f1b6a..8c37503834 100644 --- a/repos/base/src/core/ram_dataspace_factory.cc +++ b/repos/base/src/core/ram_dataspace_factory.cc @@ -11,13 +11,10 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Genode includes */ -#include - /* core includes */ #include -using namespace Genode; +using namespace Core; Ram_allocator::Alloc_result diff --git a/repos/base/src/core/region_map_component.cc b/repos/base/src/core/region_map_component.cc index af2bf50681..3b3f08e392 100644 --- a/repos/base/src/core/region_map_component.cc +++ b/repos/base/src/core/region_map_component.cc @@ -14,7 +14,6 @@ */ /* Genode includes */ -#include #include #include @@ -27,7 +26,7 @@ static const bool verbose_page_faults = false; -struct Genode::Region_map_component::Fault_area +struct Core::Region_map_component::Fault_area { addr_t _fault_addr = 0; addr_t _base = 0; @@ -145,7 +144,7 @@ struct Genode::Region_map_component::Fault_area }; -using namespace Genode; +using namespace Core; static void print_page_fault(char const *msg, addr_t pf_addr, @@ -292,7 +291,7 @@ void Rm_faulter::dissolve_from_faulting_region_map(Region_map_component &caller) locked_ptr->discard_faulter(*this, DO_LOCK); } - _faulting_region_map = Genode::Weak_ptr(); + _faulting_region_map = Weak_ptr(); } @@ -301,7 +300,7 @@ void Rm_faulter::continue_after_resolved_fault() Mutex::Guard lock_guard(_mutex); _pager_object.wake_up(); - _faulting_region_map = Genode::Weak_ptr(); + _faulting_region_map = Weak_ptr(); _fault_state = Region_map::State(); } diff --git a/repos/base/src/core/rom_session_component.cc b/repos/base/src/core/rom_session_component.cc index 5dc789588e..8e11f32302 100644 --- a/repos/base/src/core/rom_session_component.cc +++ b/repos/base/src/core/rom_session_component.cc @@ -11,11 +11,14 @@ * under the terms of the GNU Affero General Public License version 3. */ +/* Genode includes */ #include -#include #include -using namespace Genode; +/* core includes */ +#include + +using namespace Core; Rom_session_component::Rom_session_component(Rom_fs &rom_fs, diff --git a/repos/base/src/core/rpc_cap_factory.cc b/repos/base/src/core/rpc_cap_factory.cc index 30100f9054..73569ce43e 100644 --- a/repos/base/src/core/rpc_cap_factory.cc +++ b/repos/base/src/core/rpc_cap_factory.cc @@ -11,12 +11,12 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* core-local includes */ +/* core includes */ #include -long Genode::Rpc_cap_factory::_unique_id_cnt; +long Core::Rpc_cap_factory::_unique_id_cnt; -Genode::Mutex &Genode::Rpc_cap_factory::_mutex() +Genode::Mutex &Core::Rpc_cap_factory::_mutex() { static Mutex static_mutex; return static_mutex; diff --git a/repos/base/src/core/rpc_cap_factory_l4.cc b/repos/base/src/core/rpc_cap_factory_l4.cc index c427cd7c06..cdd83082d1 100644 --- a/repos/base/src/core/rpc_cap_factory_l4.cc +++ b/repos/base/src/core/rpc_cap_factory_l4.cc @@ -19,7 +19,7 @@ #include #include -using namespace Genode; +using namespace Core; static unsigned unique_id_cnt; @@ -36,10 +36,10 @@ Native_capability Rpc_cap_factory::_alloc(Rpc_cap_factory &, Rpc_obj_key const rpc_obj_key(++unique_id_cnt); /* combine thread ID of 'ep' with new unique ID */ - Capability_space::Ipc_cap_data cap_data = - Capability_space::ipc_cap_data(ep); + Genode::Capability_space::Ipc_cap_data cap_data = + Genode::Capability_space::ipc_cap_data(ep); - return Capability_space::import(cap_data.dst, rpc_obj_key); + return Genode::Capability_space::import(cap_data.dst, rpc_obj_key); } diff --git a/repos/base/src/core/signal_receiver.cc b/repos/base/src/core/signal_receiver.cc index 1fc0d2285b..c3fb1c6e29 100644 --- a/repos/base/src/core/signal_receiver.cc +++ b/repos/base/src/core/signal_receiver.cc @@ -21,10 +21,12 @@ /* base-internal includes */ #include -/* core-local includes */ +/* core includes */ #include +#include + +using namespace Core; -using namespace Genode; Signal_receiver::Signal_receiver() { } diff --git a/repos/base/src/core/signal_source_component.cc b/repos/base/src/core/signal_source_component.cc index 7b91c0be78..3de6f26b2c 100644 --- a/repos/base/src/core/signal_source_component.cc +++ b/repos/base/src/core/signal_source_component.cc @@ -17,7 +17,7 @@ /* core includes */ #include -using namespace Genode; +using namespace Core; /***************************** diff --git a/repos/base/src/core/signal_transmitter_noinit.cc b/repos/base/src/core/signal_transmitter_noinit.cc index 44b01e4734..62ba8f6342 100644 --- a/repos/base/src/core/signal_transmitter_noinit.cc +++ b/repos/base/src/core/signal_transmitter_noinit.cc @@ -14,12 +14,13 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* core-local includes */ +/* core includes */ #include #include -using namespace Genode; +using namespace Core; -void Genode::init_core_signal_transmitter(Rpc_entrypoint &) { } + +void Core::init_core_signal_transmitter(Rpc_entrypoint &) { } Rpc_entrypoint &Core_env::signal_ep() { return _entrypoint; } diff --git a/repos/base/src/core/signal_transmitter_proxy.cc b/repos/base/src/core/signal_transmitter_proxy.cc index 3d861a3849..722dc496c2 100644 --- a/repos/base/src/core/signal_transmitter_proxy.cc +++ b/repos/base/src/core/signal_transmitter_proxy.cc @@ -16,7 +16,7 @@ #include #include -/* core-local includes */ +/* core includes */ #include #include #include @@ -24,7 +24,7 @@ /* base-internal includes */ #include -using namespace Genode; +using namespace Core; static Constructible delivery_proxy; @@ -36,7 +36,7 @@ static Constructible delivery_proxy; static Rpc_entrypoint *_ep; -void Genode::init_core_signal_transmitter(Rpc_entrypoint &ep) { _ep = &ep; } +void Core::init_core_signal_transmitter(Rpc_entrypoint &ep) { _ep = &ep; } void Genode::init_signal_transmitter(Env &) diff --git a/repos/base/src/core/spec/x86/io_port_session_component.cc b/repos/base/src/core/spec/x86/io_port_session_component.cc index 200fcf6b2a..10c1874098 100644 --- a/repos/base/src/core/spec/x86/io_port_session_component.cc +++ b/repos/base/src/core/spec/x86/io_port_session_component.cc @@ -19,13 +19,9 @@ /* core includes */ #include -using namespace Genode; +using namespace Core; -/****************************** - ** Constructor / destructor ** - ******************************/ - Io_port_session_component::Io_port_session_component(Range_allocator &io_port_alloc, const char *args) : _io_port_alloc(io_port_alloc) diff --git a/repos/base/src/core/spec/x86/io_port_session_support.cc b/repos/base/src/core/spec/x86/io_port_session_support.cc index f65579068b..a51e505e31 100644 --- a/repos/base/src/core/spec/x86/io_port_session_support.cc +++ b/repos/base/src/core/spec/x86/io_port_session_support.cc @@ -14,7 +14,7 @@ /* core includes */ #include -using namespace Genode; +using namespace Core; /************** diff --git a/repos/base/src/core/spec/x86/platform_services.cc b/repos/base/src/core/spec/x86/platform_services.cc index 5bd9f18921..1edc5d85e2 100644 --- a/repos/base/src/core/spec/x86/platform_services.cc +++ b/repos/base/src/core/spec/x86/platform_services.cc @@ -24,10 +24,10 @@ /* * Add x86 specific ioport service */ -void Genode::platform_add_local_services(Rpc_entrypoint &, - Sliced_heap &sliced_heap, - Registry &local_services, - Trace::Source_registry &) +void Core::platform_add_local_services(Rpc_entrypoint &, + Sliced_heap &sliced_heap, + Registry &local_services, + Trace::Source_registry &) { static Io_port_root io_port_root(*core_env().pd_session(), platform().io_port_alloc(), sliced_heap); diff --git a/repos/base/src/core/stack_area.cc b/repos/base/src/core/stack_area.cc index c981eb54e5..f8791b334d 100644 --- a/repos/base/src/core/stack_area.cc +++ b/repos/base/src/core/stack_area.cc @@ -15,7 +15,6 @@ /* Genode includes */ #include #include -#include #include #include @@ -37,7 +36,7 @@ namespace Genode { } -using namespace Genode; +using namespace Core; /** @@ -56,7 +55,7 @@ class Stack_area_region_map : public Region_map { private: - using Ds_slab = Synced_allocator >; Ds_slab _ds_slab { platform().core_mem_alloc() }; diff --git a/repos/base/src/core/trace_session_component.cc b/repos/base/src/core/trace_session_component.cc index 09f19a0e9f..e46950cc66 100644 --- a/repos/base/src/core/trace_session_component.cc +++ b/repos/base/src/core/trace_session_component.cc @@ -11,14 +11,15 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* core-internal includes */ -#include +/* Genode includes */ #include #include +/* core-internal includes */ +#include -using namespace Genode; -using namespace Genode::Trace; +using namespace Core; +using namespace Core::Trace; Dataspace_capability Session_component::dataspace() diff --git a/repos/base/src/core/vm_session_common.cc b/repos/base/src/core/vm_session_common.cc index acf7fa256e..bf7f2e3326 100644 --- a/repos/base/src/core/vm_session_common.cc +++ b/repos/base/src/core/vm_session_common.cc @@ -16,16 +16,16 @@ * under the terms of the GNU Affero General Public License version 3. */ -/* Base includes */ +/* Genode includes */ #include -/* Core includes */ +/* core includes */ #include #include #include -using Genode::addr_t; -using Genode::Vm_session_component; +using namespace Core; + void Vm_session_component::attach(Dataspace_capability const cap, addr_t const guest_phys, @@ -172,11 +172,11 @@ void Vm_session_component::detach(Region_map::Local_addr addr) if (region) detach(region->base(), region->size()); else - Genode::error(__PRETTY_FUNCTION__, " unknown region"); + error(__PRETTY_FUNCTION__, " unknown region"); } void Vm_session_component::unmap_region(addr_t base, size_t size) { - Genode::error(__func__, " unimplemented ", base, " ", size); + error(__func__, " unimplemented ", base, " ", size); } diff --git a/repos/base/src/include/pager/capability.h b/repos/base/src/include/pager/capability.h index efd441b0ce..997c8f618a 100644 --- a/repos/base/src/include/pager/capability.h +++ b/repos/base/src/include/pager/capability.h @@ -16,15 +16,4 @@ #include -namespace Genode { - - /* - * The 'Pager_capability' type is returned by 'Region_map::add_client' and - * passed as argument to 'Cpu_session::set_pager'. It is never invoked or - * otherwise used. - */ - class Pager_object; - typedef Capability Pager_capability; -} - #endif /* _INCLUDE__PAGER__CAPABILITY_H_ */