From a2cd8f6cce7b2ee7da52d603d0877b291dc4c693 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sat, 24 Oct 2020 15:46:11 -0700
Subject: [PATCH] ARM Decoder: Fix decoding pre-indexed writeback instructions
 (fixes #1915)

---
 CHANGES               | 1 +
 src/arm/decoder-arm.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 040ee635b..f6597ab52 100644
--- a/CHANGES
+++ b/CHANGES
@@ -61,6 +61,7 @@ Other fixes:
  - 3DS: Fix crash with libctru 2.0 when exiting
  - 3DS: Fix thread cleanup
  - All: Improve export headers (fixes mgba.io/i/1738)
+ - ARM Decoder: Fix decoding pre-indexed writeback instructions (fixes mgba.io/i/1915)
  - Core: Ensure ELF regions can be written before trying
  - Core: Fix reported ROM size when a fixed buffer size is used
  - Core: Fix memory leak loading ELF files
diff --git a/src/arm/decoder-arm.c b/src/arm/decoder-arm.c
index cf75d8881..895c82fcd 100644
--- a/src/arm/decoder-arm.c
+++ b/src/arm/decoder-arm.c
@@ -218,6 +218,7 @@
 		ARM_MEMORY_ ## FORMAT, \
 		ADDRESSING_MODE, FORMAT ## _CYCLES, ARM_ACCESS_ ## TYPE, OTHER_AFFECTED) \
 	DEFINE_LOAD_STORE_DECODER_EX_ARM(NAME ## PUW, MNEMONIC, \
+		ARM_MEMORY_PRE_INCREMENT | \
 		ARM_MEMORY_WRITEBACK | \
 		ARM_MEMORY_ ## FORMAT, \
 		ADDRESSING_MODE, FORMAT ## _CYCLES, ARM_ACCESS_ ## TYPE, OTHER_AFFECTED) \