Skip to content

Commit 5eba27f

Browse files
committed
llvm_asm! -> asm!
1 parent c09f94f commit 5eba27f

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Changelog.md

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

3+
- Use new `asm!` syntax instead of deprecated `llvm_asm!` ([#148](https://github.com/rust-osdev/bootloader/154))
4+
35
# 0.10.1 – 2021-04-07
46

57
- Fix docs.rs build: Don't enable any features

src/bin/bios.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![feature(lang_items)]
22
#![feature(global_asm)]
3-
#![feature(llvm_asm)]
43
#![feature(asm)]
54
#![no_std]
65
#![no_main]
@@ -51,8 +50,10 @@ extern "C" {
5150
#[no_mangle]
5251
pub unsafe extern "C" fn stage_4() -> ! {
5352
// Set stack segment
54-
llvm_asm!("mov bx, 0x0
55-
mov ss, bx" ::: "bx" : "intel");
53+
asm!(
54+
"mov bx, 0x0; mov ss, bx",
55+
out("bx") _,
56+
);
5657

5758
let kernel_start = 0x400000;
5859
let kernel_size = &_kernel_size as *const _ as u64;

0 commit comments

Comments
 (0)