about summary refs log tree commit diff stats
path: root/miasm2/jitter/llvmconvert.py
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2018-05-15 19:46:08 +0200
committerGitHub <noreply@github.com>2018-05-15 19:46:08 +0200
commitc2b0779c68ce50514e19e021084328d265b53663 (patch)
treecab4451d098d94a9de3a13bb9cd1b3721b1f51f1 /miasm2/jitter/llvmconvert.py
parentb0db47c82568f7bf78ce1fdfe059569d6efd019a (diff)
parentd87f5e3c45edd586c6c1ac77a3e485a33e95e236 (diff)
downloadmiasm-c2b0779c68ce50514e19e021084328d265b53663.tar.gz
miasm-c2b0779c68ce50514e19e021084328d265b53663.zip
Merge pull request #742 from commial/refactor/x86_cpuid
Rename x86 specific op 'cpuid' to 'x86_cpuid'
Diffstat (limited to 'miasm2/jitter/llvmconvert.py')
-rw-r--r--miasm2/jitter/llvmconvert.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/miasm2/jitter/llvmconvert.py b/miasm2/jitter/llvmconvert.py
index eef34c16..97cd9f17 100644
--- a/miasm2/jitter/llvmconvert.py
+++ b/miasm2/jitter/llvmconvert.py
@@ -231,7 +231,7 @@ class LLVMContext_JIT(LLVMContext):
                             "args": [p8,
                                      itype,
                                      itype]},
-              "cpuid": {"ret": itype,
+              "x86_cpuid": {"ret": itype,
                         "args": [itype,
                                  itype]},
         }
@@ -368,7 +368,7 @@ class LLVMFunction():
 
     # Operation translation
     ## Basics
-    op_translate = {'cpuid': 'cpuid',
+    op_translate = {'x86_cpuid': 'x86_cpuid',
     }
     ## Add the size as first argument
     op_translate_with_size = {}