diff options
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/arch/cpu/interrupts.cpp | 7 | ||||
| -rw-r--r-- | arch/x86_64/arch/memory/region_allocator.cpp | 3 | ||||
| -rw-r--r-- | arch/x86_64/kapi/memory.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86_64/arch/cpu/interrupts.cpp b/arch/x86_64/arch/cpu/interrupts.cpp index c825e8ab..2fdc4671 100644 --- a/arch/x86_64/arch/cpu/interrupts.cpp +++ b/arch/x86_64/arch/cpu/interrupts.cpp @@ -50,7 +50,7 @@ namespace arch::cpu constexpr auto pic_master_irq_end = pic_master_irq_start + 8; constexpr auto pic_slave_irq_start = pic_master_irq_end; - constexpr auto to_exception_type(exception e) + constexpr auto to_exception_type(exception e) -> enum kapi::cpu::exception::type { switch (e) { @@ -75,7 +75,7 @@ namespace arch::cpu } } - constexpr auto has_error_code(exception e) + constexpr auto has_error_code(exception e) -> bool { switch (e) { @@ -155,8 +155,7 @@ namespace arch::cpu if (kapi::interrupts::dispatch(irq_number) == kapi::interrupts::status::unhandled) { - kstd::println(kstd::print_sink::stderr, "[ARCH:CPU] Unhandled interrupt {:#04x} (IRQ{})", number, - irq_number); + kstd::println(kstd::print_sink::stderr, "[ARCH:CPU] Unhandled interrupt {:#04x} (IRQ{})", number, irq_number); } acknowledge_pic_interrupt(frame); diff --git a/arch/x86_64/arch/memory/region_allocator.cpp b/arch/x86_64/arch/memory/region_allocator.cpp index ece492f3..b78924d8 100644 --- a/arch/x86_64/arch/memory/region_allocator.cpp +++ b/arch/x86_64/arch/memory/region_allocator.cpp @@ -15,12 +15,13 @@ namespace arch::memory { namespace { - constexpr auto last_frame(multiboot2::memory_map::region const & region) + constexpr auto last_frame(multiboot2::memory_map::region const & region) -> kapi::memory::frame { return kapi::memory::frame::containing(kapi::memory::physical_address{region.base + region.size_in_B - 1}); } constexpr auto falls_within(kapi::memory::frame candidate, kapi::memory::frame start, kapi::memory::frame end) + -> bool { return candidate >= start && candidate <= end; } diff --git a/arch/x86_64/kapi/memory.cpp b/arch/x86_64/kapi/memory.cpp index 9cf955e5..03c5107c 100644 --- a/arch/x86_64/kapi/memory.cpp +++ b/arch/x86_64/kapi/memory.cpp @@ -40,7 +40,7 @@ namespace kapi::memory auto constinit higher_half_mapper = std::optional<arch::memory::higher_half_mapper>{}; //! Instantiate a basic, memory region based, early frame allocator for remapping. - auto collect_memory_information() + auto collect_memory_information() -> arch::memory::region_allocator::memory_information { auto memory_map = boot::bootstrap_information.mbi->maybe_memory_map(); if (!memory_map) |
