Update to x86_64 0.13.1

Author: phil-opp

Cargo.lock

@@ -32,7 +32,7 @@ required-features = ["uefi_bin"]
 
 [dependencies]
 xmas-elf = { version = "0.6.2", optional = true }
-x86_64 = { git = "https://github.com/rust-osdev/x86_64.git", optional = true }
+x86_64 = { version = "0.13.1", optional = true }
 usize_conversions = { version = "0.2.0", optional = true }
 bit_field = { version = "0.10.0", optional = true }
 log = { version = "0.4.8", optional = true }

Cargo.toml

@@ -5,7 +5,7 @@ use crate::{
 use x86_64::{
     align_up,
     structures::paging::{
-        FrameAllocator, MapperAllSizes, Page, PageSize, PageTableFlags as Flags, PhysFrame,
+        mapper::MapperAllSizes, FrameAllocator, Page, PageSize, PageTableFlags as Flags, PhysFrame,
         Size4KiB,
     },
     PhysAddr, VirtAddr,

src/binary/load_kernel.rs

@@ -398,7 +398,7 @@ unsafe fn context_switch(
 ) -> ! {
     // identity-map current and next frame, so that we don't get an immediate pagefault
     // after switching the active page table
-    let current_addr = PhysAddr::new(registers::read_rip());
+    let current_addr = PhysAddr::new(registers::read_rip().as_u64());
     let current_frame: PhysFrame = PhysFrame::containing_address(current_addr);
     for frame in PhysFrame::range_inclusive(current_frame, current_frame + 1) {
         unsafe {

src/binary/mod.rs

@@ -6,5 +6,5 @@ edition = "2018"
 
 [dependencies]
 bootloader = { path = "../../.." }
-x86_64 = "0.12.2"
+x86_64 = "0.13.1"
 uart_16550 = "0.2.10"