From b6bff56523bcfe635ddc6c430391555ea9ab1756 Mon Sep 17 00:00:00 2001
From: MerryMage <git@mary.rs>
Date: Sun, 16 May 2021 10:31:14 +0100
Subject: [PATCH] translate_thumb: Update current_instruction_size in
 TranslateSingleThumbInstruction

---
 src/frontend/A32/translate/translate_thumb.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/translate/translate_thumb.cpp b/src/frontend/A32/translate/translate_thumb.cpp
index 69e9b7ba..99610a26 100644
--- a/src/frontend/A32/translate/translate_thumb.cpp
+++ b/src/frontend/A32/translate/translate_thumb.cpp
@@ -152,8 +152,11 @@ IR::Block TranslateThumb(LocationDescriptor descriptor, MemoryReadCodeFuncType m
 bool TranslateSingleThumbInstruction(IR::Block& block, LocationDescriptor descriptor, u32 thumb_instruction) {
     TranslatorVisitor visitor{block, descriptor, {}};
 
-    const bool is_thumb_16 = IsThumb16(static_cast<u16>(thumb_instruction));
     bool should_continue = true;
+
+    const bool is_thumb_16 = IsThumb16(static_cast<u16>(thumb_instruction));
+    visitor.current_instruction_size = is_thumb_16 ? 2 : 4;
+
     if (is_thumb_16) {
         if (const auto decoder = DecodeThumb16<TranslatorVisitor>(static_cast<u16>(thumb_instruction))) {
             should_continue = decoder->get().call(visitor, static_cast<u16>(thumb_instruction));