From ccad2abbd81929fbd548e93d1cbe4a12cf7f9add Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Wed, 5 Jul 2023 10:58:20 -0400
Subject: [PATCH] GP-0 revised x86-64 ldef entry for compat32 variant and
 change opinion entries to give preference to default variant

---
 .../FileFormats/data/languages/apport.opinion |  2 +-
 .../data/languages/minidump.opinion           |  2 +-
 .../data/languages/pagedump.opinion           |  2 +-
 .../Processors/x86/data/languages/x86.ldefs   |  2 +-
 .../Processors/x86/data/languages/x86.opinion | 19 ++++++++++---------
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Ghidra/Features/FileFormats/data/languages/apport.opinion b/Ghidra/Features/FileFormats/data/languages/apport.opinion
index 63f9aee02b..72e121eb83 100644
--- a/Ghidra/Features/FileFormats/data/languages/apport.opinion
+++ b/Ghidra/Features/FileFormats/data/languages/apport.opinion
@@ -1,7 +1,7 @@
 <opinions>
     <constraint loader="Dump File Loader">
         <constraint compilerSpecID="linux">
-        	<constraint primary="amd64" processor="x86" endian="little" size="64" />
+        	<constraint primary="amd64" processor="x86" endian="little" size="64"	variant="default" />
         </constraint>
     </constraint>
 </opinions>
diff --git a/Ghidra/Features/FileFormats/data/languages/minidump.opinion b/Ghidra/Features/FileFormats/data/languages/minidump.opinion
index 4b55b98f2c..4ebf266d58 100644
--- a/Ghidra/Features/FileFormats/data/languages/minidump.opinion
+++ b/Ghidra/Features/FileFormats/data/languages/minidump.opinion
@@ -9,7 +9,7 @@
         	<!-- constraint primary="6"     processor="IA64"      endian="little" size="32" -->
         	<!-- constraint primary="7"     processor="ALPHA64"   endian="little" size="32" -->
         	<!-- constraint primary="8"     processor="MSIL"      endian="little" size="32" -->
-        	<constraint primary="9"     processor="x86"     endian="little" size="64" />
+        	<constraint primary="9"     processor="x86"     endian="little" size="64"	variant="default" />
         	<!-- constraint primary="10"    processor="IA32/64"   endian="little" size="32" -->
         	<!-- constraint primary="11"    processor="NEUTRAL"     endian="little" size="32" -->
         	<constraint primary="12"    processor="ARM"     endian="little" size="64" />
diff --git a/Ghidra/Features/FileFormats/data/languages/pagedump.opinion b/Ghidra/Features/FileFormats/data/languages/pagedump.opinion
index dcf71103df..a35175710f 100644
--- a/Ghidra/Features/FileFormats/data/languages/pagedump.opinion
+++ b/Ghidra/Features/FileFormats/data/languages/pagedump.opinion
@@ -19,7 +19,7 @@
         	<constraint primary="386"   processor="x86"     endian="little" size="32" />
         	<constraint primary="486"   processor="x86"     endian="little" size="32" />
         	<constraint primary="586"   processor="x86"     endian="little" size="32" />
-        	<constraint primary="8664"  processor="x86"     endian="little" size="64" />
+        	<constraint primary="8664"  processor="x86"     endian="little" size="64"	variant="default" />
         </constraint>
         <constraint compilerSpecID="default">
         	<constraint primary="601"   processor="PowerPC" endian="little" size="32" />
diff --git a/Ghidra/Processors/x86/data/languages/x86.ldefs b/Ghidra/Processors/x86/data/languages/x86.ldefs
index 02f71502b2..1961485c4f 100644
--- a/Ghidra/Processors/x86/data/languages/x86.ldefs
+++ b/Ghidra/Processors/x86/data/languages/x86.ldefs
@@ -99,7 +99,7 @@
     <external_name tool="DWARF.register.mapping.file" name="x86-64.dwarf"/>
     <external_name tool="Golang.register.info.file" name="x86-64-golang.register.info"/>
   </language>
-  <language processor="x86-compat32"
+  <language processor="x86"
             endian="little"
             size="64"
             variant="compat32"
diff --git a/Ghidra/Processors/x86/data/languages/x86.opinion b/Ghidra/Processors/x86/data/languages/x86.opinion
index 341758b0ca..bca1e2d2cc 100644
--- a/Ghidra/Processors/x86/data/languages/x86.opinion
+++ b/Ghidra/Processors/x86/data/languages/x86.opinion
@@ -1,16 +1,17 @@
 <opinions>
+	<!-- NOTE: variant="default" is specified for 64-bit to give preference to the default variant -->
     <constraint loader="Portable Executable (PE)">
       <constraint compilerSpecID="windows">
         <constraint primary="332"   processor="x86"     endian="little" size="32" />
         <constraint primary="333"   processor="x86"     endian="little" size="32" />
         <constraint primary="334"   processor="x86"     endian="little" size="32" />
-        <constraint primary="34404" processor="x86"     endian="little" size="64" />
+        <constraint primary="34404" processor="x86"     endian="little" size="64"	variant="default" />
       </constraint>
       <constraint compilerSpecID="clangwindows">
         <constraint primary="332"   secondary="clang" processor="x86" endian="little" size="32" />
         <constraint primary="333"   secondary="clang" processor="x86" endian="little" size="32" />
         <constraint primary="334"   secondary="clang" processor="x86" endian="little" size="32" />
-        <constraint primary="34404" secondary="clang" processor="x86" endian="little" size="64" />
+        <constraint primary="34404" secondary="clang" processor="x86" endian="little" size="64"	variant="default" />
       </constraint>
       <constraint compilerSpecID="borlandcpp">
         <constraint primary="332"  secondary="borlandcpp" processor="x86" endian="little" size="32" />
@@ -24,18 +25,18 @@
       </constraint>
       <constraint compilerSpecID="golang">
         <constraint primary="332"  secondary="golang" processor="x86" endian="little" size="32" />
-        <constraint primary="34404"  secondary="golang" processor="x86" endian="little" size="64" />
+        <constraint primary="34404"  secondary="golang" processor="x86" endian="little" size="64"	variant="default" />
       </constraint>
     </constraint>
     <constraint loader="Debug Symbols (DBG)" compilerSpecID="windows">
         <constraint primary="332"   processor="x86"     endian="little" size="32" />
         <constraint primary="333"   processor="x86"     endian="little" size="32" />
         <constraint primary="334"   processor="x86"     endian="little" size="32" />
-        <constraint primary="34404" processor="x86"     endian="little" size="64" />
+        <constraint primary="34404" processor="x86"     endian="little" size="64"	variant="default" />
     </constraint>
     <constraint loader="Executable and Linking Format (ELF)" compilerSpecID="gcc">
         <constraint primary="3"    processor="x86"      endian="little" size="32" />
-        <constraint primary="62"   processor="x86"      endian="little" size="64" />
+        <constraint primary="62"   processor="x86"      endian="little" size="64"	variant="default" />
     </constraint>
     <constraint loader="Module Definition (DEF)" compilerSpecID="windows">
         <constraint primary="0" processor="x86" endian="little" size="32" />
@@ -51,18 +52,18 @@
     </constraint>
     <constraint loader="Mac OS X Mach-O" compilerSpecID="gcc">
         <constraint primary="7"        processor="x86"     endian="little" size="32" />
-        <constraint primary="16777223" processor="x86"     endian="little" size="64" />
+        <constraint primary="16777223" processor="x86"     endian="little" size="64"	variant="default" />
     </constraint>
     <constraint loader="DYLD Cache" compilerSpecID="gcc">
-        <constraint primary="x86_64"   processor="x86"     endian="little" size="64" />
+        <constraint primary="x86_64"   processor="x86"     endian="little" size="64"	variant="default" />
     </constraint>
     <constraint loader="Common Object File Format (COFF)" compilerSpecID="gcc">
         <constraint primary="332"     processor="x86"          endian="little" size="32" />
-        <constraint primary="-31132"  processor="x86"          endian="little" size="64" />
+        <constraint primary="-31132"  processor="x86"          endian="little" size="64"	variant="default" />
     </constraint>
     <constraint loader="MS Common Object File Format (COFF)" compilerSpecID="windows">
         <constraint primary="332"    processor="x86"          endian="little" size="32" />
-        <constraint primary="-31132" processor="x86"          endian="little" size="64" />
+        <constraint primary="-31132" processor="x86"          endian="little" size="64"	variant="default" />
     </constraint>
     <constraint loader="Assembler Output (AOUT)" compilerSpecID="gcc">
         <constraint primary="134"  processor="x86"          endian="little" size="32" />