From c65b7357a40311ca4699d77f561bec39191bd782 Mon Sep 17 00:00:00 2001
From: WangRunji <wangrunji0408@163.com>
Date: Fri, 28 Dec 2018 17:00:59 +0800
Subject: [PATCH] use riscv crate from github

---
 crate/riscv                       | 1 -
 kernel/Cargo.lock                 | 4 +++-
 kernel/Cargo.toml                 | 2 +-
 kernel/run-qemu-script-custom-llc | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 160000 crate/riscv

diff --git a/crate/riscv b/crate/riscv
deleted file mode 160000
index c00e91c6..00000000
--- a/crate/riscv
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c00e91c621fdba648dc15d81a7bcf392f21c423f
diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock
index fb737011..e93ddbab 100644
--- a/kernel/Cargo.lock
+++ b/kernel/Cargo.lock
@@ -222,6 +222,7 @@ dependencies = [
 [[package]]
 name = "riscv"
 version = "0.3.0"
+source = "git+https://github.com/riscv-and-rust-and-decaf/riscv#f7bea54d7f254b63b5a6130285ab421c23d2f3bd"
 dependencies = [
  "bare-metal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -322,7 +323,7 @@ dependencies = [
  "once 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "pc-keyboard 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "riscv 0.3.0",
+ "riscv 0.3.0 (git+https://github.com/riscv-and-rust-and-decaf/riscv)",
  "simple-filesystem 0.0.1 (git+https://github.com/wangrunji0408/SimpleFileSystem-Rust?branch=multi-thread)",
  "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "uart_16550 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -462,6 +463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d"
 "checksum register 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e10f31b6d2299e5620986ad9fcdd66463e125ad72af4f403f9aedf7592d5ccdb"
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
+"checksum riscv 0.3.0 (git+https://github.com/riscv-and-rust-and-decaf/riscv)" = "<none>"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
index f3eb92ac..570a9380 100644
--- a/kernel/Cargo.toml
+++ b/kernel/Cargo.toml
@@ -48,7 +48,7 @@ uart_16550 = "0.1"
 pc-keyboard = "0.3"
 
 [target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
-riscv = { path = "../crate/riscv" }
+riscv = { git = "https://github.com/riscv-and-rust-and-decaf/riscv" }
 bbl = { path = "../crate/bbl" }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
diff --git a/kernel/run-qemu-script-custom-llc b/kernel/run-qemu-script-custom-llc
index 59c79b8b..1883d43f 100755
--- a/kernel/run-qemu-script-custom-llc
+++ b/kernel/run-qemu-script-custom-llc
@@ -454,7 +454,7 @@ fi
 CNAME=riscv
 if ! [[ -f outdir/${CNAME}.o ]]
 then
-rustc --crate-name riscv ../crate/riscv/src/lib.rs \
+rustc --crate-name riscv $CARGO_PATH/git/checkouts/riscv-1e845b622ce46f1d/f7bea54*/src/lib.rs \
     --color always --crate-type lib --emit=metadata,llvm-bc \
     -C opt-level=1 \
     -C debuginfo=2 \