diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-07-03 21:17:35 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-07-03 21:20:13 +0200 |
commit | 27f699ef0c8c2dce0f1dff19eef25f02e3da397e (patch) | |
tree | 52f95be1d05ba2a621d3bb8ac9129341f8d9973b /Kernel/kmalloc.cpp | |
parent | c4c4bbc5ba5119e9ccc8ded948b26e7c4851a909 (diff) | |
download | serenity-27f699ef0c8c2dce0f1dff19eef25f02e3da397e.zip |
AK: Rename the common integer typedefs to make it obvious what they are.
These types can be picked up by including <AK/Types.h>:
* u8, u16, u32, u64 (unsigned)
* i8, i16, i32, i64 (signed)
Diffstat (limited to 'Kernel/kmalloc.cpp')
-rw-r--r-- | Kernel/kmalloc.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Kernel/kmalloc.cpp b/Kernel/kmalloc.cpp index 48d18cb98b..4985f84647 100644 --- a/Kernel/kmalloc.cpp +++ b/Kernel/kmalloc.cpp @@ -29,22 +29,22 @@ struct [[gnu::packed]] allocation_t #define BASE_PHYSICAL (3 * MB) #define RANGE_SIZE (1 * MB) -static byte alloc_map[POOL_SIZE / CHUNK_SIZE / 8]; +static u8 alloc_map[POOL_SIZE / CHUNK_SIZE / 8]; volatile size_t sum_alloc = 0; volatile size_t sum_free = POOL_SIZE; volatile size_t kmalloc_sum_eternal = 0; -dword g_kmalloc_call_count; -dword g_kfree_call_count; +u32 g_kmalloc_call_count; +u32 g_kfree_call_count; bool g_dump_kmalloc_stacks; -static byte* s_next_eternal_ptr; -static byte* s_end_of_eternal_range; +static u8* s_next_eternal_ptr; +static u8* s_end_of_eternal_range; bool is_kmalloc_address(const void* ptr) { - if (ptr >= (byte*)ETERNAL_BASE_PHYSICAL && ptr < s_next_eternal_ptr) + if (ptr >= (u8*)ETERNAL_BASE_PHYSICAL && ptr < s_next_eternal_ptr) return true; return (size_t)ptr >= BASE_PHYSICAL && (size_t)ptr <= (BASE_PHYSICAL + POOL_SIZE); } @@ -58,7 +58,7 @@ void kmalloc_init() sum_alloc = 0; sum_free = POOL_SIZE; - s_next_eternal_ptr = (byte*)ETERNAL_BASE_PHYSICAL; + s_next_eternal_ptr = (u8*)ETERNAL_BASE_PHYSICAL; s_end_of_eternal_range = s_next_eternal_ptr + ETERNAL_RANGE_SIZE; } @@ -137,7 +137,7 @@ void* kmalloc_impl(size_t size) if (chunks_here == chunks_needed) { auto* a = (allocation_t*)(BASE_PHYSICAL + (first_chunk * CHUNK_SIZE)); - byte* ptr = (byte*)a; + u8* ptr = (u8*)a; ptr += sizeof(allocation_t); a->nchunk = chunks_needed; a->start = first_chunk; @@ -173,7 +173,7 @@ void kfree(void* ptr) InterruptDisabler disabler; ++g_kfree_call_count; - auto* a = (allocation_t*)((((byte*)ptr) - sizeof(allocation_t))); + auto* a = (allocation_t*)((((u8*)ptr) - sizeof(allocation_t))); for (size_t k = a->start; k < (a->start + a->nchunk); ++k) alloc_map[k / 8] &= ~(1 << (k % 8)); |