michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Rename main to rust_main to support testing

Browse Source 
On testing, `std` is imported, which defines an own `main` function. Thus `cargo test` fails if there alread exists one non-mangled main.
This commit is contained in:
Philipp Oppermann
2015-09-15 14:43:50 +02:00
parent 3030b1c862
commit 5db8977495
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/arch/x86_64/long_mode_init.asm
View File

@@ -13,7 +13,7 @@
; limitations under the License.
global long_mode_start
extern main
extern rust_main
section .text
bits 64
@@ -21,7 +21,7 @@ long_mode_start:
call setup_SSE
; call rust main
call main
call rust_main
.os_returned:
; rust main returned, print `OS returned!`
mov rax, 0x4f724f204f534f4f