From 70cdc2ca9f07775d7a0c70f0d9cdf221c69064d4 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Thu, 5 May 2022 12:37:47 -0400 Subject: [PATCH] Fix MOVEP to register. Advance to lack of MOVEM. --- .../M68k/Implementation/ExecutorImplementation.hpp | 2 +- OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp b/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp index 71eeb68ad..6dea4a815 100644 --- a/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp +++ b/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp @@ -422,7 +422,7 @@ void Executor::movep(Preinstruction instruction, uint32_t sou reg = bus_handler_.template read(address) << 24; address += 2; - reg |= bus_handler_.template read(address) << 26; + reg |= bus_handler_.template read(address) << 16; address += 2; } else { reg &= 0xffff0000; diff --git a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm index 79856ae82..f3dd080c8 100644 --- a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm +++ b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm @@ -42,6 +42,8 @@ // lea // lslr_aslr_roxlr_rolr // move_tofrom_srccr +// move +// movep // Issues to fix: // @@ -70,8 +72,8 @@ - (void)setUp { // To limit tests run to a subset of files and/or of tests, uncomment and fill in below. - _fileSet = [NSSet setWithArray:@[@"move.json"]]; -// _testSet = [NSSet setWithArray:@[@"MOVE[A] 033c"]]; + _fileSet = [NSSet setWithArray:@[@"movem.json"]]; +// _testSet = [NSSet setWithArray:@[@"MOVE[A] 0148"]]; // _fileSet = [NSSet setWithArray:@[@"jmp_jsr.json"]]; // _testSet = [NSSet setWithArray:@[@"CHK 41a8"]]; }