From 2aee17ba31d3b3e1713b5f1ca6b5af3b5d23b4d9 Mon Sep 17 00:00:00 2001
From: ghidorahrex <ghidorahrex@users.noreply.github.com>
Date: Fri, 13 Dec 2019 09:47:12 -0500
Subject: [PATCH 1/2] GT-3299: Fixed stackshift/extrapop for 8051 and 6805.

---
 Ghidra/Processors/6805/data/languages/6805.cspec | 2 +-
 Ghidra/Processors/8051/data/languages/8051.cspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Processors/6805/data/languages/6805.cspec b/Ghidra/Processors/6805/data/languages/6805.cspec
index 2c60effd58..73d046698c 100644
--- a/Ghidra/Processors/6805/data/languages/6805.cspec
+++ b/Ghidra/Processors/6805/data/languages/6805.cspec
@@ -6,7 +6,7 @@
   </global>
   <stackpointer register="SP" space="RAM" growth="negative"/>
   <default_proto>
-    <prototype name="__stdcall" extrapop="-2" stackshift="-2">
+    <prototype name="__stdcall" extrapop="2" stackshift="2">
       <input>
         <pentry minsize="1" maxsize="1">
           <register name="A"/>
diff --git a/Ghidra/Processors/8051/data/languages/8051.cspec b/Ghidra/Processors/8051/data/languages/8051.cspec
index ab1b88383f..67911b49c8 100644
--- a/Ghidra/Processors/8051/data/languages/8051.cspec
+++ b/Ghidra/Processors/8051/data/languages/8051.cspec
@@ -10,7 +10,7 @@
   </global>
   <stackpointer register="SP" space="INTMEM" growth="positive"/>
   <default_proto>
-    <prototype name="__stdcall" extrapop="-2" stackshift="-2" strategy="register">
+    <prototype name="__stdcall" extrapop="2" stackshift="2" strategy="register">
       <input>
         <pentry minsize="1" maxsize="1">
           <register name="ACC"/>

From 5ea27f70e96f41dbad9d523c583e204767881f6a Mon Sep 17 00:00:00 2001
From: ghidorahrex <ghidorahrex@users.noreply.github.com>
Date: Mon, 27 Jan 2020 14:51:54 -0500
Subject: [PATCH 2/2] GT-3299: Corrected stackshift and extrapop in cspecs.

---
 Ghidra/Processors/8051/data/languages/8051.cspec       | 2 +-
 Ghidra/Processors/8085/data/languages/8085.cspec       | 2 +-
 Ghidra/Processors/Toy/data/languages/toyPosStack.cspec | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Ghidra/Processors/8051/data/languages/8051.cspec b/Ghidra/Processors/8051/data/languages/8051.cspec
index 67911b49c8..ab1b88383f 100644
--- a/Ghidra/Processors/8051/data/languages/8051.cspec
+++ b/Ghidra/Processors/8051/data/languages/8051.cspec
@@ -10,7 +10,7 @@
   </global>
   <stackpointer register="SP" space="INTMEM" growth="positive"/>
   <default_proto>
-    <prototype name="__stdcall" extrapop="2" stackshift="2" strategy="register">
+    <prototype name="__stdcall" extrapop="-2" stackshift="-2" strategy="register">
       <input>
         <pentry minsize="1" maxsize="1">
           <register name="ACC"/>
diff --git a/Ghidra/Processors/8085/data/languages/8085.cspec b/Ghidra/Processors/8085/data/languages/8085.cspec
index 6f98c13568..cfd08b5c40 100644
--- a/Ghidra/Processors/8085/data/languages/8085.cspec
+++ b/Ghidra/Processors/8085/data/languages/8085.cspec
@@ -6,7 +6,7 @@
   </global>
   <stackpointer register="SP" space="ram" growth="negative"/>
   <default_proto>
-    <prototype name="__stdcall" extrapop="-2" stackshift="-2">
+    <prototype name="__stdcall" extrapop="2" stackshift="2">
       <input>
         <pentry minsize="1" maxsize="1">
           <register name="A"/>
diff --git a/Ghidra/Processors/Toy/data/languages/toyPosStack.cspec b/Ghidra/Processors/Toy/data/languages/toyPosStack.cspec
index 297fbaf2d7..795ba37e3a 100644
--- a/Ghidra/Processors/Toy/data/languages/toyPosStack.cspec
+++ b/Ghidra/Processors/Toy/data/languages/toyPosStack.cspec
@@ -6,7 +6,7 @@
   </global>
   <stackpointer register="sp" space="ram" growth="positive"/>
   <default_proto>
-    <prototype name="__stdcall" extrapop="unknown" stackshift="4">
+    <prototype name="__stdcall" extrapop="unknown" stackshift="-4">
       <input>
         <pentry minsize="1" maxsize="4">
           <register name="r12"/>