diff options
| author | Mike Pall <mike> | 2015-11-04 14:09:59 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-11-04 14:09:59 +0100 |
| commit | 0aa337a41c830f12928395683dc902028a1ffa89 (patch) | |
| tree | 3bc014112c86bcbb4adcf28c859e4c294b21982d /dynasm | |
| parent | 0029110ce9d493e670bfebbb95fb598c7c727d71 (diff) | |
| parent | 367cba29ea03aa758eb041c3a0c5f1c7616f9a0a (diff) | |
| download | luajit-0aa337a41c830f12928395683dc902028a1ffa89.tar.gz luajit-0aa337a41c830f12928395683dc902028a1ffa89.tar.bz2 luajit-0aa337a41c830f12928395683dc902028a1ffa89.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'dynasm')
| -rw-r--r-- | dynasm/dasm_x86.lua | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dynasm/dasm_x86.lua b/dynasm/dasm_x86.lua index a8e25ed3..1fa80b55 100644 --- a/dynasm/dasm_x86.lua +++ b/dynasm/dasm_x86.lua | |||
| @@ -1116,6 +1116,7 @@ local map_op = { | |||
| 1116 | shrd_3 = "mriqdw:0FACRmU|mrC/qq:0FADRm|mrC/dd:|mrC/ww:", | 1116 | shrd_3 = "mriqdw:0FACRmU|mrC/qq:0FADRm|mrC/dd:|mrC/ww:", |
| 1117 | 1117 | ||
| 1118 | rdtsc_0 = "0F31", -- P1+ | 1118 | rdtsc_0 = "0F31", -- P1+ |
| 1119 | rdpmc_0 = "0F33", -- P6+ | ||
| 1119 | cpuid_0 = "0FA2", -- P1+ | 1120 | cpuid_0 = "0FA2", -- P1+ |
| 1120 | 1121 | ||
| 1121 | -- floating point ops | 1122 | -- floating point ops |