Diff
Modified: trunk/ChangeLog (161671 => 161672)
--- trunk/ChangeLog 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/ChangeLog 2014-01-10 21:37:34 UTC (rev 161672)
@@ -1,3 +1,15 @@
+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.
+
+ * Source/cmake/OptionsEfl.cmake:
+ Enable udis86 disassembler.
+
2014-01-10 Benjamin Poulain <[email protected]>
Remove the BlackBerry port from trunk
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (161671 => 161672)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2014-01-10 21:37:34 UTC (rev 161672)
@@ -498,6 +498,36 @@
)
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} ${_javascript_CORE_DIR}/disassembler/udis86/itab.py ${_javascript_CORE_DIR}/disassembler/udis86/optable.xml
+ VERBATIM)
+
+ list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
+ ${_javascript_CORE_DIR}/disassembler/udis86
+ )
+ list(APPEND _javascript_Core_HEADERS
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
+ )
+ list(APPEND _javascript_Core_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
# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
Modified: trunk/Source/_javascript_Core/ChangeLog (161671 => 161672)
--- trunk/Source/_javascript_Core/ChangeLog 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-01-10 21:37:34 UTC (rev 161672)
@@ -1,3 +1,26 @@
+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]>
Remove the BlackBerry files outside WebCore
Modified: trunk/Source/_javascript_Core/disassembler/udis86/udis86_decode.c (161671 => 161672)
--- trunk/Source/_javascript_Core/disassembler/udis86/udis86_decode.c 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/_javascript_Core/disassembler/udis86/udis86_decode.c 2014-01-10 21:37:34 UTC (rev 161672)
@@ -459,6 +459,8 @@
rm = (REX_B(u->pfx_rex) << 3) | MODRM_RM(modrm(u));
reg = (REX_R(u->pfx_rex) << 3) | MODRM_REG(modrm(u));
+ UNUSED_PARAM(reg);
+
op->size = resolve_operand_size(u, size);
/*
Modified: trunk/Source/_javascript_Core/disassembler/udis86/udis86_syn-att.c (161671 => 161672)
--- trunk/Source/_javascript_Core/disassembler/udis86/udis86_syn-att.c 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/_javascript_Core/disassembler/udis86/udis86_syn-att.c 2014-01-10 21:37:34 UTC (rev 161672)
@@ -81,9 +81,9 @@
mkasm(u, "0x%x", op->lval.sdword);
} else if (op->offset == 64) {
if (op->lval.sdword < 0)
- mkasm(u, "-0x" FMT64 "x", -op->lval.sqword);
+ mkasm(u, "-0x" FMT64 "x", (uint64_t)-op->lval.sqword);
else
- mkasm(u, "0x" FMT64 "x", op->lval.sqword);
+ mkasm(u, "0x" FMT64 "x", (uint64_t)op->lval.sqword);
}
if (op->base)
@@ -119,7 +119,7 @@
}
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;
}
@@ -127,16 +127,16 @@
case UD_OP_JIMM:
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;
}
Modified: trunk/Source/_javascript_Core/disassembler/udis86/udis86_syn-intel.c (161671 => 161672)
--- trunk/Source/_javascript_Core/disassembler/udis86/udis86_syn-intel.c 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/_javascript_Core/disassembler/udis86/udis86_syn-intel.c 2014-01-10 21:37:34 UTC (rev 161672)
@@ -106,7 +106,7 @@
else mkasm(u, "%s0x%lx", (op_f) ? "+" : "", (unsigned long)op->lval.udword);
}
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, "]");
break;
@@ -133,7 +133,7 @@
}
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;
}
@@ -143,13 +143,13 @@
if (syn_cast) opr_cast(u, op);
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;
}
Modified: trunk/Source/_javascript_Core/disassembler/udis86/udis86_types.h (161671 => 161672)
--- trunk/Source/_javascript_Core/disassembler/udis86/udis86_types.h 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/_javascript_Core/disassembler/udis86/udis86_types.h 2014-01-10 21:37:34 UTC (rev 161672)
@@ -48,7 +48,11 @@
typedef __int32 int32_t;
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>
# endif /* __UD_STANDALONE__ */
Modified: trunk/Source/WTF/ChangeLog (161671 => 161672)
--- trunk/Source/WTF/ChangeLog 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/WTF/ChangeLog 2014-01-10 21:37:34 UTC (rev 161672)
@@ -1,3 +1,15 @@
+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.
+
+ * wtf/Platform.h:
+ Enable udis86 disassembler on EFL.
+
2014-01-10 Hunseop Jeong <[email protected]>
[EFL] Enable the DFG_JIT on ARMv7
Modified: trunk/Source/WTF/wtf/Platform.h (161671 => 161672)
--- trunk/Source/WTF/wtf/Platform.h 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/WTF/wtf/Platform.h 2014-01-10 21:37:34 UTC (rev 161672)
@@ -685,7 +685,7 @@
/* If possible, try to enable a disassembler. This is optional. We proceed in two
steps: first we try to find some disassembler that we can use, and then we
decide if the high-level disassembler API can be enabled. */
-#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && PLATFORM(MAC) \
+#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && (PLATFORM(MAC) || (PLATFORM(EFL) && OS(LINUX))) \
&& (CPU(X86) || CPU(X86_64))
#define WTF_USE_UDIS86 1
#endif
Modified: trunk/Source/cmake/OptionsEfl.cmake (161671 => 161672)
--- trunk/Source/cmake/OptionsEfl.cmake 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-01-10 21:37:34 UTC (rev 161672)
@@ -30,6 +30,7 @@
set(WTF_USE_ICU_UNICODE 1)
set(WTF_USE_SOUP 1)
+set(WTF_USE_UDIS86 1)
add_definitions(-DWTF_USE_GLIB=1)
add_definitions(-DWTF_USE_SOUP=1)
