6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-15 14:27:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix TAS Dn.

Browse Source
This commit is contained in:
Thomas Harte
2022-05-06 12:23:04 -04:00
parent 8176bb6f79
commit ac6a9ab631
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InstructionSets/M68k/Executor.hpp
View File

@@ -54,7 +54,7 @@ template <Model model, typename BusHandler> class Executor {
template <typename IntT> void movem_toM(Preinstruction instruction, uint32_t source, uint32_t dest); template <typename IntT> void movem_toM(Preinstruction instruction, uint32_t source, uint32_t dest);
template <typename IntT> void movem_toR(Preinstruction instruction, uint32_t source, uint32_t dest); template <typename IntT> void movem_toR(Preinstruction instruction, uint32_t source, uint32_t dest);
void pea(uint32_t address); void pea(uint32_t address);
void tas(uint32_t address); void tas(Preinstruction instruction, uint32_t address);
// TODO: ownership of this shouldn't be here. // TODO: ownership of this shouldn't be here.
struct Registers { struct Registers {

19
InstructionSets/M68k/Implementation/ExecutorImplementation.hpp
View File

@@ -402,15 +402,22 @@ void Executor<model, BusHandler>::pea(uint32_t address) {
} }
template <Model model, typename BusHandler> template <Model model, typename BusHandler>
void Executor<model, BusHandler>::tas(uint32_t address) { void Executor<model, BusHandler>::tas(Preinstruction instruction, uint32_t address) {
uint8_t original_value;
if(instruction.mode<0>() != AddressingMode::DataRegisterDirect) {
uint8_t value = bus_handler_.template read<uint8_t>(address); uint8_t value = bus_handler_.template read<uint8_t>(address);
original_value = value;
value |= 0x80;
bus_handler_.template write<uint8_t>(address, value);
} else {
original_value = uint8_t(address);
address |= 0x80;
registers_[instruction.reg<0>()].b = uint8_t(address);
}
status_.overflow_flag_ = status_.carry_flag_ = 0; status_.overflow_flag_ = status_.carry_flag_ = 0;
status_.zero_result_ = value; status_.zero_result_ = original_value;
status_.negative_flag_ = value & 0x80; status_.negative_flag_ = original_value & 0x80;
value |= 0x80;
bus_handler_.template write<uint8_t>(address, value);
} }
template <Model model, typename BusHandler> template <Model model, typename BusHandler>

2
InstructionSets/M68k/Implementation/PerformImplementation.hpp
View File

@@ -794,7 +794,7 @@ template <
*/ */
case Operation::TAS: case Operation::TAS:
flow_controller.tas(src.l); flow_controller.tas(instruction, src.l);
break; break;
/* /*

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

@@ -49,6 +49,9 @@
// mulu_muls // mulu_muls
// neg_not // neg_not
// negx_clr // negx_clr
// swap
// tas
// tst
// Issues to fix: // Issues to fix:
// //
@@ -78,7 +81,7 @@
- (void)setUp { - (void)setUp {
// To limit tests run to a subset of files and/or of tests, uncomment and fill in below. // To limit tests run to a subset of files and/or of tests, uncomment and fill in below.
_fileSet = [NSSet setWithArray:@[@"swap.json", @"tst.json", @"tas.json"]]; _fileSet = [NSSet setWithArray:@[@"rts.json", @"rtr.json"]];
// _testSet = [NSSet setWithArray:@[@"NEGX 00c0"]]; // _testSet = [NSSet setWithArray:@[@"NEGX 00c0"]];
// _fileSet = [NSSet setWithArray:@[@"jmp_jsr.json"]]; // _fileSet = [NSSet setWithArray:@[@"jmp_jsr.json"]];
// _testSet = [NSSet setWithArray:@[@"CHK 41a8"]]; // _testSet = [NSSet setWithArray:@[@"CHK 41a8"]];