6502
/
EightBit
mirror of https://github.com/MoleskiCoder/EightBit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fully switch to C++20

This commit is contained in:
Adrian Conlon 2022-07-01 09:30:38 +01:00
parent 4c65c22a85
commit 9e2c3e32b1
10 changed files with 4 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gaming/src/Game.cpp
View File

@ -181,11 +181,7 @@ void Game::addJoystick(SDL_Event& e) {
auto controller = std::make_shared<GameController>(which);
const auto joystickId = controller->getJoystickId();
m_gameControllers[which] = controller;
#if __cplusplus >= 202002L
SDL_assert(m_mappedControllers.contains(joystickId));
#else
SDL_assert(m_mappedControllers.find(joystickId) != m_mappedControllers.end());
#endif
m_mappedControllers[joystickId] = which;
SDL_Log("Joystick device %d added (%zd controllers)", which, m_gameControllers.size());
}

4
M6502/HarteTest_6502/checker_t.cpp
View File

@ -208,11 +208,7 @@ void checker_t::check(test_t test) {
const auto pc = cpu.PC().word;
const auto start_opcode = runner().peek(pc);
#if __cplusplus >= 202002L
m_undocumented = m_undocumented_opcodes.contains(start_opcode);
#else
m_undocumented = m_undocumented_opcodes.find(start_opcode) != m_undocumented_opcodes.end();
#endif
if (undocumented()) {
m_valid = false;
m_messages.push_back("Undocumented");

19
M6502/HarteTest_6502/opcode_test_suite_t.cpp
View File

@ -4,24 +4,7 @@
opcode_test_suite_t::opcode_test_suite_t(const std::string path) noexcept
: parser_t(path) {}
#ifdef USE_COROUTINES
#if __cplusplus >= 202002L
EightBit::co_generator_t<test_t> opcode_test_suite_t::generator() const {
for (const auto element : *this)
co_yield test_t(element);
}
#else
void opcode_test_suite_t::generator(boost::coroutines2::coroutine<test_t>::push_type& sink) const {
for (const auto element : *this)
sink(test_t(element));
}
#endif
#else
std::vector<test_t> opcode_test_suite_t::generate() const {
std::vector<test_t> returned;
returned.reserve(size());
for (const auto element : *this)
returned.push_back(test_t(element));
return returned;
}
#endif
}

17
M6502/HarteTest_6502/opcode_test_suite_t.h
View File

@ -2,14 +2,7 @@
#include <string>
#ifdef USE_COROUTINES
#if __cplusplus >= 202002L
# include <co_generator_t.h>
#else
# include <boost/coroutine2/all.hpp>
#endif
# include <vector>
#endif
#include <co_generator_t.h>
#include "parser_t.h"
#include "test_t.h"
@ -26,13 +19,5 @@ public:
[[nodiscard]] auto end() const noexcept { return array().end(); }
[[nodiscard]] auto size() const noexcept { return array().size(); }
#ifdef USE_COROUTINES
#if __cplusplus >= 202002L
[[nodiscard]] EightBit::co_generator_t<test_t> generator() const;
#else
void generator(boost::coroutines2::coroutine<test_t>::push_type& sink) const;
#endif
#else
std::vector<test_t> generate() const;
#endif
};

4
M6502/HarteTest_6502/parser_t.h
View File

@ -19,11 +19,7 @@ public:
parser_t() noexcept {}
parser_t(std::string path) noexcept;
#if __cplusplus >= 202002L
[[nodiscard]] constexpr std::string_view path() const noexcept { return m_path; }
#else
[[nodiscard]] std::string_view path() const noexcept { return m_path; }
#endif
[[nodiscard]] const auto raw() const noexcept { return m_raw; }
virtual void load();

18
M6502/HarteTest_6502/processor_test_suite_t.cpp
View File

@ -7,26 +7,8 @@ processor_test_suite_t::processor_test_suite_t(std::string location) noexcept
: m_location(location) {
}
#ifdef USE_COROUTINES
#if __cplusplus >= 202002L
EightBit::co_generator_t<opcode_test_suite_t> processor_test_suite_t::generator() const {
std::filesystem::path directory = location();
for (const auto& entry : std::filesystem::directory_iterator{ directory })
co_yield opcode_test_suite_t(entry.path().string());
}
#else
void processor_test_suite_t::generator(boost::coroutines2::coroutine<opcode_test_suite_t>::push_type& sink) const {
std::filesystem::path directory = location();
for (const auto& entry : std::filesystem::directory_iterator{ directory })
sink(opcode_test_suite_t(entry.path().string()));
}
#endif
#else
std::vector<opcode_test_suite_t> processor_test_suite_t::generate() const {
std::vector<opcode_test_suite_t> returned;
std::filesystem::path directory = location();
for (const auto& entry : std::filesystem::directory_iterator{ directory })
returned.push_back(opcode_test_suite_t(entry.path().string()));
return returned;
}
#endif

22
M6502/HarteTest_6502/processor_test_suite_t.h
View File

@ -3,15 +3,7 @@
#include <string>
#include <string_view>
#ifdef USE_COROUTINES
#if __cplusplus >= 202002L
# include <co_generator_t.h>
#else
# include <boost/coroutine2/all.hpp>
#endif
#else
# include <vector>
#endif
#include <co_generator_t.h>
#include "opcode_test_suite_t.h"
@ -22,19 +14,7 @@ private:
public:
processor_test_suite_t(std::string location) noexcept;
#if __cplusplus >= 202002L
[[nodiscard]] constexpr std::string_view location() const noexcept { return m_location; }
#else
[[nodiscard]] std::string_view location() const noexcept { return m_location; }
#endif
#ifdef USE_COROUTINES
#if __cplusplus >= 202002L
[[nodiscard]] EightBit::co_generator_t<opcode_test_suite_t> generator() const;
#else
void generator(boost::coroutines2::coroutine<opcode_test_suite_t>::push_type& sink) const;
#endif
#else
[[nodiscard]] std::vector<opcode_test_suite_t> generate() const;
#endif
};

11
M6502/HarteTest_6502/stdafx.h
View File

@ -22,15 +22,6 @@
#include <Disassembly.h>
#include <Symbols.h>
#define USE_COROUTINES
#ifdef USE_COROUTINES
#if __cplusplus >= 202002L
# include <co_generator_t.h>
#else
# include <boost/coroutine2/all.hpp>
# include <boost/bind.hpp>
#endif
#endif
#include <co_generator_t.h>
#include "simdjson/simdjson.h"

70
M6502/HarteTest_6502/tests.cpp
View File

@ -4,10 +4,6 @@
#include <iostream>
#include <filesystem>
#if __cplusplus < 202002L
# include <boost/bind.hpp>
#endif
#include "TestRunner.h"
#include "checker_t.h"
#include "test_t.h"
@ -30,10 +26,6 @@ int main() {
checker_t checker(runner);
checker.initialise();
#ifdef USE_COROUTINES
#if __cplusplus >= 202002L
processor_test_suite_t m6502_tests(directory);
auto opcode_generator = m6502_tests.generator();
while (opcode_generator) {
@ -64,68 +56,6 @@ int main() {
}
}
#else
const processor_test_suite_t m6502_tests(directory);
boost::coroutines2::coroutine<opcode_test_suite_t>::pull_type opcodes(boost::bind(&processor_test_suite_t::generator, &m6502_tests, _1));
for (auto& opcode : opcodes) {
const auto path = std::filesystem::path(opcode.path());
std::cout << "Processing: " << path.filename() << "\n";
opcode.load();
boost::coroutines2::coroutine<test_t>::pull_type tests(boost::bind(&opcode_test_suite_t::generator, &opcode, _1));
for (const auto& test : tests) {
checker.check(test);
if (checker.invalid()) {
++invalid_opcode_count;
if (checker.unimplemented())
++unimplemented_opcode_count;
if (checker.undocumented())
++undocumented_opcode_count;
std::cout << "** Failed: " << test.name() << "\n";
for (const auto& message : checker.messages())
std::cout << "**** " << message << "\n";
break;
}
}
}
#endif
#else
const processor_test_suite_t m6502_tests(directory);
auto opcodes = m6502_tests.generate();
for (auto& opcode : opcodes) {
const auto path = std::filesystem::path(opcode.path());
std::cout << "Processing: " << path.filename() << "\n";
opcode.load();
const auto tests = opcode.generate();
for (const auto& test : tests) {
checker.check(test);
if (checker.invalid()) {
++invalid_opcode_count;
if (checker.unimplemented())
++unimplemented_opcode_count;
if (checker.undocumented())
++undocumented_opcode_count;
std::cout << "** Failed: " << test.name() << "\n";
for (const auto& message : checker.messages())
std::cout << "**** " << message << "\n";
break;
}
}
}
#endif
const auto finish_time = std::chrono::steady_clock::now();
const auto elapsed_time = finish_time - start_time;
const auto seconds = std::chrono::duration_cast<std::chrono::duration<double>>(elapsed_time).count();

24
Z80/inc/Profiler.h
View File

@ -27,8 +27,6 @@ namespace EightBit {
[[nodiscard]] constexpr const auto& instructions() const { return m_instructions; }
[[nodiscard]] constexpr const auto& addresses() const { return m_addresses; }
#if __cplusplus >= 202002L
[[nodiscard]] constexpr auto instructions_available() const noexcept {
const auto found = std::find_if(
instructions().begin(), instructions().end(),
@ -47,28 +45,6 @@ namespace EightBit {
return instructions_available() || addresses_available();
}
#else
[[nodiscard]] auto instructions_available() const noexcept {
const auto found = std::find_if(
instructions().begin(), instructions().end(),
[](const auto& value) { return value != 0; });
return found != instructions().end();
}
[[nodiscard]] auto addresses_available() const noexcept {
const auto found = std::find_if(
addresses().begin(), addresses().end(),
[](const auto& value) { return value != 0; });
return found != addresses().end();
}
[[nodiscard]] auto available() const noexcept {
return instructions_available() || addresses_available();
}
#endif
void dumpInstructionProfiles() const;
void dumpAddressProfiles() const;
};