6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-12-21 02:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Tidy EightBit library header usage (avoids compilation error with latest VS2019, "Memory.h")

Browse Source 
Signed-off-by: Adrian Conlon <adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2021-05-29 10:31:32 +01:00
parent b1ca06447f
commit d199adb027
18 changed files with 45 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
inc/EightBitCompilerDefinitions.h
View File

@ -1,14 +1,15 @@
#pragma once
#include <cassert>
#ifdef _MSC_VER
# include <intrin.h>
#endif
#ifdef __GNUG__
# include <x86intrin.h>
#else
#endif
#if !(defined(_MSC_VER) || defined(__GNUG__))
# include <cassert>
# include <bitset>
#endif
@ -16,12 +17,13 @@ namespace EightBit {
[[nodiscard]] int countBits(uint8_t value) noexcept;
[[nodiscard]] bool oddParity(uint8_t value) noexcept;
[[nodiscard]] int findFirstSet(unsigned long value) noexcept;
constexpr void assume(int expression);
}
inline int EightBit::countBits(uint8_t value) noexcept {
#ifdef _MSC_VER
#if defined(_MSC_VER)
return __popcnt(value);
#elif defined(__GNUG__)
return __builtin_popcount(value);
#else
/*
Published in 1988, the C Programming Language 2nd Ed.
@ -40,12 +42,16 @@ inline int EightBit::countBits(uint8_t value) noexcept {
}
inline bool EightBit::oddParity(const uint8_t value) noexcept {
#ifdef __GNUG__
return __builtin_parity(value)
#else
return countBits(value) % 2;
#endif
}
inline int EightBit::findFirstSet(const unsigned long value) noexcept {
#ifdef _MSC_VER
unsigned long index;
#if defined(_MSC_VER)
unsigned long index = 0;
if (_BitScanForward(&index, value))
return index + 1;
return 0;
@ -60,44 +66,33 @@ inline int EightBit::findFirstSet(const unsigned long value) noexcept {
#endif
}
inline constexpr void EightBit::assume(const int expression) {
#ifdef _MSC_VER
__assume(expression);
#elif defined(__GNUG__)
if (!expression)
__builtin_unreachable();
#else
assert(expression);
#endif
}
#define ASSUME(x) EightBit::assume(x)
#define PARITY(x) EightBit::oddParity(x)
#ifdef _MSC_VER
# define ASSUME(x) __assume(x);
# define LIKELY(x) (x)
# define UNLIKELY(x) (x)
# define PARITY(x) EightBit::oddParity(x)
# define UNREACHABLE { ASSUME(0); throw std::exception("unreachable"); }
#elif defined(__GNUG__)
# define ASSUME(x) { if (!x) __builtin_unreachable(); }
# define LIKELY(x) __builtin_expect(!!(x), 1)
# define UNLIKELY(x) __builtin_expect(!!(x), 0)
# define PARITY(x) __builtin_parity(x)
# define UNREACHABLE __builtin_unreachable();
#else
# define ASSUME(x) assert(x);
# define LIKELY(x) (x)
# define UNLIKELY(x) (x)
# define PARITY(x) EightBit::oddParity(x)
# define UNREACHABLE ASSUME(0)
#endif

8
inc/Processor.h
View File

@ -11,9 +11,15 @@
namespace EightBit {
class Processor : public ClockedChip {
public:
// http://graphics.stanford.edu/~seander/bithacks.html#FixedSignExtend
// b: number of bits representing the number in x
// x: sign extend this b-bit number to r
[[nodiscard]] static int8_t signExtend(int b, uint8_t x) noexcept;
[[nodiscard]] static constexpr int8_t signExtend(int b, uint8_t x) noexcept {
const uint8_t m = bit(b - 1); // mask can be pre-computed if b is fixed
x = x & (bit(b) - 1); // (Skip this if bits in x above position b are already zero.)
const auto result = (x ^ m) - m;
return result;
}
~Processor() = default;

2
src/BigEndianProcessor.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "BigEndianProcessor.h"
#include "../inc/BigEndianProcessor.h"
EightBit::BigEndianProcessor::BigEndianProcessor(Bus& memory)
: Processor(memory) {}

8
src/Bus.cpp
View File

@ -1,8 +1,8 @@
#include "stdafx.h"
#include "Bus.h"
#include "Ram.h"
#include "IntelHexFile.h"
#include "EightBitCompilerDefinitions.h"
#include "../inc/Bus.h"
#include "../inc/Ram.h"
#include "../inc/IntelHexFile.h"
#include "../inc/EightBitCompilerDefinitions.h"
void EightBit::Bus::raisePOWER() {}

2
src/ClockedChip.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "ClockedChip.h"
#include "../inc/ClockedChip.h"
void EightBit::ClockedChip::tick(const int extra) {
for (int i = 0; i < extra; ++i)

2
src/Device.cpp
View File

@ -1,4 +1,4 @@
#include "stdafx.h"
#include "Device.h"
#include "../inc/Device.h"
DEFINE_PIN_LEVEL_CHANGERS(POWER, Device);

4
src/EightBit.vcxproj
View File

@ -70,19 +70,15 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>..\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>..\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>..\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>..\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

2
src/EventArgs.cpp
View File

@ -1,4 +1,4 @@
#include "stdafx.h"
#include "EventArgs.h"
#include "../inc/EventArgs.h"
EightBit::EventArgs EightBit::EventArgs::m_empty;

4
src/InputOutput.cpp
View File

@ -1,9 +1,9 @@
#include "stdafx.h"
#include "InputOutput.h"
#include "../inc/InputOutput.h"
#include <stdexcept>
#include "Register.h"
#include "../inc/Register.h"
size_t EightBit::InputOutput::size() const noexcept {
return 0x100;

2
src/IntelHexFile.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "IntelHexFile.h"
#include "../inc/IntelHexFile.h"
#include <sstream>

2
src/IntelProcessor.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "IntelProcessor.h"
#include "../inc/IntelProcessor.h"
EightBit::IntelProcessor::IntelProcessor(Bus& bus)
: LittleEndianProcessor(bus) {

2
src/LittleEndianProcessor.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "LittleEndianProcessor.h"
#include "../inc/LittleEndianProcessor.h"
EightBit::LittleEndianProcessor::LittleEndianProcessor(Bus& memory)
: Processor(memory) {}

2
src/Makefile
View File

@ -1,7 +1,5 @@
LIB = libeightbit.a
CXXFLAGS = -I ../inc
CXXFILES = BigEndianProcessor.cpp Bus.cpp ClockedChip.cpp Device.cpp EventArgs.cpp InputOutput.cpp IntelHexFile.cpp IntelProcessor.cpp LittleEndianProcessor.cpp Memory.cpp Processor.cpp Ram.cpp Rom.cpp UnusedMemory.cpp
include ../compile.mk

2
src/Memory.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "Memory.h"
#include "../inc/Memory.h"
#include <stdexcept>

10
src/Processor.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "Processor.h"
#include "../inc/Processor.h"
EightBit::Processor::Processor(Bus& bus)
: m_bus(bus) {
@ -86,14 +86,6 @@ int EightBit::Processor::execute(const uint8_t value) {
return execute();
}
// http://graphics.stanford.edu/~seander/bithacks.html#FixedSignExtend
int8_t EightBit::Processor::signExtend(const int b, uint8_t x) noexcept {
const uint8_t m = bit(b - 1); // mask can be pre-computed if b is fixed
x = x & (bit(b) - 1); // (Skip this if bits in x above position b are already zero.)
const auto result = (x ^ m) - m;
return result;
}
void EightBit::Processor::jump(const register16_t destination) noexcept {
PC() = destination;
}

2
src/Ram.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "Ram.h"
#include "../inc/Ram.h"
EightBit::Ram::Ram(const size_t size) noexcept
: Rom(size) {}

2
src/Rom.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "Rom.h"
#include "../inc/Rom.h"
#include <iostream>

2
src/UnusedMemory.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h"
#include "UnusedMemory.h"
#include "../inc/UnusedMemory.h"
EightBit::UnusedMemory::UnusedMemory(const size_t size, const uint8_t value)
: m_size(size), m_value(value) {}