From dc0c38184e52128aea4ce9bc513f0ba5440afcc5 Mon Sep 17 00:00:00 2001
From: Yi Lin <qinsoon@gmail.com>
Date: Fri, 6 Mar 2026 04:41:38 +0000
Subject: [PATCH 1/2] Adapt to dynamic side metadata address

---
 mmtk/Cargo.lock | 4 ++--
 mmtk/Cargo.toml | 4 ++--
 mmtk/src/api.rs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index 6c5f4eb..108245f 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -573,7 +573,7 @@ dependencies = [
 [[package]]
 name = "mmtk"
 version = "0.32.0"
-source = "git+https://github.com/wks/mmtk-core.git?rev=70b17d97c704c2f885bb96041abf686a07590530#70b17d97c704c2f885bb96041abf686a07590530"
+source = "git+https://github.com/qinsoon/mmtk-core.git?rev=4ea8099033f0c832c1dbe33805eacc8be6826bf3#4ea8099033f0c832c1dbe33805eacc8be6826bf3"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -609,7 +609,7 @@ dependencies = [
 [[package]]
 name = "mmtk-macros"
 version = "0.32.0"
-source = "git+https://github.com/wks/mmtk-core.git?rev=70b17d97c704c2f885bb96041abf686a07590530#70b17d97c704c2f885bb96041abf686a07590530"
+source = "git+https://github.com/qinsoon/mmtk-core.git?rev=4ea8099033f0c832c1dbe33805eacc8be6826bf3#4ea8099033f0c832c1dbe33805eacc8be6826bf3"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index 882b5c8..7401783 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -36,8 +36,8 @@ probe = "0.5"
 features = ["vo_bit", "object_pinning", "sticky_immix_non_moving_nursery"]
 
 # Uncomment the following lines to use mmtk-core from the official repository.
-git = "https://github.com/wks/mmtk-core.git"
-rev = "70b17d97c704c2f885bb96041abf686a07590530"
+git = "https://github.com/qinsoon/mmtk-core.git"
+rev = "4ea8099033f0c832c1dbe33805eacc8be6826bf3"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 #path = "../../mmtk-core"
diff --git a/mmtk/src/api.rs b/mmtk/src/api.rs
index 787ea71..14b8a3a 100644
--- a/mmtk/src/api.rs
+++ b/mmtk/src/api.rs
@@ -332,7 +332,7 @@ pub extern "C" fn mmtk_get_vo_bit_log_region_size() -> usize {
 
 #[no_mangle]
 pub extern "C" fn mmtk_get_vo_bit_base() -> usize {
-    mmtk::util::metadata::side_metadata::VO_BIT_SIDE_METADATA_ADDR.as_usize()
+    mmtk::util::metadata::side_metadata::vo_bit_side_metadata_addr().as_usize()
 }
 
 #[no_mangle]

From 031867d25ab2c5146d000a70f18dd176b1ac13e6 Mon Sep 17 00:00:00 2001
From: Yi Lin <qinsoon@gmail.com>
Date: Tue, 14 Apr 2026 03:56:48 +0000
Subject: [PATCH 2/2] Update mmtk-core

---
 mmtk/Cargo.lock | 4 ++--
 mmtk/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index bdaa999..f462496 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -574,7 +574,7 @@ dependencies = [
 [[package]]
 name = "mmtk"
 version = "0.32.0"
-source = "git+https://github.com/qinsoon/mmtk-core.git?rev=4ea8099033f0c832c1dbe33805eacc8be6826bf3#4ea8099033f0c832c1dbe33805eacc8be6826bf3"
+source = "git+https://github.com/qinsoon/mmtk-core.git?rev=0d591e81380717a957c80fa76a81863d9d2be260#0d591e81380717a957c80fa76a81863d9d2be260"
 dependencies = [
  "atomic",
  "atomic-traits",
@@ -610,7 +610,7 @@ dependencies = [
 [[package]]
 name = "mmtk-macros"
 version = "0.32.0"
-source = "git+https://github.com/qinsoon/mmtk-core.git?rev=4ea8099033f0c832c1dbe33805eacc8be6826bf3#4ea8099033f0c832c1dbe33805eacc8be6826bf3"
+source = "git+https://github.com/qinsoon/mmtk-core.git?rev=0d591e81380717a957c80fa76a81863d9d2be260#0d591e81380717a957c80fa76a81863d9d2be260"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index 80f852d..c628e43 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -37,7 +37,7 @@ features = ["vo_bit", "object_pinning", "sticky_immix_non_moving_nursery"]
 
 # Uncomment the following lines to use mmtk-core from the official repository.
 git = "https://github.com/qinsoon/mmtk-core.git"
-rev = "4ea8099033f0c832c1dbe33805eacc8be6826bf3"
+rev = "0d591e81380717a957c80fa76a81863d9d2be260"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 #path = "../../mmtk-core"