aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2014-09-21 18:05:00 +0200
committerMike Pall <mike>2014-09-21 18:05:00 +0200
commit357defaa4e844e6294148ec0c5aca3191905d1a9 (patch)
tree2ef7faf8ec422ef8f93871fa65983bc48f856939
parentb7d29b6e67c683f86306aa76a349c64a567c3dd1 (diff)
parentae7d4d5ad6a843ee1b9a3eea0aff72253b0fa9cb (diff)
downloadluajit-357defaa4e844e6294148ec0c5aca3191905d1a9.tar.gz
luajit-357defaa4e844e6294148ec0c5aca3191905d1a9.tar.bz2
luajit-357defaa4e844e6294148ec0c5aca3191905d1a9.zip
Merge branch 'master' into v2.1
-rw-r--r--dynasm/dasm_x86.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/dynasm/dasm_x86.lua b/dynasm/dasm_x86.lua
index f3859e3e..4de5b478 100644
--- a/dynasm/dasm_x86.lua
+++ b/dynasm/dasm_x86.lua
@@ -1081,6 +1081,9 @@ local map_op = {
1081 btr_2 = "mrqdw:0FB3Rm|miqdw:0FBA6mU", 1081 btr_2 = "mrqdw:0FB3Rm|miqdw:0FBA6mU",
1082 bts_2 = "mrqdw:0FABRm|miqdw:0FBA5mU", 1082 bts_2 = "mrqdw:0FABRm|miqdw:0FBA5mU",
1083 1083
1084 shld_3 = "mriqdw:0FA4RmU|mrCqdw:0FA5Rm",
1085 shrd_3 = "mriqdw:0FACRmU|mrCqdw:0FADRm",
1086
1084 rdtsc_0 = "0F31", -- P1+ 1087 rdtsc_0 = "0F31", -- P1+
1085 cpuid_0 = "0FA2", -- P1+ 1088 cpuid_0 = "0FA2", -- P1+
1086 1089