aboutsummaryrefslogtreecommitdiff
path: root/x86_64/Makefrag.am
diff options
context:
space:
mode:
authorLuca Dariz <luca@orpolo.org>2023-04-19 21:47:02 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-05-01 02:00:28 +0200
commit660bc8ab3813737b3857648b7ec60d88494aeed1 (patch)
tree1566958542f4af9707992aa02faac3c925d08186 /x86_64/Makefrag.am
parent589735c3220793d1e9423bf6ec751b4625309aac (diff)
downloadgnumach-660bc8ab3813737b3857648b7ec60d88494aeed1.tar.gz
gnumach-660bc8ab3813737b3857648b7ec60d88494aeed1.tar.bz2
gnumach-660bc8ab3813737b3857648b7ec60d88494aeed1.zip
x86_64: add 64-bit syscall entry point
While theoretically we could still use the same call gate as for 32-bit userspace, it doesn't seem very common, and gcc seems to not encode properly the instruction. Instead we use syscall/sysret as other kernels (e.g. XNU,Linux). This version still has some limitations, but should be enough to start working on the 64-bit user space. * i386/i386/i386asm.sym: add more constants to fill pcb->iss * i386/i386/ldt.c: configure 64-bit syscall entry point. We can just check for the SEP bit as MSR are always available on x86_64. * i386/i386/ldt.h: swap CS/DS segments order if !USER32 as required by sysret * i386/i386/locore.h: add syscall64 prototype * i386/i386/msr.h: add MSR definitions and C read/write helpers * i386/include/mach/i386/syscall_sw.h: remove old BSD_TRAP * x86_64/Makefrag.am: selectively install syscall_sw.h depending on USER32 * x86_64/include/syscall_sw.h: add entry point template from user space * x86_64/locore.S: implement syscall64 entry point and use it when a 64-bit user-space is configured Message-Id: <20230419194703.410575-4-luca@orpolo.org>
Diffstat (limited to 'x86_64/Makefrag.am')
-rw-r--r--x86_64/Makefrag.am7
1 files changed, 6 insertions, 1 deletions
diff --git a/x86_64/Makefrag.am b/x86_64/Makefrag.am
index d3735890..fb225aa5 100644
--- a/x86_64/Makefrag.am
+++ b/x86_64/Makefrag.am
@@ -175,11 +175,16 @@ include_mach_x86_64_HEADERS = \
i386/include/mach/i386/mach_i386_types.h \
i386/include/mach/i386/machine_types.defs \
i386/include/mach/i386/multiboot.h \
- i386/include/mach/i386/syscall_sw.h \
i386/include/mach/i386/thread_status.h \
i386/include/mach/i386/trap.h \
i386/include/mach/i386/vm_param.h \
i386/include/mach/i386/vm_types.h
+
+if enable_user32
+include_mach_x86_64_HEADERS += i386/include/mach/i386/syscall_sw.h
+else
+include_mach_x86_64_HEADERS += x86_64/include/syscall_sw.h
+endif
#
# Platform specific parts.