6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-10-05 04:17:26 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	inc/EightBitCompilerDefinitions.h
This commit is contained in:
Adrian Conlon
2017-12-12 23:08:34 +00:00
parent c5b7b06e59 697bfb636d
commit c8dd6e7267
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
LR35902/src/LR35902.cpp
View File

@@ -281,40 +281,23 @@ void EightBit::GameBoy::LR35902::ccf(uint8_t& a, uint8_t& f) {
int EightBit::GameBoy::LR35902::singleStep() { int EightBit::GameBoy::LR35902::singleStep() {
int current = 0; const auto interruptEnable = BUS().peek(IoRegisters::BASE + IoRegisters::IE);
const auto interruptEnable = m_bus.peek(IoRegisters::BASE + IoRegisters::IE);
const auto interruptFlags = m_bus.IO().peek(IoRegisters::IF); const auto interruptFlags = m_bus.IO().peek(IoRegisters::IF);
const auto ime = IME();
auto masked = interruptEnable & interruptFlags; auto masked = interruptEnable & interruptFlags;
if (masked) { if (masked) {
if (ime) { if (IME()) {
m_bus.IO().poke(IoRegisters::IF, 0); m_bus.IO().poke(IoRegisters::IF, 0);
lower(INT());
const int index = EightBit::findFirstSet(masked);
BUS().placeDATA(0x38 + (index << 3));
} else { } else {
if (halted()) if (halted())
proceed(); proceed();
} }
} }
if (ime && (masked & IoRegisters::Interrupts::VerticalBlank)) { const auto current = step();
lower(INT());
BUS().placeDATA(0x40);
} else if (ime && (masked & IoRegisters::Interrupts::DisplayControlStatus)) {
lower(INT());
BUS().placeDATA(0x48);
} else if (ime && (masked & IoRegisters::Interrupts::TimerOverflow)) {
lower(INT());
BUS().placeDATA(0x50);
} else if (ime && (masked & IoRegisters::Interrupts::SerialTransfer)) {
lower(INT());
BUS().placeDATA(0x58);
} else if (ime && (masked & IoRegisters::Interrupts::KeypadPressed)) {
lower(INT());
BUS().placeDATA(0x60);
}
current += step();
m_bus.IO().checkTimers(current); m_bus.IO().checkTimers(current);
m_bus.IO().transferDma(); m_bus.IO().transferDma();
@@ -653,7 +636,7 @@ void EightBit::GameBoy::LR35902::executeOther(int x, int y, int z, int p, int q)
addCycles(2); addCycles(2);
break; break;
case 4: // GB: LD (FF00 + n),A case 4: // GB: LD (FF00 + n),A
m_bus.write(IoRegisters::BASE + fetchByte(), a); BUS().write(IoRegisters::BASE + fetchByte(), a);
addCycles(3); addCycles(3);
break; break;
case 5: { // GB: ADD SP,dd case 5: { // GB: ADD SP,dd
@@ -669,7 +652,7 @@ void EightBit::GameBoy::LR35902::executeOther(int x, int y, int z, int p, int q)
addCycles(4); addCycles(4);
break; break;
case 6: // GB: LD A,(FF00 + n) case 6: // GB: LD A,(FF00 + n)
a = m_bus.read(IoRegisters::BASE + fetchByte()); a = BUS().read(IoRegisters::BASE + fetchByte());
addCycles(3); addCycles(3);
break; break;
case 7: { // GB: LD HL,SP + dd case 7: { // GB: LD HL,SP + dd
@@ -730,7 +713,7 @@ void EightBit::GameBoy::LR35902::executeOther(int x, int y, int z, int p, int q)
addCycles(3); addCycles(3);
break; break;
case 4: // GB: LD (FF00 + C),A case 4: // GB: LD (FF00 + C),A
m_bus.write(IoRegisters::BASE + C(), a); BUS().write(IoRegisters::BASE + C(), a);
addCycles(2); addCycles(2);
break; break;
case 5: // GB: LD (nn),A case 5: // GB: LD (nn),A
@@ -739,7 +722,7 @@ void EightBit::GameBoy::LR35902::executeOther(int x, int y, int z, int p, int q)
addCycles(4); addCycles(4);
break; break;
case 6: // GB: LD A,(FF00 + C) case 6: // GB: LD A,(FF00 + C)
a = m_bus.read(IoRegisters::BASE + C()); a = BUS().read(IoRegisters::BASE + C());
addCycles(2); addCycles(2);
break; break;
case 7: // GB: LD A,(nn) case 7: // GB: LD A,(nn)

28
inc/EightBitCompilerDefinitions.h
View File

@@ -1,8 +1,17 @@
#pragma once #pragma once
#ifdef _MSC_VER
# include <intrin.h>
#endif
#ifdef __GNUG__
# include <x86intrin.h>
#endif
namespace EightBit { namespace EightBit {
int countBits(uint8_t value); int countBits(uint8_t value);
bool oddParity(uint8_t value); bool oddParity(uint8_t value);
int findFirstSet(int value);
} }
/* /*
@@ -25,21 +34,30 @@ inline bool EightBit::oddParity(uint8_t value) {
return countBits(value) % 2; return countBits(value) % 2;
} }
inline int EightBit::findFirstSet(int value) {
#ifdef _MSC_VER #ifdef _MSC_VER
unsigned long index;
if (_BitScanForward(&index, value))
return index + 1;
return 0;
#elif defined(__GNUG__)
return __builtin_ffs(value);
#else
# error Find first set not implemented
#endif
}
# include <intrin.h> #ifdef _MSC_VER
# define LIKELY(x) (x) # define LIKELY(x) (x)
# define UNLIKELY(x) (x) # define UNLIKELY(x) (x)
# define EIGHTBIT_PARITY(x) (__popcnt(x) % 2) # define PARITY(x) (__popcnt(x) % 2)
# define UNREACHABLE __assume(0) # define UNREACHABLE __assume(0)
#elif defined(__GNUG__) #elif defined(__GNUG__)
# include <x86intrin.h>
# define LIKELY(x) __builtin_expect(!!(x), 1) # define LIKELY(x) __builtin_expect(!!(x), 1)
# define UNLIKELY(x) __builtin_expect(!!(x), 0) # define UNLIKELY(x) __builtin_expect(!!(x), 0)
@@ -52,7 +70,7 @@ inline bool EightBit::oddParity(uint8_t value) {
# define LIKELY(x) (x) # define LIKELY(x) (x)
# define UNLIKELY(x) (x) # define UNLIKELY(x) (x)
# define EIGHTBIT_PARITY(x) EightBit::oddParity(x) # define PARITY(x) EightBit::oddParity(x)
# define UNREACHABLE # define UNREACHABLE