Merge pull request #209 from rust-osdev/update-deps

Fix `asm` imports on latest nightly
rust-osdev · Dec 23, 2021 · 4e66623 · 4e66623
2 parents 2a44fd4 + 4529b53
commit 4e66623
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,7 @@ required-features = ["uefi_bin"]
 
 [dependencies]
 xmas-elf = { version = "0.6.2", optional = true }
-x86_64 = { version = "0.13.2", optional = true, default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", optional = true, default-features = false, features = ["instructions", "inline_asm"] }
 usize_conversions = { version = "0.2.0", optional = true }
 bit_field = { version = "0.10.0", optional = true }
 log = { version = "0.4.8", optional = true }

diff --git a/Changelog.md b/Changelog.md
@@ -1,7 +1,11 @@
 # Unreleased
 
+- Fix `asm` imports on latest nightly ([#209](https://github.com/rust-osdev/bootloader/pull/209))
+
 # 0.10.9 – 2021-10-07
 
+- Add support for framebuffer configuration ([#179](https://github.com/rust-osdev/bootloader/pull/179))
+
 # 0.10.8 – 2021-08-22
 
 - Pad UEFI FAT file length ([#180](https://github.com/rust-osdev/bootloader/pull/180))

diff --git a/examples/test_framework/Cargo.toml b/examples/test_framework/Cargo.toml
@@ -12,6 +12,6 @@ members = [
 
 [dependencies]
 bootloader = { path = "../.." } # replace this with a version number
-x86_64 = "0.14.2"
+x86_64 = "0.14.7"
 uart_16550 = "0.2.14"
 spin = { version = "0.9.0", features = ["lazy"] }
diff --git a/src/bin/bios.rs b/src/bin/bios.rs
@@ -11,8 +11,11 @@ use bootloader::{
     binary::SystemInfo,
     boot_info::{FrameBufferInfo, PixelFormat},
 };
-use core::panic::PanicInfo;
-use core::slice;
+use core::{
+    arch::{asm, global_asm},
+    panic::PanicInfo,
+    slice,
+};
 use usize_conversions::usize_from;
 use x86_64::structures::paging::{FrameAllocator, OffsetPageTable};
 use x86_64::structures::paging::{

diff --git a/src/bin/uefi.rs b/src/bin/uefi.rs
@@ -17,7 +17,7 @@ use bootloader::{
     binary::{legacy_memory_region::LegacyFrameAllocator, parsed_config::CONFIG, SystemInfo},
     boot_info::FrameBufferInfo,
 };
-use core::{mem, panic::PanicInfo, slice};
+use core::{arch::asm, mem, panic::PanicInfo, slice};
 use uefi::{
     prelude::{entry, Boot, Handle, ResultExt, Status, SystemTable},
     proto::console::gop::{GraphicsOutput, PixelFormat},

diff --git a/src/binary/mod.rs b/src/binary/mod.rs
@@ -3,6 +3,7 @@ use crate::{
     boot_info::{BootInfo, FrameBuffer, FrameBufferInfo, MemoryRegion, TlsTemplate},
 };
 use core::{
+    arch::asm,
     mem::{self, MaybeUninit},
     slice,
 };

diff --git a/tests/runner/src/main.rs b/tests/runner/src/main.rs
@@ -1,6 +1,7 @@
 use std::{
+    io::Write,
     path::{Path, PathBuf},
-    process::Command,
+    process::{Command, Stdio},
 };
 
 const QEMU_ARGS: &[&str] = &[
@@ -28,8 +29,11 @@ fn main() {
     run_cmd.args(QEMU_ARGS);
     run_cmd.args(std::env::args().skip(2).collect::<Vec<_>>());
 
-    let exit_status = run_cmd.status().unwrap();
-    match exit_status.code() {
+    let child_output = run_cmd.output().unwrap();
+    std::io::stderr().write_all(&child_output.stderr).unwrap();
+    std::io::stderr().write_all(&child_output.stdout).unwrap();
+
+    match child_output.status.code() {
         Some(33) => {}                     // success
         Some(35) => panic!("Test failed"), // success
         other => panic!("Test failed with unexpected exit code `{:?}`", other),

diff --git a/tests/test_kernels/default_settings/Cargo.toml b/tests/test_kernels/default_settings/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"
 
 [dependencies]
 bootloader = { path = "../../.." }
-x86_64 = { version = "0.13.2", default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", default-features = false, features = ["instructions", "inline_asm"] }
 uart_16550 = "0.2.10"
diff --git a/tests/test_kernels/higher_half/Cargo.toml b/tests/test_kernels/higher_half/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"
 
 [dependencies]
 bootloader = { path = "../../.." }
-x86_64 = { version = "0.13.2", default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", default-features = false, features = ["instructions", "inline_asm"] }
 uart_16550 = "0.2.10"
diff --git a/tests/test_kernels/map_phys_mem/Cargo.toml b/tests/test_kernels/map_phys_mem/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 bootloader = { path = "../../.." }
-x86_64 = { version = "0.13.2", default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", default-features = false, features = ["instructions", "inline_asm"] }
 uart_16550 = "0.2.10"
 
 [package.metadata.bootloader]