Merge branch 'master' into capstone-5-dev

* master: native/cpu/x86: Add support for CPUID EAX=80000000h (#1811)
trailofbits · Oct 24, 2020 · 9405a92 · 9405a92
2 parents 3e646f7 + 2152023
commit 9405a92
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/manticore/native/cpu/x86.py b/manticore/native/cpu/x86.py
@@ -961,6 +961,10 @@ def CPUID(cpu):
                 0x0: (0x00000000, 0x00000000, 0x00000000, 0x00000000),
                 0x1: (0x00000000, 0x00000000, 0x00000000, 0x00000000),
             },
+            # CPUID with EAX=80000000h returns the highest supported extended function
+            # query in EAX. We don't currently support any other than 80000000h itself,
+            # so just return it back.
+            0x80000000: (0x80000000, 0x00000000, 0x00000000, 0x00000000),
         }
 
         if cpu.EAX not in conf: