Skip to content

fix(cpuid): remove unnecessary unsafe #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lencerf merged 1 commit into from
Mar 6, 2026
+3 −3
Merged

fix(cpuid): remove unnecessary unsafe #418

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions alioth/src/board/board_x86_64/board_x86_64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ impl<V: Vm> ArchBoard<V> {
};
out.ecx |= (1 << 24) | (1 << 31);

let leaf_8000_0000 = unsafe { __cpuid(0x8000_0000) };
let leaf_8000_0000 = __cpuid(0x8000_0000);
cpuids.insert(
CpuidIn {
func: 0x8000_0000,
Expand All @@ -137,7 +137,7 @@ impl<V: Vm> ArchBoard<V> {
// 0x8000_0005: L1 cache/LTB
// 0x8000_0006: L2 cache/TLB and L3 cache
for func in 0x8000_0002..=0x8000_0006 {
let host_cpuid = unsafe { __cpuid(func) };
let host_cpuid = __cpuid(func);
cpuids.insert(CpuidIn { func, index: None }, host_cpuid);
}

Expand All @@ -153,7 +153,7 @@ impl<V: Vm> ArchBoard<V> {
let Some(out) = cpuids.get_mut(&leaf) else {
return error::MissingCpuid { leaf }.fail();
};
let host_ebx = unsafe { __cpuid(leaf.func) }.ebx;
let host_ebx = __cpuid(leaf.func).ebx;
// set PhysAddrReduction to 1
out.ebx = (1 << 6) | (host_ebx & 0x3f);
out.ecx = 0;
Expand Down