6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-01-08 11:29:26 +00:00
Code Issues Projects Releases Wiki Activity

Tidy raster line execution a little.

Browse Source 
Signed-off-by: Adrian.Conlon <adrian.conlon@gmail.com>
This commit is contained in:
Adrian.Conlon 2017-09-01 13:24:41 +01:00
parent e42484d35c
commit ef3203d943
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LR35902/inc/LR35902.h
View File

@ -43,6 +43,7 @@ namespace EightBit {
int singleStep();
protected:
int runRasterLines(int limit);
virtual int execute(uint8_t opcode);
int step();

19
LR35902/src/LR35902.cpp
View File

@ -335,26 +335,27 @@ void EightBit::LR35902::ccf(uint8_t& a, uint8_t& f) {
int EightBit::LR35902::runRasterLines() {
m_bus.resetLY();
return runRasterLines(Display::RasterHeight);
}
int EightBit::LR35902::runRasterLines(int limit) {
int count = 0;
for (int line = 0; line < Display::RasterHeight; ++line)
for (int line = 0; line < limit; ++line)
count += runRasterLine();
return count;
}
int EightBit::LR35902::runRasterLine() {
auto cycles = run(cyclesPerLine());
const auto count = run(cyclesPerLine());
m_bus.incrementLY();
if ((m_bus.peekRegister(Bus::STAT) & Processor::Bit6) && (m_bus.peekRegister(Bus::LYC) == m_bus.peekRegister(Bus::LY)))
if ((m_bus.peekRegister(Bus::STAT) & Bit6) && (m_bus.peekRegister(Bus::LYC) == m_bus.peekRegister(Bus::LY)))
m_bus.triggerInterrupt(Bus::Interrupts::DisplayControlStatus);
return cycles;
return count;
}
int EightBit::LR35902::runVerticalBlankLines() {
m_bus.triggerInterrupt(Bus::Interrupts::VerticalBlank);
int count = 0;
for (int line = 0; line < (Bus::TotalLineCount - Display::RasterHeight); ++line)
count += runRasterLine();
return count;
return runRasterLines(Bus::TotalLineCount - Display::RasterHeight);
}
int EightBit::LR35902::singleStep() {
@ -529,7 +530,7 @@ void EightBit::LR35902::executeOther(int x, int y, int z, int p, int q) {
case 1: // 16-bit load immediate/add
switch (q) {
case 0: // LD rp,nn
Processor::fetchWord(RP(p));
fetchWord(RP(p));
cycles += 3;
break;
case 1: // ADD HL,rp