Create hsdis backend using LLVM

Author: magicus

make/Hsdis.gmk

@@ -46,6 +46,7 @@ ifeq ($(call isTargetOs, windows), true)
 
   $(eval $(call DefineNativeToolchain, TOOLCHAIN_MINGW, \
       CC := $(MINGW_BASE)-gcc, \
+      CXX := $(MINGW_BASE)-g++, \
       LD := $(MINGW_BASE)-ld, \
       OBJCOPY := $(MINGW_BASE)-objcopy, \
       RC := $(RC), \
@@ -78,19 +79,40 @@ else
   HSDIS_TOOLCHAIN_CFLAGS := $(CFLAGS_JDKLIB)
   HSDIS_TOOLCHAIN_LDFLAGS := $(LDFLAGS_JDKLIB)
   HSDIS_TOOLCHAIN_LIBS := -ldl
+
+  ifeq ($(HSDIS_BACKEND), llvm)
+    # Use C++ instead of C
+    HSDIS_TOOLCHAIN_CFLAGS := $(CXXFLAGS_JDKLIB)
+    HSDIS_TOOLCHAIN := TOOLCHAIN_LINK_CXX
+  endif
+endif
+
+ifeq ($(HSDIS_BACKEND), llvm)
+  ifeq ($(call isTargetOs, linux), true)
+    LLVM_OS := pc-linux-gnu
+  else ifeq ($(call isTargetOs, macosx), true)
+    LLVM_OS := apple-darwin
+  else ifeq ($(call isTargetOs, windows), true)
+    LLVM_OS := pc-windows-msvc
+  else
+    $(error No support for LLVM on this platform)
+  endif
+
+  HSDIS_CFLAGS += -DLLVM_DEFAULT_TRIPLET='"$(OPENJDK_TARGET_CPU)-$(LLVM_OS)"'
 endif
 
 
 $(eval $(call SetupJdkLibrary, BUILD_HSDIS, \
     NAME := hsdis, \
-    SRC := $(TOPDIR)/src/utils/hsdis, \
+    SRC := $(TOPDIR)/src/utils/hsdis/$(HSDIS_BACKEND), \
+    EXTRA_HEADER_DIRS := $(TOPDIR)/src/utils/hsdis, \
     TOOLCHAIN := $(HSDIS_TOOLCHAIN), \
     OUTPUT_DIR := $(HSDIS_OUTPUT_DIR), \
     OBJECT_DIR := $(HSDIS_OUTPUT_DIR), \
     DISABLED_WARNINGS_gcc := undef format-nonliteral sign-compare, \
     DISABLED_WARNINGS_clang := undef format-nonliteral, \
     CFLAGS := $(HSDIS_TOOLCHAIN_CFLAGS) $(HSDIS_CFLAGS), \
-    LDFLAGS := $(HSDIS_TOOLCHAIN_LDFLAGS) $(SHARED_LIBRARY_FLAGS), \
+    LDFLAGS := $(HSDIS_TOOLCHAIN_LDFLAGS) $(HSDIS_LDFLAGS) $(SHARED_LIBRARY_FLAGS), \
     LIBS := $(HSDIS_LIBS) $(HSDIS_TOOLCHAIN_LIBS), \
 ))
 

make/autoconf/jdk-options.m4

@@ -788,7 +788,7 @@ AC_DEFUN([JDKOPT_BUILD_BINUTILS],
 AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS],
 [
   AC_ARG_WITH([hsdis], [AS_HELP_STRING([--with-hsdis],
-      [what hsdis backend to use ('none', 'binutils') @<:@none@:>@])])
+      [what hsdis backend to use ('none', 'binutils', 'llvm') @<:@none@:>@])])
 
   AC_ARG_WITH([binutils], [AS_HELP_STRING([--with-binutils],
       [where to find the binutils files needed for hsdis/binutils])])
@@ -824,6 +824,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS],
           test -e $BINUTILS_DIR/libiberty/libiberty.a; then
         AC_MSG_RESULT([$BINUTILS_DIR])
         HSDIS_CFLAGS="-I$BINUTILS_DIR/include -I$BINUTILS_DIR/bfd -DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB"
+        HSDIS_LDFLAGS=""
         HSDIS_LIBS="$BINUTILS_DIR/bfd/libbfd.a $BINUTILS_DIR/opcodes/libopcodes.a $BINUTILS_DIR/libiberty/libiberty.a $BINUTILS_DIR/zlib/libz.a"
       else
         AC_MSG_RESULT([invalid])
@@ -837,12 +838,27 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS],
       AC_MSG_NOTICE([--with-binutils to point to a pre-built binutils installation.])
       AC_MSG_ERROR([Cannot continue])
     fi
+  elif test "x$with_hsdis" = xllvm; then
+    HSDIS_BACKEND=llvm
+    AC_MSG_RESULT(['llvm'])
+    # Macs with homebrew has llvm in /usr/local/opt
+    UTIL_LOOKUP_PROGS(LLVM_CONFIG, llvm-config, [$PATH:/usr/local/opt/llvm/bin])
+    if test "x$LLVM_CONFIG" = x; then
+      AC_MSG_NOTICE([Cannot locate llvm-config which is needed for hsdis/llvm. Try using LLVM_CONFIG=<path>.])
+      AC_MSG_ERROR([Cannot continue])
+    fi
+
+    # We need the LLVM flags and libs, and llvm-config provides them for us.
+    HSDIS_CFLAGS=`$LLVM_CONFIG --cflags`
+    HSDIS_LDFLAGS=`$LLVM_CONFIG --ldflags`
+    HSDIS_LIBS=`$LLVM_CONFIG --libs $OPENJDK_TARGET_CPU_ARCH ${OPENJDK_TARGET_CPU_ARCH}disassembler`
   else
     AC_MSG_RESULT([invalid])
     AC_MSG_ERROR([Incorrect hsdis backend "$with_hsdis"])
   fi
 
   AC_SUBST(HSDIS_BACKEND)
   AC_SUBST(HSDIS_CFLAGS)
+  AC_SUBST(HSDIS_LDFLAGS)
   AC_SUBST(HSDIS_LIBS)
 ])

make/autoconf/spec.gmk.in

@@ -361,6 +361,7 @@ ALLOW_ABSOLUTE_PATHS_IN_OUTPUT := @ALLOW_ABSOLUTE_PATHS_IN_OUTPUT@
 
 HSDIS_BACKEND := @HSDIS_BACKEND@
 HSDIS_CFLAGS := @HSDIS_CFLAGS@
+HSDIS_LDFLAGS := @HSDIS_LDFLAGS@
 HSDIS_LIBS := @HSDIS_LIBS@
 
 # The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep

src/utils/hsdis/hsdis.c renamed to src/utils/hsdis/binutils/hsdis-binutils.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -72,9 +72,14 @@
 #ifndef SHARED_TOOLS_HSDIS_H
 #define SHARED_TOOLS_HSDIS_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 extern
-#ifdef DLL_EXPORT
-  DLL_EXPORT
+#ifdef _WIN32
+__declspec(dllexport)
 #endif
 void* decode_instructions_virtual(uintptr_t start_va, uintptr_t end_va,
                                   unsigned char* buffer, uintptr_t length,
@@ -87,8 +92,8 @@ void* decode_instructions_virtual(uintptr_t start_va, uintptr_t end_va,
 
 /* This is the compatability interface for older versions of hotspot */
 extern
-#ifdef DLL_ENTRY
-  DLL_ENTRY
+#ifdef _WIN32
+__declspec(dllexport)
 #endif
 void* decode_instructions(void* start_pv, void* end_pv,
                     void* (*event_callback)(void*, const char*, void*),
@@ -115,4 +120,9 @@ typedef void* (*decode_func_stype) (void* start_pv, void* end_pv,
                                     decode_instructions_printf_callback_ftype printf_callback,
                                     void* printf_stream,
                                     const char* options);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SHARED_TOOLS_HSDIS_H */