Skip to content

Commit efcae2f

Browse files
authored
Update to mmtk-core PR#647 (#178)
1 parent 72c9b56 commit efcae2f

File tree

6 files changed

+14
-147
lines changed

6 files changed

+14
-147
lines changed

mmtk/Cargo.lock

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ once_cell = "1.10.0"
2929
# - change branch
3030
# - change repo name
3131
# But other changes including adding/removing whitespaces in commented lines may break the CI.
32-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "76131c493be38e421f5fb157f9900f850584554f" }
32+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "4ae23b1dc0e14f62c196c12c93818e00e9de7cc5" }
3333
# Uncomment the following to build locally
3434
# mmtk = { path = "../repos/mmtk-core" }
3535

mmtk/src/object_model.rs

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
use std::sync::atomic::Ordering;
2-
31
use super::UPCALLS;
42
use crate::abi::Oop;
53
use crate::{vm_metadata, OpenJDK};
64
use mmtk::util::alloc::fill_alignment_gap;
75
use mmtk::util::copy::*;
8-
use mmtk::util::metadata::header_metadata::HeaderMetadataSpec;
96
use mmtk::util::{Address, ObjectReference};
107
use mmtk::vm::*;
118

129
pub struct VMObjectModel {}
1310

1411
impl ObjectModel<OpenJDK> for VMObjectModel {
15-
// For now we use the default const from mmtk-core
1612
const GLOBAL_LOG_BIT_SPEC: VMGlobalLogBitSpec = vm_metadata::LOGGING_SIDE_METADATA_SPEC;
1713

1814
const LOCAL_FORWARDING_POINTER_SPEC: VMLocalForwardingPointerSpec =
@@ -22,68 +18,6 @@ impl ObjectModel<OpenJDK> for VMObjectModel {
2218
const LOCAL_MARK_BIT_SPEC: VMLocalMarkBitSpec = vm_metadata::MARKING_METADATA_SPEC;
2319
const LOCAL_LOS_MARK_NURSERY_SPEC: VMLocalLOSMarkNurserySpec = vm_metadata::LOS_METADATA_SPEC;
2420

25-
#[inline(always)]
26-
fn load_metadata(
27-
metadata_spec: &HeaderMetadataSpec,
28-
object: ObjectReference,
29-
mask: Option<usize>,
30-
atomic_ordering: Option<Ordering>,
31-
) -> usize {
32-
vm_metadata::load_metadata(metadata_spec, object, mask, atomic_ordering)
33-
}
34-
35-
#[inline(always)]
36-
fn store_metadata(
37-
metadata_spec: &HeaderMetadataSpec,
38-
object: ObjectReference,
39-
val: usize,
40-
mask: Option<usize>,
41-
atomic_ordering: Option<Ordering>,
42-
) {
43-
vm_metadata::store_metadata(metadata_spec, object, val, mask, atomic_ordering);
44-
}
45-
46-
#[inline(always)]
47-
fn compare_exchange_metadata(
48-
metadata_spec: &HeaderMetadataSpec,
49-
object: ObjectReference,
50-
old_val: usize,
51-
new_val: usize,
52-
mask: Option<usize>,
53-
success_order: Ordering,
54-
failure_order: Ordering,
55-
) -> bool {
56-
vm_metadata::compare_exchange_metadata(
57-
metadata_spec,
58-
object,
59-
old_val,
60-
new_val,
61-
mask,
62-
success_order,
63-
failure_order,
64-
)
65-
}
66-
67-
#[inline(always)]
68-
fn fetch_add_metadata(
69-
metadata_spec: &HeaderMetadataSpec,
70-
object: ObjectReference,
71-
val: usize,
72-
order: Ordering,
73-
) -> usize {
74-
vm_metadata::fetch_add_metadata(metadata_spec, object, val, order)
75-
}
76-
77-
#[inline(always)]
78-
fn fetch_sub_metadata(
79-
metadata_spec: &HeaderMetadataSpec,
80-
object: ObjectReference,
81-
val: usize,
82-
order: Ordering,
83-
) -> usize {
84-
vm_metadata::fetch_sub_metadata(metadata_spec, object, val, order)
85-
}
86-
8721
#[inline]
8822
fn copy(
8923
from: ObjectReference,

mmtk/src/vm_metadata/constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use mmtk::vm::*;
33
#[cfg(target_pointer_width = "64")]
44
pub(crate) const FORWARDING_BITS_OFFSET: isize = 56;
55
#[cfg(target_pointer_width = "32")]
6-
pub(crate) const FORWARDING_BITS_OFFSET: isize = 0;
6+
pub(crate) const FORWARDING_BITS_OFFSET: isize = unimplemenged!();
77

88
pub(crate) const FORWARDING_POINTER_OFFSET: isize = 0;
99

mmtk/src/vm_metadata/global.rs

Lines changed: 0 additions & 75 deletions
This file was deleted.

mmtk/src/vm_metadata/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
mod constants;
2-
mod global;
32

43
pub(crate) use self::constants::*;
5-
pub(crate) use self::global::*;

0 commit comments

Comments
 (0)