8361380: ARM32: Atomic stubs should be in pre-universe

Co-authored-by: Andrew Dinn <[email protected]>
Reviewed-by: kvn, adinn

Author: shipilev

src/hotspot/cpu/arm/stubDeclarations_arm.hpp

@@ -30,7 +30,13 @@
                                           do_arch_blob,                 \
                                           do_arch_entry,                \
                                           do_arch_entry_init)           \
-  do_arch_blob(preuniverse, 0)                                          \
+  do_arch_blob(preuniverse, 500)                                        \
+  do_stub(preuniverse, atomic_load_long)                                \
+  do_arch_entry(Arm, preuniverse, atomic_load_long,                     \
+                atomic_load_long_entry, atomic_load_long_entry)         \
+  do_stub(preuniverse, atomic_store_long)                               \
+  do_arch_entry(Arm, preuniverse, atomic_store_long,                    \
+                atomic_store_long_entry, atomic_store_long_entry)       \
 
 
 #define STUBGEN_INITIAL_BLOBS_ARCH_DO(do_stub,                          \
@@ -41,12 +47,6 @@
   do_stub(initial, idiv_irem)                                           \
   do_arch_entry(Arm, initial, idiv_irem,                                \
                 idiv_irem_entry, idiv_irem_entry)                       \
-  do_stub(initial, atomic_load_long)                                    \
-  do_arch_entry(Arm, initial, atomic_load_long,                         \
-                atomic_load_long_entry, atomic_load_long_entry)         \
-  do_stub(initial, atomic_store_long)                                   \
-  do_arch_entry(Arm, initial, atomic_store_long,                        \
-                atomic_store_long_entry, atomic_store_long_entry)       \
 
 #define STUBGEN_CONTINUATION_BLOBS_ARCH_DO(do_stub,                     \
                                            do_arch_blob,                \

src/hotspot/cpu/arm/stubGenerator_arm.cpp

@@ -3127,7 +3127,14 @@ class StubGenerator: public StubCodeGenerator {
   // Initialization
 
   void generate_preuniverse_stubs() {
-    // preuniverse stubs are not needed for arm
+    // Atomics are used in universe initialization code (e.g. CDS relocation),
+    // therefore we need to generate real stubs very early on.
+    StubRoutines::_atomic_add_entry = generate_atomic_add();
+    StubRoutines::_atomic_xchg_entry = generate_atomic_xchg();
+    StubRoutines::_atomic_cmpxchg_entry = generate_atomic_cmpxchg();
+    StubRoutines::_atomic_cmpxchg_long_entry = generate_atomic_cmpxchg_long();
+    StubRoutines::Arm::_atomic_load_long_entry = generate_atomic_load_long();
+    StubRoutines::Arm::_atomic_store_long_entry = generate_atomic_store_long();
   }
 
   void generate_initial_stubs() {
@@ -3151,14 +3158,6 @@ class StubGenerator: public StubCodeGenerator {
 
     // integer division used both by interpreter and compiler
     StubRoutines::Arm::_idiv_irem_entry = generate_idiv_irem();
-
-    StubRoutines::_atomic_add_entry = generate_atomic_add();
-    StubRoutines::_atomic_xchg_entry = generate_atomic_xchg();
-    StubRoutines::_atomic_cmpxchg_entry = generate_atomic_cmpxchg();
-    StubRoutines::_atomic_cmpxchg_long_entry = generate_atomic_cmpxchg_long();
-    StubRoutines::Arm::_atomic_load_long_entry = generate_atomic_load_long();
-    StubRoutines::Arm::_atomic_store_long_entry = generate_atomic_store_long();
-
   }
 
   void generate_continuation_stubs() {

src/hotspot/cpu/zero/stubGenerator_zero.cpp

@@ -180,6 +180,10 @@ class StubGenerator: public StubCodeGenerator {
 
   void generate_preuniverse_stubs() {
     StubRoutines::_fence_entry               = ShouldNotCallThisStub();
+    StubRoutines::_atomic_xchg_entry         = ShouldNotCallThisStub();
+    StubRoutines::_atomic_cmpxchg_entry      = ShouldNotCallThisStub();
+    StubRoutines::_atomic_cmpxchg_long_entry = ShouldNotCallThisStub();
+    StubRoutines::_atomic_add_entry          = ShouldNotCallThisStub();
   }
 
   void generate_initial_stubs() {
@@ -192,12 +196,6 @@ class StubGenerator: public StubCodeGenerator {
     StubRoutines::_forward_exception_entry   = ShouldNotCallThisStub();
     StubRoutines::_call_stub_entry           = (address) call_stub;
     StubRoutines::_catch_exception_entry     = ShouldNotCallThisStub();
-
-    // atomic calls
-    StubRoutines::_atomic_xchg_entry         = ShouldNotCallThisStub();
-    StubRoutines::_atomic_cmpxchg_entry      = ShouldNotCallThisStub();
-    StubRoutines::_atomic_cmpxchg_long_entry = ShouldNotCallThisStub();
-    StubRoutines::_atomic_add_entry          = ShouldNotCallThisStub();
   }
 
   void generate_continuation_stubs() {

src/hotspot/share/runtime/stubDeclarations.hpp

@@ -615,6 +615,17 @@
   do_blob(preuniverse)                                                  \
   do_stub(preuniverse, fence)                                           \
   do_entry(preuniverse, fence, fence_entry, fence_entry)                \
+  do_stub(preuniverse, atomic_add)                                      \
+  do_entry(preuniverse, atomic_add, atomic_add_entry, atomic_add_entry) \
+  do_stub(preuniverse, atomic_xchg)                                     \
+  do_entry(preuniverse, atomic_xchg, atomic_xchg_entry,                 \
+           atomic_xchg_entry)                                           \
+  do_stub(preuniverse, atomic_cmpxchg)                                  \
+  do_entry(preuniverse, atomic_cmpxchg, atomic_cmpxchg_entry,           \
+           atomic_cmpxchg_entry)                                        \
+  do_stub(preuniverse, atomic_cmpxchg_long)                             \
+  do_entry(preuniverse, atomic_cmpxchg_long, atomic_cmpxchg_long_entry, \
+           atomic_cmpxchg_long_entry)                                   \
   /* merge in stubs and entries declared in arch header */              \
   STUBGEN_PREUNIVERSE_BLOBS_ARCH_DO(do_stub, do_arch_blob,              \
                                     do_arch_entry, do_arch_entry_init)  \
@@ -637,16 +648,6 @@
   do_stub(initial, catch_exception)                                     \
   do_entry(initial, catch_exception, catch_exception_entry,             \
            catch_exception_entry)                                       \
-  do_stub(initial, atomic_add)                                          \
-  do_entry(initial, atomic_add, atomic_add_entry, atomic_add_entry)     \
-  do_stub(initial, atomic_xchg)                                         \
-  do_entry(initial, atomic_xchg, atomic_xchg_entry, atomic_xchg_entry)  \
-  do_stub(initial, atomic_cmpxchg)                                      \
-  do_entry(initial, atomic_cmpxchg, atomic_cmpxchg_entry,               \
-           atomic_cmpxchg_entry)                                        \
-  do_stub(initial, atomic_cmpxchg_long)                                 \
-  do_entry(initial, atomic_cmpxchg_long, atomic_cmpxchg_long_entry,     \
-           atomic_cmpxchg_long_entry)                                   \
   do_stub(initial, updateBytesCRC32)                                    \
   do_entry(initial, updateBytesCRC32, updateBytesCRC32,                 \
            updateBytesCRC32)                                            \