Merge branch 'master' into v2.1

2015-11-04 14:09:59 +01:00
parent 0029110ce9 367cba29ea
commit 0aa337a41c
2 changed files with 16 additions and 0 deletions
--- a/dynasm/dasm_x86.lua
+++ b/dynasm/dasm_x86.lua
@@ -1116,6 +1116,7 @@ local map_op = {
  shrd_3 =	"mriqdw:0FACRmU|mrC/qq:0FADRm|mrC/dd:|mrC/ww:",

  rdtsc_0 =	"0F31", -- P1+
+  rdpmc_0 =	"0F33", -- P6+
  cpuid_0 =	"0FA2", -- P1+

  -- floating point ops