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

Merge branch 'master' of https://github.com/MoleskiCoder/EightBit

Browse Source
This commit is contained in:
Adrian Conlon 2019-11-19 23:06:19 +00:00
commit f9cc29f72e
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LR35902/inc/GameBoyBus.h
View File

@ -55,8 +55,8 @@ namespace EightBit {
void loadBootRom(const std::string& path);
void loadGameRom(const std::string& path);
int runRasterLines();
int runVerticalBlankLines();
void runRasterLines();
void runVerticalBlankLines();
protected:
virtual MemoryMapping mapping(uint16_t address) override;
@ -90,13 +90,15 @@ namespace EightBit {
int m_romBank = 1;
int m_ramBank = 0;
int m_allowed = 0;
void validateCartridgeType();
void Bus_WrittenByte(EightBit::EventArgs);
int runRasterLines(int lines);
int runVerticalBlankLines(int lines);
int runRasterLine(int limit);
void runRasterLines(int lines);
void runVerticalBlankLines(int lines);
void runRasterLine(int suggested);
};
}
}

38
LR35902/src/GameBoyBus.cpp
View File

@ -191,24 +191,18 @@ EightBit::MemoryMapping EightBit::GameBoy::Bus::mapping(uint16_t address) {
return { m_highInternalRam, 0xff80, 0xffff, MemoryMapping::AccessLevel::ReadWrite };
}
int EightBit::GameBoy::Bus::runRasterLines() {
void EightBit::GameBoy::Bus::runRasterLines() {
m_enabledLCD = !!(IO().peek(IoRegisters::LCDC) & IoRegisters::LcdEnable);
IO().resetLY();
return runRasterLines(Display::RasterHeight);
runRasterLines(Display::RasterHeight);
}
int EightBit::GameBoy::Bus::runRasterLines(int lines) {
int count = 0;
int allowed = CyclesPerLine;
for (int line = 0; line < lines; ++line) {
auto executed = runRasterLine(allowed);
count += executed;
allowed = CyclesPerLine - (executed - CyclesPerLine);
}
return count;
void EightBit::GameBoy::Bus::runRasterLines(int lines) {
for (int line = 0; line < lines; ++line)
runRasterLine(CyclesPerLine);
}
int EightBit::GameBoy::Bus::runRasterLine(int limit) {
void EightBit::GameBoy::Bus::runRasterLine(int suggested) {
/*
A scanline normally takes 456 clocks (912 clocks in double speed
@ -233,7 +227,7 @@ int EightBit::GameBoy::Bus::runRasterLine(int limit) {
The rest of the clocks of line 153 are spent in line 0 in mode 1!
*/
int count = 0;
m_allowed += suggested;
if (m_enabledLCD) {
if ((IO().peek(IoRegisters::STAT) & Chip::Bit6) && (IO().peek(IoRegisters::LYC) == IO().peek(IoRegisters::LY)))
@ -243,32 +237,30 @@ int EightBit::GameBoy::Bus::runRasterLine(int limit) {
IO().updateLcdStatusMode(IoRegisters::LcdStatusMode::SearchingOamRam);
if (IO().peek(IoRegisters::STAT) & Chip::Bit5)
IO().triggerInterrupt(IoRegisters::Interrupts::DisplayControlStatus);
count += CPU().run(80); // ~19us
m_allowed -= CPU().run(80); // ~19us
// Mode 3, OAM/VRAM unavailable
IO().updateLcdStatusMode(IoRegisters::LcdStatusMode::TransferringDataToLcd);
count += CPU().run(170); // ~41us
m_allowed -= CPU().run(170); // ~41us
// Mode 0
IO().updateLcdStatusMode(IoRegisters::LcdStatusMode::HBlank);
if (IO().peek(IoRegisters::STAT) & Chip::Bit3)
IO().triggerInterrupt(IoRegisters::Interrupts::DisplayControlStatus);
count += CPU().run(limit - count); // ~48.6us
m_allowed -= CPU().run(m_allowed); // ~48.6us
IO().incrementLY();
} else {
count += CPU().run(CyclesPerLine);
m_allowed -= CPU().run(CyclesPerLine);
}
return count;
}
int EightBit::GameBoy::Bus::runVerticalBlankLines() {
void EightBit::GameBoy::Bus::runVerticalBlankLines() {
const auto lines = TotalLineCount - Display::RasterHeight;
return runVerticalBlankLines(lines);
runVerticalBlankLines(lines);
}
int EightBit::GameBoy::Bus::runVerticalBlankLines(int lines) {
void EightBit::GameBoy::Bus::runVerticalBlankLines(int lines) {
/*
Vertical Blank interrupt is triggered when the LCD
@ -293,5 +285,5 @@ int EightBit::GameBoy::Bus::runVerticalBlankLines(int lines) {
IO().triggerInterrupt(IoRegisters::Interrupts::DisplayControlStatus);
IO().triggerInterrupt(IoRegisters::Interrupts::VerticalBlank);
}
return runRasterLines(lines);
runRasterLines(lines);
}