ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pass intreq by ref

This commit is contained in:
MrWint 2019-05-25 22:37:59 +02:00
parent 40167579bb
commit 8247df4be5
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgambatte/src/interruptrequester.h
View File

@ -85,9 +85,9 @@ public:
template<bool isReader>void SyncState(NewState *ns);
};
inline void flagHdmaReq(InterruptRequester *const intreq) { intreq->setEventTime<DMA>(0); }
inline void flagGdmaReq(InterruptRequester *const intreq) { intreq->setEventTime<DMA>(1); }
inline void ackDmaReq(InterruptRequester *const intreq) { intreq->setEventTime<DMA>(disabled_time); }
inline void flagHdmaReq(InterruptRequester &intreq) { intreq.setEventTime<DMA>(0); }
inline void flagGdmaReq(InterruptRequester &intreq) { intreq.setEventTime<DMA>(1); }
inline void ackDmaReq(InterruptRequester &intreq) { intreq.setEventTime<DMA>(disabled_time); }
inline bool hdmaReqFlagged(const InterruptRequester &intreq) { return intreq.eventTime(DMA) == 0; }
inline bool gdmaReqFlagged(const InterruptRequester &intreq) { return intreq.eventTime(DMA) == 1; }

10
libgambatte/src/memory.cpp
View File

@ -33,7 +33,7 @@ Memory::Memory(const Interrupter &interrupter_in, unsigned short &sp, unsigned s
getInput(0),
divLastUpdate(0),
lastOamDmaUpdate(disabled_time),
display(ioamhram, 0, VideoInterruptRequester(&intreq)),
display(ioamhram, 0, VideoInterruptRequester(intreq)),
interrupter(interrupter_in),
dmaSource(0),
dmaDestination(0),
@ -203,7 +203,7 @@ unsigned long Memory::event(unsigned long cycleCounter) {
unsigned dmaLength = ((ioamhram[0x155] & 0x7F) + 0x1) * 0x10;
unsigned length = hdmaReqFlagged(intreq) ? 0x10 : dmaLength;
ackDmaReq(&intreq);
ackDmaReq(intreq);
if ((static_cast<unsigned long>(dmaDest) + length) & 0x10000) {
length = 0x10000 - dmaDest;
@ -843,7 +843,7 @@ void Memory::nontrivial_ff_write(const unsigned P, unsigned data, const unsigned
intreq.setEventTime<BLIT>(cycleCounter + (456 * 4 << isDoubleSpeed()));
if (hdmaEnabled)
flagHdmaReq(&intreq);
flagHdmaReq(intreq);
}
} else
display.lcdcChange(data, cycleCounter);
@ -944,9 +944,9 @@ void Memory::nontrivial_ff_write(const unsigned P, unsigned data, const unsigned
if (ioamhram[0x140] & 0x80) {
display.enableHdma(cycleCounter);
} else
flagHdmaReq(&intreq);
flagHdmaReq(intreq);
} else
flagGdmaReq(&intreq);
flagGdmaReq(intreq);
}
}

1
libgambatte/src/memory.h
View File

@ -30,7 +30,6 @@ static unsigned char const agbOverride[0xD] = { 0xFF, 0x00, 0xCD, 0x03, 0x35, 0x
#include "gambatte.h"
namespace gambatte {
class InputGetter;
class FilterInfo;
class Memory {

8
libgambatte/src/video.h
View File

@ -31,13 +31,13 @@
namespace gambatte {
class VideoInterruptRequester {
InterruptRequester * intreq;
InterruptRequester &intreq;
public:
explicit VideoInterruptRequester(InterruptRequester * intreq) : intreq(intreq) {}
explicit VideoInterruptRequester(InterruptRequester &intreq) : intreq(intreq) {}
void flagHdmaReq() const { gambatte::flagHdmaReq(intreq); }
void flagIrq(const unsigned bit) const { intreq->flagIrq(bit); }
void setNextEventTime(const unsigned long time) const { intreq->setEventTime<VIDEO>(time); }
void flagIrq(const unsigned bit) const { intreq.flagIrq(bit); }
void setNextEventTime(const unsigned long time) const { intreq.setEventTime<VIDEO>(time); }
};
class LCD {

BIN
output/dll/libgambatte.dll
View File

Binary file not shown.