From 5e355383df37764a55b84f20021bbe9ff1a31efd Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 27 Apr 2022 19:53:15 -0400
Subject: [PATCH 1/2] Correct SIB test.

---
 InstructionSets/x86/Decoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/InstructionSets/x86/Decoder.cpp b/InstructionSets/x86/Decoder.cpp
index ae8447e14..d4db0b021 100644
--- a/InstructionSets/x86/Decoder.cpp
+++ b/InstructionSets/x86/Decoder.cpp
@@ -849,7 +849,7 @@ std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(con
 			default: assert(false);
 		}
 
-		if(expects_sib && (source_ == Source::Indirect | destination_ == Source::Indirect)) {
+		if(expects_sib && (source_ == Source::Indirect || destination_ == Source::Indirect)) {
 			phase_ = Phase::ScaleIndexBase;
 		} else {
 			phase_ = (displacement_size_ != DataSize::None || operand_size_ != DataSize::None) ? Phase::DisplacementOrOperand : Phase::ReadyToPost;

From 39261436c8170f7b9057ab52112580478f28ff7c Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 27 Apr 2022 19:53:32 -0400
Subject: [PATCH 2/2] Remove unused type alias.

---
 InstructionSets/M68k/Decoder.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/InstructionSets/M68k/Decoder.cpp b/InstructionSets/M68k/Decoder.cpp
index 367848932..414b9768d 100644
--- a/InstructionSets/M68k/Decoder.cpp
+++ b/InstructionSets/M68k/Decoder.cpp
@@ -1144,8 +1144,6 @@ Preinstruction Predecoder<model>::decode6(uint16_t instruction) {
 
 template <Model model>
 Preinstruction Predecoder<model>::decode7(uint16_t instruction) {
-	using Op = Operation;
-
 	// 4-134 (p238)
 	if(!(instruction & 0x100)) {
 		Decode(MOVEQ);