Rename edge to slot

Parent PR: mmtk/mmtk-core#1134

Author: wks

mmtk/Cargo.lock

@@ -32,7 +32,7 @@ memoffset = "0.9.0"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI.
-mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "fea59e4f5cc6176093da1d8efa7d7b3b4b8d0fa7" }
+mmtk = { git = "https://github.com/wks/mmtk-core.git", rev = "e46383ddbc60b3e418999294712e3b10a2c6282a" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/Cargo.toml

@@ -1,5 +1,5 @@
 use super::UPCALLS;
-use crate::OpenJDKEdge;
+use crate::OpenJDKSlot;
 use atomic::Atomic;
 use atomic::Ordering;
 use mmtk::util::constants::*;
@@ -278,10 +278,10 @@ impl InstanceRefKlass {
         }
         *DISCOVERED_OFFSET
     }
-    pub fn referent_address<const COMPRESSED: bool>(oop: Oop) -> OpenJDKEdge<COMPRESSED> {
+    pub fn referent_address<const COMPRESSED: bool>(oop: Oop) -> OpenJDKSlot<COMPRESSED> {
         oop.get_field_address(Self::referent_offset()).into()
     }
-    pub fn discovered_address<const COMPRESSED: bool>(oop: Oop) -> OpenJDKEdge<COMPRESSED> {
+    pub fn discovered_address<const COMPRESSED: bool>(oop: Oop) -> OpenJDKSlot<COMPRESSED> {
         oop.get_field_address(Self::discovered_offset()).into()
     }
 }
@@ -461,10 +461,10 @@ impl ArrayOopDesc {
     pub unsafe fn slice<const COMPRESSED: bool>(
         &self,
         ty: BasicType,
-    ) -> crate::OpenJDKEdgeRange<COMPRESSED> {
+    ) -> crate::OpenJDKSlotRange<COMPRESSED> {
         let base = self.base::<COMPRESSED>(ty);
         let start = base;
-        let lshift = OpenJDKEdge::<COMPRESSED>::LOG_BYTES_IN_EDGE;
+        let lshift = OpenJDKSlot::<COMPRESSED>::LOG_BYTES_IN_SLOT;
         let end = base + ((self.length::<COMPRESSED>() as usize) << lshift);
         (start..end).into()
     }

mmtk/src/abi.rs

@@ -1,4 +1,4 @@
-use crate::edges::OpenJDKEdge;
+use crate::slots::OpenJDKSlot;
 use crate::OpenJDK;
 use crate::OpenJDK_Upcalls;
 use crate::BUILDER;
@@ -254,7 +254,7 @@ pub extern "C" fn handle_user_collection_request(tls: VMMutatorThread) {
 
 #[no_mangle]
 pub extern "C" fn mmtk_enable_compressed_oops() {
-    crate::edges::enable_compressed_oops()
+    crate::slots::enable_compressed_oops()
 }
 
 #[no_mangle]
@@ -366,13 +366,13 @@ pub extern "C" fn process_bulk(options: *const c_char) -> bool {
 #[no_mangle]
 pub extern "C" fn mmtk_narrow_oop_base() -> Address {
     debug_assert!(crate::use_compressed_oops());
-    crate::edges::BASE.load(Ordering::Relaxed)
+    crate::slots::BASE.load(Ordering::Relaxed)
 }
 
 #[no_mangle]
 pub extern "C" fn mmtk_narrow_oop_shift() -> usize {
     debug_assert!(crate::use_compressed_oops());
-    crate::edges::SHIFT.load(Ordering::Relaxed)
+    crate::slots::SHIFT.load(Ordering::Relaxed)
 }
 
 #[no_mangle]
@@ -440,11 +440,11 @@ pub extern "C" fn mmtk_object_reference_write_slow(
     })
 }
 
-fn log_bytes_in_edge() -> usize {
+fn log_bytes_in_slot() -> usize {
     if crate::use_compressed_oops() {
-        OpenJDKEdge::<true>::LOG_BYTES_IN_EDGE
+        OpenJDKSlot::<true>::LOG_BYTES_IN_SLOT
     } else {
-        OpenJDKEdge::<false>::LOG_BYTES_IN_EDGE
+        OpenJDKSlot::<false>::LOG_BYTES_IN_SLOT
     }
 }
 
@@ -456,7 +456,7 @@ pub extern "C" fn mmtk_array_copy_pre(
     dst: Address,
     count: usize,
 ) {
-    let bytes = count << log_bytes_in_edge();
+    let bytes = count << log_bytes_in_slot();
     with_mutator!(|mutator| {
         mutator
             .barrier()
@@ -473,7 +473,7 @@ pub extern "C" fn mmtk_array_copy_post(
     count: usize,
 ) {
     with_mutator!(|mutator| {
-        let bytes = count << log_bytes_in_edge();
+        let bytes = count << log_bytes_in_slot();
         mutator
             .barrier()
             .memory_region_copy_post((src..src + bytes).into(), (dst..dst + bytes).into());