diff options
| author | Matteo Gmür <matteo.gmuer1@ost.ch> | 2024-10-17 13:12:29 +0200 |
|---|---|---|
| committer | Matteo Gmür <matteo.gmuer1@ost.ch> | 2024-10-17 13:12:29 +0200 |
| commit | f9ddd266e1ab1a7fcd4952a066083ca19fba63cf (patch) | |
| tree | 694825047086e18855bdb34fc24698292f6258ff /arch/x86_64/src/kernel | |
| parent | d539ed1f4f26a42959bcae6ea3050b7f99f5f872 (diff) | |
| parent | b865b36b38d951de28cc4df5fa67338b8245a1c3 (diff) | |
| download | teachos-f9ddd266e1ab1a7fcd4952a066083ca19fba63cf.tar.xz teachos-f9ddd266e1ab1a7fcd4952a066083ca19fba63cf.zip | |
Merge branch 'fmorgner/abort' into 'feat_memory_manager'
Implement support for `std::terminate` via `::abort`
See merge request teachos/kernel!2
Diffstat (limited to 'arch/x86_64/src/kernel')
| -rw-r--r-- | arch/x86_64/src/kernel/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp index 12498d0..babe251 100644 --- a/arch/x86_64/src/kernel/main.cpp +++ b/arch/x86_64/src/kernel/main.cpp @@ -165,7 +165,6 @@ namespace teachos::arch::kernel auto allocator = arch::memory::area_frame_allocator(kernel_start, kernel_end, multiboot_start, multiboot_end, memory_areas, area_count); - // WATCH OUT: using optional::value() crashes the build... I think its because of missing exception handling auto last_allocated = allocator.allocate_frame(); auto allocated = last_allocated; do @@ -174,6 +173,6 @@ namespace teachos::arch::kernel allocated = allocator.allocate_frame(); } while (allocated.has_value()); video::vga::text::write("Allocated Frames", video::vga::text::common_attributes::green_on_black); - video::vga::text::write_number(allocated->frame_number, video::vga::text::common_attributes::green_on_black); + video::vga::text::write_number(allocated.value().frame_number, video::vga::text::common_attributes::green_on_black); } } // namespace teachos::arch::kernel |