falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match dma_copy functions (#175) 

* Match dma funcs in code_80091750.c

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran 2022-04-16 19:31:44 -04:00 committed by GitHub
parent fe810f8d1f
commit 13a11f0ffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/code_80091750.c
View File

@ -3872,39 +3872,23 @@ Gfx *func_80098FC8(Gfx *displayListHead, s32 ulx, s32 uly, s32 lrx, s32 lry) {
return func_80098C18(displayListHead, ulx, uly, lrx, lry, 0, 0, 0, 0xFF);
}
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern OSMesgQueue gDmaMesgQueue;
extern ? _textures_0aSegmentRomStart;
void dma_copy_base_729a30(u64 *arg0, size_t nbytes, void *vaddr) {
OSIoMesg sp30;
OSMesg sp2C;
void dma_copy_base_729a30(s32 arg0, u32 arg1, void *arg2) {
? sp30;
void *sp2C;
osInvalDCache(arg2, arg1);
osPiStartDma(&sp30, 0, 0, (arg0 & 0xFFFFFF) + &_textures_0aSegmentRomStart, arg2, arg1, &gDmaMesgQueue);
osRecvMesg(&gDmaMesgQueue, &sp2C, 1);
osInvalDCache(vaddr, nbytes);
osPiStartDma(&sp30, OS_MESG_PRI_NORMAL, OS_READ, &_textures_0aSegmentRomStart[SEGMENT_OFFSET(arg0)], vaddr, nbytes, &gDmaMesgQueue);
osRecvMesg(&gDmaMesgQueue, &sp2C, OS_MESG_BLOCK);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/dma_copy_base_729a30.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern OSMesgQueue gDmaMesgQueue;
extern ? _textures_0bSegmentRomStart;
void dma_copy_base_7fa3c0(u64 *arg0, size_t nbytes, void *vaddr) {
OSIoMesg sp30;
OSMesg sp2C;
void dma_copy_base_7fa3c0(s32 arg0, u32 arg1, void *arg2) {
? sp30;
void *sp2C;
osInvalDCache(arg2, arg1);
osPiStartDma(&sp30, 0, 0, (arg0 & 0xFFFFFF) + &_textures_0bSegmentRomStart, arg2, arg1, &gDmaMesgQueue);
osRecvMesg(&gDmaMesgQueue, &sp2C, 1);
osInvalDCache(vaddr, nbytes);
osPiStartDma(&sp30, OS_MESG_PRI_NORMAL, OS_READ, &_textures_0bSegmentRomStart[SEGMENT_OFFSET(arg0)], vaddr, nbytes, &gDmaMesgQueue);
osRecvMesg(&gDmaMesgQueue, &sp2C, OS_MESG_BLOCK);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/dma_copy_base_7fa3c0.s")
#endif
void func_80099110(void) {
gD_8018E118TotalSize = 0;

5
src/code_80091750.h
View File

@ -102,6 +102,8 @@ Gfx *func_800959F8(Gfx*, Vtx*);
Gfx *func_80098C18(Gfx*, s32, s32, s32, s32, s32, s32, s32, s32);
Gfx *draw_box(Gfx*, s32, s32, s32, s32, s32, s32, s32, s32);
Gfx *func_80098FC8(Gfx*, s32, s32, s32, s32);
void dma_copy_base_729a30(u64*, size_t, void*);
void dma_copy_base_7fa3c0(u64*, size_t, void*);
void func_80099110();
void func_80099184(s32);
void *segmented_to_virtual(void*);
@ -277,4 +279,7 @@ extern f32 D_8018EDD8;
extern f32 D_8018EDDC;
extern s8 D_802874F5;
extern u8 _textures_0aSegmentRomStart[];
extern u8 _textures_0bSegmentRomStart[];
#endif