Calling runtime addr mapper from barrier - Dev iteration.

rh-openjdk · Jan 16, 2025 · 7caae3d · 7caae3d
1 parent 6f9cb8f
commit 7caae3d
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "gc/g1/customMapper.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1BarrierSetRuntime.hpp"
@@ -299,6 +300,10 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm,
   const Register card_addr = tmp;
   const Register cardtable = tmp2;
 
+  if (SanitizeGC) {
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SanitizerGCMapper::mapNewAddrToOriginalAddr), store_addr);
+  }
+
   __ movptr(card_addr, store_addr);
   __ shrptr(card_addr, CardTable::card_shift());
   // Do not use ExternalAddress to load 'byte_map_base', since 'byte_map_base' is NOT

diff --git a/src/hotspot/share/gc/g1/customMapper.cpp b/src/hotspot/share/gc/g1/customMapper.cpp
@@ -1,4 +1,9 @@
-#include "customMapper.h"
+#include "customMapper.hpp"
 
 void * beforeAddr = nullptr;
-void * afterAddr = nullptr;
+void * afterAddr = nullptr;
+
+void* SanitizerGCMapper::mapNewAddrToOriginalAddr(void* newAddr) {
+    volatile int a = 1;
+    return nullptr;
+}
diff --git a/src/hotspot/share/gc/g1/customMapper.h → src/hotspot/share/gc/g1/customMapper.hpp b/src/hotspot/share/gc/g1/customMapper.h → src/hotspot/share/gc/g1/customMapper.hpp
@@ -4,4 +4,9 @@
     extern void * beforeAddr;
     extern void * afterAddr;
 
+class SanitizerGCMapper {
+public:
+  static void* mapNewAddrToOriginalAddr(void* newAddr);
+};
+
 #endif //CUSTOMMAPPER_H
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
@@ -25,8 +25,7 @@
 #ifndef SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
 #define SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
 
-#include "gc/g1/customMapper.h"
-
+#include "gc/g1/customMapper.hpp"
 #include "gc/g1/g1BlockOffsetTable.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/shared/cardTable.hpp"

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -25,7 +25,7 @@
 #ifndef SHARE_GC_G1_G1COLLECTEDHEAP_HPP
 #define SHARE_GC_G1_G1COLLECTEDHEAP_HPP
 
-#include "gc/g1/customMapper.h"
+#include "gc/g1/customMapper.hpp"
 
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BiasedArray.hpp"

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
@@ -26,9 +26,6 @@
 #define SHARE_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
 
 #include "gc/g1/g1CollectedHeap.hpp"
-
-#include "customMapper.h"
-
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CollectorState.hpp"
 #include "gc/g1/g1ConcurrentMark.inline.hpp"

diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
@@ -53,7 +53,7 @@
 #include "runtime/globals_extension.hpp"
 #include "utilities/powerOfTwo.hpp"
 
-#include "gc/g1/customMapper.h"
+#include "gc/g1/customMapper.hpp"
 
 uint   G1HeapRegion::LogOfHRGrainBytes = 0;
 uint   G1HeapRegion::LogCardsPerRegion = 0;

diff --git a/src/hotspot/share/gc/shared/cardTable.hpp b/src/hotspot/share/gc/shared/cardTable.hpp
@@ -27,14 +27,13 @@
 
 #include <fstream>
 
+#include "gc/g1/customMapper.hpp"
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/align.hpp"
 
-#include "gc/g1/customMapper.h"
-
 class CardTable: public CHeapObj<mtGC> {
   friend class VMStructs;
 public: