6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-27 16:31:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into ZXSpectrum

Browse Source
This commit is contained in:
Thomas Harte 2021-03-21 22:44:37 -04:00
commit f37f89a7d3
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Components/9918/Implementation/9918Base.hpp
View File

@ -350,11 +350,14 @@ class Base {
case MemoryAccess::Write: case MemoryAccess::Write:
if(master_system_.cram_is_selected) { if(master_system_.cram_is_selected) {
// Adjust the palette. // Adjust the palette. In a Master System blue has a slightly different
// scale; cf. https://www.retrorgb.com/sega-master-system-non-linear-blue-channel-findings.html
constexpr uint8_t rg_scale[] = {0, 85, 170, 255};
constexpr uint8_t b_scale[] = {0, 104, 170, 255};
master_system_.colour_ram[ram_pointer_ & 0x1f] = palette_pack( master_system_.colour_ram[ram_pointer_ & 0x1f] = palette_pack(
uint8_t(((read_ahead_buffer_ >> 0) & 3) * 255 / 3), rg_scale[(read_ahead_buffer_ >> 0) & 3],
uint8_t(((read_ahead_buffer_ >> 2) & 3) * 255 / 3), rg_scale[(read_ahead_buffer_ >> 2) & 3],
uint8_t(((read_ahead_buffer_ >> 4) & 3) * 255 / 3) b_scale[(read_ahead_buffer_ >> 4) & 3]
); );
// Schedule a CRAM dot; this is scheduled for wherever it should appear // Schedule a CRAM dot; this is scheduled for wherever it should appear

2
Machines/Sinclair/ZX8081/ZX8081.cpp
View File

@ -169,7 +169,7 @@ template<bool is_zx81> class ConcreteMachine:
} }
if(!(address & 2)) nmi_is_enabled_ = false; if(!(address & 2)) nmi_is_enabled_ = false;
if(!(address & 1)) nmi_is_enabled_ = is_zx81; if(!(address & 1)) nmi_is_enabled_ = is_zx81;
if(!nmi_is_enabled_) z80_.set_wait_line(false); if(is_zx81 && !nmi_is_enabled_) z80_.set_wait_line(false);
// The below emulates the ZonX AY expansion device. // The below emulates the ZonX AY expansion device.
if constexpr (is_zx81) { if constexpr (is_zx81) {

2
OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm
View File

@ -43,7 +43,7 @@
// Issue each test file. // Issue each test file.
for(NSURL *url in tests) { for(NSURL *url in tests) {
// Compare against a file set if one has been supplied. // Compare against a file set if one has been supplied.
if(_fileSet && ![_fileSet containsObject:[[url path] lastPathComponent]]) continue; if(_fileSet && ![_fileSet containsObject:[url lastPathComponent]]) continue;
NSLog(@"Testing %@", url); NSLog(@"Testing %@", url);
[self testJSONAtURL:url]; [self testJSONAtURL:url];
} }

2
OSBindings/Mac/Clock SignalTests/EmuTOSTests.mm
View File

@ -107,7 +107,7 @@ class EmuTOS: public ComparativeBusHandler {
const std::vector<ROMMachine::ROM> rom_names = {{"AtariST", "", image.UTF8String, 0, 0 }}; const std::vector<ROMMachine::ROM> rom_names = {{"AtariST", "", image.UTF8String, 0, 0 }};
const auto roms = CSROMFetcher()(rom_names); const auto roms = CSROMFetcher()(rom_names);
NSString *const traceLocation = [[NSBundle bundleForClass:[self class]] pathForResource:trace ofType:@"trace.txt.gz"]; NSString *const traceLocation = [[NSBundle bundleForClass:[self class]] pathForResource:trace ofType:@"trace.txt.gz"];
_machine = std::make_unique<EmuTOS>(*roms[0], traceLocation.UTF8String); _machine = std::make_unique<EmuTOS>(*roms[0], traceLocation.fileSystemRepresentation);
_machine->run_for(HalfCycles(length)); _machine->run_for(HalfCycles(length));
} }