From 229af0380c933c66cbddd1f93b4cadc1fdef7161 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Mon, 21 Feb 2022 15:52:16 -0500
Subject: [PATCH] This is normatively called the address size.

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

diff --git a/InstructionSets/x86/Decoder.cpp b/InstructionSets/x86/Decoder.cpp
index fdfc76d19..f76ac9343 100644
--- a/InstructionSets/x86/Decoder.cpp
+++ b/InstructionSets/x86/Decoder.cpp
@@ -696,7 +696,7 @@ std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(con
 				destination_,
 				sib_,
 				lock_,
-				memory_size_,
+				address_size_,
 				segment_override_,
 				repetition_,
 				Size(operation_size_),
diff --git a/InstructionSets/x86/Decoder.hpp b/InstructionSets/x86/Decoder.hpp
index d367cf033..6c52e698b 100644
--- a/InstructionSets/x86/Decoder.hpp
+++ b/InstructionSets/x86/Decoder.hpp
@@ -154,7 +154,7 @@ template <Model model> class Decoder {
 		// Prefix capture fields.
 		Repetition repetition_ = Repetition::None;
 		bool lock_ = false;
-		bool memory_size_ = false;
+		bool address_size_ = false;
 		Source segment_override_ = Source::None;
 
 		/// Resets size capture and all fields with default values.
@@ -163,7 +163,7 @@ template <Model model> class Decoder {
 			displacement_size_ = operand_size_ = 0;
 			displacement_ = operand_ = 0;
 			lock_ = false;
-			memory_size_ = false;
+			address_size_ = false;
 			segment_override_ = Source::None;
 			repetition_ = Repetition::None;
 			phase_ = Phase::Instruction;
diff --git a/InstructionSets/x86/Instruction.hpp b/InstructionSets/x86/Instruction.hpp
index 46997badb..a94170acc 100644
--- a/InstructionSets/x86/Instruction.hpp
+++ b/InstructionSets/x86/Instruction.hpp
@@ -478,7 +478,7 @@ template<bool is_32bit> class Instruction {
 
 		// Fields yet to be properly incorporated...
 		ScaleIndexBase sib_;
-		bool memory_size_ = false;
+		bool address_size_ = false;
 
 	public:
 		/// @returns The number of bytes used for meaningful content within this class. A receiver must use at least @c sizeof(Instruction) bytes
@@ -489,7 +489,7 @@ template<bool is_32bit> class Instruction {
 		SourceSIB  source() const		{	return SourceSIB(Source(sources_ & 0x3f), sib_);			}
 		SourceSIB destination() const	{	return SourceSIB(Source((sources_ >> 6) & 0x3f), sib_);		}
 		bool lock() const				{	return sources_ & 0x8000;					}
-		bool memory_size() const 		{	return memory_size_;						}
+		bool address_size() const 		{	return address_size_;						}
 		Source segment_override() const	{	return Source((sources_ >> 12) & 7);		}
 
 		Repetition repetition() const	{	return Repetition(repetition_size_ & 3);	}
@@ -509,7 +509,7 @@ template<bool is_32bit> class Instruction {
 			Source destination,
 			ScaleIndexBase sib,
 			bool lock,
-			bool memory_size,
+			bool address_size,
 			Source segment_override,
 			Repetition repetition,
 			Size operation_size,
@@ -526,7 +526,7 @@ template<bool is_32bit> class Instruction {
 				displacement_(displacement),
 				operand_(operand),
 				sib_(sib),
-				memory_size_(memory_size) {}
+				address_size_(address_size) {}
 };
 
 // TODO: repack.