From 7a13061e4a61ac677eb2ccbefde5c44b4c80aae5 Mon Sep 17 00:00:00 2001
From: emteere <47253321+emteere@users.noreply.github.com>
Date: Fri, 22 May 2020 15:39:00 -0400
Subject: [PATCH] GP-10_emteere adding missing get_pc_thunk.as/si

---
 .../x86/data/languages/x86gcc.cspec           | 22 +++++++++++++++++++
 .../x86/data/patterns/x86gcc_patterns.xml     | 10 +++++++++
 2 files changed, 32 insertions(+)

diff --git a/Ghidra/Processors/x86/data/languages/x86gcc.cspec b/Ghidra/Processors/x86/data/languages/x86gcc.cspec
index 73daf57473..17448cf973 100644
--- a/Ghidra/Processors/x86/data/languages/x86gcc.cspec
+++ b/Ghidra/Processors/x86/data/languages/x86gcc.cspec
@@ -295,6 +295,17 @@
   </resolveprototype>
   <eval_current_prototype name="__cdecl/__regparm"/>
 
+  <callfixup name="get_pc_thunk_ax">
+    <target name="__i686.get_pc_thunk.ax"/>
+    <target name="__x86.get_pc_thunk.ax"/>
+    <pcode>
+      <body><![CDATA[
+      EAX = * ESP;
+      ESP = ESP + 4;
+      ]]></body>
+    </pcode>
+  </callfixup>
+  
   <callfixup name="get_pc_thunk_bx">
     <target name="__i686.get_pc_thunk.bx"/>
     <target name="__x86.get_pc_thunk.bx"/>
@@ -327,4 +338,15 @@
       ]]></body>
     </pcode>
   </callfixup>
+  
+    <callfixup name="get_pc_thunk_si">
+    <target name="__i686.get_pc_thunk.si"/>
+    <target name="__x86.get_pc_thunk.si"/>
+    <pcode>
+      <body><![CDATA[
+      ESI = * ESP;
+      ESP = ESP + 4;
+      ]]></body>
+    </pcode>
+  </callfixup>
 </compiler_spec>
diff --git a/Ghidra/Processors/x86/data/patterns/x86gcc_patterns.xml b/Ghidra/Processors/x86/data/patterns/x86gcc_patterns.xml
index 3e110a3ed4..a8f1e0340b 100644
--- a/Ghidra/Processors/x86/data/patterns/x86gcc_patterns.xml
+++ b/Ghidra/Processors/x86/data/patterns/x86gcc_patterns.xml
@@ -31,6 +31,11 @@
   </pattern>
 
 
+  <pattern>
+     <data>0x8b 0x04 0x24 0xc3 </data> <!-- MOV  EAX,[ESP] / RET -->
+     <funcstart label="__i686.get_pc_thunk.ax" validcode="function"/>
+  </pattern>
+  
   <pattern>
      <data>0x8b 0x1c 0x24 0xc3 </data> <!-- MOV  EBX,[ESP] / RET -->
      <funcstart label="__i686.get_pc_thunk.bx" validcode="function"/>
@@ -45,6 +50,11 @@
      <data>0x8b 0x14 0x24 0xc3 </data> <!-- MOV  EDX,[ESP] / RET -->
      <funcstart label="__i686.get_pc_thunk.dx" validcode="function"/>
   </pattern>
+  
+  <pattern>
+     <data>0x8b 0x34 0x24 0xc3 </data> <!-- MOV  ESI,[ESP] / RET -->
+     <funcstart label="__i686.get_pc_thunk.si" validcode="function"/>
+  </pattern>
 
   <patternpairs totalbits="32" postbits="16">
     <prepatterns>