File tree 1 file changed +3
-3
lines changed
1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change 1
1
#![ feature( lang_items) ]
2
2
#![ feature( global_asm) ]
3
3
#![ feature( step_trait) ]
4
- #![ feature( asm ) ]
4
+ #![ feature( llvm_asm ) ]
5
5
#![ feature( nll) ]
6
6
#![ feature( const_fn) ]
7
7
#![ no_std]
@@ -43,7 +43,7 @@ global_asm!(include_str!("video_mode/vga_320x200.s"));
43
43
global_asm ! ( include_str!( "video_mode/vga_text_80x25.s" ) ) ;
44
44
45
45
unsafe fn context_switch ( boot_info : VirtAddr , entry_point : VirtAddr , stack_pointer : VirtAddr ) -> ! {
46
- asm ! ( "call $1; ${:private}.spin.${:uid}: jmp ${:private}.spin.${:uid}" ::
46
+ llvm_asm ! ( "call $1; ${:private}.spin.${:uid}: jmp ${:private}.spin.${:uid}" ::
47
47
"{rsp}" ( stack_pointer) , "r" ( entry_point) , "{rdi}" ( boot_info) :: "intel" ) ;
48
48
:: core:: hint:: unreachable_unchecked ( )
49
49
}
@@ -89,7 +89,7 @@ extern "C" {
89
89
#[ no_mangle]
90
90
pub unsafe extern "C" fn stage_4 ( ) -> ! {
91
91
// Set stack segment
92
- asm ! ( "mov bx, 0x0
92
+ llvm_asm ! ( "mov bx, 0x0
93
93
mov ss, bx" :: : "bx" : "intel" ) ;
94
94
95
95
let kernel_start = 0x400000 ;
You can’t perform that action at this time.
0 commit comments