Merge pull request #808 from FioraAeterna/bochs

Externals: update Bochs to newer version

Externals/Bochs_disasm/Bochs_disasm.vcxproj

@@ -50,14 +50,18 @@
     <ClInclude Include="dis_tables.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dis_decode.cpp" />
-    <ClCompile Include="dis_groups.cpp" />
-    <ClCompile Include="resolve.cpp" />
-    <ClCompile Include="syntax.cpp" />
+    <ClCompile Include="dis_decode.cc" />
+    <ClCompile Include="dis_groups.cc" />
+    <ClCompile Include="resolve.cc" />
+    <ClCompile Include="syntax.cc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="dis_tables.inl" />
-    <None Include="opcodes.inl" />
+    <None Include="opcodes.inc" />
+    <None Include="dis_tables.inc" />
+    <None Include="dis_tables_avx.inc" />
+    <None Include="dis_tables_sse.inc" />
+    <None Include="dis_tables_x87.inc" />
+    <None Include="dis_tables_xop.inc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Externals/Bochs_disasm/CMakeLists.txt

@@ -1,7 +1,7 @@
-set(SRCS dis_decode.cpp
-         dis_groups.cpp
-         resolve.cpp
-         syntax.cpp)
+set(SRCS dis_decode.cc
+         dis_groups.cc
+         resolve.cc
+         syntax.cc)
 
 if(WIN32)
     set(SRCS ${SRCS} stdafx.cpp)

Externals/Bochs_disasm/Makefile.in

@@ -0,0 +1,82 @@
+# Copyright (C) 2001  The Bochs Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+@SUFFIX_LINE@
+
+srcdir = @srcdir@
+VPATH = @srcdir@
+top_builddir    = ..
+top_srcdir      = @top_srcdir@
+
+SHELL = @SHELL@
+
+@SET_MAKE@
+
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+RANLIB = @RANLIB@
+
+
+# ===========================================================
+# end of configurable options
+# ===========================================================
+
+
+BX_OBJS = \
+  dis_decode.o \
+  dis_groups.o \
+  resolve.o    \
+  syntax.o
+
+BX_INCLUDES = disasm.h
+
+BX_INCDIRS = -I.. -I$(srcdir)/.. -I../@INSTRUMENT_DIR@ -I$(srcdir)/../@INSTRUMENT_DIR@
+
+all: libdisasm.a
+
+.@CPP_SUFFIX@.o:
+	$(CXX) @DASH@c $(BX_INCDIRS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
+
+
+
+libdisasm.a: $(BX_OBJS)
+	@RMCOMMAND@ libdisasm.a
+	@MAKELIB@ $(BX_OBJS)
+	$(RANLIB) libdisasm.a
+
+$(BX_OBJS): $(BX_INCLUDES)
+
+
+clean:
+	@RMCOMMAND@ *.o
+	@RMCOMMAND@ *.a
+
+dist-clean: clean
+	@RMCOMMAND@ Makefile
+
+###########################################
+# dependencies generated by
+#  gcc -MM -I.. -I../instrument/stubs *.cc | sed 's/\.cc/.@CPP_SUFFIX@/g'
+###########################################
+dis_decode.o: dis_decode.@CPP_SUFFIX@ disasm.h ../config.h dis_tables.h opcodes.inc \
+              dis_tables.inc dis_tables_x87.inc dis_tables_sse.inc dis_tables_avx.inc dis_tables_xop.inc
+dis_groups.o: dis_groups.@CPP_SUFFIX@ disasm.h ../config.h
+resolve.o: resolve.@CPP_SUFFIX@ disasm.h ../config.h
+syntax.o: syntax.@CPP_SUFFIX@ disasm.h ../config.h

Externals/Bochs_disasm/config.h

@@ -38,4 +38,8 @@ typedef Bit64u bx_address;
 
 #endif
 
+#define BX_CONST64(x)  (x##LL)
+#define GET32L(val64) ((Bit32u)(((Bit64u)(val64)) & 0xFFFFFFFF))
+#define GET32H(val64) ((Bit32u)(((Bit64u)(val64)) >> 32))
+
 #endif