From 9832f584352caafbb9f40fa2ad363a073b5c6bfe Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Mon, 14 Dec 2020 10:20:24 -0500
Subject: [PATCH] GP-512 corrected ARM 8-byte return storage in cspecs

---
 Ghidra/Processors/ARM/data/languages/ARM.cspec     | 2 +-
 Ghidra/Processors/ARM/data/languages/ARM_v45.cspec | 3 +++
 Ghidra/Processors/ARM/data/languages/ARM_win.cspec | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Processors/ARM/data/languages/ARM.cspec b/Ghidra/Processors/ARM/data/languages/ARM.cspec
index 19c8bb9b00..cc73915db5 100644
--- a/Ghidra/Processors/ARM/data/languages/ARM.cspec
+++ b/Ghidra/Processors/ARM/data/languages/ARM.cspec
@@ -82,7 +82,7 @@
           <register name="r0"/>
         </pentry>
         <pentry minsize="5" maxsize="8">
-          <addr space="join" piece1="r0" piece2="r1"/>
+          <addr space="join" piece1="r1" piece2="r0"/>
         </pentry>
       </output>
       <unaffected>
diff --git a/Ghidra/Processors/ARM/data/languages/ARM_v45.cspec b/Ghidra/Processors/ARM/data/languages/ARM_v45.cspec
index db5ca37aae..a6fbaa3df9 100644
--- a/Ghidra/Processors/ARM/data/languages/ARM_v45.cspec
+++ b/Ghidra/Processors/ARM/data/languages/ARM_v45.cspec
@@ -59,6 +59,9 @@
         <pentry minsize="1" maxsize="4" extension="inttype">
           <register name="r0"/>
         </pentry>
+        <pentry minsize="5" maxsize="8">
+          <addr space="join" piece1="r1" piece2="r0"/>
+        </pentry>
       </output>
       <unaffected>
         <register name="r4"/>
diff --git a/Ghidra/Processors/ARM/data/languages/ARM_win.cspec b/Ghidra/Processors/ARM/data/languages/ARM_win.cspec
index 9e71ff4a04..f4e1dc2d1c 100644
--- a/Ghidra/Processors/ARM/data/languages/ARM_win.cspec
+++ b/Ghidra/Processors/ARM/data/languages/ARM_win.cspec
@@ -86,7 +86,7 @@
           <register name="r0"/>
         </pentry>
         <pentry minsize="5" maxsize="8">
-          <addr space="join" piece1="r0" piece2="r1"/>
+          <addr space="join" piece1="r1" piece2="r0"/>
         </pentry>
       </output>
       <unaffected>