Bump version to v0.10. Update Rust to nightly-2022-02-11 (#100)

.github/scripts/ci-test-normal.sh

@@ -22,7 +22,7 @@ python scripts/testMMTk.py -j $JAVA_HOME -g RBaseBaseSemiSpace -a "Xms75M Xmx75M
 ./dist/RFastAdaptiveNoGC_x86_64_m32-linux/rvm -Xms3G -Xmx3G -jar benchmarks/dacapo-2006-10-MR2.jar luindex
 ./dist/RFastAdaptiveNoGC_x86_64_m32-linux/rvm -Xms3G -Xmx3G -jar benchmarks/dacapo-2006-10-MR2.jar pmd
 
-RVM_OPTIONS='-X:gc:threads=16'
+export MMTK_THREADS=16
 
 # RFastAdaptiveSemiSpace
 ./bin/buildit localhost RFastAdaptiveSemiSpace -j $JAVA_HOME --answer-yes --use-third-party-heap=../../ --use-third-party-build-configs=../../jikesrvm/build/configs --use-external-source=../../jikesrvm/rvm/src --m32

CHANGELOG.md

@@ -1,3 +1,7 @@
+0.10.0 (2022-02-14)
+===
+* Updates to mmtk-core 0.10.0.
+
 0.9.0 (2021-12-16)
 ===
 * Updates to mmtk-core 0.9.0.

mmtk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mmtk_jikesrvm"
-version = "0.9.0"
+version = "0.10.0"
 authors = [" <>"]
 
 [lib]
@@ -21,7 +21,7 @@ log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"]
 # - change branch/rev
 # - 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 = "c38365be73e83dfd8a41e901d4537e87e0eb0ffe" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "42262c296e164b5b1d05103e527ce5a9aee7cfd2" }
 # Uncomment the following to build locally - if you change the path locally, do not commit the change in a PR
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/rust-toolchain

@@ -1 +1 @@
-nightly-2021-12-05
+nightly-2022-02-11

mmtk/src/api.rs

@@ -275,6 +275,7 @@ pub extern "C" fn alloc_slow_largeobject(
 
 #[no_mangle]
 pub extern "C" fn test_stack_alignment() {
+    use std::arch::asm;
     info!("Entering stack alignment test with no args passed");
     unsafe {
         let _xmm: f32;
@@ -286,6 +287,7 @@ pub extern "C" fn test_stack_alignment() {
 #[allow(clippy::many_single_char_names)]
 #[no_mangle]
 pub extern "C" fn test_stack_alignment1(a: usize, b: usize, c: usize, d: usize, e: usize) -> usize {
+    use std::arch::asm;
     info!("Entering stack alignment test");
     info!("a:{}, b:{}, c:{}, d:{}, e:{}", a, b, c, d, e);
     unsafe {

mmtk/src/collection.rs

@@ -8,6 +8,8 @@ use mmtk::MutatorContext;
 use JikesRVM;
 use JTOC_BASE;
 
+use std::arch::asm;
+
 pub static mut BOOT_THREAD: OpaquePointer = OpaquePointer::UNINITIALIZED;
 
 #[derive(Default)]

mmtk/src/lib.rs

@@ -1,4 +1,3 @@
-#![feature(asm)]
 #![feature(vec_into_raw_parts)]
 extern crate libc;
 extern crate mmtk;
@@ -57,6 +56,7 @@ impl VMBinding for JikesRVM {
 impl JikesRVM {
     #[inline(always)]
     pub fn mm_entrypoint_test(input1: usize, input2: usize, input3: usize, input4: usize) -> usize {
+        use std::arch::asm;
         unsafe {
             jtoc_call!(
                 MM_ENTRYPOINT_TEST_METHOD_OFFSET,

mmtk/src/reference_glue.rs

@@ -9,6 +9,8 @@ use mmtk::TraceLocal;
 use entrypoint::*;
 use JikesRVM;
 
+use std::arch::asm;
+
 pub struct VMReferenceGlue {}
 
 impl ReferenceGlue<JikesRVM> for VMReferenceGlue {

mmtk/src/scan_boot_image.rs

@@ -137,8 +137,7 @@ fn process_chunk(
 
 fn decode_long_encoding(cursor: Address) -> usize {
     unsafe {
-        let mut value: usize;
-        value = cursor.load::<u8>() as usize & 0x000000fc;
+        let mut value: usize = cursor.load::<u8>() as usize & 0x000000fc;
         value |= (((cursor + 1isize).load::<u8>() as usize) << BITS_IN_BYTE) & 0x0000ff00;
         value |= (((cursor + 2isize).load::<u8>() as usize) << (2 * BITS_IN_BYTE)) & 0x00ff0000;
         value |= (((cursor + 3isize).load::<u8>() as usize) << (3 * BITS_IN_BYTE)) & 0xff000000;

mmtk/src/scan_sanity.rs

@@ -1,6 +1,7 @@
 use entrypoint::*;
 use mmtk::util::OpaquePointer;
 use mmtk::TraceLocal;
+use std::arch::asm;
 
 pub fn scan_boot_image_sanity<T: TraceLocal>(_trace: &mut T, tls: OpaquePointer) {
     trace!("scan_boot_image_sanity");

mmtk/src/scan_statics.rs

@@ -4,6 +4,7 @@ use mmtk::memory_manager;
 use mmtk::scheduler::*;
 use mmtk::util::opaque_pointer::*;
 use mmtk::MMTK;
+use std::arch::asm;
 use std::marker::PhantomData;
 use JTOC_BASE;
 

mmtk/src/scanning.rs

@@ -1,3 +1,4 @@
+use std::arch::asm;
 use std::mem::size_of;
 use std::slice;