6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-04-06 10:38:16 +00:00
Code Issues Projects Releases Wiki Activity

Add test of operand_flags and operand_size; add entries for missing 68000 and 68010 instructions.

Browse Source
This commit is contained in:
Thomas Harte 2022-10-31 15:15:05 -04:00
parent bbd2cd47ea
commit ccadf69630
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InstructionSets/M68k/Implementation/InstructionOperandFlags.hpp
View File

@ -19,7 +19,9 @@ template <Model model, Operation t_operation> constexpr uint8_t operand_flags(Op
//
// No operands are fetched or stored.
// (which means that source and destination will appear as their effective addresses)
//
// (which means that source and destination, if they exist,
// should be supplied as their effective addresses)
//
case Operation::PEA:
case Operation::JMP: case Operation::JSR:
@ -27,6 +29,8 @@ template <Model model, Operation t_operation> constexpr uint8_t operand_flags(Op
case Operation::TAS:
case Operation::RTR: case Operation::RTS: case Operation::RTE:
case Operation::RTD:
case Operation::TRAP: case Operation::RESET: case Operation::NOP:
case Operation::STOP: case Operation::TRAPV: case Operation::BKPT:
return 0;
//

11
InstructionSets/M68k/Instruction.hpp
View File

@ -151,9 +151,12 @@ enum class Operation: uint8_t {
EXTbtol,
cpBcc, cpDBcc, cpGEN,
cpScc, cpTRAPcc, cpRESTORE,
cpSAVE,
// Coprocessor instructions are omitted for now, until I can
// determine by what mechanism the number of
// "OPTIONAL COPROCESSOR-DEFINED EXTENSION WORDS" is determined.
// cpBcc, cpDBcc, cpGEN,
// cpScc, cpTRAPcc, cpRESTORE,
// cpSAVE,
//
// 68030 additions.
@ -177,7 +180,7 @@ enum class Operation: uint8_t {
//
Max68000 = RESET,
Max68010 = RTD,
Max68020 = cpSAVE,
Max68020 = EXTbtol,
Max68030 = PTESTW,
Max68040 = PTESTW,
};

12
OSBindings/Mac/Clock SignalTests/68000DecoderTests.mm
View File

@ -53,6 +53,12 @@ template <Model model> void test(NSString *filename, Class cls) {
const auto found = decoder.decode(uint16_t(instr));
// Test that all appropriate table entries are present for this operation.
if(found.operation != Operation::Undefined) {
operand_flags<model>(found.operation);
operand_size(found.operation);
}
NSString *const instruction = [NSString stringWithUTF8String:found.to_string(instr).c_str()];
if(![instruction isEqualToString:expected]) {
[failures addObject:[NSString stringWithFormat:@"%@ should decode as %@; got %@", instrName, expected, instruction]];
@ -77,13 +83,7 @@ template <Model model> void test(NSString *filename, Class cls) {
test<Model::M68010>(@"68010ops", [self class]);
}
/*
TODO: generate full new reference JSONs for tests below here.
For now these are here for manual verification of the diffs.
*/
- (void)test68020 {
// generate<Model::M68020>();
test<Model::M68020>(@"68020ops", [self class]);
}