Use latest Rust nightly (#22)

* Use llvm_asm! instead of asm!
* Use 2020-07-08 in CI
* Use updated mmtk-core

.github/workflows/ci.yml

@@ -16,8 +16,8 @@ jobs:
           token: ${{ secrets.CI_ACCESS_TOKEN }}
           submodules: true
       - name: Setup Environments
-        run: RUSTUP_TOOLCHAIN=nightly-2019-08-26 ./.github/scripts/ci-setup.sh
+        run: RUSTUP_TOOLCHAIN=nightly-2020-07-08 ./.github/scripts/ci-setup.sh
 
       # Run the tests
       - name: Dacapo Tests
-        run: RUSTUP_TOOLCHAIN=nightly-2019-08-26 ./.github/scripts/ci-test.sh
+        run: RUSTUP_TOOLCHAIN=nightly-2020-07-08 ./.github/scripts/ci-test.sh

mmtk/src/api.rs

@@ -224,7 +224,7 @@ pub extern "C" fn alloc_slow_largeobject(allocator: *mut c_void, size: usize, al
 pub extern "C" fn test_stack_alignment() {
     info!("Entering stack alignment test with no args passed");
     unsafe {
-        asm!("movaps %xmm1, (%esp)" : : : "sp", "%xmm1", "memory");
+        llvm_asm!("movaps %xmm1, (%esp)" : : : "sp", "%xmm1", "memory");
     }
     info!("Exiting stack alignment test");
 }
@@ -235,7 +235,7 @@ pub extern "C" fn test_stack_alignment1(a: usize, b: usize, c: usize, d: usize,
     info!("a:{}, b:{}, c:{}, d:{}, e:{}",
           a, b, c, d, e);
     unsafe {
-        asm!("movaps %xmm1, (%esp)" : : : "sp", "%xmm1", "memory");
+        llvm_asm!("movaps %xmm1, (%esp)" : : : "sp", "%xmm1", "memory");
     }
     let result = a + b * 2 + c * 3  + d * 4 + e * 5;
     info!("Exiting stack alignment test");

mmtk/src/jtoc_call.rs

@@ -31,7 +31,7 @@ macro_rules! jikesrvm_call {
         let rvm_thread = $tls;
 
         $(
-            asm!("push %ebx" : : "{ebx}"($arg) : "sp", "memory");
+            llvm_asm!("push %ebx" : : "{ebx}"($arg) : "sp", "memory");
         )*
 
         let call_addr = $call_addr;
@@ -44,23 +44,23 @@ macro_rules! jikesrvm_call {
 #[cfg(target_arch = "x86")]
 macro_rules! jikesrvm_call_helper {
     ($ret:ident, $rvm_thread:ident, $call_addr:ident) => (
-        asm!("call *%ebx"
+        llvm_asm!("call *%ebx"
              : "={eax}"($ret)
              : "{esi}"($rvm_thread), "{ebx}"($call_addr)
              : "ebx", "ecx", "edx", "esi", "memory", "mm0", "mm1", "mm2", "mm3", "mm4", "mm5", "mm6", "mm7", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "ymm0", "ymm1", "ymm2", "ymm3", "ymm4", "ymm5", "ymm6", "ymm7", "zmm0", "zmm1", "zmm2", "zmm3", "zmm4", "zmm5", "zmm6", "zmm7"
              : "volatile");
     );
 
     ($ret:ident, $rvm_thread:ident, $call_addr:ident, $arg1:ident) => (
-        asm!("call *%ebx"
+        llvm_asm!("call *%ebx"
              : "={eax}"($ret)
              : "{esi}"($rvm_thread), "{ebx}"($call_addr), "{eax}"($arg1)
              : "ebx", "ecx", "edx", "esi", "memory", "mm0", "mm1", "mm2", "mm3", "mm4", "mm5", "mm6", "mm7", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "ymm0", "ymm1", "ymm2", "ymm3", "ymm4", "ymm5", "ymm6", "ymm7", "zmm0", "zmm1", "zmm2", "zmm3", "zmm4", "zmm5", "zmm6", "zmm7"
              : "volatile");
     );
 
     ($ret:ident, $rvm_thread:ident, $call_addr:ident, $arg1:ident, $arg2:ident $(, $arg:ident)*) => (
-        asm!("call *%ebx"
+        llvm_asm!("call *%ebx"
              : "={eax}"($ret)
              : "{esi}"($rvm_thread), "{ebx}"($call_addr), "{eax}"($arg1), "{edx}"($arg2)
              : "ebx", "ecx", "edx", "esi", "memory", "mm0", "mm1", "mm2", "mm3", "mm4", "mm5", "mm6", "mm7", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "ymm0", "ymm1", "ymm2", "ymm3", "ymm4", "ymm5", "ymm6", "ymm7", "zmm0", "zmm1", "zmm2", "zmm3", "zmm4", "zmm5", "zmm6", "zmm7"

mmtk/src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(asm)]
+#![feature(llvm_asm)]
 #[macro_use]
 extern crate mmtk;
 extern crate libc;