kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Match OdemiExi2 (#575)

Browse source 
* name audio.c and board/audio.c

* fix audio, complete board/basic_space, battle

* revert changes that broke build

* completely finish New and NewMore.cp, for some reason NewMore fails checksum

* finally match NewMore.cp

* match NMWException.cpp

* match mem_TRK

* match TRK with correct linker, uses Revo's notify func

* match TRKReadUARTPoll

* match OdemiExi2

* undo git's stupidness

* testing

* naively match REV 1 for real this time
This commit is contained in:
CreateSource 2025-03-16 15:50:44 -04:00 • committed by GitHub
parent 91d6eb5428
commit 4fdca137cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 335 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.vscode/settings.json vendored
View file

@ -68,7 +68,8 @@
"roll.h": "c",
"msghndlr.h": "c",
"dispatch.h": "c",
"trk.h": "c"
"trk.h": "c",
"debuggerdriver.h": "c"
},
"search.useIgnoreFiles": false,
"search.exclude": {

3
configure.py
View file

@ -252,8 +252,7 @@ cflags_trk = [
cflags_odemuexi = [
*cflags_base,
"-inline auto,deferred"
# TODO figure out flags
"-inline deferred"
]
cflags_amcstub = [

313
src/OdemuExi2/DebuggerDriver.c
View file

@ -1,43 +1,41 @@
#if VERSION == 0
#include <dolphin/exi.h>
#include <dolphin/hw_regs.h>
#include <dolphin/os.h>
#include <dolphin/exi.h>
#include <dolphin/hw_regs.h>
#include <dolphin/os.h>
typedef void (*MTRCallbackType)(int);
typedef void (*MTRCallbackType)(int);
static MTRCallbackType MTRCallback;
static MTRCallbackType MTRCallback;
static void (*DBGCallback)(u32, OSContext *);
static void (*DBGCallback)(u32, OSContext *);
static u32 SendMailData;
static u32 SendMailData;
static s32 RecvDataLeng;
static s32 RecvDataLeng;
static u8 *pEXIInputFlag;
static u8 *pEXIInputFlag;
static u8 EXIInputFlag;
static u8 EXIInputFlag;
static u8 SendCount = 0x80;
static u8 SendCount = 0x80;
#define IS_TRUE(x) ((x) != FALSE)
#define IS_FALSE(x) !IS_TRUE(x)
#define ROUND_UP(x, align) (((x) + (align)-1) & (-(align)))
#define IS_TRUE(x) ((x) != FALSE)
#define IS_FALSE(x) !IS_TRUE(x)
#define ROUND_UP(x, align) (((x) + (align)-1) & (-(align)))
#if VERSION == VERSION_NO_ENG0
// functions
static void CheckMailBox(void);
static void MWCallback(u32 a, OSContext *b);
static void DBGHandler(s16 a, OSContext *b);
static u32 DBGEXISelect(u32 v);
static void DBGEXIInit();
static void DBGEXIInit();
static u32 DBGEXISelect(u32 v);
static void CheckMailBox(void);
static void MWCallback(u32 a, OSContext *b);
static void DBGHandler(s16 a, OSContext *b);
void DBClose(void) { }
void DBClose(void) { }
void DBOpen(void) { }
void DBOpen(void) { }
BOOL DBWrite(void *src, u32 size)
{
BOOL DBWrite(void *src, u32 size)
{
u32 v;
u32 busyFlag;
BOOL interrupts = OSDisableInterrupts();
@ -68,10 +66,10 @@
OSRestoreInterrupts(interrupts);
return 0;
}
}
BOOL DBRead(u32 *buffer, s32 count)
{
BOOL DBRead(u32 *buffer, s32 count)
{
u32 interrupts = OSDisableInterrupts();
u32 v = SendMailData & 0x10000 ? 0x1000 : 0;
@ -83,27 +81,27 @@
OSRestoreInterrupts(interrupts);
return 0;
}
}
u32 DBQueryData(void)
{
u32 DBQueryData(void)
{
BOOL interrupts;
EXIInputFlag = 0;
if (!RecvDataLeng) {
interrupts = OSDisableInterrupts();
CheckMailBox();
#if VERSION > 0
#if VERSION > 0
OSRestoreInterrupts(interrupts);
}
#else
#else
}
OSRestoreInterrupts(interrupts);
#endif
#endif
return RecvDataLeng;
}
}
static void CheckMailBox(void)
{
inline static void CheckMailBox(void)
{
u32 v;
DBGReadStatus(&v);
if (v & 1) {
@ -116,19 +114,19 @@
EXIInputFlag = 1;
}
}
}
}
void DBInitInterrupts(void)
{
void DBInitInterrupts(void)
{
__OSMaskInterrupts(0x18000);
__OSMaskInterrupts(0x40);
DBGCallback = &MWCallback;
__OSSetInterruptHandler(0x19, DBGHandler);
__OSUnmaskInterrupts(0x40);
}
}
void DBInitComm(u8 **a, MTRCallbackType b)
{
void DBInitComm(u8 **a, MTRCallbackType b)
{
BOOL interrupts = OSDisableInterrupts();
{
pEXIInputFlag = (u8 *)EXIInputFlag;
@ -141,53 +139,53 @@
DBGEXIInit();
}
OSRestoreInterrupts(interrupts);
}
}
static void DBGHandler(s16 a, OSContext *b)
{
*__PIRegs = 0x1000;
if (DBGCallback) {
DBGCallback(a, b);
}
}
static void MWCallback(u32 a, OSContext *b)
{
EXIInputFlag = TRUE;
if (MTRCallback) {
MTRCallback(0);
}
}
#pragma push
#pragma dont_inline on
static BOOL DBGReadStatus(u32 *p1)
{
return _DBGReadStatus(p1);
}
#pragma pop
static BOOL _DBGReadStatus(u32 *p1)
{
inline static BOOL _DBGReadStatus(u32 *p1)
{
BOOL total = FALSE;
u32 v;
DBGEXISelect(4);
v = 0x40000000;
total |= !(DBGEXIImm(&v, 2, 1));
total |= !(DBGEXISync());
v = 1 << 30;
total |= IS_FALSE(DBGEXIImm(&v, 2, 1));
total |= IS_FALSE(DBGEXISync());
total |= !(DBGEXIImm(p1, 4, 0));
total |= !(DBGEXISync());
total |= IS_FALSE(DBGEXIImm(p1, 4, 0));
total |= IS_FALSE(DBGEXISync());
total |= !(DBGEXIDeselect());
total |= IS_FALSE(DBGEXIDeselect());
return !(total);
return IS_FALSE(total);
}
static void DBGHandler(s16 a, OSContext *b)
{
*__PIRegs = 0x1000;
if (DBGCallback) {
DBGCallback(a, b);
}
}
static BOOL DBGWrite(u32 count, void *buffer, s32 param3)
{
static void MWCallback(u32 a, OSContext *b)
{
EXIInputFlag = TRUE;
if (MTRCallback) {
MTRCallback(0);
}
}
#pragma push
#pragma dont_inline on
static BOOL DBGReadStatus(u32 *p1)
{
return _DBGReadStatus(p1);
}
#pragma pop
static BOOL DBGWrite(u32 count, void *buffer, s32 param3)
{
BOOL total = FALSE;
u32 *buf_p = (u32 *)buffer;
u32 v1;
@ -213,10 +211,10 @@
total |= IS_FALSE(DBGEXIDeselect());
return IS_FALSE(total);
}
}
static BOOL DBGRead(u32 count, u32 *buffer, s32 param3)
{
static BOOL DBGRead(u32 count, u32 *buffer, s32 param3)
{
BOOL total = FALSE;
u32 *buf_p = (u32 *)buffer;
u32 v1;
@ -242,33 +240,34 @@
total |= IS_FALSE(DBGEXIDeselect());
return IS_FALSE(total);
}
}
#pragma push
#pragma dont_inline on
static BOOL DBGReadMailbox(u32 *p1)
{
long cmd;
long v;
#define TO_BOOL(x) (((u32)__cntlzw((x)) >> 5))
#pragma push
#pragma dont_inline on
static BOOL DBGReadMailbox(u32* p1)
{
u32 v;
u32 total = 0;
u32 stack0, stack1, stack2;
DBGEXISelect(4);
v = 0x60000000;
cmd = 0;
cmd |= !(DBGEXIImm(&v, 2, 1));
cmd |= !(DBGEXISync());
total |= !(DBGEXIImm(&v, 2, 1) != 0);
DBGEXISync();
cmd |= !(DBGEXIImm(p1, 4, 0));
cmd |= !(DBGEXISync());
total |= !(DBGEXIImm(p1, 4, 0) != 0);
DBGEXISync();
cmd |= !(DBGEXIDeselect());
DBGEXIDeselect();
total = TO_BOOL(total);
return total;
}
#pragma pop
return !(cmd);
}
#pragma pop
static BOOL DBGWriteMailbox(u32 p1)
{
inline static BOOL DBGWriteMailbox(u32 p1)
{
u32 cmd = 0xc0000000;
u32 v;
u32 base = p1;
@ -281,10 +280,10 @@
total |= IS_FALSE(DBGEXIDeselect());
return IS_FALSE(total);
}
}
static BOOL DBGEXIImm(void *buffer, s32 bytecounter, u32 write)
{
static BOOL DBGEXIImm(void *buffer, s32 bytecounter, u32 write)
{
u8 *tempPointer;
u32 writeOutValue;
int i;
@ -311,70 +310,23 @@
}
return TRUE;
}
}
static BOOL DBGEXISync()
{
inline static BOOL DBGEXISync()
{
while (__EXIRegs[13] & 1)
;
return TRUE;
}
static BOOL DBGEXIDeselect(void)
{
__EXIRegs[10] &= 0x405;
return TRUE;
}
static u32 DBGEXISelect(u32 v)
{
u32 regs = __EXIRegs[10];
regs &= 0x405;
regs |= 0x80 | (v << 4);
__EXIRegs[10] = regs;
return TRUE;
}
static void DBGEXIInit()
{
__OSMaskInterrupts(0x18000);
__EXIRegs[10] = 0;
}
#elif VERSION == 1
#include <dolphin/exi.h>
#include <dolphin/hw_regs.h>
#include <dolphin/os.h>
typedef void (*MTRCallbackType)(int);
static MTRCallbackType MTRCallback;
static void (*DBGCallback)(u32, OSContext *);
static u32 SendMailData;
static s32 RecvDataLeng;
static u8 *pEXIInputFlag;
static u8 EXIInputFlag;
static u8 SendCount = 0x80;
#define IS_TRUE(x) ((x) != FALSE)
#define IS_FALSE(x) !IS_TRUE(x)
#define ROUND_UP(x, align) (((x) + (align)-1) & (-(align)))
// TODO
void DBGEXIInit()
{
__OSMaskInterrupts(0x18000);
__EXIRegs[10] = 0;
}
static u32 DBGEXISelect(u32 v)
inline BOOL DBGEXIDeselect(void)
{
__EXIRegs[10] &= 0x405;
return TRUE;
}
inline static u32 DBGEXISelect(u32 v)
{
u32 regs = __EXIRegs[10];
regs &= 0x405;
@ -383,13 +335,36 @@ static u32 DBGEXISelect(u32 v)
return TRUE;
}
BOOL DBGEXIDeselect(void)
inline static void DBGEXIInit()
{
__OSMaskInterrupts(0x18000);
__EXIRegs[10] = 0;
}
#else
inline void DBGEXIInit()
{
__OSMaskInterrupts(0x18000);
__EXIRegs[10] = 0;
}
inline static u32 DBGEXISelect(u32 v)
{
u32 regs = __EXIRegs[10];
regs &= 0x405;
regs |= 0x80 | (v << 4);
__EXIRegs[10] = regs;
return TRUE;
}
inline BOOL DBGEXIDeselect(void)
{
__EXIRegs[10] &= 0x405;
return TRUE;
}
static BOOL DBGEXISync()
inline static BOOL DBGEXISync()
{
while (__EXIRegs[13] & 1)
;
@ -427,7 +402,7 @@ static BOOL DBGEXIImm(void *buffer, s32 bytecounter, u32 write)
return TRUE;
}
static BOOL DBGWriteMailbox(u32 p1)
inline static BOOL DBGWriteMailbox(u32 p1)
{
u32 cmd = 0xc0000000;
u32 v;
@ -522,7 +497,7 @@ static BOOL DBGWrite(u32 count, void *buffer, s32 param3)
return IS_FALSE(total);
}
static BOOL _DBGReadStatus(u32 *p1)
inline static BOOL _DBGReadStatus(u32 *p1)
{
BOOL total = FALSE;
u32 v;
@ -541,10 +516,12 @@ static BOOL _DBGReadStatus(u32 *p1)
return IS_FALSE(total);
}
#pragma dont_inline on
static BOOL DBGReadStatus(u32 *p1)
{
return _DBGReadStatus(p1);
}
#pragma dont_inline reset
static void MWCallback(u32 a, OSContext *b)
{
@ -587,7 +564,7 @@ void DBInitInterrupts(void)
__OSUnmaskInterrupts(0x40);
}
static void CheckMailBox(void)
inline static void CheckMailBox(void)
{
u32 v;
DBGReadStatus(&v);
@ -673,6 +650,4 @@ void DBOpen(void) { }
void DBClose(void) { }
#else
#endif