From 24abf1f68bd3d9004526edd213763bf9bb244127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
Date: Wed, 3 Oct 2012 21:22:29 +0200
Subject: [PATCH] winedbg: Add enhanced Coprocessor move operators to Thumb2
 disassembler.

---
 programs/winedbg/be_arm.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c
index 5a95e615481..3ecf47504a8 100644
--- a/programs/winedbg/be_arm.c
+++ b/programs/winedbg/be_arm.c
@@ -996,6 +996,15 @@ static UINT thumb2_disasm_coprocmov1(UINT inst, ADDRESS64 *addr)
     return 0;
 }
 
+static UINT thumb2_disasm_coprocmov2(UINT inst, ADDRESS64 *addr)
+{
+    dbg_printf("\n\t%s%s\tp%u, #%u, %s, %s, cr%u", (inst & 0x00100000)?"mrrc":"mcrr",
+               (inst & 0x10000000)?"2":"", get_nibble(inst, 2), get_nibble(inst, 1),
+               tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)], get_nibble(inst, 0));
+
+    return 0;
+}
+
 struct inst_arm
 {
         UINT mask;
@@ -1070,6 +1079,7 @@ static const struct inst_arm tbl_thumb32[] = {
     { 0xff700000, 0xf8500000, thumb2_disasm_ldrword },
     { 0xef000010, 0xee000000, thumb2_disasm_coprocdat },
     { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 },
+    { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },
     { 0x00000000, 0x00000000, NULL }
 };