Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bugs related to handling real mode switch in inline assembly sections; reenable LTO as that fixes it

Browse Source
This commit is contained in:
mintsuki 2020-09-25 22:57:57 +02:00
parent c657e86cc8
commit b41fa7e204
6 changed files with 79 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
decompressor/Makefile
View File

@ -2,7 +2,7 @@ CC = i386-elf-gcc
LD = i386-elf-gcc
OBJCOPY = i386-elf-objcopy
CFLAGS = -Os -pipe -Wall -Wextra
CFLAGS = -flto -Os -pipe -Wall -Wextra
INTERNAL_CFLAGS = \
-std=gnu11 \
@ -20,7 +20,7 @@ INTERNAL_CFLAGS = \
-MMD \
-I.
LDFLAGS = -Os
LDFLAGS = -flto -Os
INTERNAL_LDFLAGS = \
-lgcc \

BIN
limine.bin
View File

Binary file not shown.

4
stage2/Makefile
View File

@ -2,7 +2,7 @@ CC = i386-elf-gcc
LD = i386-elf-gcc
OBJCOPY = i386-elf-objcopy
CFLAGS = -Os -pipe -Wall -Wextra
CFLAGS = -flto -Os -pipe -Wall -Wextra
INTERNAL_CFLAGS = \
-std=gnu11 \
@ -22,7 +22,7 @@ INTERNAL_CFLAGS = \
-I. \
-I..
LDFLAGS = -Os
LDFLAGS = -flto -Os
INTERNAL_LDFLAGS = \
-lgcc \

61
stage2/protos/chainload.c
View File

@ -7,34 +7,8 @@
#include <drivers/disk.h>
#include <lib/term.h>
void chainload(void) {
int part; {
char buf[32];
if (!config_get_value(buf, 0, 32, "PARTITION")) {
part = -1;
} else {
part = (int)strtoui(buf);
}
}
int drive; {
char buf[32];
if (!config_get_value(buf, 0, 32, "DRIVE")) {
panic("DRIVE not specified");
}
drive = (int)strtoui(buf);
}
term_deinit();
if (part != -1) {
struct part p;
get_part(&p, drive, part);
read_partition(drive, &p, (void *)0x7c00, 0, 512);
} else {
read(drive, (void *)0x7c00, 0, 512);
}
__attribute__((section(".realmode"), used))
static void spinup(uint8_t drive) {
asm volatile (
// Jump to real mode
"jmp 0x08:1f\n\t"
@ -65,3 +39,34 @@ void chainload(void) {
: "memory"
);
}
void chainload(void) {
int part; {
char buf[32];
if (!config_get_value(buf, 0, 32, "PARTITION")) {
part = -1;
} else {
part = (int)strtoui(buf);
}
}
int drive; {
char buf[32];
if (!config_get_value(buf, 0, 32, "DRIVE")) {
panic("DRIVE not specified");
}
drive = (int)strtoui(buf);
}
term_deinit();
if (part != -1) {
struct part p;
get_part(&p, drive, part);
read_partition(drive, &p, (void *)0x7c00, 0, 512);
} else {
read(drive, (void *)0x7c00, 0, 512);
}
spinup(drive);
}

71
stage2/protos/linux.c
View File

@ -12,6 +12,44 @@
#define KERNEL_LOAD_ADDR ((size_t)0x100000)
#define INITRD_LOAD_ADDR ((size_t)0x1000000)
__attribute__((section(".realmode"), used))
static void spinup(uint16_t real_mode_code_seg, uint16_t kernel_entry_seg) {
asm volatile (
"cli\n\t"
"cld\n\t"
"jmp 0x08:1f\n\t"
"1: .code16\n\t"
"mov ax, 0x10\n\t"
"mov ds, ax\n\t"
"mov es, ax\n\t"
"mov fs, ax\n\t"
"mov gs, ax\n\t"
"mov ss, ax\n\t"
"mov eax, cr0\n\t"
"and al, 0xfe\n\t"
"mov cr0, eax\n\t"
"jmp 0x0000:1f\n\t"
"1:\n\t"
"mov ds, bx\n\t"
"mov es, bx\n\t"
"mov fs, bx\n\t"
"mov gs, bx\n\t"
"mov ss, bx\n\t"
"mov sp, 0xfdf0\n\t"
"push cx\n\t"
"push 0\n\t"
"retf\n\t"
".code32\n\t"
:
: "b" (real_mode_code_seg), "c" (kernel_entry_seg)
: "memory"
);
}
void linux_load(char *cmdline, int boot_drive) {
int kernel_drive; {
char buf[32];
@ -136,36 +174,5 @@ void linux_load(char *cmdline, int boot_drive) {
term_deinit();
asm volatile (
"cli\n\t"
"cld\n\t"
"jmp 0x08:1f\n\t"
"1: .code16\n\t"
"mov ax, 0x10\n\t"
"mov ds, ax\n\t"
"mov es, ax\n\t"
"mov fs, ax\n\t"
"mov gs, ax\n\t"
"mov ss, ax\n\t"
"mov eax, cr0\n\t"
"and al, 0xfe\n\t"
"mov cr0, eax\n\t"
"jmp 0x0000:1f\n\t"
"1:\n\t"
"mov ds, bx\n\t"
"mov es, bx\n\t"
"mov fs, bx\n\t"
"mov gs, bx\n\t"
"mov ss, bx\n\t"
"mov sp, 0xfdf0\n\t"
"push cx\n\t"
"push 0\n\t"
"retf\n\t"
:
: "b" (real_mode_code_seg), "c" (kernel_entry_seg)
: "memory"
);
spinup(real_mode_code_seg, kernel_entry_seg);
}

5
stage2/protos/stivale.c
View File

@ -348,7 +348,7 @@ __attribute__((noreturn)) void stivale_spinup(
: "memory"
);
} else if (bits == 32) {
asm volatile(
asm volatile (
"cli\n\t"
"cld\n\t"
@ -371,7 +371,8 @@ __attribute__((noreturn)) void stivale_spinup(
"iret\n\t"
:
: "b"(&entry_point), "D"(stivale_struct), "S"(&stack)
: "memory");
: "memory"
);
}
for (;;);
}