Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2014-09-21 18:05:00 +02:00
commit 357defaa4e

View File

@ -1081,6 +1081,9 @@ local map_op = {
btr_2 = "mrqdw:0FB3Rm|miqdw:0FBA6mU", btr_2 = "mrqdw:0FB3Rm|miqdw:0FBA6mU",
bts_2 = "mrqdw:0FABRm|miqdw:0FBA5mU", bts_2 = "mrqdw:0FABRm|miqdw:0FBA5mU",
shld_3 = "mriqdw:0FA4RmU|mrCqdw:0FA5Rm",
shrd_3 = "mriqdw:0FACRmU|mrCqdw:0FADRm",
rdtsc_0 = "0F31", -- P1+ rdtsc_0 = "0F31", -- P1+
cpuid_0 = "0FA2", -- P1+ cpuid_0 = "0FA2", -- P1+