8290840: Refactor the "os" class

Reviewed-by: dholmes, gziemski, stuefe, stefank

Author: iklam

src/hotspot/cpu/aarch64/vm_version_aarch64.cpp

@@ -28,13 +28,11 @@
 #include "runtime/arguments.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
-#include "runtime/os.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/macros.hpp"
 
-#include OS_HEADER_INLINE(os)
-
 int VM_Version::_cpu;
 int VM_Version::_model;
 int VM_Version::_model2;

src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp

@@ -38,6 +38,7 @@
 #include "oops/compressedOops.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "runtime/frame.inline.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"

src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp

@@ -34,6 +34,7 @@
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "oops/accessDecorators.hpp"
 #include "oops/compressedOops.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/safepointMechanism.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/powerOfTwo.hpp"

src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp

@@ -38,6 +38,7 @@
 #include "oops/klass.inline.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/jniHandles.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/safepointMechanism.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"

src/hotspot/cpu/ppc/vm_version_ppc.cpp

@@ -41,6 +41,7 @@
 
 #include <sys/sysinfo.h>
 #if defined(_AIX)
+#include "os_aix.hpp"
 #include <libperfstat.h>
 #endif
 

src/hotspot/cpu/riscv/icache_riscv.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,8 +29,27 @@
 
 #define __ _masm->
 
+// SYSCALL_RISCV_FLUSH_ICACHE is used to flush instruction cache. The "fence.i" instruction
+// only work on the current hart, so kernel provides the icache flush syscall to flush icache
+// on each hart. You can pass a flag to determine a global or local icache flush.
+static void icache_flush(long int start, long int end)
+{
+  const int SYSCALL_RISCV_FLUSH_ICACHE = 259;
+  register long int __a7 asm ("a7") = SYSCALL_RISCV_FLUSH_ICACHE;
+  register long int __a0 asm ("a0") = start;
+  register long int __a1 asm ("a1") = end;
+  // the flush can be applied to either all threads or only the current.
+  // 0 means a global icache flush, and the icache flush will be applied
+  // to other harts concurrently executing.
+  register long int __a2 asm ("a2") = 0;
+  __asm__ volatile ("ecall\n\t"
+                    : "+r" (__a0)
+                    : "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a7)
+                    : "memory");
+}
+
 static int icache_flush(address addr, int lines, int magic) {
-  os::icache_flush((long int) addr, (long int) (addr + (lines << ICache::log2_line_size)));
+  icache_flush((long int) addr, (long int) (addr + (lines << ICache::log2_line_size)));
   return magic;
 }
 

src/hotspot/cpu/riscv/vm_version_riscv.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,13 +25,11 @@
 
 #include "precompiled.hpp"
 #include "runtime/java.hpp"
-#include "runtime/os.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/macros.hpp"
 
-#include OS_HEADER_INLINE(os)
-
 const char* VM_Version::_uarch = "";
 uint32_t VM_Version::_initial_vector_length = 0;
 

src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "prims/jniFastGetField.hpp"
 #include "prims/jvm_misc.hpp"
 #include "prims/jvmtiExport.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/stubRoutines.hpp"
 

src/hotspot/cpu/x86/rdtsc_x86.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,10 @@
 #include "rdtsc_x86.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/javaThread.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/orderAccess.hpp"
 #include "vm_version_x86.hpp"
 
-// The following header contains the implementations of rdtsc()
-#include OS_CPU_HEADER_INLINE(os)
-
 static jlong _epoch = 0;
 static bool rdtsc_elapsed_counter_enabled = false;
 static jlong tsc_frequency = 0;

src/hotspot/cpu/x86/vm_version_x86.cpp

@@ -33,14 +33,12 @@
 #include "memory/universe.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
-#include "runtime/os.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "utilities/virtualizationSupport.hpp"
 
-#include OS_HEADER_INLINE(os)
-
 int VM_Version::_cpu;
 int VM_Version::_model;
 int VM_Version::_stepping;