Changeset 161672 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Jan 10, 2014, 1:37:34 PM (11 years ago)

Author:

[email protected]

Message:

[EFL][JSC] Enable udis86 disassembler on efl.
​https://bugs.webkit.org/show_bug.cgi?id=125502

Patch by Tamas Gergely <​[email protected]> on 2014-01-10
Reviewed by Michael Saboff.

Enable udis86 disassembler on efl and fix build warnings.

.:

• Source/cmake/OptionsEfl.cmake: Enable udis86 disassembler.

Source/JavaScriptCore:

• CMakeLists.txt: Add udis86 disassembler source files.
• disassembler/udis86/udis86_decode.c:

(decode_modrm_rm):

Build warning fixes.

• disassembler/udis86/udis86_syn-att.c:

(gen_operand):

Build warning fixes.

• disassembler/udis86/udis86_syn-intel.c:

(gen_operand):

Build warning fixes.

• disassembler/udis86/udis86_types.h: Correct FMT64 for uint64_t.

Source/WTF:

• wtf/Platform.h: Enable udis86 disassembler on EFL.

Location:

trunk/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• disassembler/udis86/udis86_decode.c (modified) (1 diff)
• disassembler/udis86/udis86_syn-att.c (modified) (3 diffs)
• disassembler/udis86/udis86_syn-intel.c (modified) (3 diffs)
• disassembler/udis86/udis86_types.h (modified) (1 diff)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -499 +499 @@
 endif ()
 
+if (WTF_USE_UDIS86)
+    set(UDIS_GEN_DEP
+        disassembler/udis86/ud_opcode.py
+        disassembler/udis86/ud_optable.py
+    )
+
+    add_custom_command(
+        OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.c ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
+        DEPENDS ${UDIS_GEN_DEP}
+        WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+        COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/disassembler/udis86/itab.py ${JAVASCRIPTCORE_DIR}/disassembler/udis86/optable.xml
+        VERBATIM)
+
+    list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+        ${JAVASCRIPTCORE_DIR}/disassembler/udis86
+    )
+    list(APPEND JavaScriptCore_HEADERS
+        ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
+    )
+    list(APPEND JavaScriptCore_SOURCES
+        disassembler/udis86/udis86.c
+        disassembler/udis86/udis86_decode.c
+        disassembler/udis86/udis86_input.c
+        disassembler/udis86/udis86_itab_holder.c
+        disassembler/udis86/udis86_syn-att.c
+        disassembler/udis86/udis86_syn-intel.c
+        disassembler/udis86/udis86_syn.c
+    )
+endif ()
+
 if (ENABLE_LLINT)
     # We cannot check for RUBY_FOUND because it is set only when the full package is installed and

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-10  Tamas Gergely  <[email protected]>
+
+        [EFL][JSC] Enable udis86 disassembler on efl.
+        https://bugs.webkit.org/show_bug.cgi?id=125502
+
+        Reviewed by Michael Saboff.
+
+        Enable udis86 disassembler on efl and fix build warnings.
+
+        * CMakeLists.txt:
+          Add udis86 disassembler source files.
+        * disassembler/udis86/udis86_decode.c:
+        (decode_modrm_rm):
+          Build warning fixes.
+        * disassembler/udis86/udis86_syn-att.c:
+        (gen_operand):
+          Build warning fixes.
+        * disassembler/udis86/udis86_syn-intel.c:
+        (gen_operand):
+          Build warning fixes.
+        * disassembler/udis86/udis86_types.h:
+          Correct FMT64 for uint64_t.
+
 2014-01-09  Benjamin Poulain  <[email protected]>
 

trunk/Source/JavaScriptCore/disassembler/udis86/udis86_decode.c

@@ -460 +460 @@
   reg = (REX_R(u->pfx_rex) << 3) | MODRM_REG(modrm(u));
 
+  UNUSED_PARAM(reg);
+  
   op->size = resolve_operand_size(u, size);
 

trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-att.c

@@ -82 +82 @@
                 } else if (op->offset == 64) {
                         if (op->lval.sdword < 0)
-                                mkasm(u, "-0x" FMT64 "x", -op->lval.sqword);
-                        else
-                                mkasm(u, "0x" FMT64 "x", op->lval.sqword);
+                            mkasm(u, "-0x" FMT64 "x", (uint64_t)-op->lval.sqword);
+                        else
+                            mkasm(u, "0x" FMT64 "x", (uint64_t)op->lval.sqword);
                 }
 
@@ -120 +120 @@
         if ( sext_size < 64 )
             sext_mask = ( 1ull << sext_size ) - 1;
-        mkasm( u, "$0x" FMT64 "x", imm & sext_mask ); 
+        mkasm( u, "$0x" FMT64 "x", (uint64_t)(imm & sext_mask) ); 
 
                 break;
@@ -128 +128 @@
                 switch (op->size) {
                         case  8:
-                                mkasm(u, "0x" FMT64 "x", u->pc + op->lval.sbyte); 
+                                mkasm(u, "0x" FMT64 "x", (uint64_t)(u->pc + op->lval.sbyte)); 
                                 break;
                         case 16:
-                                mkasm(u, "0x" FMT64 "x", (u->pc + op->lval.sword) & 0xffff );
+                                mkasm(u, "0x" FMT64 "x", (uint64_t)((u->pc + op->lval.sword) & 0xffff) );
                                 break;
                         case 32:
                                 if (u->dis_mode == 32)
-                                    mkasm(u, "0x" FMT64 "x", (u->pc + op->lval.sdword) & 0xffffffff);
+                                    mkasm(u, "0x" FMT64 "x", (uint64_t)((u->pc + op->lval.sdword) & 0xffffffff));
                                 else
-                                    mkasm(u, "0x" FMT64 "x", u->pc + op->lval.sdword);
+                                    mkasm(u, "0x" FMT64 "x", (uint64_t)(u->pc + op->lval.sdword));
                                 break;
                         default:break;

trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-intel.c

@@ -107 +107 @@
                 }
                 else if (op->offset == 64) 
-                        mkasm(u, "%s0x" FMT64 "x", (op_f) ? "+" : "", op->lval.uqword);
+                        mkasm(u, "%s0x" FMT64 "x", (op_f) ? "+" : "", (uint64_t)op->lval.uqword);
 
                 mkasm(u, "]");
@@ -134 +134 @@
         if ( sext_size < 64 )
             sext_mask = ( 1ull << sext_size ) - 1;
-        mkasm( u, "0x" FMT64 "x", imm & sext_mask ); 
+        mkasm( u, "0x" FMT64 "x", (uint64_t)(imm & sext_mask) ); 
 
                 break;
@@ -144 +144 @@
                 switch (op->size) {
                         case  8:
-                                mkasm(u, "0x" FMT64 "x", u->pc + op->lval.sbyte); 
+                                mkasm(u, "0x" FMT64 "x", (uint64_t)(u->pc + op->lval.sbyte)); 
                                 break;
                         case 16:
-                                mkasm(u, "0x" FMT64 "x", ( u->pc + op->lval.sword ) & 0xffff );
+                                mkasm(u, "0x" FMT64 "x", (uint64_t)(( u->pc + op->lval.sword ) & 0xffff) );
                                 break;
                         case 32:
-                                mkasm(u, "0x" FMT64 "x", ( u->pc + op->lval.sdword ) & 0xfffffffful );
+                                mkasm(u, "0x" FMT64 "x", (uint64_t)(( u->pc + op->lval.sdword ) & 0xfffffffful) );
                                 break;
                         default:break;

trunk/Source/JavaScriptCore/disassembler/udis86/udis86_types.h

@@ -49 +49 @@
   typedef __int64 int64_t;
 #else
-# define FMT64 "%ll"
+# if defined(__GNU_LIBRARY__) && defined(__WORDSIZE) && (__WORDSIZE == 64)
+#  define FMT64 "%l"
+# else
+#  define FMT64 "%ll"
+# endif
 # ifndef __UD_STANDALONE__
 #  include <inttypes.h>