Skip to content

Update to mmtk-core PR #838 #221

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 29, 2023
Merged

Update to mmtk-core PR #838 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
358a1c8
Update to mmtk-core PR #838
qinsoon May 29, 2023
1674d7a
Update mmtk-core
qinsoon May 29, 2023
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 @@ -30,7 +30,7 @@ once_cell = "1.10.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 = "de8bbfe623eee5e915f32870de8f81128df8ad41" }
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "2ec37bde7955304f3e4bc5f7bed3fbfba3833cc0" }
# Uncomment the following to build locally
# mmtk = { path = "../repos/mmtk-core" }

Expand Down
2 changes: 1 addition & 1 deletion mmtk/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub extern "C" fn alloc(
mutator: *mut Mutator<OpenJDK>,
size: usize,
align: usize,
offset: isize,
offset: usize,
allocator: AllocationSemantics,
) -> Address {
memory_manager::alloc::<OpenJDK>(unsafe { &mut *mutator }, size, align, offset, allocator)
Expand Down
2 changes: 1 addition & 1 deletion mmtk/src/object_model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ impl ObjectModel<OpenJDK> for VMObjectModel {
::std::mem::size_of::<usize>()
}

fn get_align_offset_when_copied(_object: ObjectReference) -> isize {
fn get_align_offset_when_copied(_object: ObjectReference) -> usize {
0
}

Expand Down
2 changes: 1 addition & 1 deletion openjdk/mmtk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extern void* alloc_slow_largeobject(MMTk_Mutator mutator, size_t size,
size_t align, size_t offset);

extern void post_alloc(MMTk_Mutator mutator, void* refer,
int bytes, int allocator);
size_t bytes, int allocator);

/// Full pre-barrier
extern void mmtk_object_reference_write_pre(MMTk_Mutator mutator, void* src, void* slot, void* target);
Expand Down