From bc35674ed34612cf58c061b6bf28b9d27c221206 Mon Sep 17 00:00:00 2001 From: angie Date: Sun, 3 Sep 2023 17:22:26 -0300 Subject: [PATCH] cleanup osVirtualToPhysical --- src/libultra/os/virtualtophysical.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/libultra/os/virtualtophysical.c b/src/libultra/os/virtualtophysical.c index 61abb14e0b..864f54eb86 100644 --- a/src/libultra/os/virtualtophysical.c +++ b/src/libultra/os/virtualtophysical.c @@ -1,13 +1,12 @@ -#include "PR/ultratypes.h" -#include "PR/osint.h" +#include "ultra64.h" #include "libc/stdint.h" -uintptr_t osVirtualToPhysical(void* virtualAddress) { - if (((uintptr_t)virtualAddress >= 0x80000000) && ((uintptr_t)virtualAddress < 0xA0000000)) { - return (uintptr_t)virtualAddress & 0x1FFFFFFF; - } else if (((uintptr_t)virtualAddress >= 0xA0000000) && ((uintptr_t)virtualAddress < 0xC0000000)) { - return (uintptr_t)virtualAddress & 0x1FFFFFFF; +uintptr_t osVirtualToPhysical(void* addr) { + if (IS_KSEG0(addr)) { + return K0_TO_PHYS(addr); + } else if (IS_KSEG1(addr)) { + return K1_TO_PHYS(addr); } else { - return __osProbeTLB(virtualAddress); + return __osProbeTLB(addr); } }