Skip to content
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

llvm_asm! -> asm! #154

Merged
merged 1 commit into from
Apr 30, 2021
+6 −3
Merged

llvm_asm! -> asm! #154

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Unreleased

- Use new `asm!` syntax instead of deprecated `llvm_asm!` ([#148](/~https://github.com/rust-osdev/bootloader/154))

# 0.10.1 – 2021-04-07

- Fix docs.rs build: Don't enable any features
Expand Down
7 changes: 4 additions & 3 deletions src/bin/bios.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#![feature(lang_items)]
#![feature(global_asm)]
#![feature(llvm_asm)]
#![feature(asm)]
#![no_std]
#![no_main]
Expand Down Expand Up @@ -51,8 +50,10 @@ extern "C" {
#[no_mangle]
pub unsafe extern "C" fn stage_4() -> ! {
// Set stack segment
llvm_asm!("mov bx, 0x0
mov ss, bx" ::: "bx" : "intel");
asm!(
"mov bx, 0x0; mov ss, bx",
out("bx") _,
);

let kernel_start = 0x400000;
let kernel_size = &_kernel_size as *const _ as u64;
Expand Down