From 83c8f9996e17dde078ab4afcc3f188ef688009bc Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Fri, 17 Nov 2023 10:27:38 -0500
Subject: [PATCH] Switch back to the natural type.

---
 InstructionSets/x86/Decoder.cpp | 4 ++--
 InstructionSets/x86/Decoder.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/InstructionSets/x86/Decoder.cpp b/InstructionSets/x86/Decoder.cpp
index b9cbdc063..da58640d1 100644
--- a/InstructionSets/x86/Decoder.cpp
+++ b/InstructionSets/x86/Decoder.cpp
@@ -15,7 +15,7 @@
 using namespace InstructionSet::x86;
 
 template <Model model>
-std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(const uint8_t *source, uint32_t length) {
+std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(const uint8_t *source, std::size_t length) {
 	// Instruction length limits:
 	//
 	//	8086/80186: none*
@@ -26,7 +26,7 @@ std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(con
 	// be back to wherever it started, so it's safe to spit out a NOP and reset parsing
 	// without any loss of context. This reduces the risk of the decoder tricking a caller into
 	// an infinite loop.
-	constexpr uint32_t max_instruction_length = model >= Model::i80386 ? 15 : (model == Model::i80286 ? 10 : 65536);
+	static constexpr std::size_t max_instruction_length = model >= Model::i80386 ? 15 : (model == Model::i80286 ? 10 : 65536);
 	const uint8_t *const end = source + std::min(length, max_instruction_length - consumed_);
 
 	// MARK: - Prefixes (if present) and the opcode.
diff --git a/InstructionSets/x86/Decoder.hpp b/InstructionSets/x86/Decoder.hpp
index 23defb001..62afbb76b 100644
--- a/InstructionSets/x86/Decoder.hpp
+++ b/InstructionSets/x86/Decoder.hpp
@@ -44,7 +44,7 @@ template <Model model> class Decoder {
 				The 80286 and 80386 have instruction length limits of 10 and 15 bytes respectively, so
 				cannot overflow the field.
 		*/
-		std::pair<int, InstructionT> decode(const uint8_t *source, uint32_t length);
+		std::pair<int, InstructionT> decode(const uint8_t *source, std::size_t length);
 
 		/*!
 			Enables or disables 32-bit protected mode. Meaningful only if the @c Model supports it.