From babed67df51df723d55c8151dd7109c7e2470bf4 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 17 Aug 2016 15:47:54 -0600 Subject: [PATCH] Map kernel in AP, WIP --- x86/startup-x86_64.asm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/x86/startup-x86_64.asm b/x86/startup-x86_64.asm index 8d27857193..1e4c57a2b7 100644 --- a/x86/startup-x86_64.asm +++ b/x86/startup-x86_64.asm @@ -1,7 +1,7 @@ trampoline: .ready: dq 0 - .page_table: dq 0 - .stack: dq 0 + .stack_start: dq 0 + .stack_end: dq 0 .code: dq 0 times 512 - ($ - trampoline) db 0 @@ -128,10 +128,11 @@ long_mode_ap: mov gs, rax mov ss, rax - mov rax, [trampoline.page_table] - mov cr3, rax - mov rsp, [trampoline.stack] + mov rdi, [trampoline.stack_start] + mov rsi, [trampoline.stack_end] + + lea rsp, [rsi - 16] mov qword [trampoline.ready], 1 mov rax, [trampoline.code]