From 4931f266a72dccfb439badfa1070563003c80ce3 Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Sat, 25 Feb 2023 02:24:36 +0100 Subject: define consts --- kernel/src/sys/userspace_asm.S | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'kernel/src/sys/userspace_asm.S') diff --git a/kernel/src/sys/userspace_asm.S b/kernel/src/sys/userspace_asm.S index 4431a84..1bb19a3 100644 --- a/kernel/src/sys/userspace_asm.S +++ b/kernel/src/sys/userspace_asm.S @@ -3,6 +3,10 @@ .extern begin_userspace .extern syscall_handler +.set IA32_EFER, 0xc0000080 +.set STAR_MSR, 0xc0000081 +.set LSTAR_MSR, 0xc0000082 + .global jump_userspace jump_userspace: mov $0x1b, %ax @@ -11,17 +15,17 @@ jump_userspace: mov %ax, %fs mov %ax, %gs - mov $0xc0000082, %rcx + mov $LSTAR_MSR, %rcx movabs $__syscall, %rax shr $32, %rax mov %eax, %edx movabs $__syscall, %rax wrmsr - mov $0xc0000080, %rcx + mov $IA32_EFER, %rcx rdmsr or $1, %eax wrmsr - mov $0xc0000081, %rcx + mov $STAR_MSR, %rcx rdmsr mov $0x00130008, %edx wrmsr -- cgit v1.2.3