6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-11 08:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Temporarily avoid use of Writeable.

Browse Source
This commit is contained in:
Thomas Harte 2023-11-05 21:47:52 -05:00
parent 009915f4de
commit 797c9fe129
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InstructionSets/x86/AccessType.hpp
View File

@ -46,7 +46,8 @@ class Writeable {
private: private:
IntT &target_; IntT &target_;
}; };
template <typename IntT> struct ReturnType<IntT, AccessType::Write> { using type = Writeable<IntT>; }; //template <typename IntT> struct ReturnType<IntT, AccessType::Write> { using type = Writeable<IntT>; };
template <typename IntT> struct ReturnType<IntT, AccessType::Write> { using type = IntT &; };
// Read-modify-writes: return a reference. // Read-modify-writes: return a reference.
template <typename IntT> struct ReturnType<IntT, AccessType::ReadModifyWrite> { using type = IntT &; }; template <typename IntT> struct ReturnType<IntT, AccessType::ReadModifyWrite> { using type = IntT &; };

4
OSBindings/Mac/Clock SignalTests/8088Tests.mm
View File

@ -273,7 +273,7 @@ struct Memory {
// Entry point used by the flow controller so that it can mark up locations at which the flags were written, // Entry point used by the flow controller so that it can mark up locations at which the flags were written,
// so that defined-flag-only masks can be applied while verifying RAM contents. // so that defined-flag-only masks can be applied while verifying RAM contents.
template <typename IntT, AccessType type> template <typename IntT, AccessType type>
typename ReturnType<IntT, type>::type &access(InstructionSet::x86::Source segment, uint16_t offset, Tag tag) { typename InstructionSet::x86::ReturnType<IntT, type>::type &access(InstructionSet::x86::Source segment, uint16_t offset, Tag tag) {
const uint32_t physical_address = address(segment, offset); const uint32_t physical_address = address(segment, offset);
return access<IntT, type>(physical_address, tag); return access<IntT, type>(physical_address, tag);
} }
@ -281,7 +281,7 @@ struct Memory {
// An additional entry point for the flow controller; on the original 8086 interrupt vectors aren't relative // An additional entry point for the flow controller; on the original 8086 interrupt vectors aren't relative
// to a selector, they're just at an absolute location. // to a selector, they're just at an absolute location.
template <typename IntT, AccessType type> template <typename IntT, AccessType type>
typename ReturnType<IntT, type>::type &access(uint32_t address, Tag tag) { typename InstructionSet::x86::ReturnType<IntT, type>::type &access(uint32_t address, Tag tag) {
if constexpr (type == AccessType::PreauthorisedRead) { if constexpr (type == AccessType::PreauthorisedRead) {
if(!test_preauthorisation(address)) { if(!test_preauthorisation(address)) {
printf("Non preauthorised access\n"); printf("Non preauthorised access\n");