Skip to content

Rename edge to slot #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 22, 2024
Merged

Rename edge to slot #85

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab1ad10
Rename edge to slot
wks May 17, 2024
cfa99fc
Update mmtk-core to 56b2521d2b99848ee0613a0a5288fe6d81b754ba
mmtkgc-bot May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mmtk/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mmtk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ log = "*"
# - 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 = "a02803b4104519ff2289234101a2dd8ceedd1bc7" }
mmtk = { git = "https://github.com/wks/mmtk-core.git", rev = "e46383ddbc60b3e418999294712e3b10a2c6282a" }
# Uncomment the following and fix the path to mmtk-core to build locally
# mmtk = { path = "../repos/mmtk-core" }

Expand Down
6 changes: 3 additions & 3 deletions mmtk/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub struct V8;
///
/// TODO: We start with Address to transition from the old API.
/// We should define an edge type suitable for V8.
pub type V8Edge = Address;
pub type V8Slot = Address;

impl VMBinding for V8 {
type VMObjectModel = object_model::VMObjectModel;
Expand All @@ -60,8 +60,8 @@ impl VMBinding for V8 {
type VMActivePlan = active_plan::VMActivePlan;
type VMReferenceGlue = reference_glue::VMReferenceGlue;

type VMEdge = V8Edge;
type VMMemorySlice = mmtk::vm::edge_shape::UnimplementedMemorySlice<V8Edge>;
type VMSlot = V8Slot;
type VMMemorySlice = mmtk::vm::slot::UnimplementedMemorySlice<V8Slot>;

const MAX_ALIGNMENT: usize = 32;
}
Expand Down
10 changes: 5 additions & 5 deletions mmtk/src/scanning.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
use mmtk::util::opaque_pointer::*;
use mmtk::util::ObjectReference;
use mmtk::vm::EdgeVisitor;
use mmtk::vm::RootsWorkFactory;
use mmtk::vm::Scanning;
use mmtk::vm::SlotVisitor;
use mmtk::Mutator;
use V8Edge;
use V8Slot;
use V8;

pub struct VMScanning {}

impl Scanning<V8> for VMScanning {
fn scan_object<EV: EdgeVisitor<V8Edge>>(
fn scan_object<EV: SlotVisitor<V8Slot>>(
_tls: VMWorkerThread,
_object: ObjectReference,
_edge_visitor: &mut EV,
Expand All @@ -25,12 +25,12 @@ impl Scanning<V8> for VMScanning {
fn scan_roots_in_mutator_thread(
_tls: VMWorkerThread,
_mutator: &'static mut Mutator<V8>,
_factory: impl RootsWorkFactory<V8Edge>,
_factory: impl RootsWorkFactory<V8Slot>,
) {
unimplemented!()
}

fn scan_vm_specific_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory<V8Edge>) {
fn scan_vm_specific_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory<V8Slot>) {
unimplemented!()
}

Expand Down