sinamas/gambatte
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgambatte: pass intreq by ref

Browse Source
This commit is contained in:
sinamas 2013-03-18 23:22:49 +01:00
parent f102bb4fc1
commit 1a387eb7ab
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgambatte/src/interruptrequester.h
View File

@ -81,9 +81,9 @@ public:
unsigned long eventTime(MemEventId id) const { return eventTimes.value(id); }
};
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

@ -29,7 +29,7 @@ Memory::Memory(const Interrupter &interrupter_in)
: getInput(0),
divLastUpdate(0),
lastOamDmaUpdate(DISABLED_TIME),
display(ioamhram, 0, VideoInterruptRequester(&intreq)),
display(ioamhram, 0, VideoInterruptRequester(intreq)),
interrupter(interrupter_in),
dmaSource(0),
dmaDestination(0),
@ -205,7 +205,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;
@ -802,7 +802,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);
@ -891,9 +891,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);
}
}

8
libgambatte/src/video.h
View File

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