update to jdk-20+10

27360: LA port of 8290840: Refactor the "os" class

Author: theaoqi

src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.cpp

@@ -32,6 +32,8 @@
 #include "code/vtableStubs.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/allocation.inline.hpp"
+#include "os_linux.hpp"
+#include "os_posix.hpp"
 #include "prims/jniFastGetField.hpp"
 #include "prims/jvm_misc.hpp"
 #include "runtime/arguments.hpp"
@@ -313,21 +315,6 @@ int os::Linux::get_fpu_control_word(void) {
 void os::Linux::set_fpu_control_word(int fpu_control) {
 }
 
-bool os::is_allocatable(size_t bytes) {
-
-  if (bytes < 2 * G) {
-    return true;
-  }
-
-  char* addr = reserve_memory(bytes);
-
-  if (addr != NULL) {
-    release_memory(addr, bytes);
-  }
-
-  return addr != NULL;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // thread stack
 

src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.hpp renamed to src/hotspot/os_cpu/linux_loongarch/os_linux_loongarch.inline.hpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015, 2022, Loongson Technology. All rights reserved.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, Loongson Technology. 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
@@ -23,16 +23,7 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_LOONGARCH_OS_LINUX_LOONGARCH_HPP
-#define OS_CPU_LINUX_LOONGARCH_OS_LINUX_LOONGARCH_HPP
+#ifndef OS_CPU_LINUX_LOONGARCH_OS_LINUX_LOONGARCH_INLINE_HPP
+#define OS_CPU_LINUX_LOONGARCH_OS_LINUX_LOONGARCH_INLINE_HPP
 
-  static void setup_fpu();
-  static bool is_allocatable(size_t bytes);
-
-  // Used to register dynamic code cache area with the OS
-  // Note: Currently only used in 64 bit Windows implementations
-  static bool register_code_area(char *low, char *high) { return true; }
-
-  static bool is_ActiveCoresMP();
-
-#endif // OS_CPU_LINUX_LOONGARCH_OS_LINUX_LOONGARCH_HPP
+#endif // OS_CPU_LINUX_LOONGARCH_OS_LINUX_LOONGARCH_INLINE_HPP

src/hotspot/share/runtime/os.hpp

@@ -22,6 +22,12 @@
  *
  */
 
+/*
+ * This file has been modified by Loongson Technology in 2022, These
+ * modifications are Copyright (c) 2022, Loongson Technology, and are made
+ * available on the same license terms set forth above.
+ */
+
 #ifndef SHARE_RUNTIME_OS_HPP
 #define SHARE_RUNTIME_OS_HPP
 
@@ -311,6 +317,9 @@ class os: AllStatic {
     return (_processor_count != 1);
   }
 
+  // Used only on LoongArch64.
+  static bool is_ActiveCoresMP();
+
   static julong available_memory();
   static julong physical_memory();
   static bool has_allocatable_memory_limit(size_t* limit);