mirrors/limine
1
0
Fork 0
mirror of https://github.com/limine-bootloader/limine synced 2024-12-11 17:24:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

When calling into real mode, also pass the segment registers

Browse Source
This commit is contained in:
mintsuki 2020-09-02 04:39:27 +02:00
parent b9be2e70c1
commit 46f46ddd15
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
limine.bin
View File

Binary file not shown.

30
src/lib/real.c
View File

@ -40,16 +40,16 @@ void rm_int(uint8_t int_no, struct rm_regs *out_regs, struct rm_regs *in_regs) {
"mov cr0, eax\n\t"
FARJMP16("0", "1f")
"1:\n\t"
"mov ax, 0\n\t"
"mov ds, ax\n\t"
"mov es, ax\n\t"
"mov fs, ax\n\t"
"mov gs, ax\n\t"
"xor ax, ax\n\t"
"mov ss, ax\n\t"
// Load in_regs
"mov dword ptr ds:[5f], esp\n\t"
"mov esp, dword ptr ds:[7f]\n\t"
"mov dword ptr ss:[5f], esp\n\t"
"mov esp, dword ptr ss:[7f]\n\t"
"pop gs\n\t"
"pop fs\n\t"
"pop es\n\t"
"pop ds\n\t"
"popfd\n\t"
"pop ebp\n\t"
"pop edi\n\t"
@ -58,7 +58,7 @@ void rm_int(uint8_t int_no, struct rm_regs *out_regs, struct rm_regs *in_regs) {
"pop ecx\n\t"
"pop ebx\n\t"
"pop eax\n\t"
"mov esp, dword ptr ds:[5f]\n\t"
"mov esp, dword ptr ss:[5f]\n\t"
"sti\n\t"
@ -69,9 +69,9 @@ void rm_int(uint8_t int_no, struct rm_regs *out_regs, struct rm_regs *in_regs) {
"cli\n\t"
// Load out_regs
"mov dword ptr ds:[5f], esp\n\t"
"mov esp, dword ptr ds:[6f]\n\t"
"lea esp, [esp + 8*4]\n\t"
"mov dword ptr ss:[5f], esp\n\t"
"mov esp, dword ptr ss:[6f]\n\t"
"lea esp, [esp + 10*4]\n\t"
"push eax\n\t"
"push ebx\n\t"
"push ecx\n\t"
@ -80,10 +80,14 @@ void rm_int(uint8_t int_no, struct rm_regs *out_regs, struct rm_regs *in_regs) {
"push edi\n\t"
"push ebp\n\t"
"pushfd\n\t"
"mov esp, dword ptr ds:[5f]\n\t"
"push ds\n\t"
"push es\n\t"
"push fs\n\t"
"push gs\n\t"
"mov esp, dword ptr ss:[5f]\n\t"
// Restore GDT
"lgdt [8f]\n\t"
"lgdt ss:[8f]\n\t"
// Jump back to pmode
"mov eax, cr0\n\t"

6
src/lib/real.h
View File

@ -12,6 +12,10 @@
#define EFLAGS_ZF (1 << 6)
struct rm_regs {
uint16_t gs;
uint16_t fs;
uint16_t es;
uint16_t ds;
uint32_t eflags;
uint32_t ebp;
uint32_t edi;
@ -20,7 +24,7 @@ struct rm_regs {
uint32_t ecx;
uint32_t ebx;
uint32_t eax;
};
} __attribute__((packed));
void rm_int(uint8_t int_no, struct rm_regs *out_regs, struct rm_regs *in_regs);