From ca2ccc31aa5af08cc3d6c2d0a1991900f7c40e66 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Tue, 11 Apr 2017 18:23:45 +0200
Subject: [PATCH] Call the rust_main function from assembly

---
 src/arch/x86_64/long_mode_init.asm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/arch/x86_64/long_mode_init.asm b/src/arch/x86_64/long_mode_init.asm
index eab3788..00b6b22 100644
--- a/src/arch/x86_64/long_mode_init.asm
+++ b/src/arch/x86_64/long_mode_init.asm
@@ -1,4 +1,5 @@
 global long_mode_start
+extern rust_main
 
 section .text
 bits 64
@@ -11,6 +12,10 @@ long_mode_start:
     mov fs, ax
     mov gs, ax
 
+    ; call the rust main
+    extern rust_main
+    call rust_main
+
     ; print `OKAY` to screen
     mov rax, 0x2f592f412f4b2f4f
     mov qword [0xb8000], rax