From c550b00ddeec80f94666d03372b89d5cdab6f416 Mon Sep 17 00:00:00 2001 From: Ronald Caesar Date: Wed, 13 Aug 2025 15:40:01 -0400 Subject: [PATCH] aarch64/mem: Fixed pointer arithmatic warning Signed-off-by: Ronald Caesar --- core/aarch64/isa.cpp | 6 +++--- core/aarch64/isa.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/aarch64/isa.cpp b/core/aarch64/isa.cpp index 50a1aaf..05814a9 100644 --- a/core/aarch64/isa.cpp +++ b/core/aarch64/isa.cpp @@ -2,12 +2,12 @@ #include "Base/Assert.h" #include "memory/arena.h" -static inline void* aarch64::memory::gpa_to_hva(aarch64::memory::guest_memory_t* memory, uint64_t gpa) +static inline uint8_t* aarch64::memory::gpa_to_hva(aarch64::memory::guest_memory_t* memory, uint64_t gpa) { ASSERT(nullptr != memory); ASSERT(nullptr != memory->base); ASSERT(gpa < memory->size); - void* hva = memory->base + gpa; + uint8_t* hva = memory->base + gpa; return hva; } @@ -18,7 +18,7 @@ void cpuTest() ASSERT(nullptr != guest_memory_arena.data); aarch64::memory::guest_memory_t guest_ram = {}; - guest_ram.base = guest_memory_arena.data; + guest_ram.base = static_cast(guest_memory_arena.data); guest_ram.size = guest_memory_arena.capacity; // Outdated Code diff --git a/core/aarch64/isa.h b/core/aarch64/isa.h index 57bb237..ed7a15d 100644 --- a/core/aarch64/isa.h +++ b/core/aarch64/isa.h @@ -47,7 +47,7 @@ namespace memory */ typedef struct { - void* base; + uint8_t* base; uint64_t size; } guest_memory_t; @@ -74,7 +74,7 @@ typedef struct * * Return: A valid host virtual address pointer corresponding to the GPA. */ -static inline void* gpa_to_hva(guest_memory_t* memory, uint64_t gpa); +static inline uint8_t* gpa_to_hva(guest_memory_t* memory, uint64_t gpa); } // namespace memory } // namespace aarch64