Replace libdisasm with capstone

Makefile.am

 ## Process this file with automake to produce Makefile.in
 
 # Copyright (c) 2011, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
@@ skipping 13 matching lines @@
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 # This allows #includes to be relative to src/
-AM_CPPFLAGS = -I$(top_srcdir)/src
+AM_CPPFLAGS = \
+  -I$(top_srcdir)/src \
+  -I$(top_srcdir)/src/third_party/capstone/include
 AM_CFLAGS =
 AM_CXXFLAGS =
 
 if ANDROID_HOST
 # This allows using fixed NDK headers when building for Android.
 AM_CXXFLAGS += -I$(top_srcdir)/src/common/android/include
 # This is only necessary for building the unit tests until GTest is upgraded
 # to a future version.
 AM_CXXFLAGS += -I$(top_srcdir)/src/common/android/testing/include
 endif
@@ skipping 96 matching lines @@
         src/testing/gtest/src/gtest-all.cc \
         src/testing/gtest/src/gtest_main.cc \
         src/testing/src/gmock-all.cc
 src_testing_libtesting_a_CPPFLAGS = \
         $(AM_CPPFLAGS) $(TEST_CFLAGS)
 endif
 
 if !DISABLE_PROCESSOR
 lib_LIBRARIES += src/libbreakpad.a
 pkgconfig_DATA += breakpad.pc
-noinst_LIBRARIES += src/third_party/libdisasm/libdisasm.a
+noinst_LIBRARIES += src/third_party/capstone/libcapstone.a
 endif
 
 if LINUX_HOST
 lib_LIBRARIES += src/client/linux/libbreakpad_client.a
 pkgconfig_DATA += breakpad-client.pc
 
 src_client_linux_libbreakpad_client_a_SOURCES = \
         src/client/linux/crash_generation/crash_generation_client.cc \
         src/client/linux/crash_generation/crash_generation_server.cc \
         src/client/linux/dump_writer_common/thread_info.cc \
@@ skipping 133 matching lines @@
         src/processor/static_map_iterator.h \
         src/processor/static_map-inl.h \
         src/processor/static_map.h \
         src/processor/static_range_map-inl.h \
         src/processor/static_range_map.h \
         src/processor/symbolic_constants_win.cc \
         src/processor/symbolic_constants_win.h \
         src/processor/tokenize.cc \
         src/processor/tokenize.h
 
-src_third_party_libdisasm_libdisasm_a_SOURCES = \
-        src/third_party/libdisasm/ia32_implicit.c \
-        src/third_party/libdisasm/ia32_implicit.h \
-        src/third_party/libdisasm/ia32_insn.c \
-        src/third_party/libdisasm/ia32_insn.h \
-        src/third_party/libdisasm/ia32_invariant.c \
-        src/third_party/libdisasm/ia32_invariant.h \
-        src/third_party/libdisasm/ia32_modrm.c \
-        src/third_party/libdisasm/ia32_modrm.h \
-        src/third_party/libdisasm/ia32_opcode_tables.c \
-        src/third_party/libdisasm/ia32_opcode_tables.h \
-        src/third_party/libdisasm/ia32_operand.c \
-        src/third_party/libdisasm/ia32_operand.h \
-        src/third_party/libdisasm/ia32_reg.c \
-        src/third_party/libdisasm/ia32_reg.h \
-        src/third_party/libdisasm/ia32_settings.c \
-        src/third_party/libdisasm/ia32_settings.h \
-        src/third_party/libdisasm/libdis.h \
-        src/third_party/libdisasm/qword.h \
-        src/third_party/libdisasm/x86_disasm.c \
-        src/third_party/libdisasm/x86_format.c \
-        src/third_party/libdisasm/x86_imm.c \
-        src/third_party/libdisasm/x86_imm.h \
-        src/third_party/libdisasm/x86_insn.c \
-        src/third_party/libdisasm/x86_misc.c \
-        src/third_party/libdisasm/x86_operand_list.c \
-        src/third_party/libdisasm/x86_operand_list.h
+# Currently building capstone with x86 support only (includes x86-64).
+# To add more architectures to the capstone build, add the arch-specific
+# sources to the list below (look in src/third_party/capstone/Makefile
+# to determine the necessary sources), and add the proper -DCAPSTONE_HAS_
+# define to the CPPFLAGS below SOURCES.
+src_third_party_capstone_libcapstone_a_SOURCES = \
+        src/third_party/capstone/arch/X86/X86DisassemblerDecoder.c \
+        src/third_party/capstone/arch/X86/X86Disassembler.c \
+        src/third_party/capstone/arch/X86/X86IntelInstPrinter.c \
+        src/third_party/capstone/arch/X86/X86ATTInstPrinter.c \
+        src/third_party/capstone/arch/X86/X86Mapping.c \
+        src/third_party/capstone/arch/X86/X86Module.c \
+        src/third_party/capstone/cs.c \
+        src/third_party/capstone/utils.c \
+        src/third_party/capstone/SStream.c \
+        src/third_party/capstone/MCInst.c \
+        src/third_party/capstone/MCInstrDesc.c \
+        src/third_party/capstone/MCRegisterInfo.c
+src_third_party_capstone_libcapstone_a_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(top_srcdir)/src/third_party/capstone \
+        -DCAPSTONE_USE_SYS_DYN_MEM \
+        -DCAPSTONE_HAS_X86
 
 ## Programs
 bin_PROGRAMS += \
         src/processor/microdump_stackwalk \
         src/processor/minidump_dump \
         src/processor/minidump_stackwalk
 endif !DISABLE_PROCESSOR
 
 if LINUX_HOST
 EXTRA_PROGRAMS += \
@@ skipping 426 matching lines @@
         src/processor/stackwalker_amd64.o \
         src/processor/stackwalker_arm.o \
         src/processor/stackwalker_arm64.o \
         src/processor/stackwalker_mips.o \
         src/processor/stackwalker_ppc.o \
         src/processor/stackwalker_ppc64.o \
         src/processor/stackwalker_sparc.o \
         src/processor/stackwalker_x86.o \
         src/processor/symbolic_constants_win.o \
         src/processor/tokenize.o \
-        src/third_party/libdisasm/libdisasm.a \
+        src/third_party/capstone/libcapstone.a \
         $(TEST_LIBS) \
         $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 
 src_processor_disassembler_x86_unittest_SOURCES = \
         src/processor/disassembler_x86_unittest.cc
 src_processor_disassembler_x86_unittest_CPPFLAGS = \
         $(AM_CPPFLAGS) $(TEST_CFLAGS)
 src_processor_disassembler_x86_unittest_LDADD = \
         src/processor/disassembler_x86.o \
-        src/third_party/libdisasm/libdisasm.a \
+        src/third_party/capstone/libcapstone.a \
         $(TEST_LIBS) \
         $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 
 src_processor_fast_source_line_resolver_unittest_SOURCES = \
         src/processor/fast_source_line_resolver_unittest.cc
 src_processor_fast_source_line_resolver_unittest_CPPFLAGS = \
         $(AM_CPPFLAGS) $(TEST_CFLAGS)
 src_processor_fast_source_line_resolver_unittest_LDADD = \
         src/processor/fast_source_line_resolver.o \
         src/processor/basic_source_line_resolver.o \
@@ skipping 79 matching lines @@
         src/processor/stackwalker_amd64.o \
         src/processor/stackwalker_arm.o \
         src/processor/stackwalker_arm64.o \
         src/processor/stackwalker_mips.o \
         src/processor/stackwalker_ppc.o \
         src/processor/stackwalker_ppc64.o \
         src/processor/stackwalker_sparc.o \
         src/processor/stackwalker_x86.o \
         src/processor/symbolic_constants_win.o \
         src/processor/tokenize.o \
-        src/third_party/libdisasm/libdisasm.a \
+        src/third_party/capstone/libcapstone.a \
         $(TEST_LIBS) \
         $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 
 src_processor_minidump_unittest_SOURCES = \
         src/common/test_assembler.cc \
         src/processor/minidump_unittest.cc \
         src/processor/synth_minidump.cc
 src_processor_minidump_unittest_CPPFLAGS = \
         $(AM_CPPFLAGS) $(TEST_CFLAGS)
 src_processor_minidump_unittest_LDADD = \
         src/processor/basic_code_modules.o \
         src/processor/dump_context.o \
         src/processor/dump_object.o \
         src/processor/logging.o \
         src/processor/minidump.o \
         src/processor/pathname_stripper.o \
         src/processor/proc_maps_linux.o \
         $(TEST_LIBS) \
         $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 
 src_processor_proc_maps_linux_unittest_SOURCES = \
         src/processor/proc_maps_linux.cc \
         src/processor/proc_maps_linux_unittest.cc
 src_processor_proc_maps_linux_unittest_CPPFLAGS = \
         $(AM_CPPFLAGS) $(TEST_CFLAGS)
 src_processor_proc_maps_linux_unittest_LDADD = \
         src/processor/logging.o \
         src/processor/pathname_stripper.o \
-        src/third_party/libdisasm/libdisasm.a \
+        src/third_party/capstone/libcapstone.a \
         $(TEST_LIBS) \
         $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 
 src_processor_static_address_map_unittest_SOURCES = \
         src/processor/static_address_map_unittest.cc
 src_processor_static_address_map_unittest_CPPFLAGS = \
         $(AM_CPPFLAGS) $(TEST_CFLAGS)
 src_processor_static_address_map_unittest_LDADD = \
         src/processor/logging.o \
         src/processor/pathname_stripper.o \
@@ skipping 211 matching lines @@
         src/processor/stackwalker_address_list.o \
         src/processor/stackwalker_amd64.o \
         src/processor/stackwalker_arm.o \
         src/processor/stackwalker_arm64.o \
         src/processor/stackwalker_mips.o \
         src/processor/stackwalker_ppc.o \
         src/processor/stackwalker_ppc64.o \
         src/processor/stackwalker_sparc.o \
         src/processor/stackwalker_x86.o \
         src/processor/tokenize.o \
-        src/third_party/libdisasm/libdisasm.a
+        src/third_party/capstone/libcapstone.a
 
 src_processor_minidump_stackwalk_SOURCES = \
         src/processor/minidump_stackwalk.cc
 src_processor_minidump_stackwalk_LDADD = \
         src/processor/basic_code_modules.o \
         src/processor/basic_source_line_resolver.o \
         src/processor/call_stack.o \
         src/processor/cfi_frame_info.o \
         src/processor/disassembler_x86.o \
         src/processor/dump_context.o \
@@ skipping 17 matching lines @@
         src/processor/stackwalker_amd64.o \
         src/processor/stackwalker_arm.o \
         src/processor/stackwalker_arm64.o \
         src/processor/stackwalker_mips.o \
         src/processor/stackwalker_ppc.o \
         src/processor/stackwalker_ppc64.o \
         src/processor/stackwalker_sparc.o \
         src/processor/stackwalker_x86.o \
         src/processor/symbolic_constants_win.o \
         src/processor/tokenize.o \
-        src/third_party/libdisasm/libdisasm.a
+        src/third_party/capstone/libcapstone.a
 
 endif !DISABLE_PROCESSOR
 
 ## Additional files to be included in a source distribution
 ##
 ## find src/client src/common src/processor/testdata src/tools \
 ##     -type f \! -path '*/.svn/*' -print | sort | \
 ##     sed -e s/'^\(.*\)$'/'\t\1 \\'/
 EXTRA_DIST = \
         $(SCRIPTS) \
@@ skipping 129 matching lines @@
         src/tools/windows/dump_syms/dump_syms.vcproj \
         src/tools/windows/dump_syms/run_regtest.sh \
         src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc \
         src/tools/windows/dump_syms/testdata/dump_syms_regtest.pdb \
         src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym \
         src/tools/windows/symupload/symupload.cc \
         src/tools/windows/symupload/symupload.vcproj
 
 mostlyclean-local:
         -find src -name '*.dwo' -exec rm -f {} +