6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-06-22 18:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Clarify some (no) exception specifications.

Browse Source 
Signed-off-by: Adrian Conlon <adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2021-10-18 17:19:28 +01:00
parent f62e8c30a2
commit 357e51c09a
5 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
M6502/HarteTest_6502/TestRunner.cpp
View File

@ -149,8 +149,8 @@ bool TestRunner::checkState() {
return false; return false;
for (int i = 0; i < expected_cycles.size(); ++i) { for (int i = 0; i < expected_cycles.size(); ++i) {
const auto& expected = expected_cycles.at(i); const auto& expected = expected_cycles[i];
const auto& actual = actual_cycles.at(i); // actual could be less than expected const auto& actual = actual_cycles[i]; // actual could be less than expected
check("Cycle address", expected.address(), actual.address()); check("Cycle address", expected.address(), actual.address());
check("Cycle value", expected.value(), actual.value()); check("Cycle value", expected.value(), actual.value());
check("Cycle action", expected.action(), actual.action()); check("Cycle action", expected.action(), actual.action());

19
M6502/HarteTest_6502/cycle_t.cpp
View File

@ -4,38 +4,33 @@
#include <cassert> #include <cassert>
#include <stdexcept> #include <stdexcept>
cycle_t::action_t cycle_t::to_action(std::string value) { cycle_t::action_t cycle_t::to_action(std::string value) noexcept {
if (value == "read") if (value == "read")
return action_t::read; return action_t::read;
if (value == "write") if (value == "write")
return action_t::write; return action_t::write;
throw new std::out_of_range("Unknown action"); return action_t::unknown;
} }
std::string cycle_t::to_string(action_t value) { std::string cycle_t::to_string(action_t value) noexcept {
if (value == action_t::read) if (value == action_t::read)
return "read"; return "read";
if (value == action_t::write) if (value == action_t::write)
return "write"; return "write";
throw new std::out_of_range("Unknown action"); return "unknown";
} }
cycle_t::cycle_t(uint16_t address, uint8_t value, action_t action) cycle_t::cycle_t(uint16_t address, uint8_t value, action_t action) noexcept
: m_address(address), : m_address(address),
m_value(value), m_value(value),
m_action(action) {} m_action(action) {}
cycle_t::cycle_t(uint16_t address, uint8_t value, std::string action)
: m_address(address),
m_value(value),
m_action(to_action(action)) {}
#ifdef USE_SIMDJSON_JSON #ifdef USE_SIMDJSON_JSON
cycle_t::cycle_t(simdjson::dom::element input) cycle_t::cycle_t(simdjson::dom::element input) noexcept
: cycle_t(input.get_array()) {} : cycle_t(input.get_array()) {}
cycle_t::cycle_t(simdjson::dom::array input) cycle_t::cycle_t(simdjson::dom::array input) noexcept
: m_address((uint16_t)(uint64_t)input.at(0)), : m_address((uint16_t)(uint64_t)input.at(0)),
m_value((uint8_t)(uint64_t)input.at(1)), m_value((uint8_t)(uint64_t)input.at(1)),
m_action(to_action((std::string)input.at(2))) { m_action(to_action((std::string)input.at(2))) {

11
M6502/HarteTest_6502/cycle_t.h
View File

@ -29,15 +29,14 @@ private:
action_t m_action = action_t::unknown; action_t m_action = action_t::unknown;
public: public:
[[nodiscard]] static action_t to_action(std::string value); [[nodiscard]] static std::string to_string(action_t value) noexcept;
[[nodiscard]] static std::string to_string(action_t value); [[nodiscard]] static action_t to_action(std::string value) noexcept;
cycle_t(uint16_t address, uint8_t value, action_t action); cycle_t(uint16_t address, uint8_t value, action_t action) noexcept;
cycle_t(uint16_t address, uint8_t value, std::string action);
#ifdef USE_SIMDJSON_JSON #ifdef USE_SIMDJSON_JSON
cycle_t(simdjson::dom::element input); cycle_t(simdjson::dom::element input) noexcept;
cycle_t(simdjson::dom::array input); cycle_t(simdjson::dom::array input) noexcept;
#endif #endif
#ifdef USE_BOOST_JSON #ifdef USE_BOOST_JSON

4
M6502/HarteTest_6502/cycles_t.h
View File

@ -53,6 +53,6 @@ public:
void clear() { m_cycles.clear(); } void clear() { m_cycles.clear(); }
[[nodiscard]] auto& at(size_t idx) { return m_cycles.at(idx); } [[nodiscard]] auto& operator[](size_t idx) noexcept { return m_cycles[idx]; }
[[nodiscard]] const auto& at(size_t idx) const { return m_cycles.at(idx); } [[nodiscard]] const auto& operator[](size_t idx) const noexcept { return m_cycles[idx]; }
}; };

10
M6502/HarteTest_6502/ram_t.h
View File

@ -42,13 +42,13 @@ public:
ram_t(const Json::Value& input); ram_t(const Json::Value& input);
#endif #endif
[[nodiscard]] auto begin() const { return m_bytes.begin(); } [[nodiscard]] auto begin() const noexcept { return m_bytes.begin(); }
[[nodiscard]] auto end() const { return m_bytes.end(); } [[nodiscard]] auto end() const noexcept { return m_bytes.end(); }
[[nodiscard]] auto size() const noexcept { return m_bytes.size(); } [[nodiscard]] auto size() const noexcept { return m_bytes.size(); }
void clear() { m_bytes.clear(); } void clear() noexcept { m_bytes.clear(); }
[[nodiscard]] auto& at(size_t idx) { return m_bytes.at(idx); } [[nodiscard]] auto& operator[](size_t idx) noexcept { return m_bytes[idx]; }
[[nodiscard]] const auto& at(size_t idx) const { return m_bytes.at(idx); } [[nodiscard]] const auto& operator[](size_t idx) const noexcept { return m_bytes[idx]; }
}; };