loic/bringelle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring

Browse source
This commit is contained in:
Loic Guegan 2021-04-12 10:13:21 +02:00
parent 6edeba8fe2
commit 39713a3736
24 changed files with 187 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile
View file

@ -6,14 +6,14 @@ LD_SCRIPT := linker.ld
# Indeed boot.o generated by boot.S should appear
# first in the kernel binary (thus it must be linked first, cf the $(EXEC) rule)
BOOT_OBJ := $(addsuffix .o,$(basename $(shell find ./boot -name "*.[c|S]" ! -name "boot.S")))
UTILS_OBJ := $(addsuffix .o,$(basename $(shell find ./utils -name "*.[c|S]")))
CORE_OBJ := $(addsuffix .o,$(basename $(shell find ./core -name "*.[c|S]")))
LIBC_OBJ := $(addsuffix .o,$(basename $(shell find ./libc -name "*.[c|S]")))
INT_OBJ := $(addsuffix .o,$(basename $(shell find ./int -name "*.[c|S]")))
all: $(EXEC)
$(EXEC): boot/boot.o $(BOOT_OBJ) $(UTILS_OBJ) $(LIBC_OBJ) $(INT_OBJ) bringelle.o
$(EXEC): boot/boot.o $(BOOT_OBJ) $(CORE_OBJ) $(LIBC_OBJ) $(INT_OBJ) bringelle.o
ld -n -T $(LD_SCRIPT) -nostdlib -o bringelle $^
%.o: %.S

1
src/boot/multiboot.c
View file

@ -1,5 +1,4 @@
#include "multiboot.h"
#include "utils/mem.h"
/// See boot.S
extern u8* MB_INFO;

5
src/boot/multiboot.h
View file

@ -1,7 +1,8 @@
#ifndef MULTIBOOT_H
#define MULTIBOOT_H
#include "utils/types.h"
#include "core/types.h"
#include "core/mem.h"
typedef struct MBI_TAG_HEADER {
u32 type;
@ -29,10 +30,12 @@ typedef struct MBI_TAG_FB {
* Parse Bootloader boot information structure
*/
char mb_load_tag(char **data, char type);
/**
* Search for Bootloader name
*/
char mb_load_bl_name(MBI_TAG_BL_NAME *data);
/**
* Search for FrameBuffer structure (TODO: Finish)
*/

14
src/bringelle.c
View file

@ -1,14 +1,14 @@
#include "libc/stdio.h"
#include "int/pic.h"
#include "boot/multiboot.h"
#include "utils/mem.h"
#include "utils/gdt.h"
#include "utils/paging.h"
#include "core/mem.h"
#include "core/gdt.h"
#include "core/paging.h"
char show_tics=0;
extern GDT_TSS TSS;
extern void interrupt_enable();
void utask(){
char msg[]="Message from the task :D";
@ -20,8 +20,8 @@ void bringelle(){
clear();
printc("Booting Bringelle...\n",GREEN);
// Kernel boot sequence
pic_enable_interrupt();
// ----- Kernel boot sequence
interrupt_enable();
print("Interrupts enabled\n");
paging_enable();
@ -52,8 +52,6 @@ void bringelle(){
: "=m" (TSS.ss0), "=m" (TSS.esp0)
);
while(1);
}

0
src/utils/asm.h → src/core/asm.h
View file

0
src/utils/framebuffer.c → src/core/framebuffer.c
View file

8
src/utils/framebuffer.h → src/core/framebuffer.h
View file

@ -21,7 +21,15 @@ typedef struct VIDEO_STATE {
* Print char
*/
void putchar(char);
/**
* Scroll the framebuffer from one line
*/
void scrollup();
/**
* Clear all char from the framebuffer
*/
void clear();
#endif

0
src/utils/gdt.c → src/core/gdt.c
View file

0
src/utils/gdt.h → src/core/gdt.h
View file

0
src/utils/mem.c → src/core/mem.c
View file

3
src/utils/mem.h → src/core/mem.h
View file

@ -3,6 +3,9 @@
#include "types.h"
/**
* Copy size byte from *src to *dst
*/
void memcpy(void *src, void *dst, int size);
#endif

0
src/utils/paging.c → src/core/paging.c
View file

3
src/utils/paging.h → src/core/paging.h
View file

@ -5,6 +5,9 @@
#define PAGING_DIR_LOCATION 0x1000
#define PAGING_TABLE_LOCATION 0x5000
/*
* Configure and enable paging
*/
void paging_enable();
#endif

0
src/utils/syscall.c → src/core/syscall.c
View file

3
src/utils/syscall.h → src/core/syscall.h
View file

@ -1,6 +1,9 @@
#ifndef SYSCALL_H
#define SYSCALL_H
/*
* Perform a syscall
*/
void syscall();
#endif

2
src/utils/types.h → src/core/types.h
View file

@ -1,5 +1,5 @@
#ifndef TYPES_H
#define TYPES_h
#define TYPES_H
typedef unsigned char u8;
typedef unsigned short u16;

4
src/int/8042.c
View file

@ -1,6 +1,6 @@
#include "8042.h"
#include "utils/framebuffer.h"
#include "utils/asm.h"
#include "core/framebuffer.h"
#include "core/asm.h"
DEFINE_AZERTY;

2
src/int/8042.h
View file

@ -1,7 +1,7 @@
#ifndef _8042_H
#define _8042_H
#include "utils/types.h"
#include "core/types.h"
void _8042_keypress();

39
src/int/idt.c Normal file
View file

@ -0,0 +1,39 @@
#include "idt.h"
struct IDT_REGISTER IDTR={
8*IDT_MAX_ENTRY,
0x0
};
// Interrupt functions (cf int.S)
extern u32
INT_DEFAULT,
INT_PAGE_FAULT,
INT_CLOCK,
INT_KEYPRESS,
INT_SYSCALL;
void idt_init(){
// Map first default 32 entries
for(int i=0;i<IDT_MAX_ENTRY;i++){
idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_DEFAULT,IDT_INT_GATE},i);
if(i==14)
idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_PAGE_FAULT,IDT_INT_GATE},i);
if(i==32)
idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_CLOCK,IDT_INT_GATE},i);
if(i==33)
idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_KEYPRESS,IDT_INT_GATE},i);
if(i==48)
idt_write_entry((IDT_ENTRY){0x08,(u32)&INT_SYSCALL,IDT_TRAP_GATE},i);
}
asm("lidtl (IDTR)");
}
void idt_write_entry(IDT_ENTRY entry, int id){
int descriptor[2];
descriptor[0]=entry.offset & 0xFFFF | entry.segment << 16;
descriptor[1]=entry.type & 0xFFFF | entry.offset & 0xFFFF0000;
memcpy((void*)descriptor, (void *)(IDTR.base+(id*8)),8);
}

32
src/int/idt.h Normal file
View file

@ -0,0 +1,32 @@
#ifndef IDT_H
#define IDT_H
#include "core/types.h"
#include "core/mem.h"
#define IDT_MAX_ENTRY 200
#define IDT_INT_GATE 0x8E00
#define IDT_TRAP_GATE 0xEF00
typedef struct IDT_ENTRY {
u16 segment;
u32 offset;
u16 type;
} IDT_ENTRY;
struct IDT_REGISTER {
u16 limit;
u32 base;
} __attribute__((packed));
/**
* Copy IDT into memory and load it
*/
void idt_init();
/**
* Write an IDT entry into memory
*/
void idt_write_entry(IDT_ENTRY entry,int id);
#endif

72
src/int/int.S
View file

@ -0,0 +1,72 @@
.macro SAVE_REGS
pushal
push %ds
push %es
push %fs
push %gs
push %ebx
mov $0x10,%bx
mov %bx,%ds
pop %ebx
.endm
.macro RESTORE_REGS
pop %gs
pop %fs
pop %es
pop %ds
popal
.endm
.globl interrupt_enable
interrupt_enable:
call idt_init
call pic_init
sti
ret
.globl INT_DEFAULT
INT_DEFAULT:
SAVE_REGS
movb $0x20, %al
outb %al, $0x20
RESTORE_REGS
iret
.globl INT_KEYPRESS
INT_KEYPRESS:
SAVE_REGS
call _8042_keypress
movb $0x20, %al
outb %al, $0x20
RESTORE_REGS
iret
.globl INT_CLOCK
INT_CLOCK:
SAVE_REGS
call clock
movb $0x20, %al
outb %al, $0x20
RESTORE_REGS
iret
.globl INT_SYSCALL
INT_SYSCALL:
SAVE_REGS
call syscall
movb $0x20, %al
outb %al, $0x20
RESTORE_REGS
iret
.globl INT_PAGE_FAULT
INT_PAGE_FAULT:
SAVE_REGS
call page_fault
hlt
movb $0x20, %al
outb %al, $0x20
RESTORE_REGS
iret

99
src/int/pic.c
View file

@ -1,88 +1,10 @@
#include "pic.h"
#include "utils/asm.h"
#include "utils/mem.h"
#include "utils/syscall.h"
struct IDT_REGISTER IDTR={
200*8,
0x0
};
/// Bridge between IDT and functions call
asm (
".macro SAVE_REGS \n\t"
"pushal \n\t"
"push %ds \n\t"
"push %es \n\t"
"push %fs \n\t"
"push %gs \n\t"
"push %ebx \n\t"
"mov $0x10,%bx \n\t"
"mov %bx,%ds \n\t"
"pop %ebx \n\t"
".endm \n\t"
".macro RESTORE_REGS \n\t"
"pop %gs \n\t"
"pop %fs \n\t"
"pop %es \n\t"
"pop %ds \n\t"
"popal \n\t"
".endm \n\t"
"PIC_IRQ_DEFAULT: \n\t"
"SAVE_REGS \n\t"
"movb $0x20, %al \n\t"
"outb %al, $0x20 \n\t"
"RESTORE_REGS \n\t"
"iret \n\t"
"PIC_IRQ_PRINT: \n\t"
"SAVE_REGS \n\t"
"call _8042_keypress \n\t"
"movb $0x20, %al \n\t"
"outb %al, $0x20 \n\t"
"RESTORE_REGS \n\t"
"iret \n\t"
"PIC_IRQ_CLOCK: \n\t"
"SAVE_REGS \n\t"
"call clock \n\t"
"movb $0x20, %al \n\t"
"outb %al, $0x20 \n\t"
"RESTORE_REGS \n\t"
"iret \n\t"
"PIC_IRQ_SYSCALL: \n\t"
"SAVE_REGS \n\t"
"call syscall \n\t"
"movb $0x20, %al \n\t"
"outb %al, $0x20 \n\t"
"RESTORE_REGS \n\t"
"iret \n\t"
"INT_PAGE_FAULT: \n\t"
"SAVE_REGS \n\t"
"call page_fault \n\t"
"hlt \n\t"
"movb $0x20, %al \n\t"
"outb %al, $0x20 \n\t"
"RESTORE_REGS \n\t"
"iret \n\t"
);
extern u32 PIC_IRQ_DEFAULT,PIC_IRQ_PRINT,PIC_IRQ_CLOCK, PIC_IRQ_SYSCALL,INT_PAGE_FAULT;
void pic_enable_interrupt(){
// Map first default 32 entries
for(int i=0;i<200;i++){
pic_add_idt_entry((IDT_ENTRY){0x08,(u32)&PIC_IRQ_DEFAULT,IDT_INT_GATE},i);
if(i==14)
pic_add_idt_entry((IDT_ENTRY){0x08,(u32)&INT_PAGE_FAULT,IDT_INT_GATE},i);
if(i==32)
pic_add_idt_entry((IDT_ENTRY){0x08,(u32)&PIC_IRQ_CLOCK,IDT_INT_GATE},i);
if(i==33)
pic_add_idt_entry((IDT_ENTRY){0x08,(u32)&PIC_IRQ_PRINT,IDT_INT_GATE},i);
if(i==48)
pic_add_idt_entry((IDT_ENTRY){0x08,(u32)&PIC_IRQ_SYSCALL,IDT_TRAP_GATE},i);
}
// Now configure 8952A
#include "core/asm.h"
#include "core/mem.h"
#include "core/syscall.h"
void pic_init(){
// ICW1: Initialisation
outbj(0x20,0x11); // Master
outbj(0xA0,0x11); // Slave
@ -101,15 +23,6 @@ void pic_enable_interrupt(){
// OCW: Masking
outbj(0x21,0b11111100);
asm("lidtl (IDTR)");
asm("sti");
}
void pic_add_idt_entry(IDT_ENTRY entry, int id){
int descriptor[2];
descriptor[0]=entry.offset & 0xFFFF | entry.segment << 16;
descriptor[1]=entry.type & 0xFFFF | entry.offset & 0xFFFF0000;
memcpy((void*)descriptor, (void *)(IDTR.base+(id*8)),8);
}

22
src/int/pic.h
View file

@ -1,23 +1,9 @@
#ifndef PIC_H
#define PIC_H
#include "utils/types.h"
#define IDT_INT_GATE 0x8E00
#define IDT_TRAP_GATE 0xEF00
typedef struct IDT_ENTRY {
u16 segment;
u32 offset;
u16 type;
} IDT_ENTRY;
struct IDT_REGISTER {
u16 limit;
u32 base;
} __attribute__((packed));
void pic_enable_interrupt();
void pic_add_idt_entry(IDT_ENTRY entry,int id);
/**
* Configure
*/
void pic_init();
#endif

2
src/libc/stdio.h
View file

@ -1,7 +1,7 @@
#ifndef STDIO_H
#define STDIO_H
#include "utils/framebuffer.h"
#include "core/framebuffer.h"
void print(char*);
void printc(char*,VIDEO_COLORS c);