im dumb
This commit is contained in:
parent
05c153e9ab
commit
c00b188c05
src
10
src/CP15.cpp
10
src/CP15.cpp
|
@ -529,7 +529,7 @@ void ARMv5::WriteBufferWrite(u32 val, u8 flag, u8 cycles, u32 addr)
|
|||
else if (WBWritePointer == 16) // indicates empty write buffer
|
||||
{
|
||||
WBWritePointer = 0;
|
||||
WBTimestamp = (((NDS.ARM9Timestamp + DataCycles) + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1)) >> NDS.ARM9ClockShift;
|
||||
WBTimestamp = (((NDS.ARM9Timestamp + DataCycles + 1) + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1)) >> NDS.ARM9ClockShift;
|
||||
}
|
||||
|
||||
WriteBufferFifo[WBFillPointer] = val | (u64)flag << 62;
|
||||
|
@ -1183,7 +1183,7 @@ bool ARMv5::DataWrite8(u32 addr, u8 val)
|
|||
u8 cycles = NDS.ARM9MemTimings[addr>>14][0];
|
||||
if ((addr >> 24) == 0x02)
|
||||
{
|
||||
cycles = (cycles - 2) & 0x80;
|
||||
cycles = (cycles - 2) | 0x80;
|
||||
}
|
||||
|
||||
WriteBufferWrite(addr, 3, 0);
|
||||
|
@ -1250,7 +1250,7 @@ bool ARMv5::DataWrite16(u32 addr, u16 val)
|
|||
u8 cycles = NDS.ARM9MemTimings[addr>>14][0];
|
||||
if ((addr >> 24) == 0x02)
|
||||
{
|
||||
cycles = (cycles - 2) & 0x80;
|
||||
cycles = (cycles - 2) | 0x80;
|
||||
}
|
||||
|
||||
WriteBufferWrite(addr, 3, 0);
|
||||
|
@ -1317,7 +1317,7 @@ bool ARMv5::DataWrite32(u32 addr, u32 val)
|
|||
u8 cycles = NDS.ARM9MemTimings[addr>>14][2];
|
||||
if ((addr >> 24) == 0x02)
|
||||
{
|
||||
cycles = (cycles - 2) & 0x80;
|
||||
cycles = (cycles - 2) | 0x80;
|
||||
}
|
||||
|
||||
WriteBufferWrite(addr, 3, 0);
|
||||
|
@ -1381,7 +1381,7 @@ bool ARMv5::DataWrite32S(u32 addr, u32 val)
|
|||
u8 cycles = NDS.ARM9MemTimings[addr>>14][3];
|
||||
if ((addr >> 24) == 0x02)
|
||||
{
|
||||
cycles = (cycles - 2) & 0x80;
|
||||
cycles = (cycles - 2) | 0x80;
|
||||
}
|
||||
|
||||
WriteBufferWrite(val, 2, cycles, addr);
|
||||
|
|
Loading…
Reference in New Issue