Update (2022.11.08)

28678: Fix a typo in PosixSignals::pd_hotspot_signal_handler
28665: [LA] useless code in share/utilities/macros.hpp

Author: loongson-jvm

src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.cpp

@@ -224,7 +224,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
 #endif
 
       // Handle signal from NativeJump::patch_verified_entry().
-      if (sig == SIGILL & nativeInstruction_at(pc)->is_sigill_not_entrant()) {
+      if (sig == SIGILL && nativeInstruction_at(pc)->is_sigill_not_entrant()) {
 #ifdef PRINT_SIGNAL_HANDLE
         tty->print_cr("verified entry = %lx, sig=%d", nativeInstruction_at(pc), sig);
 #endif

src/hotspot/share/utilities/macros.hpp

@@ -625,27 +625,16 @@
 //   OS_CPU_HEADER(vmStructs)          --> vmStructs_linux_x86.hpp
 //
 // basename<cpu>.hpp / basename<cpu>.inline.hpp
-#if defined(LOONGARCH) && !defined(ZERO)
-#define CPU_HEADER_H(basename)         XSTR(basename ## _loongarch.h)
-#define CPU_HEADER(basename)           XSTR(basename ## _loongarch.hpp)
-#define CPU_HEADER_INLINE(basename)    XSTR(basename ## _loongarch.inline.hpp)
-#else
 #define CPU_HEADER_H(basename)         XSTR(CPU_HEADER_STEM(basename).h)
 #define CPU_HEADER(basename)           XSTR(CPU_HEADER_STEM(basename).hpp)
 #define CPU_HEADER_INLINE(basename)    XSTR(CPU_HEADER_STEM(basename).inline.hpp)
-#endif
 // basename<os>.hpp / basename<os>.inline.hpp
 #define OS_HEADER_H(basename)          XSTR(OS_HEADER_STEM(basename).h)
 #define OS_HEADER(basename)            XSTR(OS_HEADER_STEM(basename).hpp)
 #define OS_HEADER_INLINE(basename)     XSTR(OS_HEADER_STEM(basename).inline.hpp)
 // basename<os><cpu>.hpp / basename<os><cpu>.inline.hpp
-#if defined(LOONGARCH) && !defined(ZERO)
-#define OS_CPU_HEADER(basename)        XSTR(basename ## _linux_loongarch.hpp)
-#define OS_CPU_HEADER_INLINE(basename) XSTR(basename ## _linux_loongarch.inline.hpp)
-#else
 #define OS_CPU_HEADER(basename)        XSTR(OS_CPU_HEADER_STEM(basename).hpp)
 #define OS_CPU_HEADER_INLINE(basename) XSTR(OS_CPU_HEADER_STEM(basename).inline.hpp)
-#endif
 // basename<compiler>.hpp / basename<compiler>.inline.hpp
 #define COMPILER_HEADER(basename)        XSTR(COMPILER_HEADER_STEM(basename).hpp)
 #define COMPILER_HEADER_INLINE(basename) XSTR(COMPILER_HEADER_STEM(basename).inline.hpp)