mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-03 18:03:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes known undefined behaviour from DmaMgr and Lib_Ptr taking u32 rather than void*

Browse Source
This commit is contained in:
Kenix3
2020-06-04 21:41:44 -04:00
parent dfbcac539e
commit 664182c289
9 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_lib.c
+18 -11
View File
@@ -606,30 +606,37 @@ f32 Lib_PushAwayVec3f(Vec3f* start, Vec3f* pusher, f32 distanceToApproach) {
void Lib_Nop801004FC(void) {}
u32 Lib_PtrSegToVirt(void* ptr) {
return(gRspSegmentPhysAddrs[((u32)ptr << 4) >> 28] + ((u32)ptr & 0xFFFFFF)) + 0x80000000;
void* Lib_PtrSegToVirt(void* ptr) {
// TODO: PHYSICAL_TO_VIRTUAL macro
// UB to cast the pointer to u32
return (void*)(((u32)gRspSegmentPhysAddrs[((u32)ptr << 4) >> 28] + ((u32)ptr & 0xFFFFFF)) + 0x80000000);
}
u32 Lib_PtrSegToVirtNull(void* ptr) {
void* Lib_PtrSegToVirtNull(void* ptr) {
// UB to cast the pointer to u32 in order to bitshift.
if (((u32)ptr >> 28) == 0) {
return (u32)ptr;
return ptr;
}
return(gRspSegmentPhysAddrs[((u32)ptr << 4) >> 28] + ((u32)ptr & 0xFFFFFF)) + 0x80000000;
// TODO: PHYSICAL_TO_VIRTUAL macro
// UB to cast the pointer to u32
return (void*)(((u32)gRspSegmentPhysAddrs[((u32)ptr << 4) >> 28] + ((u32)ptr & 0xFFFFFF)) + 0x80000000);
}
u32 Lib_PtrSegToK0(void* ptr) {
void* Lib_PtrSegToK0(void* ptr) {
if (ptr == NULL) {
return 0;
return NULL;
} else {
return (u32)ptr + 0x80000000;
// TODO: PHYSICAL_TO_VIRTUAL macro
return (void*)((u32)ptr + 0x80000000);
}
}
u32 Lib_PtrSegToK0Null(void* ptr) {
void* Lib_PtrSegToK0Null(void* ptr) {
if (ptr == NULL) {
return 0;
return NULL;
} else {
return (u32)ptr + 0x80000000;
// TODO: PHYSICAL_TO_VIRTUAL macro
return (void*)((u32)ptr + 0x80000000);
}
}