github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

set the correct context size on i386. synch the platform init with x86_64 changes.

This commit is contained in:
Kalamatee 2023-04-18 18:30:00 +01:00 committed by deadwood
parent d4bd118dda
commit efdea0d874
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/i386-pc/kernel/kernel_cpu.h
View File

@ -15,7 +15,7 @@
#define regs_t struct ExceptionContext
/* There are no private add-ons */
#define AROSCPUContext ExceptionContext
#define CPUSSEContxtSize (sizeof(struct AROSCPUContext) + sizeof(struct FPFXSContext) + 15)
#define CPUSSEContxtSize (sizeof(struct AROSCPUContext) + sizeof(struct FPXContext) + 15)
/* We have no VBlank emulation */
#define NO_VBLANK_EMU

27
arch/i386-pc/kernel/platform_init.c
View File

@ -25,6 +25,7 @@
extern struct syscallx86_Handler x86_SCSupervisorHandler;
int core_SysCallHandler(struct ExceptionContext *regs, struct KernelBase *KernelBase, void *HandlerData2);
extern int core_APICSpuriousHandle(struct ExceptionContext *, void *, void *);
static int PlatformInit(struct KernelBase *KernelBase)
{
@ -76,16 +77,36 @@ static int PlatformInit(struct KernelBase *KernelBase)
// Set up the base syscall handler(s)
NEWLIST(&data->kb_SysCallHandlers);
if (!core_SetIDTGate(idt, APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_SYSCALL),
(uintptr_t)IntrDefaultGates[APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_SYSCALL)], TRUE, FALSE))
/*
* Setup the BSP's exception, spurious, heartbeat and syscall gates early
*/
core_SetExGates((x86vectgate_t *)idt);
if (!core_SetIDTGate((x86vectgate_t *)idt, APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_SYSCALL),
(uintptr_t)IntrDefaultGates[APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_SYSCALL)], TRUE, FALSE))
{
krnPanic(NULL, "Failed to set BSP Syscall Vector\n"
"Vector #%02X\n",
APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_SYSCALL));
}
if (!core_SetIDTGate((x86vectgate_t *)idt, APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_HEARTBEAT),
(uintptr_t)IntrDefaultGates[APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_HEARTBEAT)], TRUE, FALSE))
{
krnPanic(NULL, "Failed to set BSP Heartbeat Vector\n"
"Vector #%02X\n",
APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_HEARTBEAT));
}
if (!core_SetIDTGate((x86vectgate_t *)idt, APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_SPURIOUS),
(uintptr_t)IntrDefaultGates[APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_SPURIOUS)], TRUE, FALSE))
{
krnPanic(NULL, "Failed to set BSP Spurious Vector\n"
"Vector #%02X\n",
APIC_CPU_EXCEPT_TO_VECTOR(APIC_EXCEPT_SPURIOUS));
}
KrnAddExceptionHandler(APIC_EXCEPT_SPURIOUS, core_APICSpuriousHandle, KernelBase, NULL);
KrnAddExceptionHandler(APIC_EXCEPT_SYSCALL, core_SysCallHandler, KernelBase, NULL);
krnAddSysCallHandler(data, &x86_SCSupervisorHandler, FALSE, TRUE);
D(bug("[Kernel:i386] %s: BSP vectors and handlers configured\n", __func__));
/* Set correct TSS address in the GDT */
GDT[6].base_low = ((unsigned long)tss) & 0xffff;
GDT[6].base_mid = (((unsigned long)tss) >> 16) & 0xff;