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

Correct a couple of merge issues.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2017-12-12 23:12:45 +00:00
parent c8dd6e7267
commit 637c0c68fa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/EightBitCompilerDefinitions.h
View File

@ -61,7 +61,7 @@ inline int EightBit::findFirstSet(int value) {
# 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)
# define EIGHTBIT_PARITY(x) __builtin_parity(x) # define PARITY(x) __builtin_parity(x)
# define UNREACHABLE __builtin_unreachable(); # define UNREACHABLE __builtin_unreachable();

2
inc/IntelProcessor.h
View File

@ -69,7 +69,7 @@ namespace EightBit {
} }
template<class T> static void adjustParity(uint8_t& f, uint8_t value) { template<class T> static void adjustParity(uint8_t& f, uint8_t value) {
clearFlag(f, T::PF, EIGHTBIT_PARITY(value)); clearFlag(f, T::PF, PARITY(value));
} }
template<class T> static void adjustSZ(uint8_t& f, uint8_t value) { template<class T> static void adjustSZ(uint8_t& f, uint8_t value) {