From 5fd98e9833ac94d7d8492f869bd4fed4a87095cb Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Fri, 22 Sep 2023 22:56:33 -0400
Subject: [PATCH] Add an ignore list.

Leaves 180 failures amongst the valid 306 instructions.
---
 InstructionSets/x86/Decoder.cpp               |  3 +++
 InstructionSets/x86/Instruction.hpp           |  5 +++--
 OSBindings/Mac/Clock SignalTests/8088Tests.mm | 22 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/InstructionSets/x86/Decoder.cpp b/InstructionSets/x86/Decoder.cpp
index af86666a2..cff83311f 100644
--- a/InstructionSets/x86/Decoder.cpp
+++ b/InstructionSets/x86/Decoder.cpp
@@ -902,6 +902,9 @@ std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(con
 		if(bytes_to_consume == outstanding_bytes) {
 			phase_ = Phase::ReadyToPost;
 
+			// TODO: whether the displacement is signed appears to depend on the opcode.
+			// Find an appropriate table.
+
 			switch(displacement_size_) {
 				case DataSize::None:	displacement_ = 0;						break;
 				case DataSize::Byte:	displacement_ = int8_t(inward_data_);	break;
diff --git a/InstructionSets/x86/Instruction.hpp b/InstructionSets/x86/Instruction.hpp
index de8a5c7bb..4d25d632b 100644
--- a/InstructionSets/x86/Instruction.hpp
+++ b/InstructionSets/x86/Instruction.hpp
@@ -365,12 +365,13 @@ constexpr int num_operands(Operation operation) {
 
 		case Operation::INC:	case Operation::DEC:
 		case Operation::POP:	case Operation::PUSH:
-		case Operation::MUL:
-		case Operation::IDIV:
+		case Operation::MUL:	case Operation::IMUL_1:
+		case Operation::IDIV:	case Operation::DIV:
 		case Operation::RETfar:
 		case Operation::ESC:
 		case Operation::AAM:	case Operation::AAD:
 		case Operation::INT:
+		case Operation::JMPabs:	case Operation::JMPfar:
 			return 1;
 
 		// Pedantically, these have an displacement rather than an operand.
diff --git a/OSBindings/Mac/Clock SignalTests/8088Tests.mm b/OSBindings/Mac/Clock SignalTests/8088Tests.mm
index 5da9747cd..512b6947a 100644
--- a/OSBindings/Mac/Clock SignalTests/8088Tests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/8088Tests.mm	
@@ -37,13 +37,33 @@ constexpr char TestSuiteHome[] = "/Users/tharte/Projects/ProcessorTests/8088/v1"
 	NSSet *allowList = nil;
 //		[[NSSet alloc] initWithArray:@[
 //			@"00.json.gz",
-//		]];∂
+//		]];
+
+	// Unofficial opcodes; ignored for now.
+	NSSet *ignoreList =
+		[[NSSet alloc] initWithArray:@[
+			@"60.json.gz",		@"61.json.gz",		@"62.json.gz",		@"63.json.gz",
+			@"64.json.gz",		@"65.json.gz",		@"66.json.gz",		@"67.json.gz",
+			@"68.json.gz",		@"69.json.gz",		@"6a.json.gz",		@"6b.json.gz",
+			@"6c.json.gz",		@"6d.json.gz",		@"6e.json.gz",		@"6f.json.gz",
+
+			@"82.0.json.gz",	@"82.1.json.gz",	@"82.2.json.gz",	@"82.3.json.gz",
+			@"82.4.json.gz",	@"82.5.json.gz",	@"82.6.json.gz",	@"82.7.json.gz",
+
+			@"c0.json.gz",		@"c1.json.gz",		@"c8.json.gz",		@"c9.json.gz",
+
+			@"f6.1.json.gz",	@"f7.1.json.gz",
+			@"ff.7.json.gz",
+		]];
 
 	NSArray<NSString *> *files = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];
 	files = [files filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSString* evaluatedObject, NSDictionary<NSString *,id> *) {
 		if(allowList && ![allowList containsObject:[evaluatedObject lastPathComponent]]) {
 			return NO;
 		}
+		if([ignoreList containsObject:[evaluatedObject lastPathComponent]]) {
+			return NO;
+		}
 		return [evaluatedObject hasSuffix:@"json.gz"];
 	}]];