summaryrefslogtreecommitdiff
path: root/kernel/src/cpu/irq_stub.S
diff options
context:
space:
mode:
authorAleksa Vuckovic <aleksav013@gmail.com>2022-09-05 23:54:12 +0200
committerAleksa Vuckovic <aleksav013@gmail.com>2022-09-07 17:46:10 +0200
commit956bb743a3ba6939aaff2372fc45628cda6a9840 (patch)
tree0d1fd304eb584c892e28e43bbc851cf66786d9da /kernel/src/cpu/irq_stub.S
parent59f86fe8dd237e50c7fea03b506125e3abff0157 (diff)
userspace finally working
Diffstat (limited to 'kernel/src/cpu/irq_stub.S')
-rw-r--r--kernel/src/cpu/irq_stub.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/src/cpu/irq_stub.S b/kernel/src/cpu/irq_stub.S
index 9b2b2d8..5a8149c 100644
--- a/kernel/src/cpu/irq_stub.S
+++ b/kernel/src/cpu/irq_stub.S
@@ -24,7 +24,6 @@
pop %rax
.endm
-
.macro isr_no_error number
.global isr\number
isr\number:
@@ -38,11 +37,12 @@ isr\number:
.macro isr_error number
.global isr\number
isr\number:
- pop %rdi
pushall
+ mov 0x50(%rsp), %rdi
cld
call isr\number\()_handler
popall
+ add $8, %rsp
iretq
.endm