From 5927743ff864f06af8be367c4f79f98d69adfb30 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Mon, 13 Jul 2020 15:25:15 +0200
Subject: [PATCH] fixup! WIP: Rewrite interrupts as global assembly

---
 src/arch/x86_64/interrupt/handler.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/arch/x86_64/interrupt/handler.rs b/src/arch/x86_64/interrupt/handler.rs
index b96d666..9573925 100644
--- a/src/arch/x86_64/interrupt/handler.rs
+++ b/src/arch/x86_64/interrupt/handler.rs
@@ -266,6 +266,7 @@ macro_rules! pop_scratch {
         pop rdi
         pop rdx
         pop rcx
+        pop rax
     " };
 }
 #[macro_export]
@@ -294,8 +295,7 @@ macro_rules! interrupt_stack {
         paste::item! {
             #[no_mangle]
             unsafe extern "C" fn [<__interrupt_ $name>]($stack: *mut $crate::arch::x86_64::interrupt::InterruptStack) {
-                #[no_mangle]
-                unsafe extern "C" fn [<__interrupt_inner_ $name>]($stack: &mut $crate::arch::x86_64::interrupt::InterruptStack) {
+                unsafe fn [<__interrupt_inner_ $name>]($stack: &mut $crate::arch::x86_64::interrupt::InterruptStack) {
                     $code
                 }
 
@@ -336,8 +336,7 @@ macro_rules! interrupt {
         paste::item! {
             #[no_mangle]
             unsafe extern "C" fn [<__interrupt_ $name>]() {
-                #[no_mangle]
-                unsafe extern "C" fn [<__interrupt_inner_ $name>]() {
+                unsafe fn [<__interrupt_inner_ $name>]() {
                     $code
                 }
 
@@ -375,8 +374,7 @@ macro_rules! interrupt_error {
         paste::item! {
             #[no_mangle]
             unsafe extern "C" fn [<__interrupt_ $name>]($stack: *mut $crate::arch::x86_64::interrupt::handler::InterruptErrorStack) {
-                #[no_mangle]
-                unsafe extern "C" fn [<__interrupt_inner_ $name>]($stack: &mut $crate::arch::x86_64::interrupt::handler::InterruptErrorStack) {
+                unsafe fn [<__interrupt_inner_ $name>]($stack: &mut $crate::arch::x86_64::interrupt::handler::InterruptErrorStack) {
                     $code
                 }