piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 06:10:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

* scheduler revamp, simpler design

Browse Source 
* fix dumb bug of the year: ARM LDR opcodes would accidentally read twice, which fucked with things like the IPC FIFO.
This commit is contained in:
StapleButter
2017-01-31 03:54:51 +01:00
parent 348bbd8cb8
commit 594286ee5d
10 changed files with 274 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ARM.cpp
View File

@ -171,12 +171,6 @@ void ARM::JumpTo(u32 addr, bool restorecpsr)
else addr &= ~0x1; else addr &= ~0x1;
} }
if (addr == 0x02000800)
{
printf("!!!!!!!! %08X\n", R[15]);
//printf("%08X %08X %08X %08X\n", Read32(0x02000000), Read32(0x0200000C), Read32(0x02000800), Read32(0x02000804));
}
if (addr & 0x1) if (addr & 0x1)
{ {
addr &= ~0x1; addr &= ~0x1;
@ -320,15 +314,19 @@ void ARM::TriggerIRQ()
JumpTo(ExceptionBase + 0x18); JumpTo(ExceptionBase + 0x18);
} }
s32 ARM::Execute(s32 cyclestorun) s32 ARM::Execute()
{ {
if (Halted) if (Halted)
{ {
if (NDS::HaltInterrupted(Num)) if (NDS::HaltInterrupted(Num))
{
Halted = 0; Halted = 0;
if (NDS::IME[Num]&1)
TriggerIRQ();
}
else else
{ {
Cycles = cyclestorun; Cycles = CyclesToRun;
return Cycles; return Cycles;
} }
} }
@ -337,7 +335,7 @@ s32 ARM::Execute(s32 cyclestorun)
u32 addr = R[15] - (CPSR&0x20 ? 4:8); u32 addr = R[15] - (CPSR&0x20 ? 4:8);
u32 cpsr = CPSR; u32 cpsr = CPSR;
while (Cycles < cyclestorun) while (Cycles < CyclesToRun)
{ {
//if(Num==1)printf("%08X %08X\n", R[15] - (CPSR&0x20 ? 4:8), NextInstr); //if(Num==1)printf("%08X %08X\n", R[15] - (CPSR&0x20 ? 4:8), NextInstr);
@ -376,8 +374,9 @@ s32 ARM::Execute(s32 cyclestorun)
// TODO optimize this shit!!! // TODO optimize this shit!!!
if (Halted) if (Halted)
{ {
Cycles = cyclestorun; if (Halted == 1)
return Cycles; Cycles = CyclesToRun;
break;
} }
if (NDS::HaltInterrupted(Num)) if (NDS::HaltInterrupted(Num))
{ {
@ -390,5 +389,8 @@ s32 ARM::Execute(s32 cyclestorun)
cpsr = CPSR; cpsr = CPSR;
} }
if (Halted == 2)
Halted = 0;
return Cycles; return Cycles;
} }

3
ARM.h
View File

@ -46,7 +46,7 @@ public:
Halted = halt; Halted = halt;
} }
s32 Execute(s32 cycles); s32 Execute();
bool CheckCondition(u32 code) bool CheckCondition(u32 code)
{ {
@ -211,6 +211,7 @@ public:
s32 Waitstates[4][16]; s32 Waitstates[4][16];
s32 Cycles; s32 Cycles;
s32 CyclesToRun;
u32 Halted; u32 Halted;
u32 R[16]; // heh u32 R[16]; // heh

4
ARMInterpreter_LoadStore.cpp
View File

@ -82,7 +82,7 @@ namespace ARMInterpreter
#define A_LDR \ #define A_LDR \
offset += cpu->R[(cpu->CurInstr>>16) & 0xF]; \ offset += cpu->R[(cpu->CurInstr>>16) & 0xF]; \
u32 val = ROR(cpu->DataRead32(offset), ((offset&0x3)<<3)); \ u32 val = cpu->DataRead32(offset); val = ROR(val, ((offset&0x3)<<3)); \
if (cpu->CurInstr & (1<<21)) cpu->R[(cpu->CurInstr>>16) & 0xF] = offset; \ if (cpu->CurInstr & (1<<21)) cpu->R[(cpu->CurInstr>>16) & 0xF] = offset; \
cpu->Cycles += 1; \ cpu->Cycles += 1; \
if (((cpu->CurInstr>>12) & 0xF) == 15) \ if (((cpu->CurInstr>>12) & 0xF) == 15) \
@ -97,7 +97,7 @@ namespace ARMInterpreter
#define A_LDR_POST \ #define A_LDR_POST \
u32 addr = cpu->R[(cpu->CurInstr>>16) & 0xF]; \ u32 addr = cpu->R[(cpu->CurInstr>>16) & 0xF]; \
u32 val = ROR(cpu->DataRead32(addr, cpu->CurInstr & (1<<21)), ((addr&0x3)<<3)); \ u32 val = cpu->DataRead32(addr, cpu->CurInstr & (1<<21)); val = ROR(val, ((addr&0x3)<<3)); \
cpu->R[(cpu->CurInstr>>16) & 0xF] += offset; \ cpu->R[(cpu->CurInstr>>16) & 0xF] += offset; \
cpu->Cycles += 1; \ cpu->Cycles += 1; \
if (((cpu->CurInstr>>12) & 0xF) == 15) \ if (((cpu->CurInstr>>12) & 0xF) == 15) \

8
GPU.cpp
View File

@ -25,7 +25,7 @@
namespace GPU namespace GPU
{ {
#define LINE_CYCLES (355*6 * 2) #define LINE_CYCLES (355*6)
#define FRAME_CYCLES (LINE_CYCLES * 263) #define FRAME_CYCLES (LINE_CYCLES * 263)
u16 VCount; u16 VCount;
@ -740,7 +740,8 @@ void StartScanline(u32 line)
GPU2D_A->DrawScanline(line); GPU2D_A->DrawScanline(line);
GPU2D_B->DrawScanline(line); GPU2D_B->DrawScanline(line);
NDS::ScheduleEvent(LINE_CYCLES, StartScanline, line+1); //NDS::ScheduleEvent(LINE_CYCLES, StartScanline, line+1);
NDS::ScheduleEvent(NDS::Event_ScanlineStart, true, LINE_CYCLES, StartScanline, line+1);
} }
else if (line == 262) else if (line == 262)
{ {
@ -761,7 +762,8 @@ void StartScanline(u32 line)
if (DispStat[1] & (1<<3)) NDS::TriggerIRQ(1, NDS::IRQ_VBlank); if (DispStat[1] & (1<<3)) NDS::TriggerIRQ(1, NDS::IRQ_VBlank);
} }
NDS::ScheduleEvent(LINE_CYCLES, StartScanline, line+1); //NDS::ScheduleEvent(LINE_CYCLES, StartScanline, line+1);
NDS::ScheduleEvent(NDS::Event_ScanlineStart, true, LINE_CYCLES, StartScanline, line+1);
} }
} }

283
NDS.cpp
View File

@ -36,19 +36,23 @@ namespace NDS
// TODO LIST // TODO LIST
// * stick all the variables in a big structure? // * stick all the variables in a big structure?
// would make it easier to deal with savestates // would make it easier to deal with savestates
// * move ARM9 TCM to the ARM class (closer to the real thing, and handles "DMA can't access TCM" nicely)
SchedEvent SchedBuffer[SCHED_BUF_LEN]; /*SchedEvent SchedBuffer[SCHED_BUF_LEN];
SchedEvent* SchedQueue; SchedEvent* SchedQueue;
bool NeedReschedule; bool NeedReschedule;*/
ARM* ARM9; ARM* ARM9;
ARM* ARM7; ARM* ARM7;
s32 ARM9Cycles, ARM7Cycles; /*s32 ARM9Cycles, ARM7Cycles;
s32 CompensatedCycles; s32 CompensatedCycles;
s32 SchedCycles; s32 SchedCycles;*/
s32 CurIterationCycles;
s32 ARM7Offset;
SchedEvent SchedList[Event_MAX];
u32 SchedListMask;
u8 ARM9BIOS[0x1000]; u8 ARM9BIOS[0x1000];
u8 ARM7BIOS[0x4000]; u8 ARM7BIOS[0x4000];
@ -131,8 +135,9 @@ void LoadROM()
{ {
FILE* f; FILE* f;
f = fopen("rom/armwrestler.nds", "rb"); //f = fopen("rom/armwrestler.nds", "rb");
//f = fopen("rom/zorp.nds", "rb"); //f = fopen("rom/zorp.nds", "rb");
f = fopen("rom/nsmb.nds", "rb");
u32 bootparams[8]; u32 bootparams[8];
fseek(f, 0x20, SEEK_SET); fseek(f, 0x20, SEEK_SET);
@ -143,6 +148,8 @@ void LoadROM()
printf("ARM7: offset=%08X entry=%08X RAM=%08X size=%08X\n", printf("ARM7: offset=%08X entry=%08X RAM=%08X size=%08X\n",
bootparams[4], bootparams[5], bootparams[6], bootparams[7]); bootparams[4], bootparams[5], bootparams[6], bootparams[7]);
MapSharedWRAM(3);
fseek(f, bootparams[0], SEEK_SET); fseek(f, bootparams[0], SEEK_SET);
for (u32 i = 0; i < bootparams[3]; i+=4) for (u32 i = 0; i < bootparams[3]; i+=4)
{ {
@ -159,8 +166,23 @@ void LoadROM()
ARM7Write32(bootparams[6]+i, tmp); ARM7Write32(bootparams[6]+i, tmp);
} }
fseek(f, 0, SEEK_SET);
for (u32 i = 0; i < 0x170; i+=4)
{
u32 tmp;
fread(&tmp, 4, 1, f);
ARM9Write32(0x027FFE00+i, tmp);
}
fclose(f); fclose(f);
ARM9Write32(0x027FF800, 0x00001FC2);
ARM9Write32(0x027FF804, 0x00001FC2);
ARM9Write32(0x027FFC00, 0x00001FC2);
ARM9Write32(0x027FFC04, 0x00001FC2);
ARM9Write16(0x027FFC30, 0xFFFF);
CP15::Write(0x910, 0x0300000A); CP15::Write(0x910, 0x0300000A);
CP15::Write(0x911, 0x00000020); CP15::Write(0x911, 0x00000020);
CP15::Write(0x100, 0x00050000); CP15::Write(0x100, 0x00050000);
@ -241,12 +263,16 @@ void Reset()
RTC::Reset(); RTC::Reset();
Wifi::Reset(); Wifi::Reset();
memset(SchedBuffer, 0, sizeof(SchedEvent)*SCHED_BUF_LEN); // memset(SchedBuffer, 0, sizeof(SchedEvent)*SCHED_BUF_LEN);
SchedQueue = NULL; // SchedQueue = NULL;
memset(SchedList, 0, sizeof(SchedList));
SchedListMask = 0;
ARM9Cycles = 0; /*ARM9Cycles = 0;
ARM7Cycles = 0; ARM7Cycles = 0;
SchedCycles = 0; SchedCycles = 0;*/
CurIterationCycles = 0;
ARM7Offset = 0;
KeyInput = 0x007F03FF; KeyInput = 0x007F03FF;
@ -256,24 +282,64 @@ void Reset()
//LoadROM(); //LoadROM();
//LoadFirmware(); //LoadFirmware();
NDSCart::LoadROM("rom/nsmb.nds"); NDSCart::LoadROM("rom/nsmb.nds");
//LoadROM();
Running = true; // hax Running = true; // hax
} }
static int fnum = 0;
void CalcIterationCycles()
{
CurIterationCycles = 16;
for (int i = 0; i < Event_MAX; i++)
{
if (!(SchedListMask & (1<<i)))
continue;
if (SchedList[i].WaitCycles < CurIterationCycles)
CurIterationCycles = SchedList[i].WaitCycles;
}
}
void RunSystem(s32 cycles)
{
for (int i = 0; i < 8; i++)
{
if ((Timers[i].Cnt & 0x84) == 0x80)
Timers[i].Counter += (ARM9->Cycles >> 1) << Timers[i].CycleShift;
}
for (int i = 4; i < 8; i++)
{
if ((Timers[i].Cnt & 0x84) == 0x80)
Timers[i].Counter += ARM7->Cycles << Timers[i].CycleShift;
}
for (int i = 0; i < Event_MAX; i++)
{
if (!(SchedListMask & (1<<i)))
continue;
SchedList[i].WaitCycles -= cycles;
if (SchedList[i].WaitCycles < 1)
{
SchedListMask &= ~(1<<i);
SchedList[i].Func(SchedList[i].Param);
}
}
}
void RunFrame() void RunFrame()
{ {
s32 framecycles = 560190<<1; s32 framecycles = 560190;
const s32 maxcycles = 16; const s32 maxcycles = 16;
if (!Running) return; // dorp if (!Running) return; // dorp
fnum++;
//printf("frame %d\n", fnum);
GPU::StartFrame(); GPU::StartFrame();
while (Running && framecycles>0) /*while (Running && framecycles>0)
{ {
s32 cyclestorun = maxcycles; s32 cyclestorun = maxcycles;
if (SchedQueue) if (SchedQueue)
@ -294,10 +360,75 @@ void RunFrame()
RunEvents(c9); RunEvents(c9);
framecycles -= cyclestorun; framecycles -= cyclestorun;
} }*/
//printf("frame end\n"); while (Running && framecycles>0)
{
CalcIterationCycles();
ARM9->CyclesToRun = CurIterationCycles << 1;
ARM9->Execute();
s32 ndscyclestorun = ARM9->Cycles >> 1;
s32 ndscycles = 0;
ARM7->CyclesToRun = ndscyclestorun - ARM7Offset;
ARM7->Execute();
ARM7Offset = ARM7->Cycles - ARM7->CyclesToRun;
RunSystem(ndscyclestorun);
/*while (ndscycles < ndscyclestorun)
{
ARM7->CyclesToRun = ndscyclestorun - ndscycles - ARM7Offset;
ARM7->Execute();
ARM7Offset = 0;
RunEvents(ARM7->Cycles);
ndscycles += ARM7->Cycles;
} }
ARM7Offset = ndscycles - ndscyclestorun;*/
framecycles -= ndscyclestorun;
}
}
void Reschedule()
{
CalcIterationCycles();
ARM9->CyclesToRun = CurIterationCycles << 1;
//ARM7->CyclesToRun = CurIterationCycles - ARM7Offset;
//ARM7->CyclesToRun = (ARM9->Cycles >> 1) - ARM7->Cycles - ARM7Offset;
}
void ScheduleEvent(u32 id, bool periodic, s32 delay, void (*func)(u32), u32 param)
{
if (SchedListMask & (1<<id))
{
printf("!! EVENT %d ALREADY SCHEDULED\n", id);
return;
}
SchedEvent* evt = &SchedList[id];
if (periodic) evt->WaitCycles += delay;
else evt->WaitCycles = delay + (ARM9->Cycles >> 1);
evt->Func = func;
evt->Param = param;
SchedListMask |= (1<<id);
Reschedule();
}
void CancelEvent(u32 id)
{
SchedListMask &= ~(1<<id);
}
#if 0
SchedEvent* ScheduleEvent(s32 Delay, void (*Func)(u32), u32 Param) SchedEvent* ScheduleEvent(s32 Delay, void (*Func)(u32), u32 Param)
{ {
// find a free entry // find a free entry
@ -416,6 +547,7 @@ void CompensateARM7()
RunEvents(c9); RunEvents(c9);
} }
#endif
void PressKey(u32 key) void PressKey(u32 key)
@ -480,7 +612,7 @@ void TriggerIRQ(u32 cpu, u32 irq)
// this is redundant // this is redundant
if (!(IME[cpu] & 0x1)) return; if (!(IME[cpu] & 0x1)) return;
(cpu?ARM7:ARM9)->TriggerIRQ(); //(cpu?ARM7:ARM9)->TriggerIRQ();
} }
bool HaltInterrupted(u32 cpu) bool HaltInterrupted(u32 cpu)
@ -510,38 +642,50 @@ void CheckDMAs(u32 cpu, u32 mode)
const s32 TimerPrescaler[4] = {2, 128, 512, 2048}; //const s32 TimerPrescaler[4] = {1, 64, 256, 1024};
const s32 TimerPrescaler[4] = {0, 6, 8, 10};
void TimerIncrement(u32 param) u16 TimerGetCounter(u32 timer)
{
u32 ret = Timers[timer].Counter;
if ((Timers[timer].Cnt & 0x84) == 0x80)
{
u32 c = (timer & 0x4) ? ARM7->Cycles : (ARM9->Cycles>>1);
ret += (c << Timers[timer].CycleShift);
}
return ret >> 16;
}
void TimerOverflow(u32 param)
{ {
Timer* timer = &Timers[param]; Timer* timer = &Timers[param];
timer->Counter = 0;
u32 tid = param & 0x3; u32 tid = param & 0x3;
u32 cpu = param >> 2; u32 cpu = param >> 2;
for (;;) for (;;)
{ {
timer->Counter++;
if (tid == (param&0x3)) if (tid == (param&0x3))
timer->Event = ScheduleEvent(TimerPrescaler[timer->Control&0x3], TimerIncrement, param); ScheduleEvent(Event_Timer9_0 + param, true, (0x10000 - timer->Reload) << TimerPrescaler[timer->Cnt & 0x03], TimerOverflow, param);
//timer->Event = ScheduleEvent(TimerPrescaler[timer->Control&0x3], TimerIncrement, param);
if (timer->Counter == 0) if (timer->Counter == 0)
{ {
timer->Counter = timer->Reload; timer->Counter = timer->Reload << 16;
if (timer->Control & (1<<6)) if (timer->Cnt & (1<<6))
{
TriggerIRQ(cpu, IRQ_Timer0 + tid); TriggerIRQ(cpu, IRQ_Timer0 + tid);
//if (cpu==1) printf("Timer%d IRQ %04X\n", tid, timer->Control);
}
// cascade // cascade
if (tid == 3) if (tid == 3)
break; break;
timer++; timer++;
if ((timer->Control & 0x84) != 0x84) if ((timer->Cnt & 0x84) != 0x84)
break; break;
timer->Counter += 0x10000;
tid++; tid++;
continue; continue;
} }
@ -553,25 +697,25 @@ void TimerIncrement(u32 param)
void TimerStart(u32 id, u16 cnt) void TimerStart(u32 id, u16 cnt)
{ {
Timer* timer = &Timers[id]; Timer* timer = &Timers[id];
u16 curstart = timer->Control & (1<<7); u16 curstart = timer->Cnt & (1<<7);
u16 newstart = cnt & (1<<7); u16 newstart = cnt & (1<<7);
timer->Control = cnt; timer->Cnt = cnt;
if ((!curstart) && newstart) if ((!curstart) && newstart)
{ {
timer->Counter = timer->Reload; timer->Counter = timer->Reload << 16;
timer->CycleShift = 16 - TimerPrescaler[cnt & 0x03];
// start the timer, if it's not a cascading timer // start the timer, if it's not a cascading timer
if (!(cnt & (1<<2))) if (!(cnt & (1<<2)))
timer->Event = ScheduleEvent(TimerPrescaler[cnt&0x3], TimerIncrement, id); ScheduleEvent(Event_Timer9_0 + id, false, (0x10000 - timer->Reload) << TimerPrescaler[cnt & 0x03], TimerOverflow, id);
else else
timer->Event = NULL; CancelEvent(Event_Timer9_0 + id);
} }
else if (curstart && (!newstart)) else if (curstart && (!newstart))
{ {
if (timer->Event) CancelEvent(Event_Timer9_0 + id);
CancelEvent(timer->Event);
} }
} }
@ -659,8 +803,8 @@ void StartDiv()
void debug(u32 param) void debug(u32 param)
{ {
printf("ARM9 PC=%08X\n", ARM9->R[15]); printf("ARM9 PC=%08X %08X\n", ARM9->R[15], ARM9->R_IRQ[1]);
printf("ARM7 PC=%08X\n", ARM7->R[15]); printf("ARM7 PC=%08X %08X\n", ARM7->R[15], ARM7->R_IRQ[1]);
} }
@ -1094,7 +1238,6 @@ void ARM7Write8(u32 addr, u8 val)
void ARM7Write16(u32 addr, u16 val) void ARM7Write16(u32 addr, u16 val)
{ {
if (addr == ARM7->R[15]) printf("!!!!!!!!!!!!7777 %08X %04X\n", addr, val);
switch (addr & 0xFF800000) switch (addr & 0xFF800000)
{ {
case 0x02000000: case 0x02000000:
@ -1134,7 +1277,6 @@ void ARM7Write16(u32 addr, u16 val)
void ARM7Write32(u32 addr, u32 val) void ARM7Write32(u32 addr, u32 val)
{ {
if (addr == ARM7->R[15]) printf("!!!!!!!!!!!!7777 %08X %08X\n", addr, val);
switch (addr & 0xFF800000) switch (addr & 0xFF800000)
{ {
case 0x02000000: case 0x02000000:
@ -1220,14 +1362,14 @@ u16 ARM9IORead16(u32 addr)
case 0x040000EC: return ((u16*)DMA9Fill)[6]; case 0x040000EC: return ((u16*)DMA9Fill)[6];
case 0x040000EE: return ((u16*)DMA9Fill)[7]; case 0x040000EE: return ((u16*)DMA9Fill)[7];
case 0x04000100: return Timers[0].Counter; case 0x04000100: return TimerGetCounter(0);
case 0x04000102: return Timers[0].Control; case 0x04000102: return Timers[0].Cnt;
case 0x04000104: return Timers[1].Counter; case 0x04000104: return TimerGetCounter(1);
case 0x04000106: return Timers[1].Control; case 0x04000106: return Timers[1].Cnt;
case 0x04000108: return Timers[2].Counter; case 0x04000108: return TimerGetCounter(2);
case 0x0400010A: return Timers[2].Control; case 0x0400010A: return Timers[2].Cnt;
case 0x0400010C: return Timers[3].Counter; case 0x0400010C: return TimerGetCounter(3);
case 0x0400010E: return Timers[3].Control; case 0x0400010E: return Timers[3].Cnt;
case 0x04000130: return KeyInput & 0xFFFF; case 0x04000130: return KeyInput & 0xFFFF;
@ -1290,10 +1432,10 @@ u32 ARM9IORead32(u32 addr)
case 0x040000E8: return DMA9Fill[2]; case 0x040000E8: return DMA9Fill[2];
case 0x040000EC: return DMA9Fill[3]; case 0x040000EC: return DMA9Fill[3];
case 0x04000100: return Timers[0].Counter | (Timers[0].Control << 16); case 0x04000100: return TimerGetCounter(0) | (Timers[0].Cnt << 16);
case 0x04000104: return Timers[1].Counter | (Timers[1].Control << 16); case 0x04000104: return TimerGetCounter(1) | (Timers[1].Cnt << 16);
case 0x04000108: return Timers[2].Counter | (Timers[2].Control << 16); case 0x04000108: return TimerGetCounter(2) | (Timers[2].Cnt << 16);
case 0x0400010C: return Timers[3].Counter | (Timers[3].Control << 16); case 0x0400010C: return TimerGetCounter(3) | (Timers[3].Cnt << 16);
case 0x040001A4: return NDSCart::ROMCnt; case 0x040001A4: return NDSCart::ROMCnt;
@ -1434,7 +1576,7 @@ void ARM9IOWrite16(u32 addr, u16 val)
{ {
TriggerIRQ(1, IRQ_IPCSync); TriggerIRQ(1, IRQ_IPCSync);
} }
CompensateARM7(); //CompensateARM7();
return; return;
case 0x04000184: case 0x04000184:
@ -1555,7 +1697,7 @@ void ARM9IOWrite32(u32 addr, u32 val)
else else
{ {
bool wasempty = IPCFIFO9->IsEmpty(); bool wasempty = IPCFIFO9->IsEmpty();
IPCFIFO9->Write(val); IPCFIFO9->Write(val);printf("IPC FIFO %08X %08X\n", val, ARM9->R[6]+0x114);
if ((IPCFIFOCnt7 & 0x0400) && wasempty) if ((IPCFIFOCnt7 & 0x0400) && wasempty)
TriggerIRQ(1, IRQ_IPCRecv); TriggerIRQ(1, IRQ_IPCRecv);
} }
@ -1651,14 +1793,14 @@ u16 ARM7IORead16(u32 addr)
case 0x04000004: return GPU::DispStat[1]; case 0x04000004: return GPU::DispStat[1];
case 0x04000006: return GPU::VCount; case 0x04000006: return GPU::VCount;
case 0x04000100: return Timers[4].Counter; case 0x04000100: return TimerGetCounter(4);
case 0x04000102: return Timers[4].Control; case 0x04000102: return Timers[4].Cnt;
case 0x04000104: return Timers[5].Counter; case 0x04000104: return TimerGetCounter(5);
case 0x04000106: return Timers[5].Control; case 0x04000106: return Timers[5].Cnt;
case 0x04000108: return Timers[6].Counter; case 0x04000108: return TimerGetCounter(6);
case 0x0400010A: return Timers[6].Control; case 0x0400010A: return Timers[6].Cnt;
case 0x0400010C: return Timers[7].Counter; case 0x0400010C: return TimerGetCounter(7);
case 0x0400010E: return Timers[7].Control; case 0x0400010E: return Timers[7].Cnt;
case 0x04000130: return KeyInput & 0xFFFF; case 0x04000130: return KeyInput & 0xFFFF;
case 0x04000136: return KeyInput >> 16; case 0x04000136: return KeyInput >> 16;
@ -1720,10 +1862,10 @@ u32 ARM7IORead32(u32 addr)
case 0x040000D8: return DMAs[7]->DstAddr; case 0x040000D8: return DMAs[7]->DstAddr;
case 0x040000DC: return DMAs[7]->Cnt; case 0x040000DC: return DMAs[7]->Cnt;
case 0x04000100: return Timers[4].Counter | (Timers[4].Control << 16); case 0x04000100: return TimerGetCounter(4) | (Timers[4].Cnt << 16);
case 0x04000104: return Timers[5].Counter | (Timers[5].Control << 16); case 0x04000104: return TimerGetCounter(5) | (Timers[5].Cnt << 16);
case 0x04000108: return Timers[6].Counter | (Timers[6].Control << 16); case 0x04000108: return TimerGetCounter(6) | (Timers[6].Cnt << 16);
case 0x0400010C: return Timers[7].Counter | (Timers[7].Control << 16); case 0x0400010C: return TimerGetCounter(7) | (Timers[7].Cnt << 16);
case 0x040001A4: return NDSCart::ROMCnt; case 0x040001A4: return NDSCart::ROMCnt;
@ -1790,6 +1932,9 @@ void ARM7IOWrite8(u32 addr, u8 val)
NDSCart::SPICnt |= (val << 8); NDSCart::SPICnt |= (val << 8);
} }
return; return;
case 0x040001A2:
printf("CART SPI %02X\n", val);
return;
case 0x040001A8: NDSCart::ROMCommand[0] = val; return; case 0x040001A8: NDSCart::ROMCommand[0] = val; return;
case 0x040001A9: NDSCart::ROMCommand[1] = val; return; case 0x040001A9: NDSCart::ROMCommand[1] = val; return;
@ -1814,7 +1959,6 @@ void ARM7IOWrite8(u32 addr, u8 val)
return; return;
case 0x04000301: case 0x04000301:
//printf("ARM7 HALT %02X. IME=%08X IE=%08X IF=%08X\n", val, IME[1], IE[1], IF[1]);
if (val == 0x80) ARM7->Halt(1); if (val == 0x80) ARM7->Halt(1);
return; return;
} }
@ -1874,6 +2018,9 @@ void ARM7IOWrite16(u32 addr, u16 val)
if (ExMemCnt[0] & (1<<11)) if (ExMemCnt[0] & (1<<11))
NDSCart::SPICnt = val; NDSCart::SPICnt = val;
return; return;
case 0x040001A2:
printf("CART SPI %04X\n", val);
return;
case 0x040001B8: ROMSeed0[12] = val & 0x7F; return; case 0x040001B8: ROMSeed0[12] = val & 0x7F; return;
case 0x040001BA: ROMSeed1[12] = val & 0x7F; return; case 0x040001BA: ROMSeed1[12] = val & 0x7F; return;
@ -1930,7 +2077,7 @@ void ARM7IOWrite32(u32 addr, u32 val)
case 0x040000D0: DMAs[6]->WriteCnt(val); return; case 0x040000D0: DMAs[6]->WriteCnt(val); return;
case 0x040000D4: DMAs[7]->SrcAddr = val; return; case 0x040000D4: DMAs[7]->SrcAddr = val; return;
case 0x040000D8: DMAs[7]->DstAddr = val; return; case 0x040000D8: DMAs[7]->DstAddr = val; return;
case 0x040000DC: DMAs[7]->WriteCnt(val); printf("start dma3 %08X %08X %08X\n", val, ARM7->R[15], ARM7Read32(ARM7->R[13]+24));return; case 0x040000DC: DMAs[7]->WriteCnt(val); return;
case 0x04000100: case 0x04000100:
Timers[4].Reload = val & 0xFFFF; Timers[4].Reload = val & 0xFFFF;

25
NDS.h
View File

@ -24,7 +24,7 @@
namespace NDS namespace NDS
{ {
#define SCHED_BUF_LEN 64 /*#define SCHED_BUF_LEN 64
typedef struct _SchedEvent typedef struct _SchedEvent
{ {
@ -34,7 +34,7 @@ typedef struct _SchedEvent
struct _SchedEvent* PrevEvent; struct _SchedEvent* PrevEvent;
struct _SchedEvent* NextEvent; struct _SchedEvent* NextEvent;
} SchedEvent; } SchedEvent;*/
enum enum
{ {
@ -52,6 +52,14 @@ enum
Event_MAX Event_MAX
}; };
typedef struct
{
void (*Func)(u32 param);
s32 WaitCycles;
u32 Param;
} SchedEvent;
enum enum
{ {
IRQ_VBlank = 0, IRQ_VBlank = 0,
@ -84,9 +92,10 @@ enum
typedef struct typedef struct
{ {
u16 Reload; u16 Reload;
u16 Control; u16 Cnt;
u16 Counter; u32 Counter;
SchedEvent* Event; u32 CycleShift;
//SchedEvent* Event;
} Timer; } Timer;
@ -111,9 +120,11 @@ void RunFrame();
void PressKey(u32 key); void PressKey(u32 key);
void ReleaseKey(u32 key); void ReleaseKey(u32 key);
SchedEvent* ScheduleEvent(s32 Delay, void (*Func)(u32), u32 Param); /*SchedEvent* ScheduleEvent(s32 Delay, void (*Func)(u32), u32 Param);
void CancelEvent(SchedEvent* event); void CancelEvent(SchedEvent* event);
void RunEvents(s32 cycles); void RunEvents(s32 cycles);*/
void ScheduleEvent(u32 id, bool periodic, s32 delay, void (*func)(u32), u32 param);
void CancelEvent(u32 id);
// DO NOT CALL FROM ARM7!! // DO NOT CALL FROM ARM7!!
void CompensateARM7(); void CompensateARM7();

4
NDSCart.cpp
View File

@ -289,8 +289,8 @@ void ROMPrepareData(u32 param)
NDS::CheckDMAs(0, 0x06); NDS::CheckDMAs(0, 0x06);
NDS::CheckDMAs(1, 0x12); NDS::CheckDMAs(1, 0x12);
if (DataOutPos < DataOutLen) //if (DataOutPos < DataOutLen)
NDS::ScheduleEvent((ROMCnt & (1<<27)) ? 8:5, ROMPrepareData, 0); // NDS::ScheduleEvent((ROMCnt & (1<<27)) ? 8:5, ROMPrepareData, 0);
} }
void WriteCnt(u32 val) void WriteCnt(u32 val)

2
SPI.cpp
View File

@ -323,7 +323,7 @@ void WriteData(u8 val)
{ {
case 0x0000: SPI_Powerman::Write(val, CNT&(1<<11)); break; case 0x0000: SPI_Powerman::Write(val, CNT&(1<<11)); break;
case 0x0100: SPI_Firmware::Write(val, CNT&(1<<11)); break; case 0x0100: SPI_Firmware::Write(val, CNT&(1<<11)); break;
default: break;//printf("SPI to unknown device %04X %02X\n", CNT, val); break; default: printf("SPI to unknown device %04X %02X\n", CNT, val); break;
} }
if (CNT & (1<<14)) if (CNT & (1<<14))

9
main.cpp
View File

@ -39,9 +39,12 @@ LRESULT CALLBACK derpo(HWND window, UINT msg, WPARAM wparam, LPARAM lparam)
printf("close\n"); printf("close\n");
{ {
// 6006800 6008000 // 6006800 6008000
FILE* f = fopen("vramABG.bin", "wb"); FILE* f = fopen("wram.bin", "wb");
for (int i = 0; i < 128; i++) for (u32 i = 0x37F8000; i < 0x3808000; i+=4)
fwrite(GPU::VRAM_ABG[i], 16384, 1, f); {
u32 blarg = NDS::ARM7Read32(i);
fwrite(&blarg, 4, 1, f);
}
fclose(f); fclose(f);
} }
PostQuitMessage(0); PostQuitMessage(0);

22
melonDS.depend
View File

@ -1,16 +1,16 @@
# depslib dependency file v1.0 # depslib dependency file v1.0
1485135566 source:c:\documents\sources\melonds\main.cpp 1485812673 source:c:\documents\sources\melonds\main.cpp
<stdio.h> <stdio.h>
<windows.h> <windows.h>
"NDS.h" "NDS.h"
"GPU.h" "GPU.h"
1485798225 c:\documents\sources\melonds\nds.h 1485808644 c:\documents\sources\melonds\nds.h
"types.h" "types.h"
1481161027 c:\documents\sources\melonds\types.h 1481161027 c:\documents\sources\melonds\types.h
1485798397 source:c:\documents\sources\melonds\nds.cpp 1485831079 source:c:\documents\sources\melonds\nds.cpp
<stdio.h> <stdio.h>
<string.h> <string.h>
"NDS.h" "NDS.h"
@ -24,13 +24,13 @@
"RTC.h" "RTC.h"
"Wifi.h" "Wifi.h"
1485797690 source:c:\documents\sources\melonds\arm.cpp 1485830997 source:c:\documents\sources\melonds\arm.cpp
<stdio.h> <stdio.h>
"NDS.h" "NDS.h"
"ARM.h" "ARM.h"
"ARMInterpreter.h" "ARMInterpreter.h"
1485799759 c:\documents\sources\melonds\arm.h 1485806035 c:\documents\sources\melonds\arm.h
"types.h" "types.h"
"NDS.h" "NDS.h"
"CP15.h" "CP15.h"
@ -41,7 +41,7 @@
"types.h" "types.h"
"ARM.h" "ARM.h"
1485797066 source:c:\documents\sources\melonds\arminterpreter.cpp 1485817127 source:c:\documents\sources\melonds\arminterpreter.cpp
<stdio.h> <stdio.h>
"NDS.h" "NDS.h"
"CP15.h" "CP15.h"
@ -65,13 +65,13 @@
1485795628 c:\documents\sources\melonds\arminterpreter_loadstore.h 1485795628 c:\documents\sources\melonds\arminterpreter_loadstore.h
1485797600 source:c:\documents\sources\melonds\arminterpreter_loadstore.cpp 1485830927 source:c:\documents\sources\melonds\arminterpreter_loadstore.cpp
<stdio.h> <stdio.h>
"ARM.h" "ARM.h"
1485799621 c:\documents\sources\melonds\cp15.h 1485799621 c:\documents\sources\melonds\cp15.h
1485799278 source:c:\documents\sources\melonds\cp15.cpp 1485830984 source:c:\documents\sources\melonds\cp15.cpp
<stdio.h> <stdio.h>
<string.h> <string.h>
"NDS.h" "NDS.h"
@ -80,7 +80,7 @@
1480957111 c:\documents\sources\melonds\spi.h 1480957111 c:\documents\sources\melonds\spi.h
1485797744 source:c:\documents\sources\melonds\spi.cpp 1485820057 source:c:\documents\sources\melonds\spi.cpp
<stdio.h> <stdio.h>
<string.h> <string.h>
"NDS.h" "NDS.h"
@ -117,7 +117,7 @@
1484698068 c:\documents\sources\melonds\dma.h 1484698068 c:\documents\sources\melonds\dma.h
"types.h" "types.h"
1485789352 source:c:\documents\sources\melonds\gpu.cpp 1485809857 source:c:\documents\sources\melonds\gpu.cpp
<stdio.h> <stdio.h>
<string.h> <string.h>
"NDS.h" "NDS.h"
@ -137,7 +137,7 @@
1485112531 c:\documents\sources\melonds\ndscart.h 1485112531 c:\documents\sources\melonds\ndscart.h
"types.h" "types.h"
1485134328 source:c:\documents\sources\melonds\ndscart.cpp 1485813068 source:c:\documents\sources\melonds\ndscart.cpp
<stdio.h> <stdio.h>
<string.h> <string.h>
"NDS.h" "NDS.h"