Skip to content

Commit c521e73

Browse files
authored
Merge pull request #344 from Freax13/next
Merge `master` into `next`
2 parents 628b913 + 33194b6 commit c521e73

19 files changed

+50
-997
lines changed

Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,27 @@ license = "MIT/Apache-2.0"
2222
name = "x86_64"
2323
readme = "README.md"
2424
repository = "https://github.com/rust-osdev/x86_64"
25-
version = "0.14.7"
25+
version = "0.14.8"
2626
edition = "2018"
2727

2828
[dependencies]
2929
bit_field = "0.10.1"
3030
bitflags = "1.3.2"
3131
volatile = "0.4.4"
3232

33-
[build-dependencies]
34-
cc = { version = "1.0.37", optional = true }
35-
3633
[features]
3734
default = [ "nightly", "instructions" ]
3835
instructions = []
39-
external_asm = [ "cc" ]
40-
nightly = [ "inline_asm", "const_fn", "abi_x86_interrupt", "doc_cfg" ]
41-
inline_asm = []
36+
nightly = [ "const_fn", "abi_x86_interrupt", "asm_const", "doc_cfg" ]
4237
abi_x86_interrupt = []
4338
const_fn = []
39+
asm_const = []
4440
doc_cfg = []
4541

42+
# These features are no longer used and only there for backwards compatibility.
43+
external_asm = []
44+
inline_asm = []
45+
4646
[package.metadata.release]
4747
no-dev-version = true
4848
pre-release-replacements = [

Changelog.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Unreleased
22

3+
# 0.14.8 – 2022-02-03
4+
5+
- Add `Cr2::read_raw` ([#334](https://github.com/rust-osdev/x86_64/pull/334))
6+
- Add support for `MXCSR` register ([#336](https://github.com/rust-osdev/x86_64/pull/336))
7+
38
# 0.14.7 – 2021-12-18
49

510
- fix: build error on the latest nightly ([#329](https://github.com/rust-osdev/x86_64/pull/329))

build.rs

-54
This file was deleted.

src/addr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub struct PhysAddr(u64);
4141
/// overwritten possibly meaningful bits. This likely indicates a bug, for example an invalid
4242
/// address calculation.
4343
#[derive(Debug)]
44-
pub struct VirtAddrNotValid(u64);
44+
pub struct VirtAddrNotValid(pub u64);
4545

4646
impl VirtAddr {
4747
/// Creates a new canonical virtual address.
@@ -326,7 +326,7 @@ impl Sub<VirtAddr> for VirtAddr {
326326
///
327327
/// This means that bits 52 to 64 were not all null.
328328
#[derive(Debug)]
329-
pub struct PhysAddrNotValid(u64);
329+
pub struct PhysAddrNotValid(pub u64);
330330

331331
impl PhysAddr {
332332
/// Creates a new physical address.

0 commit comments

Comments
 (0)