diff --git a/CHANGELOG.md b/CHANGELOG.md index 46617bd..5c3e869 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.4.0 + +### Breaking Changes + +- Update `memory_addr` to `0.3.0`, which is not backward compatible with `0.2.0`. + ## 0.3.3 - Support the use of `page_table_entry` at the ARM EL2 privilege level (via the `arm-el2` feature). diff --git a/Cargo.toml b/Cargo.toml index e5ec6e4..502245b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ members = [ ] [workspace.package] -version = "0.3.3" +version = "0.4.0" authors = ["Yuekai Jia "] license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" homepage = "https://github.com/arceos-org/arceos" diff --git a/page_table_entry/Cargo.toml b/page_table_entry/Cargo.toml index f7d9c6e..41093e8 100644 --- a/page_table_entry/Cargo.toml +++ b/page_table_entry/Cargo.toml @@ -16,7 +16,7 @@ arm-el2 = [] [dependencies] bitflags = "2.6" -memory_addr = "0.2" +memory_addr = "0.3" [target.'cfg(any(target_arch = "aarch64", doc))'.dependencies] aarch64-cpu = "9.4" diff --git a/page_table_multiarch/Cargo.toml b/page_table_multiarch/Cargo.toml index 29a10fe..c557390 100644 --- a/page_table_multiarch/Cargo.toml +++ b/page_table_multiarch/Cargo.toml @@ -13,8 +13,8 @@ categories.workspace = true [dependencies] log = "0.4" -memory_addr = "0.2" -page_table_entry = { path = "../page_table_entry", version = "0.3" } +memory_addr = "0.3" +page_table_entry = { path = "../page_table_entry", version = "0.4.0" } [target.'cfg(any(target_arch = "x86_64", doc))'.dependencies] x86 = "0.52" diff --git a/page_table_multiarch/README.md b/page_table_multiarch/README.md index f0d580c..d8a15f6 100644 --- a/page_table_multiarch/README.md +++ b/page_table_multiarch/README.md @@ -30,7 +30,7 @@ Currently supported architectures and page table structures: ## Examples (x86_64) ```rust -use memory_addr::{PhysAddr, VirtAddr}; +use memory_addr::{MemoryAddr, PhysAddr, VirtAddr}; use page_table_multiarch::x86_64::{X64PageTable}; use page_table_multiarch::{MappingFlags, PagingHandler, PageSize}; diff --git a/page_table_multiarch/src/bits64.rs b/page_table_multiarch/src/bits64.rs index 118a4da..2ec0a94 100644 --- a/page_table_multiarch/src/bits64.rs +++ b/page_table_multiarch/src/bits64.rs @@ -3,7 +3,7 @@ extern crate alloc; use crate::{GenericPTE, PagingHandler, PagingMetaData}; use crate::{MappingFlags, PageSize, PagingError, PagingResult, TlbFlush, TlbFlushAll}; use core::marker::PhantomData; -use memory_addr::{PhysAddr, PAGE_SIZE_4K}; +use memory_addr::{MemoryAddr, PhysAddr, PAGE_SIZE_4K}; const ENTRY_COUNT: usize = 512; @@ -139,7 +139,7 @@ impl PageTable64 + From + Copy; + type VirtAddr: MemoryAddr; // (^)it can be converted from/to usize and it's trivially copyable /// Whether a given physical address is valid.