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

6809: Start moving away from macro based read/modify/write implementation

Browse Source 
Signed-off-by: Adrian Conlon <adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2020-12-28 18:37:21 +00:00
parent 0609ec1364
commit e9900424b7
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MC6809/inc/mc6809.h
View File

@ -132,17 +132,6 @@ namespace EightBit {
// Read/Modify/Write // Read/Modify/Write
// Macro version: easy to use
// RMW(AM_direct_byte, asl)
#define RMW(ACCESSOR, OPERATION) \
{ \
const auto data = ACCESSOR(); \
const auto address = BUS().ADDRESS(); \
const auto result = OPERATION(data); \
eat(); \
memoryWrite(address, result); \
}
typedef std::function<uint8_t(void)> accessor_t; typedef std::function<uint8_t(void)> accessor_t;
typedef std::function<uint8_t(uint8_t)> operation_t; typedef std::function<uint8_t(uint8_t)> operation_t;
@ -156,6 +145,10 @@ namespace EightBit {
memoryWrite(address, result); memoryWrite(address, result);
} }
// So define a helper macro
#define RMW(ACCESSOR, OPERATION) \
rmw([this]() { return ACCESSOR(); }, [this](uint8_t data) { return OPERATION(data); });
// Stack manipulation // Stack manipulation
void push(register16_t& stack, uint8_t value); void push(register16_t& stack, uint8_t value);
@ -326,17 +319,17 @@ namespace EightBit {
// Branching // Branching
auto branch(const register16_t destination, const int condition) { auto branch(const register16_t destination, const bool condition) {
if (condition) if (condition)
jump(destination); jump(destination);
return !!condition; return condition;
} }
void branchShort(const int condition) { void branchShort(const bool condition) {
branch(Address_relative_byte(), condition); branch(Address_relative_byte(), condition);
} }
void branchLong(const int condition) { void branchLong(const bool condition) {
if (branch(Address_relative_word(), condition)) if (branch(Address_relative_word(), condition))
eat(); eat();
} }