RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:57:45 +00:00
Code Issues Activity Actions

Kernel: Don't build with -mregparm=3

Browse source 
It was really confusing to have different calling conventions in kernel
and userspace. Also this has prevented us from linking with libgcc.
This commit is contained in:
Andreas Kling 2019-11-06 13:03:45 +01:00
parent 01b21e5e05
commit 1c6f8d3cbd
6 changed files with 54 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Kernel/Arch/i386/Boot/boot.S
View file

@ -54,8 +54,9 @@ start:
call init
mov $exit_message, %eax
pushl $exit_message
call kprintf
add $4, %esp
cli

8
Kernel/Arch/i386/CPU.cpp
View file

@ -1,7 +1,7 @@
#include "APIC.h"
#include "Assertions.h"
#include "IRQHandler.h"
#include "PIC.h"
#include "APIC.h"
#include "Process.h"
#include "Scheduler.h"
#include <AK/Types.h>
@ -82,8 +82,9 @@ asm(
" popw %es\n" \
" popw %fs\n" \
" popw %gs\n" \
" mov %esp, %eax\n" \
" pushl %esp\n" \
" call exception_" #ec "_handler\n" \
" add $4, %esp\n" \
" popw %gs\n" \
" popw %gs\n" \
" popw %fs\n" \
@ -114,8 +115,9 @@ asm(
" popw %es\n" \
" popw %fs\n" \
" popw %gs\n" \
" mov %esp, %eax\n" \
" pushl %esp\n" \
" call exception_" #ec "_handler\n" \
" add $4, %esp\n" \
" popw %gs\n" \
" popw %gs\n" \
" popw %fs\n" \

11
Kernel/Arch/i386/CPU.h
View file

@ -259,8 +259,7 @@ inline u32 read_fs_u32(u32 offset)
inline void write_fs_u32(u32 offset, u32 val)
{
asm volatile(
"movl %k[val], %%fs:%a[off]"
:: [off] "ir" (offset), [val] "ir" (val)
"movl %k[val], %%fs:%a[off]" ::[off] "ir"(offset), [ val ] "ir"(val)
: "memory");
}
@ -383,7 +382,6 @@ struct [[gnu::packed]] RegisterDump
u16 ss_if_crossRing;
};
struct [[gnu::aligned(16)]] FPUState
{
u8 buffer[512];
@ -459,8 +457,8 @@ public:
MSR(const MSR&) = delete;
MSR& operator=(const MSR&) = delete;
MSR(uint32_t msr):
m_msr(msr)
MSR(uint32_t msr)
: m_msr(msr)
{
}
@ -473,7 +471,6 @@ public:
void set(u32 low, u32 high)
{
asm volatile("wrmsr"
:: "a"(low), "d"(high), "c"(m_msr));
asm volatile("wrmsr" ::"a"(low), "d"(high), "c"(m_msr));
}
};

3
Kernel/Arch/i386/PIT.cpp
View file

@ -27,8 +27,9 @@ asm(
" popw %es\n"
" popw %fs\n"
" popw %gs\n"
" mov %esp, %eax\n"
" pushl %esp\n"
" call timer_interrupt_handler\n"
" add $4, %esp\n"
" popw %gs\n"
" popw %gs\n"
" popw %fs\n"

2
Kernel/Makefile
View file

@ -107,7 +107,7 @@ CXX_OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS)
OBJS = $(CXX_OBJS) Arch/i386/Boot/boot.ao
KERNEL = kernel
CXXFLAGS += -ffreestanding -mregparm=3 -mno-80387 -mno-mmx -mno-sse -mno-sse2
CXXFLAGS += -ffreestanding -mno-80387 -mno-mmx -mno-sse -mno-sse2
CXXFLAGS += -nostdlib -nostdinc -nostdinc++
CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/8.3.0/
CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/8.3.0/i686-pc-serenity/

3
Kernel/Syscall.cpp
View file

@ -28,8 +28,9 @@ asm(
" popw %es\n"
" popw %fs\n"
" popw %gs\n"
" mov %esp, %eax\n"
" pushl %esp\n"
" call syscall_trap_entry\n"
" add $4, %esp\n"
" popw %gs\n"
" popw %gs\n"
" popw %fs\n"