mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-21 07:52:21 -04:00
7743e5a2c4
* wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
261 lines
5.4 KiB
C
261 lines
5.4 KiB
C
#ifndef _OS_H_
|
|
#define _OS_H_
|
|
|
|
#include "PR/ultratypes.h"
|
|
|
|
typedef s32 OSPri;
|
|
|
|
typedef s32 OSId;
|
|
|
|
#define OS_READ 0
|
|
#define OS_WRITE 1
|
|
|
|
typedef union {
|
|
/* 0x0 */ struct {
|
|
/* 0x0 */ f32 f_odd;
|
|
/* 0x4 */ f32 f_even;
|
|
} f;
|
|
/* 0x0 */ f64 d;
|
|
} __OSfp;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x0 */ u64 at;
|
|
/* 0x8 */ u64 v0;
|
|
/* 0x10 */ u64 v1;
|
|
/* 0x18 */ u64 a0;
|
|
/* 0x20 */ u64 a1;
|
|
/* 0x28 */ u64 a2;
|
|
/* 0x30 */ u64 a3;
|
|
/* 0x38 */ u64 t0;
|
|
/* 0x40 */ u64 t1;
|
|
/* 0x48 */ u64 t2;
|
|
/* 0x50 */ u64 t3;
|
|
/* 0x58 */ u64 t4;
|
|
/* 0x60 */ u64 t5;
|
|
/* 0x68 */ u64 t6;
|
|
/* 0x70 */ u64 t7;
|
|
/* 0x78 */ u64 s0;
|
|
/* 0x80 */ u64 s1;
|
|
/* 0x88 */ u64 s2;
|
|
/* 0x90 */ u64 s3;
|
|
/* 0x98 */ u64 s4;
|
|
/* 0xA0 */ u64 s5;
|
|
/* 0xA8 */ u64 s6;
|
|
/* 0xB0 */ u64 s7;
|
|
/* 0xB8 */ u64 t8;
|
|
/* 0xC0 */ u64 t9;
|
|
/* 0xC8 */ u64 gp;
|
|
/* 0xD0 */ u64 sp;
|
|
/* 0xD8 */ u64 s8;
|
|
/* 0xE0 */ u64 ra;
|
|
/* 0xE8 */ u64 lo;
|
|
/* 0xF0 */ u64 hi;
|
|
/* 0xF8 */ u32 sr;
|
|
/* 0xFC */ u32 pc;
|
|
/* 0x100 */ u32 cause;
|
|
/* 0x104 */ u32 badvaddr;
|
|
/* 0x108 */ u32 rcp;
|
|
/* 0x10C */ u32 fpcsr;
|
|
/* 0x110 */ __OSfp fp0;
|
|
/* 0x118 */ __OSfp fp2;
|
|
/* 0x120 */ __OSfp fp4;
|
|
/* 0x128 */ __OSfp fp6;
|
|
/* 0x130 */ __OSfp fp8;
|
|
/* 0x138 */ __OSfp fp10;
|
|
/* 0x140 */ __OSfp fp12;
|
|
/* 0x148 */ __OSfp fp14;
|
|
/* 0x150 */ __OSfp fp16;
|
|
/* 0x158 */ __OSfp fp18;
|
|
/* 0x160 */ __OSfp fp20;
|
|
/* 0x168 */ __OSfp fp22;
|
|
/* 0x170 */ __OSfp fp24;
|
|
/* 0x178 */ __OSfp fp26;
|
|
/* 0x180 */ __OSfp fp28;
|
|
/* 0x188 */ __OSfp fp30;
|
|
} __OSThreadContext;
|
|
|
|
|
|
typedef struct OSThread_s {
|
|
/* 0x0 */ struct OSThread_s* next;
|
|
/* 0x4 */ OSPri priority;
|
|
/* 0x8 */ struct OSThread_s** queue;
|
|
/* 0xC */ struct OSThread_s* tlnext;
|
|
/* 0x10 */ u16 state;
|
|
/* 0x12 */ u16 flags;
|
|
/* 0x14 */ OSId id;
|
|
/* 0x18 */ int fp;
|
|
/* 0x20 */ __OSThreadContext context;
|
|
} OSThread;
|
|
|
|
typedef u32 OSEvent;
|
|
|
|
typedef u32 OSIntMask;
|
|
|
|
typedef u32 OSPageMask;
|
|
|
|
#define OS_MESG_NOBLOCK 0
|
|
#define OS_MESG_BLOCK 1
|
|
|
|
typedef void* OSMesg;
|
|
|
|
typedef struct {
|
|
/* 0x00 */ OSThread* mtqueue;
|
|
/* 0x04 */ OSThread* fullqueue;
|
|
/* 0x08 */ s32 validCount;
|
|
/* 0x0C */ s32 first;
|
|
/* 0x10 */ s32 msgCount;
|
|
/* 0x14 */ OSMesg* msg;
|
|
} OSMesgQueue; // size = 0x20
|
|
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u32 errStatus;
|
|
/* 0x04 */ void* dramAddr;
|
|
/* 0x08 */ void* C2Addr;
|
|
/* 0x0C */ u32 sectorSize;
|
|
/* 0x10 */ u32 C1ErrNum;
|
|
/* 0x14 */ u32 C1ErrSector[4];
|
|
} __OSBlockInfo;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u32 cmdType;
|
|
/* 0x04 */ u16 transferMode;
|
|
/* 0x06 */ u16 blockNum;
|
|
/* 0x08 */ s32 sectorNum;
|
|
/* 0x0C */ u32 devAddr;
|
|
/* 0x10 */ u32 bmCtlShadow;
|
|
/* 0x14 */ u32 seqCtlShadow;
|
|
/* 0x18 */ __OSBlockInfo block[2];
|
|
} __OSTranxInfo;
|
|
|
|
|
|
typedef struct OSPiHandle_s {
|
|
/* 0x00 */ struct OSPiHandle_s* next;
|
|
/* 0x04 */ u8 type;
|
|
/* 0x05 */ u8 latency;
|
|
/* 0x06 */ u8 pageSize;
|
|
/* 0x07 */ u8 relDuration;
|
|
/* 0x08 */ u8 pulse;
|
|
/* 0x09 */ u8 domain;
|
|
/* 0x0C */ u32 baseAddress;
|
|
/* 0x10 */ u32 speed;
|
|
/* 0x14 */ __OSTranxInfo transferInfo;
|
|
} OSPiHandle;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x0 */ u8 type;
|
|
/* 0x4 */ u32 address;
|
|
} OSPiInfo;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x0 */ u16 type;
|
|
/* 0x2 */ u8 pri;
|
|
/* 0x3 */ u8 status;
|
|
/* 0x4 */ OSMesgQueue* retQueue;
|
|
} OSIoMesgHdr;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x00 */ OSIoMesgHdr hdr;
|
|
/* 0x08 */ void* dramAddr;
|
|
/* 0x0C */ u32 devAddr;
|
|
/* 0x10 */ u32 size;
|
|
/* 0x14 */ OSPiHandle* piHandle;
|
|
} OSIoMesg;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x00 */ s32 active;
|
|
/* 0x04 */ OSThread* thread;
|
|
/* 0x08 */ OSMesgQueue* cmdQueue;
|
|
/* 0x0C */ OSMesgQueue* evtQueue;
|
|
/* 0x10 */ OSMesgQueue* acsQueue;
|
|
/* 0x14 */ s32 (*dma)(void);
|
|
/* 0x18 */ s32 (*unk18)(void);
|
|
} OSDevMgr;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u32 ctrl;
|
|
/* 0x04 */ u32 width;
|
|
/* 0x08 */ u32 burst;
|
|
/* 0x0C */ u32 vSync;
|
|
/* 0x10 */ u32 hSync;
|
|
/* 0x14 */ u32 leap;
|
|
/* 0x18 */ u32 hStart;
|
|
/* 0x1C */ u32 xScale;
|
|
/* 0x20 */ u32 vCurrent;
|
|
} OSViCommonRegs;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u32 origin;
|
|
/* 0x04 */ u32 yScale;
|
|
/* 0x08 */ u32 vStart;
|
|
/* 0x0C */ u32 vBurst;
|
|
/* 0x10 */ u32 vIntr;
|
|
} OSViFieldRegs;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u8 type;
|
|
/* 0x04 */ OSViCommonRegs comRegs;
|
|
/* 0x28 */ OSViFieldRegs fldRegs[2];
|
|
} OSViMode;
|
|
|
|
typedef u64 OSTime;
|
|
|
|
|
|
typedef struct OSTimer_s {
|
|
/* 0x00 */ struct OSTimer_s* next;
|
|
/* 0x04 */ struct OSTimer_s* prev;
|
|
/* 0x08 */ OSTime interval;
|
|
/* 0x10 */ OSTime value;
|
|
/* 0x18 */ OSMesgQueue* mq;
|
|
/* 0x1C */ OSMesg msg;
|
|
} OSTimer;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x0 */ u16 type;
|
|
/* 0x2 */ u8 status;
|
|
/* 0x3 */ u8 errno;
|
|
} OSContStatus;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x0 */ u16 button;
|
|
/* 0x2 */ s8 stick_x;
|
|
/* 0x3 */ s8 stick_y;
|
|
/* 0x4 */ u8 errno;
|
|
} OSContPad;
|
|
|
|
|
|
typedef struct {
|
|
/* 0x00 */ void* address;
|
|
/* 0x04 */ u8 databuffer[32];
|
|
/* 0x24 */ u8 addressCrc;
|
|
/* 0x25 */ u8 dataCrc;
|
|
/* 0x26 */ u8 errno;
|
|
} OSContRamIo;
|
|
|
|
typedef struct {
|
|
/* 0x0 */ u16* histo_base;
|
|
/* 0x4 */ u32 histo_size;
|
|
/* 0x8 */ u32* text_start;
|
|
/* 0xC */ u32* text_end;
|
|
} OSProf;
|
|
|
|
typedef struct {
|
|
/* 0x0 */ OSMesgQueue* mq;
|
|
/* 0x4 */ s32 port; /* Controller port */
|
|
/* 0x8 */ s32 mode;
|
|
/* 0xC */ u8 status;
|
|
} OSVoiceHandle; // size = 0x10
|
|
|
|
#endif
|