summaryrefslogtreecommitdiff
path: root/src/code/z_lib.c
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-10-26 10:44:27 -0300
committerGitHub <noreply@github.com>2023-10-26 10:44:27 -0300
commit6475196f0fd24b1697241e3662bc732cdd81d212 (patch)
tree93349fa3c1e078d5e8d902f2ce5ed31035e43cc5 /src/code/z_lib.c
parent6aaeb80f992865e1a68eed611b926f8b41ad3ed6 (diff)
Yet another libultra cleanup (#1384)
* os symbols * various variables * more variables * more cleanup * yeet HW_REG * OS_PHYSICAL_TO_K0 and other cleanups * Rename r4300.h * migrate pimgr data and cleanup on initialize.c * rename osFlash symbols * cleanup gu * vimodes * yeet rmon, do libc files * some os files * hardwareinterrupt * cleanup a lot of os files * cleanup osVirtualToPhysical * various io files * another io chunk * final io chunk * yeet hardware.h * yeet PHYSICAL_TO_VIRTUAL and VIRTUAL_TO_PHYSICAL * fix typo * fix merge * remove global.h from libultra files * fixes and format * brief explanation * review * review * review * review * SEGMENTED_TO_K0 * Revert "SEGMENTED_TO_K0" This reverts commit f8d62d670f91af401feb56489e1cbc45a1260049. * take two * bss * bss
Diffstat (limited to 'src/code/z_lib.c')
-rw-r--r--src/code/z_lib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/z_lib.c b/src/code/z_lib.c
index a68d7c882..c520b00d5 100644
--- a/src/code/z_lib.c
+++ b/src/code/z_lib.c
@@ -699,14 +699,14 @@ void Lib_Nop801004FC(void) {
}
void* Lib_SegmentedToVirtual(void* ptr) {
- return SEGMENTED_TO_VIRTUAL(ptr);
+ return SEGMENTED_TO_K0(ptr);
}
void* Lib_SegmentedToVirtualNull(void* ptr) {
if (((uintptr_t)ptr >> 28) == 0) {
return ptr;
} else {
- return SEGMENTED_TO_VIRTUAL(ptr);
+ return SEGMENTED_TO_K0(ptr);
}
}
@@ -719,7 +719,7 @@ void* Lib_VirtualToPhysical(void* ptr) {
if (ptr == NULL) {
return NULL;
} else {
- return (void*)VIRTUAL_TO_PHYSICAL(ptr);
+ return (void*)OS_K0_TO_PHYSICAL(ptr);
}
}
@@ -732,6 +732,6 @@ void* Lib_PhysicalToVirtual(void* ptr) {
if (ptr == NULL) {
return NULL;
} else {
- return (void*)PHYSICAL_TO_VIRTUAL(ptr);
+ return OS_PHYSICAL_TO_K0(ptr);
}
}