Browse Source

Merge branch 'master' into v2.1

Mike Pall 9 years ago
parent
commit
0aa337a41c
2 changed files with 16 additions and 0 deletions
  1. 1 0
      dynasm/dasm_x86.lua
  2. 15 0
      src/lj.supp

+ 1 - 0
dynasm/dasm_x86.lua

@@ -1116,6 +1116,7 @@ local map_op = {
   shrd_3 =	"mriqdw:0FACRmU|mrC/qq:0FADRm|mrC/dd:|mrC/ww:",
   shrd_3 =	"mriqdw:0FACRmU|mrC/qq:0FADRm|mrC/dd:|mrC/ww:",
 
 
   rdtsc_0 =	"0F31", -- P1+
   rdtsc_0 =	"0F31", -- P1+
+  rdpmc_0 =	"0F33", -- P6+
   cpuid_0 =	"0FA2", -- P1+
   cpuid_0 =	"0FA2", -- P1+
 
 
   -- floating point ops
   -- floating point ops

+ 15 - 0
src/lj.supp

@@ -24,3 +24,18 @@
    Memcheck:Cond
    Memcheck:Cond
    fun:lj_str_new
    fun:lj_str_new
 }
 }
+{
+   Optimized string compare
+   Memcheck:Addr4
+   fun:lj_str_fastcmp
+}
+{
+   Optimized string compare
+   Memcheck:Addr1
+   fun:lj_str_fastcmp
+}
+{
+   Optimized string compare
+   Memcheck:Cond
+   fun:lj_str_fastcmp
+}