From 8401cdbd0e850fb2b4d4d7884ac414db3ae8cd94 Mon Sep 17 00:00:00 2001
From: Caroline Tice <ctice@apple.com>
Date: Fri, 22 Apr 2011 16:03:05 +0000
Subject: [PATCH] Reformat the emulation test data files.

llvm-svn: 129991
---
 .../new-test-files/test-add-1-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-add-1-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-add-10-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-add-11-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-add-12-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-add-2-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-add-2-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-add-3-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-add-3-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-add-4-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-add-4-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-add-5-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-add-5-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-add-6-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-add-6-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-add-7-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-add-7-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-add-8-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-add-8-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-add-9-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-bic-1-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-bic-1-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-ldmia-1-arm.dat       | 119 +++++++++++++++++
 .../new-test-files/test-ldmia-1-thumb.dat     | 119 +++++++++++++++++
 .../new-test-files/test-ldmia-2-arm.dat       | 123 +++++++++++++++++
 .../new-test-files/test-ldmia-2-thumb.dat     | 123 +++++++++++++++++
 .../new-test-files/test-ldmia-3-arm.dat       | 119 +++++++++++++++++
 .../new-test-files/test-ldmia-3-thumb.dat     | 119 +++++++++++++++++
 .../new-test-files/test-ldr-1-arm.dat         | 118 +++++++++++++++++
 .../new-test-files/test-ldr-1-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-ldr-10-thumb.dat      | 118 +++++++++++++++++
 .../new-test-files/test-ldr-11-thumb.dat      | 118 +++++++++++++++++
 .../new-test-files/test-ldr-12-thumb.dat      | 118 +++++++++++++++++
 .../new-test-files/test-ldr-2-arm.dat         | 118 +++++++++++++++++
 .../new-test-files/test-ldr-2-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-ldr-3-arm.dat         | 118 +++++++++++++++++
 .../new-test-files/test-ldr-3-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-ldr-4-arm.dat         | 118 +++++++++++++++++
 .../new-test-files/test-ldr-4-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-ldr-5-arm.dat         | 118 +++++++++++++++++
 .../new-test-files/test-ldr-5-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-ldr-6-arm.dat         | 118 +++++++++++++++++
 .../new-test-files/test-ldr-6-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-ldr-7-arm.dat         | 118 +++++++++++++++++
 .../new-test-files/test-ldr-7-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-ldr-8-arm.dat         | 118 +++++++++++++++++
 .../new-test-files/test-ldr-8-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-ldr-9-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-ldrd-1-arm.dat        | 119 +++++++++++++++++
 .../new-test-files/test-ldrd-1-thumb.dat      | 119 +++++++++++++++++
 .../new-test-files/test-ldrd-2-thumb.dat      | 119 +++++++++++++++++
 .../new-test-files/test-ldrh-1-thumb.dat      | 118 +++++++++++++++++
 .../new-test-files/test-ldrsh-1-arm.dat       | 118 +++++++++++++++++
 .../new-test-files/test-ldrsh-2-arm.dat       | 118 +++++++++++++++++
 .../new-test-files/test-mov-1-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-mov-1-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mov-10-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-11-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-12-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-13-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-14-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-15-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-16-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-17-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-18-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-19-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-2-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-mov-2-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mov-20-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-21-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-22-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-23-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-24-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-25-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-26-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-27-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-28-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-29-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-3-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-mov-3-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mov-30-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-31-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-mov-4-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-mov-4-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mov-5-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-mov-5-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mov-6-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-mov-6-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mov-7-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mov-8-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mov-9-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-moveq-1-arm.dat       | 111 ++++++++++++++++
 .../new-test-files/test-movs-1-arm.dat        | 111 ++++++++++++++++
 .../new-test-files/test-mvn-1-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-mvn-1-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mvn-2-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-mvn-2-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mvn-3-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-mvn-3-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-mvn-4-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-mvn-4-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-pop-1-arm.dat         | 121 +++++++++++++++++
 .../new-test-files/test-pop-1-thumb.dat       | 121 +++++++++++++++++
 .../new-test-files/test-pop-2-arm.dat         | 118 +++++++++++++++++
 .../new-test-files/test-pop-2-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-pop-3-thumb.dat       | 118 +++++++++++++++++
 .../new-test-files/test-push-1-arm.dat        | 111 ++++++++++++++++
 .../new-test-files/test-push-1-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-push-2-arm.dat        | 111 ++++++++++++++++
 .../new-test-files/test-push-2-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-push-3-arm.dat        | 111 ++++++++++++++++
 .../new-test-files/test-push-3-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-str-1-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-str-1-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-str-2-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-str-2-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-str-3-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-str-3-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-str-4-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-str-4-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-str-5-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-strb-1-arm.dat        | 111 ++++++++++++++++
 .../new-test-files/test-strb-2-arm.dat        | 111 ++++++++++++++++
 .../new-test-files/test-strbt-1-arm.dat       | 111 ++++++++++++++++
 .../new-test-files/test-strd-1-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-strt-1-arm.dat        | 111 ++++++++++++++++
 .../new-test-files/test-sub-1-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-sub-1-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-sub-10-arm.dat        | 111 ++++++++++++++++
 .../new-test-files/test-sub-2-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-sub-2-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-sub-3-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-sub-3-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-sub-4-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-sub-4-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-sub-5-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-sub-5-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-sub-6-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-sub-6-thumb.dat       | 111 ++++++++++++++++
 .../new-test-files/test-sub-8-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-sub-9-arm.dat         | 111 ++++++++++++++++
 .../new-test-files/test-subs-1-arm.dat        | 111 ++++++++++++++++
 .../new-test-files/test-subs-1-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-subs-10-thumb.dat     | 111 ++++++++++++++++
 .../new-test-files/test-subs-2-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-subs-3-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-subs-4-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-subs-5-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-subs-6-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-subs-8-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-subs-9-thumb.dat      | 111 ++++++++++++++++
 .../new-test-files/test-vpop-1-thumb.dat      | 125 ++++++++++++++++++
 .../new-test-files/test-vpop-2-thumb.dat      | 118 +++++++++++++++++
 .../new-test-files/test-vpop-3-thumb.dat      | 121 +++++++++++++++++
 .../new-test-files/test-vpush-1-thumb.dat     | 111 ++++++++++++++++
 .../new-test-files/test-vpush-2-thumb.dat     | 111 ++++++++++++++++
 .../new-test-files/test-vpush-3-thumb.dat     | 111 ++++++++++++++++
 157 files changed, 17740 insertions(+)
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-10-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-11-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-12-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-3-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-4-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-4-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-5-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-5-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-6-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-6-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-7-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-7-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-8-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-8-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-add-9-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-bic-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-bic-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-3-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-4-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-5-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-6-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-7-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-8-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-10-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-11-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-12-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-13-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-14-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-15-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-16-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-17-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-18-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-19-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-20-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-21-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-22-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-23-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-24-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-25-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-26-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-27-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-28-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-29-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-3-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-30-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-31-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-4-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-4-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-5-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-5-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-6-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-6-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-7-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-8-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mov-9-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-moveq-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-movs-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mvn-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mvn-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mvn-3-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mvn-4-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-pop-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-pop-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-pop-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-pop-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-pop-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-push-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-push-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-push-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-push-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-push-3-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-push-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-str-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-str-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-str-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-str-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-str-3-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-str-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-str-4-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-str-4-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-str-5-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-strb-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-strb-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-strbt-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-strd-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-strt-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-10-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-2-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-3-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-4-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-4-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-5-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-5-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-6-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-6-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-8-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-sub-9-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-subs-1-arm.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-subs-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-subs-10-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-subs-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-subs-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-subs-4-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-subs-5-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-subs-6-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-subs-8-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-subs-9-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat
 create mode 100644 lldb/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat

diff --git a/lldb/test/arm_emulation/new-test-files/test-add-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-1-arm.dat
new file mode 100644
index 000000000000..a4c2ec5e99e8
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add r0, r0, r15"
+triple=arm-apple-darwin
+opcode=0xe080000f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00003000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-1-thumb.dat
new file mode 100644
index 000000000000..ac4004dff9df
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-1-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add	r0, r13, #0"
+triple=thumb-apple-darwin
+opcode=0xa800
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-10-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-10-thumb.dat
new file mode 100644
index 000000000000..53bacf6ec65e
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-10-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add     sp, r13"
+triple=thumb-apple-darwin
+opcode=0x44ed
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x5fbffca0
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-11-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-11-thumb.dat
new file mode 100644
index 000000000000..a56a2b23a387
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-11-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add     sp, r15"
+triple=thumb-apple-darwin
+opcode=0x44fd
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fe02e50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-12-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-12-thumb.dat
new file mode 100644
index 000000000000..95a9e2419a89
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-12-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add sp, r8"
+triple=thumb-apple-darwin
+opcode=0x44c5
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-2-arm.dat
new file mode 100644
index 000000000000..c4cbdee8de0c
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-2-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add r0, r13, #0"
+triple=arm-apple-darwin
+opcode=0xe28d0000
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-2-thumb.dat
new file mode 100644
index 000000000000..40f48311c13b
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-2-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add     r0, sp, r0"
+triple=thumb-apple-darwin
+opcode=0x4468
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-3-arm.dat
new file mode 100644
index 000000000000..a3aef4d6391b
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-3-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add r0, r1, r0, lsl #2"
+triple=arm-apple-darwin
+opcode=0xe0810100
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000001
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-3-thumb.dat
new file mode 100644
index 000000000000..fe80313a6169
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-3-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add.w r10, r13, #31"
+triple=thumb-apple-darwin
+opcode=0xf10d0a1f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe40
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe40
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe40
+r8=0x00000008
+r9=0x00000009
+r10=0x2fdffe5f
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe40
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-4-arm.dat
new file mode 100644
index 000000000000..11c150d9627f
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-4-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add r0, r2, r7, lsl r1"
+triple=arm-apple-darwin
+opcode=0xe0820117
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe40
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe40
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x5fbffc82
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe40
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe40
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-4-thumb.dat
new file mode 100644
index 000000000000..f83b59b18e47
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-4-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add	r3, r13, #16"
+triple=thumb-apple-darwin
+opcode=0xab04
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x2fdffe58
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-5-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-5-arm.dat
new file mode 100644
index 000000000000..5582c57b6bf8
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-5-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add r10, r13, #31"
+triple=arm-apple-darwin
+opcode=0xe28da01f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x2fdffe6f
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-5-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-5-thumb.dat
new file mode 100644
index 000000000000..a775813bd76a
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-5-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add     r3, sp, r3"
+triple=thumb-apple-darwin
+opcode=0x446b
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x2fdffe53
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-6-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-6-arm.dat
new file mode 100644
index 000000000000..d3418e815b46
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-6-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add r12, r13, #24"
+triple=arm-apple-darwin
+opcode=0xe28dc018
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x2fdffe68
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-6-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-6-thumb.dat
new file mode 100644
index 000000000000..67c432ed97fa
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-6-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add	r5, r13, #32"
+triple=thumb-apple-darwin
+opcode=0xad08
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x2fdffe68
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-7-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-7-arm.dat
new file mode 100644
index 000000000000..ba2b701da6a8
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-7-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add r6, sp, #8"
+triple=arm-apple-darwin
+opcode=0xe28d6008
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x2fdffe68
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-7-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-7-thumb.dat
new file mode 100644
index 000000000000..edb4a61d76c5
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-7-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add     sp, #16"
+triple=thumb-apple-darwin
+opcode=0xb004
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe68
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-8-arm.dat b/lldb/test/arm_emulation/new-test-files/test-add-8-arm.dat
new file mode 100644
index 000000000000..6b828a212279
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-8-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add sp, r8"
+triple=arm-apple-darwin
+opcode=0xe08dd008
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe68
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-8-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-8-thumb.dat
new file mode 100644
index 000000000000..a5dbf09cb801
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-8-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add     sp, #4"
+triple=thumb-apple-darwin
+opcode=0xb001
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe5c
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-9-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-add-9-thumb.dat
new file mode 100644
index 000000000000..a205d01e98c1
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-add-9-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="add     sp, r10"
+triple=thumb-apple-darwin
+opcode=0x44d5
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe5a
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-bic-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-bic-1-arm.dat
new file mode 100644
index 000000000000..d3e0ec96d6c1
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-bic-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="bic r4, r9"
+triple=arm-apple-darwin
+opcode=0xe1c44009
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-bic-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-bic-1-thumb.dat
new file mode 100644
index 000000000000..f703a179fbcf
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-bic-1-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="bics r4, r6"
+triple=thumb-apple-darwin
+opcode=0x43b4
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000000
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat
new file mode 100644
index 000000000000..234a08aa3731
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat
@@ -0,0 +1,119 @@
+InstructionEmulationState={
+assembly_string="ldmia r0!, {r1, r3}"
+triple=arm-apple-darwin
+opcode=0xe8b0000a
+before_state={
+memory={
+address=0x2fdffe50
+data_encoding=uint32_t
+data=[
+    0x0
+    0x2e7c 
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x0000001f
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x00000000
+r2=0x2fdffe70
+r3=0x00002e7c
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat
new file mode 100644
index 000000000000..14ae78cdf820
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat
@@ -0,0 +1,119 @@
+InstructionEmulationState={
+assembly_string="ldmia r0!, {r1, r3}"
+triple=thumb-apple-darwin
+opcode=0xc80a
+before_state={
+memory={
+address=0x2fdffe40
+data_encoding=uint32_t
+data=[
+0x0
+0x2f84
+]
+}
+registers={
+r0=0x2fdffe40
+r1=0x2fdffe50
+r2=0x2fdffe60
+r3=0x2fdffe70
+r4=0x2fdffe80
+r5=0x2fdffe90
+r6=0x2fdffea0
+r7=0x2fdffe40
+r8=0x2fdffec0
+r9=0x2fdffed0
+r10=0x2fdffee0
+r11=0x2fdffef0
+r12=0x2fdfff00
+r13=0x2fdffe40
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe48
+r1=0x00000000
+r2=0x2fdffe60
+r3=0x00002f84
+r4=0x2fdffe80
+r5=0x2fdffe90
+r6=0x2fdffea0
+r7=0x2fdffe40
+r8=0x2fdffec0
+r9=0x2fdffed0
+r10=0x2fdffee0
+r11=0x2fdffef0
+r12=0x2fdfff00
+r13=0x2fdffe40
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat
new file mode 100644
index 000000000000..54b34310f452
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat
@@ -0,0 +1,123 @@
+InstructionEmulationState={
+assembly_string="ldmia r0!, {r2, r4, r6, r8, r10, r12}"
+triple=arm-apple-darwin
+opcode=0xe8b01554
+before_state={
+memory={
+address=0x2fdffe20
+data_encoding=uint32_t
+data=[
+0x0
+0x2e7c
+0x1
+0x2fdffe84
+0x0
+0x0
+]
+}
+registers={
+r0=0x2fdffe20
+r1=0x2fdffe30
+r2=0x2fdffe40
+r3=0x0000001f
+r4=0x2fdffe60
+r5=0x2fdffe70
+r6=0x2fdffe80
+r7=0x2fdffe20
+r8=0x2fdffea0
+r9=0x2fdffeb0
+r10=0x2fdffec0
+r11=0x2fdffed0
+r12=0x2fdffee0
+r13=0x2fdffe20
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe38
+r1=0x2fdffe30
+r2=0x00000000
+r3=0x0000001f
+r4=0x00002e7c
+r5=0x2fdffe70
+r6=0x00000001
+r7=0x2fdffe20
+r8=0x2fdffe84
+r9=0x2fdffeb0
+r10=0x00000000
+r11=0x2fdffed0
+r12=0x00000000
+r13=0x2fdffe20
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat
new file mode 100644
index 000000000000..05063714c3b5
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat
@@ -0,0 +1,123 @@
+InstructionEmulationState={
+assembly_string="ldmia.w r0!,{r2,r4,r6,r8,r10,r12}"
+triple=thumb-apple-darwin
+opcode=0xe8b01554
+before_state={
+memory={
+address=0x2fdffe50
+data_encoding=uint32_t
+data=[
+0x0
+0x2f80
+0x1
+0x2fdffeac
+0x0
+0x0
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe68
+r1=0x2fdffe60
+r2=0x00000000
+r3=0x2fdffe80
+r4=0x00002f80
+r5=0x2fdffea0
+r6=0x00000001
+r7=0x2fdffe50
+r8=0x2fdffeac
+r9=0x2fdffee0
+r10=0x00000000
+r11=0x2fdfff00
+r12=0x00000000
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat
new file mode 100644
index 000000000000..6bcab43e117c
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat
@@ -0,0 +1,119 @@
+InstructionEmulationState={
+assembly_string="ldmia r14!, {r1, r3}"
+triple=arm-apple-darwin
+opcode=0xe8be000a
+before_state={
+memory={
+address=0x2e7c
+data_encoding=uint32_t
+data=[
+0xe59fc00c
+0xe08fc00c
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x0000001f
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0xe59fc00c
+r2=0x2fdffe70
+r3=0xe08fc00c
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e84
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat
new file mode 100644
index 000000000000..0126f72e1756
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat
@@ -0,0 +1,119 @@
+InstructionEmulationState={
+assembly_string="ldmia.w r14!, {r1, r3}"
+triple=thumb-apple-darwin
+opcode=0xe8be000a
+before_state={
+memory={
+address=0x2f80
+data_encoding=uint32_t
+data=[
+0xe59fc00c
+0xe08fc00c
+]
+}
+registers={
+r0=0x2fdffe78
+r1=0x2fdffe88
+r2=0x2fdffe98
+r3=0x2fdffea8
+r4=0x2fdffeb8
+r5=0x2fdffec8
+r6=0x2fdffed8
+r7=0x2fdffe78
+r8=0x2fdffef8
+r9=0x2fdfff08
+r10=0x2fdfff18
+r11=0x2fdfff28
+r12=0x2fdfff38
+r13=0x2fdffe78
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe78
+r1=0xe59fc00c
+r2=0x2fdffe98
+r3=0xe08fc00c
+r4=0x2fdffeb8
+r5=0x2fdffec8
+r6=0x2fdffed8
+r7=0x2fdffe78
+r8=0x2fdffef8
+r9=0x2fdfff08
+r10=0x2fdfff18
+r11=0x2fdfff28
+r12=0x2fdfff38
+r13=0x2fdffe78
+r14=0x00002f88
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-1-arm.dat
new file mode 100644
index 000000000000..a4def30ef776
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-1-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r0, [pc, #+24]"
+triple=arm-apple-darwin
+opcode=0xe59f0018
+before_state={
+memory={
+address=0x3018
+data_encoding=uint32_t
+data=[
+0x3030
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00003030
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat
new file mode 100644
index 000000000000..fb9549c7a0ac
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr     r0, [pc, #12]"
+triple=thumb-apple-darwin
+opcode=0x4803
+before_state={
+memory={
+address=0x300c
+data_encoding=uint32_t
+data=[
+0x3024
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00003024
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat
new file mode 100644
index 000000000000..72821aa7e0be
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr.w   r10,[ pc, #4]"
+triple=thumb-apple-darwin
+opcode=0xf8dfa004
+before_state={
+memory={
+address=0x3000
+data_encoding=uint32_t
+data=[
+0x2fe01000
+]
+}
+registers={
+r0=0x2fdffe48
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x2fdffe78
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe48
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x2fdffe78
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fe01000
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat
new file mode 100644
index 000000000000..aac725e9f11c
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr.w   r8, [pc , #0]"
+triple=thumb-apple-darwin
+opcode=0xf8df8000
+before_state={
+memory={
+address=0x2ffc
+data_encoding=uint32_t
+data=[
+0xa0e1defe
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0xa0e1defe
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat
new file mode 100644
index 000000000000..d5c503faa19b
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr.w   r9, [pc, #-4]"
+triple=thumb-apple-darwin
+opcode=0xf85f9004
+before_state={
+memory={
+address=0x2fec
+data_encoding=uint32_t
+data=[
+0x9004f85f
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x9004f85f
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-2-arm.dat
new file mode 100644
index 000000000000..c611535ea691
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-2-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r0, [pc, #256]"
+triple=arm-apple-darwin
+opcode=0xe59f0100
+before_state={
+memory={
+address=0x3100
+data_encoding=uint32_t
+data=[
+0x0
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat
new file mode 100644
index 000000000000..12507564f3bc
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r0, [pc, #+24]"
+triple=thumb-apple-darwin
+opcode=0x4806
+before_state={
+memory={
+address=0x3018
+data_encoding=uint32_t
+data=[
+0x3030
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00003030
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-3-arm.dat
new file mode 100644
index 000000000000..9d39a2d1747c
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-3-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r0, [r13, #+24]"
+triple=arm-apple-darwin
+opcode=0xe59d0018
+before_state={
+memory={
+address=0x2fdffe70
+data_encoding=uint32_t
+data=[
+0x2fdffe80
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe80
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat
new file mode 100644
index 000000000000..9ebf9678944f
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r0, [pc, #256]"
+triple=thumb-apple-darwin
+opcode=0x4840
+before_state={
+memory={
+address=0x3100
+data_encoding=uint32_t
+data=[
+0x0
+]
+}
+registers={
+r0=0x2fdffe48
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x2fdffe78
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x2fdffe78
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-4-arm.dat
new file mode 100644
index 000000000000..8e9fb9411900
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-4-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r1, [r5, #16]"
+triple=arm-apple-darwin
+opcode=0xe5951010
+before_state={
+memory={
+address=0x2fdffeb8
+data_encoding=uint32_t
+data=[
+0x7365742d
+]
+}
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x7365742d
+r2=0x2fdffe78
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat
new file mode 100644
index 000000000000..d90788fe0d79
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r0, [r13, #+24]"
+triple=thumb-apple-darwin
+opcode=0x9806
+before_state={
+memory={
+address=0x2fdffe60
+data_encoding=uint32_t
+data=[
+0x2fdffe70
+]
+}
+registers={
+r0=0x2fdffe48
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x2fdffe78
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe70
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x2fdffe78
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-5-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-5-arm.dat
new file mode 100644
index 000000000000..1d20ac8fe363
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-5-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r2, [r0]"
+triple=arm-apple-darwin
+opcode=0xe5902000
+before_state={
+memory={
+address=0x2fdffe60
+data_encoding=uint32_t
+data=[
+0x0
+]
+}
+registers={
+r0=0x2fdffe60
+r1=0x2fdffe70
+r2=0x2fdffe80
+r3=0x0000001f
+r4=0x2fdffea0
+r5=0x2fdffeb0
+r6=0x2fdffec0
+r7=0x2fdffe60
+r8=0x2fdffee0
+r9=0x2fdffef0
+r10=0x2fdfff00
+r11=0x2fdfff10
+r12=0x2fdfff20
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe60
+r1=0x2fdffe70
+r2=0x00000000
+r3=0x0000001f
+r4=0x2fdffea0
+r5=0x2fdffeb0
+r6=0x2fdffec0
+r7=0x2fdffe60
+r8=0x2fdffee0
+r9=0x2fdffef0
+r10=0x2fdfff00
+r11=0x2fdfff10
+r12=0x2fdfff20
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat
new file mode 100644
index 000000000000..fcfff65ff784
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr     r1, [pc, #0]"
+triple=thumb-apple-darwin
+opcode=0x4900
+before_state={
+memory={
+address=0x3000
+data_encoding=uint32_t
+data=[
+0x2fe01000
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fe01000
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-6-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-6-arm.dat
new file mode 100644
index 000000000000..7dfd2eceecb2
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-6-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r2, [r6], +r8, lsl #2"
+triple=arm-apple-darwin
+opcode=0xe6962108
+before_state={
+memory={
+address=0x2fdffea8
+data_encoding=uint32_t
+data=[
+0x7365742d
+]
+}
+registers={
+r0=0x2fdffe48
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x0000001f
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe48
+r1=0x2fdffe58
+r2=0x7365742d
+r3=0x0000001f
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0xef5ff9c8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat
new file mode 100644
index 000000000000..9d51ad0298cd
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r1, [r5, #16]"
+triple=thumb-apple-darwin
+opcode=0x6929
+before_state={
+memory={
+address=0x2fdffeb0
+data_encoding=uint32_t
+data=[
+0x65742d62
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x65742d62
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-7-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-7-arm.dat
new file mode 100644
index 000000000000..3a25f73a3f79
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-7-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r2, [sp, #24]"
+triple=arm-apple-darwin
+opcode=0xe59d2018
+before_state={
+memory={
+address=0x2fdffe70
+data_encoding=uint32_t
+data=[
+0x0
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000000
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat
new file mode 100644
index 000000000000..cf03ddade558
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r2, [r0]"
+triple=thumb-apple-darwin
+opcode=0x6802
+before_state={
+memory={
+address=0x2fdffe58
+data_encoding=uint32_t
+data=[
+0x0
+]
+}
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x2fdffe88
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x00000000
+r3=0x2fdffe88
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-8-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-8-arm.dat
new file mode 100644
index 000000000000..e26a3c287382
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-8-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r3, [r11, #-8]"
+triple=arm-apple-darwin
+opcode=0xe51b3008
+before_state={
+memory={
+address=0x2fdfff00
+data_encoding=uint32_t
+data=[
+0x63387830
+]
+}
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x63387830
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat
new file mode 100644
index 000000000000..b16894540c7a
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr r2, [sp, #24]"
+triple=thumb-apple-darwin
+opcode=0x9a06
+before_state={
+memory={
+address=0x2fdffe68
+data_encoding=uint32_t
+data=[
+0x2fdffe78
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe78
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat
new file mode 100644
index 000000000000..acafc42bdbe8
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldr.w r3, [r11, #8]"
+triple=thumb-apple-darwin
+opcode=0xf8db3008
+before_state={
+memory={
+address=0x2fdfff08
+data_encoding=uint32_t
+data=[
+0x62343134
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x62343134
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat
new file mode 100644
index 000000000000..88f37b677ac8
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat
@@ -0,0 +1,119 @@
+InstructionEmulationState={
+assembly_string="ldrd r0, r1, [r12, #+4]"
+triple=arm-apple-darwin
+opcode=0xe1cc00d4
+before_state={
+memory={
+address=0x2fdfff14
+data_encoding=uint32_t
+data=[
+0x30313038
+0x31623039
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x0000001f
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x30313038
+r1=0x31623039
+r2=0x2fdffe70
+r3=0x0000001f
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat
new file mode 100644
index 000000000000..2681f89564da
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat
@@ -0,0 +1,119 @@
+InstructionEmulationState={
+assembly_string="ldrd r0, r1, [r12, #+4]"
+triple=thumb-apple-darwin
+opcode=0xe9dc0101
+before_state={
+memory={
+address=0x2fdfff3c
+data_encoding=uint32_t
+data=[
+0x0
+0x0
+]
+}
+registers={
+r0=0x2fdffe78
+r1=0x2fdffe88
+r2=0x2fdffe98
+r3=0x2fdffea8
+r4=0x2fdffeb8
+r5=0x2fdffec8
+r6=0x2fdffed8
+r7=0x2fdffe78
+r8=0x2fdffef8
+r9=0x2fdfff08
+r10=0x2fdfff18
+r11=0x2fdfff28
+r12=0x2fdfff38
+r13=0x2fdffe78
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000000
+r2=0x2fdffe98
+r3=0x2fdffea8
+r4=0x2fdffeb8
+r5=0x2fdffec8
+r6=0x2fdffed8
+r7=0x2fdffe78
+r8=0x2fdffef8
+r9=0x2fdfff08
+r10=0x2fdfff18
+r11=0x2fdfff28
+r12=0x2fdfff38
+r13=0x2fdffe78
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat
new file mode 100644
index 000000000000..529afd071172
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat
@@ -0,0 +1,119 @@
+InstructionEmulationState={
+assembly_string="ldrd r4, r5, [pc, #-0]"
+triple=thumb-apple-darwin
+opcode=0xe9df4500
+before_state={
+memory={
+address=0x2ffc
+data_encoding=uint32_t
+data=[
+0xa0e1defe
+0x2fe01000
+]
+}
+registers={
+r0=0x2fdffe78
+r1=0x2fdffe88
+r2=0x2fdffe98
+r3=0x2fdffea8
+r4=0x2fdffeb8
+r5=0x2fdffec8
+r6=0x2fdffed8
+r7=0x2fdffe78
+r8=0x2fdffef8
+r9=0x2fdfff08
+r10=0x2fdfff18
+r11=0x2fdfff28
+r12=0x2fdfff38
+r13=0x2fdffe78
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe78
+r1=0x2fdffe88
+r2=0x2fdffe98
+r3=0x2fdffea8
+r4=0xa0e1defe
+r5=0x2fe01000
+r6=0x2fdffed8
+r7=0x2fdffe78
+r8=0x2fdffef8
+r9=0x2fdfff08
+r10=0x2fdfff18
+r11=0x2fdfff28
+r12=0x2fdfff38
+r13=0x2fdffe78
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat
new file mode 100644
index 000000000000..058f536f01aa
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldrh r0, [r2, #16]"
+triple=thumb-apple-darwin
+opcode=0x8a10
+before_state={
+memory={
+address=0x2fdffe78
+data_encoding=uint32_t
+data=[
+0x762f
+]
+}
+registers={
+r0=0x2fdffe48
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x2fdffe78
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x0000762f
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x2fdffe78
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat
new file mode 100644
index 000000000000..f1c0b825eb66
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldrsh r0, [r2], #+15"
+triple=arm-apple-darwin
+opcode=0xe0d200ff
+before_state={
+memory={
+address=0x2fdffe70
+data_encoding=uint32_t
+data=[
+0xfffffeeb
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x0000001f
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0xfffffeeb
+r1=0x2fdffe60
+r2=0x2fdffe7f
+r3=0x0000001f
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat
new file mode 100644
index 000000000000..32c046c41371
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="ldrsh r14, [r2], #+15"
+triple=arm-apple-darwin
+opcode=0xe0d2e0ff
+before_state={
+memory={
+address=0x2fdffe70
+data_encoding=uint32_t
+data=[
+0xfffffeec
+]
+}
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x0000001f
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe7f
+r3=0x0000001f
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0xfffffeec
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-1-arm.dat
new file mode 100644
index 000000000000..789c45ae670c
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov r12, #256"
+triple=arm-apple-darwin
+opcode=0xe3a0cc01
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x00000100
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-1-thumb.dat
new file mode 100644
index 000000000000..a9d5cde97753
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-1-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     ip, pc"
+triple=thumb-apple-darwin
+opcode=0x46fc
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x00003000
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-10-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-10-thumb.dat
new file mode 100644
index 000000000000..d0e74c1336a8
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-10-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r0, r15"
+triple=thumb-apple-darwin
+opcode=0x4678
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00003000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-11-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-11-thumb.dat
new file mode 100644
index 000000000000..2e8f6574a225
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-11-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r0, r7"
+triple=thumb-apple-darwin
+opcode=0x4638
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-12-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-12-thumb.dat
new file mode 100644
index 000000000000..1cc37d85ea68
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-12-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov.w r12, #256"
+triple=thumb-apple-darwin
+opcode=0xf44f7c80
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x00000100
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-13-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-13-thumb.dat
new file mode 100644
index 000000000000..d76c9713b056
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-13-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov r12, r13"
+triple=thumb-apple-darwin
+opcode=0x46ec
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x2fdffe50
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-14-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-14-thumb.dat
new file mode 100644
index 000000000000..950b70cf69d2
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-14-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov r14, r2"
+triple=thumb-apple-darwin
+opcode=0x4696
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00000002
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-15-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-15-thumb.dat
new file mode 100644
index 000000000000..4b5c7b110c2a
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-15-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r1, r14"
+triple=thumb-apple-darwin
+opcode=0x4671
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00002f84
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-16-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-16-thumb.dat
new file mode 100644
index 000000000000..4ee60510ef87
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-16-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r2, ip"
+triple=thumb-apple-darwin
+opcode=0x4662
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x0000000c
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-17-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-17-thumb.dat
new file mode 100644
index 000000000000..f97ab61e4c48
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-17-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r2, r13"
+triple=thumb-apple-darwin
+opcode=0x466a
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x2fdffe50
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-18-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-18-thumb.dat
new file mode 100644
index 000000000000..456eea302bd0
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-18-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov r2, r9"
+triple=thumb-apple-darwin
+opcode=0x464a
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000009
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-19-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-19-thumb.dat
new file mode 100644
index 000000000000..e9a5facdbb0b
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-19-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r3, r12"
+triple=thumb-apple-darwin
+opcode=0x4663
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000000c
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-2-arm.dat
new file mode 100644
index 000000000000..530a2005572f
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-2-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov r12, r13"
+triple=arm-apple-darwin
+opcode=0xe1a0c00d
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x2fdffe58
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-2-thumb.dat
new file mode 100644
index 000000000000..f12562db2737
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-2-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     ip, r8"
+triple=thumb-apple-darwin
+opcode=0x46c4
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x00000008
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-20-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-20-thumb.dat
new file mode 100644
index 000000000000..9746af4577ec
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-20-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov r3, r13"
+triple=thumb-apple-darwin
+opcode=0x466b
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x2fdffe50
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-21-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-21-thumb.dat
new file mode 100644
index 000000000000..7cdf9fd08c66
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-21-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r3, sp"
+triple=thumb-apple-darwin
+opcode=0x466b
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x2fdffe58
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-22-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-22-thumb.dat
new file mode 100644
index 000000000000..c25c45b9e73d
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-22-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r4, r11"
+triple=thumb-apple-darwin
+opcode=0x465c
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x0000000b
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-23-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-23-thumb.dat
new file mode 100644
index 000000000000..099579157319
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-23-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r5, r10"
+triple=thumb-apple-darwin
+opcode=0x4655
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x0000000a
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-24-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-24-thumb.dat
new file mode 100644
index 000000000000..b9489568a5eb
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-24-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r6, r9"
+triple=thumb-apple-darwin
+opcode=0x464e
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000009
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-25-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-25-thumb.dat
new file mode 100644
index 000000000000..08f2a4b7f4fa
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-25-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r7, lr"
+triple=thumb-apple-darwin
+opcode=0x4677
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x00002f84
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-26-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-26-thumb.dat
new file mode 100644
index 000000000000..0c11874d8718
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-26-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r7, r8"
+triple=thumb-apple-darwin
+opcode=0x4647
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x00000008
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-27-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-27-thumb.dat
new file mode 100644
index 000000000000..68c93d90a8cb
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-27-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     r9, pc"
+triple=thumb-apple-darwin
+opcode=0x46f9
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00003000
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-28-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-28-thumb.dat
new file mode 100644
index 000000000000..29582778f111
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-28-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     sp, ip"
+triple=thumb-apple-darwin
+opcode=0x46e5
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x0000000c
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-29-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-29-thumb.dat
new file mode 100644
index 000000000000..773cfb749b14
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-29-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     sp, pc"
+triple=thumb-apple-darwin
+opcode=0x46fd
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x00003000
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-3-arm.dat
new file mode 100644
index 000000000000..f54789458561
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-3-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov r14, r2"
+triple=arm-apple-darwin
+opcode=0xe1a0e002
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00000002
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-3-thumb.dat
new file mode 100644
index 000000000000..7cf8fefd1aa2
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-3-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov	ip, sp"
+triple=thumb-apple-darwin
+opcode=0x46ec
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x2fdffe58
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-30-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-30-thumb.dat
new file mode 100644
index 000000000000..2b394fcede0a
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-30-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     sp, r7"
+triple=thumb-apple-darwin
+opcode=0x46bd
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-31-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-31-thumb.dat
new file mode 100644
index 000000000000..190f7e66b84b
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-31-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="movs r3, #1"
+triple=thumb-apple-darwin
+opcode=0x2301
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000001
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x20000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-4-arm.dat
new file mode 100644
index 000000000000..568fcb26bf3a
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-4-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov r2, r9"
+triple=arm-apple-darwin
+opcode=0xe1a02009
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000009
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-4-thumb.dat
new file mode 100644
index 000000000000..29c31d2d6d4d
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-4-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     lr, pc"
+triple=thumb-apple-darwin
+opcode=0x46fe
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00003000
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-5-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-5-arm.dat
new file mode 100644
index 000000000000..5166f9a7c555
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-5-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov r3, #2147483648"
+triple=arm-apple-darwin
+opcode=0xe3a03102
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe38
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe38
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x80000000
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe38
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe38
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-5-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-5-thumb.dat
new file mode 100644
index 000000000000..6921b0f2a32a
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-5-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     lr, r2"
+triple=thumb-apple-darwin
+opcode=0x4696
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00000002
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-6-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mov-6-arm.dat
new file mode 100644
index 000000000000..e9cc1b83058d
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-6-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov r3, r13"
+triple=arm-apple-darwin
+opcode=0xe1a0300d
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x2fdffe60
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-6-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-6-thumb.dat
new file mode 100644
index 000000000000..43ff7501d493
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-6-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     pc, ip"
+triple=thumb-apple-darwin
+opcode=0x46e7
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x0000000c
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-7-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-7-thumb.dat
new file mode 100644
index 000000000000..49d77942fc62
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-7-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     pc, lr"
+triple=thumb-apple-darwin
+opcode=0x46f7
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002f84
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-8-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-8-thumb.dat
new file mode 100644
index 000000000000..9d8b2de16a3e
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-8-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     pc, r4"
+triple=thumb-apple-darwin
+opcode=0x46a7
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00000004
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-9-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mov-9-thumb.dat
new file mode 100644
index 000000000000..621591903f61
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mov-9-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mov     pc, sp"
+triple=thumb-apple-darwin
+opcode=0x46ef
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x2fdffe58
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-moveq-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-moveq-1-arm.dat
new file mode 100644
index 000000000000..5fe8d97ca30f
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-moveq-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="moveq r3, #1"
+triple=arm-apple-darwin
+opcode=0x3a03001
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000001
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-movs-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-movs-1-arm.dat
new file mode 100644
index 000000000000..a3258e39ccc5
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-movs-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="movs r12, r13"
+triple=arm-apple-darwin
+opcode=0xe1b0c00d
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x2fdffe58
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x20000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-1-arm.dat
new file mode 100644
index 000000000000..30004671b408
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mvn-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mvn r14, #1"
+triple=arm-apple-darwin
+opcode=0xe3e0e001
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0xfffffffe
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat
new file mode 100644
index 000000000000..c81eaf4d7bce
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mvn r0, #1"
+triple=thumb-apple-darwin
+opcode=0xf06f0001
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe98
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe98
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0xfffffffe
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe98
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe98
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-2-arm.dat
new file mode 100644
index 000000000000..b1f6d10b80e2
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mvn-2-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mvn r0, #1"
+triple=arm-apple-darwin
+opcode=0xe3e00001
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe68
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe68
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0xfffffffe
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe68
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe68
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat
new file mode 100644
index 000000000000..b7fe679e8d4a
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mvn r0, #31"
+triple=thumb-apple-darwin
+opcode=0xf06f001f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe90
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe90
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0xffffffe0
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe90
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe90
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-3-arm.dat
new file mode 100644
index 000000000000..1c4fa30cfaa3
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mvn-3-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mvn r0, #31"
+triple=arm-apple-darwin
+opcode=0xe3e0001f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0xffffffe0
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat
new file mode 100644
index 000000000000..597db3fc2a43
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mvn r14, #1"
+triple=thumb-apple-darwin
+opcode=0xf06f0e01
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe90
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe90
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe90
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe90
+r14=0xfffffffe
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-4-arm.dat
new file mode 100644
index 000000000000..fdc76101aed4
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mvn-4-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mvn r3, r8"
+triple=arm-apple-darwin
+opcode=0xe1e03008
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0xfffffff7
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat
new file mode 100644
index 000000000000..82703765d7bd
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="mvns r3, r8"
+triple=thumb-apple-darwin
+opcode=0xea7f0308
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe90
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe90
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0xfffffff7
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe90
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe90
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0xa0000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-pop-1-arm.dat
new file mode 100644
index 000000000000..17b42b4a9603
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-pop-1-arm.dat
@@ -0,0 +1,121 @@
+InstructionEmulationState={
+assembly_string="pop {r3, r4, r8, r10}"
+triple=arm-apple-darwin
+opcode=0xe8bd0518
+before_state={
+memory={
+address=0x2fdffe50
+data_encoding=uint32_t
+data=[
+0x0
+0x2e7c
+0x1
+0x2fdffeac
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000000
+r4=0x00002e7c
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000001
+r9=0x00000009
+r10=0x2fdffeac
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-pop-1-thumb.dat
new file mode 100644
index 000000000000..3811dcadbb86
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-pop-1-thumb.dat
@@ -0,0 +1,121 @@
+InstructionEmulationState={
+assembly_string="pop.w {r3, r4, r8, r10}"
+triple=thumb-apple-darwin
+opcode=0xe8bd0518
+before_state={
+memory={
+address=0x2fdffe38
+data_encoding=uint32_t
+data=[
+0x0
+0x2f80
+0x1000
+0x1
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe38
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe38
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000000
+r4=0x00002f80
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe38
+r8=0x00001000
+r9=0x00000009
+r10=0x00000001
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-pop-2-arm.dat
new file mode 100644
index 000000000000..e61ead6bdbcd
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-pop-2-arm.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="pop {r9}"
+triple=arm-apple-darwin
+opcode=0xe8bd0200
+before_state={
+memory={
+address=0x2fdffe70
+data_encoding=uint32_t
+data=[
+0x0
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe70
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe70
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe70
+r8=0x00000008
+r9=0x00000000
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe74
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-pop-2-thumb.dat
new file mode 100644
index 000000000000..fd2ad24ac3c2
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-pop-2-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="pop     {r3}"
+triple=thumb-apple-darwin
+opcode=0xbc08
+before_state={
+memory={
+address=0x2fdffe60
+data_encoding=uint32_t
+data=[
+0x0
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000000
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe64
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-pop-3-thumb.dat
new file mode 100644
index 000000000000..bee5c93cf0d7
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-pop-3-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="pop {r6}"
+triple=thumb-apple-darwin
+opcode=0xbc40
+before_state={
+memory={
+address=0x2fdffe60
+data_encoding=uint32_t
+data=[
+0x0
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000000
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe64
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-push-1-arm.dat
new file mode 100644
index 000000000000..80f39c1c8718
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-push-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="push {r0, r1, r2, r3, r7, r14}"
+triple=arm-apple-darwin
+opcode=0xe92d408f
+before_state={
+registers={
+r0=0x2fdffe30
+r1=0x2fdffe40
+r2=0x2fdffe50
+r3=0x0000001f
+r4=0x2fdffe70
+r5=0x2fdffe80
+r6=0x2fdffe90
+r7=0x2fdffe30
+r8=0x2fdffeb0
+r9=0x2fdffec0
+r10=0x2fdffed0
+r11=0x2fdffee0
+r12=0x2fdffef0
+r13=0x2fdffe30
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe30
+r1=0x2fdffe40
+r2=0x2fdffe50
+r3=0x0000001f
+r4=0x2fdffe70
+r5=0x2fdffe80
+r6=0x2fdffe90
+r7=0x2fdffe30
+r8=0x2fdffeb0
+r9=0x2fdffec0
+r10=0x2fdffed0
+r11=0x2fdffee0
+r12=0x2fdffef0
+r13=0x2fdffe18
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-push-1-thumb.dat
new file mode 100644
index 000000000000..5b97db909a0a
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-push-1-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="push {r0, r1, r2, r3, r7, r14}"
+triple=thumb-apple-darwin
+opcode=0xb58f
+before_state={
+registers={
+r0=0x2fdffe28
+r1=0x2fdffe38
+r2=0x2fdffe48
+r3=0x2fdffe58
+r4=0x2fdffe68
+r5=0x2fdffe78
+r6=0x2fdffe88
+r7=0x2fdffe28
+r8=0x2fdffea8
+r9=0x2fdffeb8
+r10=0x2fdffec8
+r11=0x2fdffed8
+r12=0x2fdffee8
+r13=0x2fdffe28
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe28
+r1=0x2fdffe38
+r2=0x2fdffe48
+r3=0x2fdffe58
+r4=0x2fdffe68
+r5=0x2fdffe78
+r6=0x2fdffe88
+r7=0x2fdffe28
+r8=0x2fdffea8
+r9=0x2fdffeb8
+r10=0x2fdffec8
+r11=0x2fdffed8
+r12=0x2fdffee8
+r13=0x2fdffe10
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-push-2-arm.dat
new file mode 100644
index 000000000000..14871ad6d54b
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-push-2-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="push {r6}"
+triple=arm-apple-darwin
+opcode=0xe92d0040
+before_state={
+registers={
+r0=0x2fdffe68
+r1=0x2fdffe78
+r2=0x2fdffe88
+r3=0x0000001f
+r4=0x2fdffea8
+r5=0x2fdffeb8
+r6=0x2fdffec8
+r7=0x2fdffe68
+r8=0x2fdffee8
+r9=0x2fdffef8
+r10=0x2fdfff08
+r11=0x2fdfff18
+r12=0x2fdfff28
+r13=0x2fdffe68
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe68
+r1=0x2fdffe78
+r2=0x2fdffe88
+r3=0x0000001f
+r4=0x2fdffea8
+r5=0x2fdffeb8
+r6=0x2fdffec8
+r7=0x2fdffe68
+r8=0x2fdffee8
+r9=0x2fdffef8
+r10=0x2fdfff08
+r11=0x2fdfff18
+r12=0x2fdfff28
+r13=0x2fdffe64
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-push-2-thumb.dat
new file mode 100644
index 000000000000..0867f8108dd6
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-push-2-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="push {r6}"
+triple=thumb-apple-darwin
+opcode=0xb440
+before_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x2fdffe88
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x2fdffe88
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe54
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-push-3-arm.dat
new file mode 100644
index 000000000000..a7dcd022c4b0
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-push-3-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="push {r7, r14}"
+triple=arm-apple-darwin
+opcode=0xe92d4080
+before_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-push-3-thumb.dat
new file mode 100644
index 000000000000..d1eea468d07e
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-push-3-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="push {r7, r14}"
+triple=thumb-apple-darwin
+opcode=0xb580
+before_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-str-1-arm.dat
new file mode 100644
index 000000000000..3ca1303a1215
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-str-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="str r0, [r13]"
+triple=arm-apple-darwin
+opcode=0xe58d0000
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-str-1-thumb.dat
new file mode 100644
index 000000000000..46b495cf27d2
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-str-1-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="str r0, [r13]"
+triple=thumb-apple-darwin
+opcode=0x9000
+before_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-str-2-arm.dat
new file mode 100644
index 000000000000..14d4dc92b076
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-str-2-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="str r1, [r0, #+4]"
+triple=arm-apple-darwin
+opcode=0xe5801004
+before_state={
+registers={
+r0=0x2fdffe60
+r1=0x2fdffe70
+r2=0x2fdffe80
+r3=0x0000001f
+r4=0x2fdffea0
+r5=0x2fdffeb0
+r6=0x2fdffec0
+r7=0x2fdffe60
+r8=0x2fdffee0
+r9=0x2fdffef0
+r10=0x2fdfff00
+r11=0x2fdfff10
+r12=0x2fdfff20
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe60
+r1=0x2fdffe70
+r2=0x2fdffe80
+r3=0x0000001f
+r4=0x2fdffea0
+r5=0x2fdffeb0
+r6=0x2fdffec0
+r7=0x2fdffe60
+r8=0x2fdffee0
+r9=0x2fdffef0
+r10=0x2fdfff00
+r11=0x2fdfff10
+r12=0x2fdfff20
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-str-2-thumb.dat
new file mode 100644
index 000000000000..cbcdcb7d6906
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-str-2-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="str	r0, [sp, #0]"
+triple=thumb-apple-darwin
+opcode=0x9000
+before_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-str-3-arm.dat
new file mode 100644
index 000000000000..b729f853b8c9
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-str-3-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="str r2, [r0]"
+triple=arm-apple-darwin
+opcode=0xe5802000
+before_state={
+registers={
+r0=0x2fdffe60
+r1=0x2fdffe70
+r2=0x2fdffe80
+r3=0x0000001f
+r4=0x2fdffea0
+r5=0x2fdffeb0
+r6=0x2fdffec0
+r7=0x2fdffe60
+r8=0x2fdffee0
+r9=0x2fdffef0
+r10=0x2fdfff00
+r11=0x2fdfff10
+r12=0x2fdfff20
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe60
+r1=0x2fdffe70
+r2=0x2fdffe80
+r3=0x0000001f
+r4=0x2fdffea0
+r5=0x2fdffeb0
+r6=0x2fdffec0
+r7=0x2fdffe60
+r8=0x2fdffee0
+r9=0x2fdffef0
+r10=0x2fdfff00
+r11=0x2fdfff10
+r12=0x2fdfff20
+r13=0x2fdffe60
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-str-3-thumb.dat
new file mode 100644
index 000000000000..7d5dc53160ad
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-str-3-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="str	r1, [sp, #32]"
+triple=thumb-apple-darwin
+opcode=0x9108
+before_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x2fdffe80
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-str-4-arm.dat
new file mode 100644
index 000000000000..1b700969d46f
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-str-4-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="str r2, [r13, #+4]"
+triple=arm-apple-darwin
+opcode=0xe58d2004
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-str-4-thumb.dat
new file mode 100644
index 000000000000..092135fe1ae0
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-str-4-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="str.w r7, [r13, #-12]!"
+triple=thumb-apple-darwin
+opcode=0xf84d7d0c
+before_state={
+registers={
+r0=0x2fdffe48
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x2fdffe78
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe48
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe48
+r1=0x2fdffe58
+r2=0x2fdffe68
+r3=0x2fdffe78
+r4=0x2fdffe88
+r5=0x2fdffe98
+r6=0x2fdffea8
+r7=0x2fdffe48
+r8=0x2fdffec8
+r9=0x2fdffed8
+r10=0x2fdffee8
+r11=0x2fdffef8
+r12=0x2fdfff08
+r13=0x2fdffe3c
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-5-arm.dat b/lldb/test/arm_emulation/new-test-files/test-str-5-arm.dat
new file mode 100644
index 000000000000..fbf6c071d04c
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-str-5-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="str r7, [r13, #-12]!"
+triple=arm-apple-darwin
+opcode=0xe52d700c
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe4c
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-strb-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-strb-1-arm.dat
new file mode 100644
index 000000000000..4f167cf9b429
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-strb-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="strb r0, [r2], #+15"
+triple=arm-apple-darwin
+opcode=0xe4c2000f
+before_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe87
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-strb-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-strb-2-arm.dat
new file mode 100644
index 000000000000..9ebeb9db366d
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-strb-2-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="strb r3, [r0, #+8]"
+triple=arm-apple-darwin
+opcode=0xe5c03008
+before_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-strbt-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-strbt-1-arm.dat
new file mode 100644
index 000000000000..5c86f56f11fc
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-strbt-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="strbt r14, [r2], #+15"
+triple=arm-apple-darwin
+opcode=0xe4e2e00f
+before_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe70
+r3=0x0000001f
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x2fdffe60
+r2=0x2fdffe7f
+r3=0x0000001f
+r4=0x2fdffe90
+r5=0x2fdffea0
+r6=0x2fdffeb0
+r7=0x2fdffe50
+r8=0x2fdffed0
+r9=0x2fdffee0
+r10=0x2fdffef0
+r11=0x2fdfff00
+r12=0x2fdfff10
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-strd-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-strd-1-thumb.dat
new file mode 100644
index 000000000000..e96571df1dca
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-strd-1-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="strd r10, r11, [r6, #+28]"
+triple=thumb-apple-darwin
+opcode=0xe9c6ab07
+before_state={
+registers={
+r0=0x2fdffe70
+r1=0x2fdffe80
+r2=0x2fdffe90
+r3=0x2fdffea0
+r4=0x2fdffeb0
+r5=0x2fdffec0
+r6=0x2fdffed0
+r7=0x2fdffe70
+r8=0x2fdffef0
+r9=0x2fdfff00
+r10=0x2fdfff10
+r11=0x2fdfff20
+r12=0x2fdfff30
+r13=0x2fdffe70
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe70
+r1=0x2fdffe80
+r2=0x2fdffe90
+r3=0x2fdffea0
+r4=0x2fdffeb0
+r5=0x2fdffec0
+r6=0x2fdffed0
+r7=0x2fdffe70
+r8=0x2fdffef0
+r9=0x2fdfff00
+r10=0x2fdfff10
+r11=0x2fdfff20
+r12=0x2fdfff30
+r13=0x2fdffe70
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-strt-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-strt-1-arm.dat
new file mode 100644
index 000000000000..b0c97794616e
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-strt-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="strt r0, [r2], #+15"
+triple=arm-apple-darwin
+opcode=0xe4a2000f
+before_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe78
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe58
+r1=0x2fdffe68
+r2=0x2fdffe87
+r3=0x0000001f
+r4=0x2fdffe98
+r5=0x2fdffea8
+r6=0x2fdffeb8
+r7=0x2fdffe58
+r8=0x2fdffed8
+r9=0x2fdffee8
+r10=0x2fdffef8
+r11=0x2fdfff08
+r12=0x2fdfff18
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-1-arm.dat
new file mode 100644
index 000000000000..e07e5fb9aa0f
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub r0, sp, r8"
+triple=arm-apple-darwin
+opcode=0xe04d0008
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x2fdffe50
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-1-thumb.dat
new file mode 100644
index 000000000000..d872a284b2c3
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-1-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub.w    r10, sp, #16"
+triple=thumb-apple-darwin
+opcode=0xf1ad0a10
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe40
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe40
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe40
+r8=0x00000008
+r9=0x00000009
+r10=0x2fdffe30
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe40
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-10-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-10-arm.dat
new file mode 100644
index 000000000000..7c0b94525310
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-10-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub r7, r12, #8"
+triple=arm-apple-darwin
+opcode=0xe24c7008
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x00000004
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-2-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-2-arm.dat
new file mode 100644
index 000000000000..5b6ee1738c1f
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-2-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub r10, r12, #31"
+triple=arm-apple-darwin
+opcode=0xe24ca01f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0xffffffed
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-2-thumb.dat
new file mode 100644
index 000000000000..2997cf5b5943
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-2-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub.w	r10, sp, #31"
+triple=thumb-apple-darwin
+opcode=0xf1ad0a1f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe40
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe40
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe40
+r8=0x00000008
+r9=0x00000009
+r10=0x2fdffe21
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe40
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-3-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-3-arm.dat
new file mode 100644
index 000000000000..288680198a50
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-3-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub r12, r13, #12"
+triple=arm-apple-darwin
+opcode=0xe24dc00c
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x2fdffe44
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-3-thumb.dat
new file mode 100644
index 000000000000..48e178b3a6ea
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-3-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub.w    r12, sp, #31"
+triple=thumb-apple-darwin
+opcode=0xf1ad0c1f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe40
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe40
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe40
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x2fdffe21
+r13=0x2fdffe40
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-4-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-4-arm.dat
new file mode 100644
index 000000000000..b63f66e31648
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-4-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub r13, r13, #24"
+triple=arm-apple-darwin
+opcode=0xe24dd018
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe38
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-4-thumb.dat
new file mode 100644
index 000000000000..9fc0f547b0d3
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-4-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub.w r1, sp, r3, lsl #2"
+triple=thumb-apple-darwin
+opcode=0xebad0183
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe30
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe30
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x2fdffe24
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe30
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe30
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-5-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-5-arm.dat
new file mode 100644
index 000000000000..7f286191b901
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-5-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub r13, r13, #4"
+triple=arm-apple-darwin
+opcode=0xe24dd004
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe54
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-5-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-5-thumb.dat
new file mode 100644
index 000000000000..27f2bfeed41c
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-5-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub.w    r7, sp, #1"
+triple=thumb-apple-darwin
+opcode=0xf1ad0701
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe4f
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-6-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-6-arm.dat
new file mode 100644
index 000000000000..0be88bb2c887
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-6-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub r1, r13, #4"
+triple=arm-apple-darwin
+opcode=0xe24d1004
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x2fdffe54
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-6-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-sub-6-thumb.dat
new file mode 100644
index 000000000000..87dd111479d5
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-6-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub.w     sp, sp, #4"
+triple=thumb-apple-darwin
+opcode=0xf1ad0d04
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe4c
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-8-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-8-arm.dat
new file mode 100644
index 000000000000..db79a2702ff0
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-8-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub r2, r2, r3"
+triple=arm-apple-darwin
+opcode=0xe0422003
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0xffffffe3
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-9-arm.dat b/lldb/test/arm_emulation/new-test-files/test-sub-9-arm.dat
new file mode 100644
index 000000000000..3fb03d95bed1
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-sub-9-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="sub r4, r12, r7"
+triple=arm-apple-darwin
+opcode=0xe04c4007
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0xd02001b4
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe58
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe58
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-1-arm.dat b/lldb/test/arm_emulation/new-test-files/test-subs-1-arm.dat
new file mode 100644
index 000000000000..b296e98d9b45
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-subs-1-arm.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="subs r10, r13, #31"
+triple=arm-apple-darwin
+opcode=0xe25da01f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ff8
+cpsr=0x60000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x0000001f
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x2fdffe31
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002e7c
+r15=0x00002ffc
+cpsr=0x20000010
+s0=0x00000000
+s1=0x00000001
+s2=0x00000002
+s3=0x00000003
+s4=0x00000004
+s5=0x00000005
+s6=0x00000006
+s7=0x00000007
+s8=0x00000008
+s9=0x00000009
+s10=0x0000000a
+s11=0x0000000b
+s12=0x0000000c
+s13=0x0000000d
+s14=0x0000000e
+s15=0x0000000f
+s16=0x00000010
+s17=0x00000011
+s18=0x00000012
+s19=0x00000013
+s20=0x00000014
+s21=0x00000015
+s22=0x00000016
+s23=0x00000017
+s24=0x00000018
+s25=0x00000019
+s26=0x0000001a
+s27=0x0000001b
+s28=0x0000001c
+s29=0x0000001d
+s30=0x0000001e
+s31=0x0000001f
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-1-thumb.dat
new file mode 100644
index 000000000000..0ccbb064c10c
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-subs-1-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="subs	r0, r6, #0"
+triple=thumb-apple-darwin
+opcode=0x1e30
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000006
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x20000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-10-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-10-thumb.dat
new file mode 100644
index 000000000000..0b3c705f2e4d
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-subs-10-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="subs.w	r1, sp, #4"
+triple=thumb-apple-darwin
+opcode=0xf1bd0104
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x2fdffe44
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x20000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-2-thumb.dat
new file mode 100644
index 000000000000..cc990ad92a72
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-subs-2-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="subs r0, r7, r5"
+triple=thumb-apple-darwin
+opcode=0x1b78
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x2fdffe43
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x20000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-3-thumb.dat
new file mode 100644
index 000000000000..79489f0ca17c
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-subs-3-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="subs.w r10, r13, #31"
+triple=thumb-apple-darwin
+opcode=0xf1bd0a1f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe38
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe38
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe38
+r8=0x00000008
+r9=0x00000009
+r10=0x2fdffe19
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe38
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x20000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-4-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-4-thumb.dat
new file mode 100644
index 000000000000..99555012a5b6
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-subs-4-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="subs r1, r3, #4"
+triple=thumb-apple-darwin
+opcode=0x1f19
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0xffffffff
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x80000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-5-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-5-thumb.dat
new file mode 100644
index 000000000000..a8fa4628dc3b
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-subs-5-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="subs r4, r2, r6"
+triple=thumb-apple-darwin
+opcode=0x1b94
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0xfffffffc
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe48
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe48
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x80000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-6-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-6-thumb.dat
new file mode 100644
index 000000000000..298daf28016f
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-subs-6-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="subs r7, r5, #7"
+triple=thumb-apple-darwin
+opcode=0x1fef
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe50
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0xfffffffe
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f84
+r15=0x00002ffe
+cpsr=0x80000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-8-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-8-thumb.dat
new file mode 100644
index 000000000000..79489f0ca17c
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-subs-8-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="subs.w r10, r13, #31"
+triple=thumb-apple-darwin
+opcode=0xf1bd0a1f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe38
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe38
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe38
+r8=0x00000008
+r9=0x00000009
+r10=0x2fdffe19
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe38
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x20000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-9-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-subs-9-thumb.dat
new file mode 100644
index 000000000000..4ca60de1cb85
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-subs-9-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="subs.w	r10, sp, #31"
+triple=thumb-apple-darwin
+opcode=0xf1bd0a1f
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe38
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe38
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe38
+r8=0x00000008
+r9=0x00000009
+r10=0x2fdffe19
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe38
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x20000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat
new file mode 100644
index 000000000000..2ab965f90c56
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat
@@ -0,0 +1,125 @@
+InstructionEmulationState={
+assembly_string="vpop    {d11, d12, d13, d14}"
+triple=thumb-apple-darwin
+opcode=0xecbdbb08
+before_state={
+memory={
+address=0x2fdffe60
+data_encoding=uint32_t
+data=[
+0x0
+0x2f80
+0x1000
+0x1
+0x2fdffebc
+0x0
+0x0
+0x2fdffe8c
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe80
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00002f80
+s24=0x00001000
+s25=0x00000001
+s26=0x2fdffebc
+s27=0x00000000
+s28=0x00000000
+s29=0x2fdffe8c
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat
new file mode 100644
index 000000000000..691b64477c47
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat
@@ -0,0 +1,118 @@
+InstructionEmulationState={
+assembly_string="vpop    {s0}"
+triple=thumb-apple-darwin
+opcode=0xecbd0a01
+before_state={
+memory={
+address=0x2fdffe98
+data_encoding=uint32_t
+data=[
+0x0
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe98
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe98
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe98
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe9c
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat
new file mode 100644
index 000000000000..0384beeba8cb
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat
@@ -0,0 +1,121 @@
+InstructionEmulationState={
+assembly_string="vpop    {s11, s12, s13, s14}"
+triple=thumb-apple-darwin
+opcode=0xecfd5a04
+before_state={
+memory={
+address=0x2fdffe60
+data_encoding=uint32_t
+data=[
+0x0
+0x2f80
+0x1000
+0x1
+]
+}
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe70
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00002f80
+s13=0x00001000
+s14=0x00000001
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat
new file mode 100644
index 000000000000..2202f196b826
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="vpush	{d11, d12, d13, d14}"
+triple=thumb-apple-darwin
+opcode=0xed2dbb08
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe40
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat
new file mode 100644
index 000000000000..60a69fa57fb8
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="vpush	{s0}"
+triple=thumb-apple-darwin
+opcode=0xed2d0a01
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe90
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe90
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe90
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe8c
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat b/lldb/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat
new file mode 100644
index 000000000000..9e1104113fc8
--- /dev/null
+++ b/lldb/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat
@@ -0,0 +1,111 @@
+InstructionEmulationState={
+assembly_string="vpush	{s11, s12, s13, s14}"
+triple=thumb-apple-darwin
+opcode=0xed6d5a04
+before_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe60
+r14=0x00002f80
+r15=0x00002ff8
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+after_state={
+registers={
+r0=0x00000000
+r1=0x00000001
+r2=0x00000002
+r3=0x00000003
+r4=0x00000004
+r5=0x00000005
+r6=0x00000006
+r7=0x2fdffe60
+r8=0x00000008
+r9=0x00000009
+r10=0x0000000a
+r11=0x0000000b
+r12=0x0000000c
+r13=0x2fdffe50
+r14=0x00002f80
+r15=0x00002ffc
+cpsr=0x60000030
+s0=0x00000000
+s1=0x00000000
+s2=0x00000000
+s3=0x00000000
+s4=0x00000000
+s5=0x00000000
+s6=0x00000000
+s7=0x00000000
+s8=0x00000000
+s9=0x00000000
+s10=0x00000000
+s11=0x00000000
+s12=0x00000000
+s13=0x00000000
+s14=0x00000000
+s15=0x00000000
+s16=0x00000000
+s17=0x00000000
+s18=0x00000000
+s19=0x00000000
+s20=0x00000000
+s21=0x00000000
+s22=0x00000000
+s23=0x00000000
+s24=0x00000000
+s25=0x00000000
+s26=0x00000000
+s27=0x00000000
+s28=0x00000000
+s29=0x00000000
+s30=0x00000000
+s31=0x00000000
+}
+}
+}