justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[util] Remove enum_bitfields

Browse Source 
The enum_bitfields system never worked quite right, and always had edge cases where name
resolution for the SFINAE would fail. Move everything over to use util::bitset, which can
be constexpr and boils down to inline integer bitops in release mode.

Improved util::bitset itself, moving the array-backed base implementation into a new
util::sized_bitset, and making the single-inttype backed implementation the base case.
Also added a distinction between | or |= (which work with real bit values) and + or +=
(which work with bit indexes).
This commit is contained in:
Justin C. Miller
2024-02-25 23:40:14 -08:00
parent f7ea46e49e
commit 9f54927a82
36 changed files with 352 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/kernel/objects/vm_area.cpp
View File

@@ -9,7 +9,7 @@ namespace obj {
using mem::frame_size;
vm_area::vm_area(size_t size, vm_flags flags) :
vm_area::vm_area(size_t size, util::bitset32 flags) :
m_size {size},
m_flags {flags},
m_spaces {m_vector_static, 0, static_size},
@@ -62,7 +62,7 @@ vm_area::can_resize(size_t size)
return true;
}
vm_area_fixed::vm_area_fixed(uintptr_t start, size_t size, vm_flags flags) :
vm_area_fixed::vm_area_fixed(uintptr_t start, size_t size, util::bitset32 flags) :
m_start {start},
vm_area {size, flags}
{
@@ -70,7 +70,7 @@ vm_area_fixed::vm_area_fixed(uintptr_t start, size_t size, vm_flags flags) :
vm_area_fixed::~vm_area_fixed()
{
if (m_flags && vm_flags::mmio)
if (m_flags.get(vm_flags::mmio))
return;
size_t pages = mem::page_count(m_size);
@@ -94,7 +94,7 @@ vm_area_fixed::get_page(uintptr_t offset, uintptr_t &phys, bool alloc)
return true;
}
vm_area_untracked::vm_area_untracked(size_t size, vm_flags flags) :
vm_area_untracked::vm_area_untracked(size_t size, util::bitset32 flags) :
vm_area {size, flags}
{
}
@@ -127,7 +127,7 @@ vm_area_untracked::add_to(vm_space *space)
}
vm_area_open::vm_area_open(size_t size, vm_flags flags) :
vm_area_open::vm_area_open(size_t size, util::bitset32 flags) :
m_mapped {nullptr},
vm_area {size, flags}
{
@@ -154,7 +154,7 @@ vm_area_open::add_existing(uintptr_t offset, uintptr_t phys)
}
vm_area_guarded::vm_area_guarded(uintptr_t start, size_t buf_pages, size_t size, vm_flags flags) :
vm_area_guarded::vm_area_guarded(uintptr_t start, size_t buf_pages, size_t size, util::bitset32 flags) :
m_pages {buf_pages + 1}, // Sections are N+1 pages for the leading guard page
m_stacks {start, m_pages*mem::frame_size},
vm_area_open {size, flags}
@@ -191,7 +191,7 @@ vm_area_guarded::get_page(uintptr_t offset, uintptr_t &phys, bool alloc)
return vm_area_open::get_page(offset, phys, alloc);
}
vm_area_ring::vm_area_ring(size_t size, vm_flags flags) :
vm_area_ring::vm_area_ring(size_t size, util::bitset32 flags) :
vm_area_open {size * 2, flags},
m_bufsize {size}
{