From 67cf9b78b3d09a423874cdb3002efdd0a46d74b1 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 525695a78..a61221a79 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ Emulation fixes:
 Other fixes:
  - 3DS: Redo video sync to be more precise
  - 3DS: Fix crash with libctru 2.0 when exiting
+ - ARM Decoder: Fix decoding pre-indexed writeback instructions (fixes mgba.io/i/1915)
  - Core: Fix reported ROM size when a fixed buffer size is used
  - Core: Fix memory leak loading ELF files
  - GBA: Disable more checks when loading GS save with checks disabled (fixes mgba.io/i/1851)
diff --git a/src/arm/decoder-arm.c b/src/arm/decoder-arm.c
index abfff5335..da5bee390 100644
--- a/src/arm/decoder-arm.c
+++ b/src/arm/decoder-arm.c
@@ -214,6 +214,7 @@
 		0, \
 		ADDRESSING_MODE, CYCLES, TYPE, OTHER_AFFECTED) \
 	DEFINE_LOAD_STORE_DECODER_EX_ARM(NAME ## PUW, MNEMONIC, \
+		ARM_MEMORY_PRE_INCREMENT | \
 		ARM_MEMORY_WRITEBACK, \
 		ADDRESSING_MODE, CYCLES, TYPE, OTHER_AFFECTED) \