Diff
Modified: trunk/ChangeLog (165066 => 165067)
--- trunk/ChangeLog 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/ChangeLog 2014-03-04 20:12:01 UTC (rev 165067)
@@ -1,3 +1,13 @@
+2014-03-04 Zan Dobersek <[email protected]>
+
+ [GTK] Build the Udis86 disassembler
+ https://bugs.webkit.org/show_bug.cgi?id=129679
+
+ Reviewed by Michael Saboff.
+
+ * GNUmakefile.am: Add the Udis86_nosources variable.
+ * Source/cmake/OptionsGTK.cmake: Enable the Udis86 disassembler.
+
2014-03-04 Martin Robinson <[email protected]>
[GTK] Simplify the GObject DOM bindings API break check into one step
Modified: trunk/GNUmakefile.am (165066 => 165067)
--- trunk/GNUmakefile.am 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/GNUmakefile.am 2014-03-04 20:12:01 UTC (rev 165067)
@@ -76,6 +76,7 @@
_javascript_core_built_nosources :=
llint_nosources :=
offlineasm_nosources :=
+udis86_nosources :=
platform_webcore_cppflags :=
platform_cppflags :=
platform_built_sources :=
Modified: trunk/Source/_javascript_Core/ChangeLog (165066 => 165067)
--- trunk/Source/_javascript_Core/ChangeLog 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-03-04 20:12:01 UTC (rev 165067)
@@ -1,3 +1,13 @@
+2014-03-04 Zan Dobersek <[email protected]>
+
+ [GTK] Build the Udis86 disassembler
+ https://bugs.webkit.org/show_bug.cgi?id=129679
+
+ Reviewed by Michael Saboff.
+
+ * GNUmakefile.am: Generate the Udis86-related derived sources. Distribute the required files.
+ * GNUmakefile.list.am: Add the Udis86 disassembler files to the build.
+
2014-03-04 Andreas Kling <[email protected]>
Fix too-narrow assertion I added in r165054.
Modified: trunk/Source/_javascript_Core/GNUmakefile.am (165066 => 165067)
--- trunk/Source/_javascript_Core/GNUmakefile.am 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/_javascript_Core/GNUmakefile.am 2014-03-04 20:12:01 UTC (rev 165067)
@@ -57,6 +57,7 @@
-I$(srcdir)/Source/_javascript_Core/debugger \
-I$(srcdir)/Source/_javascript_Core/dfg \
-I$(srcdir)/Source/_javascript_Core/disassembler \
+ -I$(srcdir)/Source/_javascript_Core/disassembler/udis86 \
-I$(srcdir)/Source/_javascript_Core/ftl \
-I$(srcdir)/Source/_javascript_Core/heap \
-I$(srcdir)/Source/_javascript_Core/inspector \
@@ -127,6 +128,10 @@
DerivedSources/_javascript_Core/JSCBuiltins.cpp: $(srcdir)/Source/_javascript_Core/generate-js-builtins $(_javascript_core_builtins_js_nosources)
$(AM_V_GEN)$(PYTHON) $^ $@
+DerivedSources/_javascript_Core/udis86_itab.h: DerivedSources/_javascript_Core/udis86_itab.c
+DerivedSources/_javascript_Core/udis86_itab.c: $(udis86_nosources)
+ $(AM_V_GEN)$(PYTHON) $(srcdir)/Source/_javascript_Core/disassembler/udis86/itab.py --outputDir DerivedSources/_javascript_Core $(srcdir)/Source/_javascript_Core/disassembler/udis86/optable.xml
+
$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS): DerivedSources/_javascript_Core/LLIntAssembly.h
jsc: $(_javascript_core_built_nosources) Programs/jsc$(EXEEXT)
@@ -230,7 +235,8 @@
Source/_javascript_Core/THANKS \
$(_javascript_core_builtins_js_nosources) \
$(llint_nosources) \
- $(offlineasm_nosources)
+ $(offlineasm_nosources) \
+ $(udis86_nosources)
CLEANFILES += \
$(_javascript_core_built_nosources) \
Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (165066 => 165067)
--- trunk/Source/_javascript_Core/GNUmakefile.list.am 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/_javascript_Core/GNUmakefile.list.am 2014-03-04 20:12:01 UTC (rev 165067)
@@ -37,7 +37,9 @@
DerivedSources/_javascript_Core/Bytecodes.h \
DerivedSources/_javascript_Core/InitBytecodes.asm \
DerivedSources/_javascript_Core/LLIntDesiredOffsets.h \
- DerivedSources/_javascript_Core/LLIntAssembly.h
+ DerivedSources/_javascript_Core/LLIntAssembly.h \
+ DerivedSources/_javascript_Core/udis86_itab.c \
+ DerivedSources/_javascript_Core/udis86_itab.h
_javascript_core_builtins_js_nosources += \
$(wildcard $(srcdir)/Source/_javascript_Core/builtins/*.js)
@@ -463,7 +465,22 @@
Source/_javascript_Core/disassembler/Disassembler.h \
Source/_javascript_Core/disassembler/LLVMDisassembler.cpp \
Source/_javascript_Core/disassembler/LLVMDisassembler.h \
+ Source/_javascript_Core/disassembler/UDis86Disassembler.cpp \
+ Source/_javascript_Core/disassembler/UDis86Disassembler.h \
Source/_javascript_Core/disassembler/X86Disassembler.cpp \
+ Source/_javascript_Core/disassembler/udis86/udis86.c \
+ Source/_javascript_Core/disassembler/udis86/udis86.h \
+ Source/_javascript_Core/disassembler/udis86/udis86_decode.c \
+ Source/_javascript_Core/disassembler/udis86/udis86_decode.h \
+ Source/_javascript_Core/disassembler/udis86/udis86_extern.h \
+ Source/_javascript_Core/disassembler/udis86/udis86_input.c \
+ Source/_javascript_Core/disassembler/udis86/udis86_input.h \
+ Source/_javascript_Core/disassembler/udis86/udis86_itab_holder.c \
+ Source/_javascript_Core/disassembler/udis86/udis86_syn.c \
+ Source/_javascript_Core/disassembler/udis86/udis86_syn.h \
+ Source/_javascript_Core/disassembler/udis86/udis86_syn-att.c \
+ Source/_javascript_Core/disassembler/udis86/udis86_syn-intel.c \
+ Source/_javascript_Core/disassembler/udis86/udis86_types.h \
Source/_javascript_Core/ftl/FTLAbbreviatedTypes.h \
Source/_javascript_Core/ftl/FTLAbbreviations.h \
Source/_javascript_Core/ftl/FTLAbstractHeap.cpp \
@@ -1326,6 +1343,12 @@
Source/_javascript_Core/offlineasm/transform.rb \
Source/_javascript_Core/offlineasm/x86.rb
+udis86_nosources += \
+ Source/_javascript_Core/disassembler/udis86/itab.py \
+ Source/_javascript_Core/disassembler/udis86/optable.xml \
+ Source/_javascript_Core/disassembler/udis86/ud_opcode.py \
+ Source/_javascript_Core/disassembler/udis86/ud_optable.py
+
# minidom
Programs_minidom_SOURCES = \
Source/_javascript_Core/API/tests/JSNode.c \
Modified: trunk/Source/WTF/ChangeLog (165066 => 165067)
--- trunk/Source/WTF/ChangeLog 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/WTF/ChangeLog 2014-03-04 20:12:01 UTC (rev 165067)
@@ -1,3 +1,12 @@
+2014-03-04 Zan Dobersek <[email protected]>
+
+ [GTK] Build the Udis86 disassembler
+ https://bugs.webkit.org/show_bug.cgi?id=129679
+
+ Reviewed by Michael Saboff.
+
+ * wtf/Platform.h: Also enable the Udis86 disassembler for the GTK port on Linux.
+
2014-03-02 Jaehun Lim <[email protected]>
[EFL] Remove m_initEfl from RunLoop.
Modified: trunk/Source/WTF/wtf/Platform.h (165066 => 165067)
--- trunk/Source/WTF/wtf/Platform.h 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/WTF/wtf/Platform.h 2014-03-04 20:12:01 UTC (rev 165067)
@@ -668,7 +668,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) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (PLATFORM(EFL) && OS(LINUX))) \
+#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (OS(LINUX) && (PLATFORM(EFL) || PLATFORM(GTK)))) \
&& (CPU(X86) || CPU(X86_64))
#define WTF_USE_UDIS86 1
#endif
Modified: trunk/Source/cmake/OptionsGTK.cmake (165066 => 165067)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-03-04 20:12:01 UTC (rev 165067)
@@ -123,6 +123,7 @@
set(VERSION ${PROJECT_VERSION})
set(WTF_USE_SOUP 1)
+set(WTF_USE_UDIS86 1)
set(WTF_OUTPUT_NAME WTFGTK)
set(_javascript_Core_OUTPUT_NAME _javascript_coregtk-${WEBKITGTK_API_VERSION})
