6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-09-29 00:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Try to get better cycle count/adjustments.

Browse Source
This commit is contained in:
Adrian Conlon 2017-09-30 00:03:42 +01:00
parent 794d0fa361
commit da438ffb85
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LR35902/inc/LR35902.h
View File

@ -40,13 +40,15 @@ namespace EightBit {
virtual void reset() override; virtual void reset() override;
int runRasterLines(); int runRasterLines();
int runRasterLine();
int runVerticalBlankLines(); int runVerticalBlankLines();
int singleStep(); int singleStep();
protected: protected:
int runRasterLines(int limit); int runRasterLines(int limit, int lines);
int runVerticalBlankLines(int limit, int lines);
int runRasterLine(int limit);
virtual int execute(uint8_t opcode); virtual int execute(uint8_t opcode);
int step(); int step();

24
LR35902/src/LR35902.cpp
View File

@ -325,18 +325,23 @@ void EightBit::GameBoy::LR35902::ccf(uint8_t& a, uint8_t& f) {
int EightBit::GameBoy::LR35902::runRasterLines() { int EightBit::GameBoy::LR35902::runRasterLines() {
m_bus.resetLY(); m_bus.resetLY();
return runRasterLines(Display::RasterHeight); return runRasterLines(Display::RasterHeight * Bus::CyclesPerLine, Display::RasterHeight);
} }
int EightBit::GameBoy::LR35902::runRasterLines(int limit) { int EightBit::GameBoy::LR35902::runRasterLines(int limit, int lines) {
int count = 0; int count = 0;
for (int line = 0; line < limit; ++line) int executed = 0;
count += runRasterLine(); int allowed = Bus::CyclesPerLine;
for (int line = 0; line < lines; ++line) {
auto executed = runRasterLine(allowed);
count += executed;
allowed = Bus::CyclesPerLine - (executed - Bus::CyclesPerLine);
}
return count; return count;
} }
int EightBit::GameBoy::LR35902::runRasterLine() { int EightBit::GameBoy::LR35902::runRasterLine(int limit) {
const auto count = run(Bus::CyclesPerLine); const auto count = run(limit);
if (m_bus.peekRegister(Bus::LCDC) & Bus::LcdEnable) { if (m_bus.peekRegister(Bus::LCDC) & Bus::LcdEnable) {
m_bus.updateLcdStatusMode(Bus::LcdStatusMode::HBlank); m_bus.updateLcdStatusMode(Bus::LcdStatusMode::HBlank);
m_bus.incrementLY(); m_bus.incrementLY();
@ -347,11 +352,16 @@ int EightBit::GameBoy::LR35902::runRasterLine() {
} }
int EightBit::GameBoy::LR35902::runVerticalBlankLines() { int EightBit::GameBoy::LR35902::runVerticalBlankLines() {
auto lines = Bus::TotalLineCount - Display::RasterHeight;
return runVerticalBlankLines(lines * Bus::CyclesPerLine, lines);
}
int EightBit::GameBoy::LR35902::runVerticalBlankLines(int limit, int lines) {
if (m_bus.peekRegister(Bus::LCDC) & Bus::LcdEnable) { if (m_bus.peekRegister(Bus::LCDC) & Bus::LcdEnable) {
m_bus.updateLcdStatusMode(Bus::LcdStatusMode::VBlank); m_bus.updateLcdStatusMode(Bus::LcdStatusMode::VBlank);
m_bus.triggerInterrupt(Bus::Interrupts::VerticalBlank); m_bus.triggerInterrupt(Bus::Interrupts::VerticalBlank);
} }
return runRasterLines(Bus::TotalLineCount - Display::RasterHeight); return runRasterLines(limit, lines);
} }
int EightBit::GameBoy::LR35902::singleStep() { int EightBit::GameBoy::LR35902::singleStep() {