Add SVM-specific C++ namespace.

Author: christianhaeubl

src/hotspot/cpu/aarch64/atomic_aarch64.hpp

@@ -32,6 +32,9 @@
 // x1: arg1
 // x2: arg2 (optional)
 // x3, x8, x9: scratch
+
+namespace svm_gc {
+
 typedef uint64_t (*aarch64_atomic_stub_t)(volatile void *ptr, uint64_t arg1, uint64_t arg2);
 
 // Pointers to stubs
@@ -52,4 +55,7 @@ extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_8_release_impl;
 extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_4_seq_cst_impl;
 extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_8_seq_cst_impl;
 
+
+} // namespace svm_gc
+
 #endif // CPU_AARCH64_ATOMIC_AARCH64_HPP

src/hotspot/cpu/aarch64/bytes_aarch64.hpp

@@ -29,6 +29,9 @@
 #include "memory/allStatic.hpp"
 #include "utilities/byteswap.hpp"
 
+
+namespace svm_gc {
+
 class Bytes: AllStatic {
  public:
   // Efficient reading and writing of unaligned unsigned data in platform-specific byte ordering
@@ -54,4 +57,7 @@ class Bytes: AllStatic {
   static inline void put_Java_u8(address p, u8 x)     { put_native_u8(p, byteswap(x)); }
 };
 
+
+} // namespace svm_gc
+
 #endif // CPU_AARCH64_BYTES_AARCH64_HPP

src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp

@@ -26,6 +26,9 @@
 #ifndef CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
 #define CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
 
+
+namespace svm_gc {
+
 const int StackAlignmentInBytes  = 16;
 const size_t pd_segfault_address = 1024;
 
@@ -78,4 +81,7 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
 
 #define USE_TRAMPOLINE_STUB_FIX_OWNER
 
+
+} // namespace svm_gc
+
 #endif // CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP

src/hotspot/cpu/aarch64/globals_aarch64.hpp

@@ -32,6 +32,9 @@
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
 
+
+namespace svm_gc {
+
 define_pd_global(bool, ImplicitNullChecks,       true);  // Generate code for implicit null checks
 define_pd_global(bool, TrapBasedNullChecks,     false);
 define_pd_global(bool, UncommonNullCast,         true);  // Uncommon-trap nulls past to check cast
@@ -133,4 +136,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
 
 // end of ARCH_FLAGS
 
+
+} // namespace svm_gc
+
 #endif // CPU_AARCH64_GLOBALS_AARCH64_HPP

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

@@ -82,6 +82,9 @@
 
 // Stub Code definitions
 
+
+namespace svm_gc {
+
 class StubGenerator: public StubCodeGenerator {
  private:
 
@@ -11921,6 +11924,9 @@ class StubGenerator: public StubCodeGenerator {
 void StubGenerator_generate(CodeBuffer* code, StubGenBlobId blob_id) {
   StubGenerator g(code, blob_id);
 }
+
+} // namespace svm_gc
+
 #endif // !SVM
 
 #if defined (LINUX)
@@ -11935,6 +11941,9 @@ void StubGenerator_generate(CodeBuffer* code, StubGenBlobId blob_id) {
   aarch64_atomic_stub_t aarch64_atomic_ ## OPNAME ## _ ## SIZE ## RELAXED ## _impl \
     = aarch64_atomic_ ## OPNAME ## _ ## SIZE ## RELAXED ## _default_impl;
 
+
+namespace svm_gc {
+
 DEFAULT_ATOMIC_OP(fetch_add, 4, )
 DEFAULT_ATOMIC_OP(fetch_add, 8, )
 DEFAULT_ATOMIC_OP(fetch_add, 4, _relaxed)
@@ -11954,4 +11963,7 @@ DEFAULT_ATOMIC_OP(cmpxchg, 8, _seq_cst)
 
 #undef DEFAULT_ATOMIC_OP
 
+
+} // namespace svm_gc
+
 #endif // LINUX

src/hotspot/cpu/x86/bytes_x86.hpp

@@ -30,6 +30,9 @@
 #include "utilities/byteswap.hpp"
 #include "utilities/macros.hpp"
 
+
+namespace svm_gc {
+
 class Bytes: AllStatic {
  public:
   // Efficient reading and writing of unaligned unsigned data in platform-specific byte ordering
@@ -98,4 +101,7 @@ class Bytes: AllStatic {
   static inline void put_Java_u8(address p, u8 x)     { put_Java<u8>(p, x); }
 };
 
+
+} // namespace svm_gc
+
 #endif // CPU_X86_BYTES_X86_HPP

src/hotspot/cpu/x86/globalDefinitions_x86.hpp

@@ -25,6 +25,9 @@
 #ifndef CPU_X86_GLOBALDEFINITIONS_X86_HPP
 #define CPU_X86_GLOBALDEFINITIONS_X86_HPP
 
+
+namespace svm_gc {
+
 const int StackAlignmentInBytes  = 16;
 const size_t pd_segfault_address = 1024;
 
@@ -54,4 +57,7 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
 
 #define USE_POINTERS_TO_REGISTER_IMPL_ARRAY
 
+
+} // namespace svm_gc
+
 #endif // CPU_X86_GLOBALDEFINITIONS_X86_HPP

src/hotspot/cpu/x86/globals_x86.hpp

@@ -31,6 +31,9 @@
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
 
+
+namespace svm_gc {
+
 define_pd_global(bool, ImplicitNullChecks,       true);  // Generate code for implicit null checks
 define_pd_global(bool, TrapBasedNullChecks,      false); // Not needed on x86.
 define_pd_global(bool, UncommonNullCast,         true);  // Uncommon-trap nulls passed to check cast
@@ -196,4 +199,7 @@ define_pd_global(intx, InitArrayShortSize, 8*BytesPerLong);
                                                                             \
 // end of ARCH_FLAGS
 
+
+} // namespace svm_gc
+
 #endif // CPU_X86_GLOBALS_X86_HPP

src/hotspot/jfrfiles/jfrEventClasses.hpp

@@ -48,6 +48,9 @@
  * The assert message contains both the index (zero based) as well as the name of the field.
  */
 
+
+namespace svm_gc {
+
 struct JfrStructVirtualSpace
 {
  private:
@@ -14451,8 +14454,14 @@ class JfrNonReentrant : public EventType {
 }; 
 
 
+
+} // namespace svm_gc
+
 #else // !INCLUDE_JFR
 
+
+namespace svm_gc {
+
 template <typename T>
 class JfrEvent {
  public:
@@ -19706,5 +19715,8 @@ class JfrNonReentrant : public EventType {
 }; 
 
 
+
+} // namespace svm_gc
+
 #endif // INCLUDE_JFR
 #endif // JFRFILES_JFREVENTCLASSES_HPP

src/hotspot/jfrfiles/jfrEventIds.hpp

@@ -30,6 +30,9 @@
 #include "utilities/macros.hpp"
 #if INCLUDE_JFR
 
+
+namespace svm_gc {
+
 enum JfrEventId {
   JfrMetadataEvent = 0,
   JfrCheckpointEvent = 1,
@@ -210,5 +213,8 @@ static const JfrEventId FIRST_EVENT_ID = JfrDurationEvent;
 static const JfrEventId LAST_EVENT_ID = JfrMethodTimingEvent;
 static const int NUMBER_OF_EVENTS = 170;
 static const int NUMBER_OF_RESERVED_EVENTS = 2;
+
+} // namespace svm_gc
+
 #endif // INCLUDE_JFR
 #endif // JFRFILES_JFREVENTIDS_HPP