diff options
| -rw-r--r-- | .bochsrc | 57 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | out/grub.cfg | 3 | ||||
| -rw-r--r-- | out/isodir/boot/grub/grub.cfg | 6 | ||||
| -rw-r--r-- | src/boot/boot.s | 14 | ||||
| -rw-r--r-- | src/include/asm.h | 15 | ||||
| -rw-r--r-- | src/include/gdt.h | 12 | ||||
| -rw-r--r-- | src/include/idt.h | 17 | ||||
| -rw-r--r-- | src/kernel/gdt.c (renamed from src/kernel/gdt/gdt.c) | 14 | ||||
| -rw-r--r-- | src/kernel/gdt/compile_flags.txt | 1 | ||||
| -rw-r--r-- | src/kernel/idt.c | 28 | ||||
| -rw-r--r-- | src/kernel/keyboard/pic.c | 1 | ||||
| -rw-r--r-- | src/utils/compile_flags.txt | 1 |
13 files changed, 157 insertions, 19 deletions
diff --git a/.bochsrc b/.bochsrc new file mode 100644 index 0000000..df42d47 --- /dev/null +++ b/.bochsrc @@ -0,0 +1,57 @@ +# configuration file generated by Bochs +plugin_ctrl: unmapped=true, biosdev=true, speaker=true, extfpuirq=true, parallel=true, serial=true, e1000=false, iodebug=true, usb_uhci=false, usb_ohci=false, usb_ehci=false, usb_xhci=false +config_interface: textconfig +display_library: sdl2 +memory: host=32, guest=32 +romimage: file="/usr/share/bochs/BIOS-bochs-latest", address=0x00000000, options=none +vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest" +floppy_bootsig_check: disabled=0 +floppya: type=1_44 +boot: cdrom +# no floppyb +ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14 +ata0-master: type=none +ata0-slave: type=cdrom, path="out/myos.iso", status=inserted, model="Generic 1234", biosdetect=auto +ata1: enabled=true, ioaddr1=0x170, ioaddr2=0x370, irq=15 +ata1-master: type=none +ata1-slave: type=none +ata2: enabled=false +ata3: enabled=false +optromimage1: file=none +optromimage2: file=none +optromimage3: file=none +optromimage4: file=none +optramimage1: file=none +optramimage2: file=none +optramimage3: file=none +optramimage4: file=none +pci: enabled=1, chipset=i440fx, slot1=none, slot2=none, slot3=none, slot4=none, slot5=none +vga: extension=none, update_freq=5, realtime=1, ddc=builtin +cpu: count=1:1:1, ips=4000000, quantum=16, model=bx_generic, reset_on_triple_fault=1, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0 +cpuid: level=6, stepping=3, model=3, family=6, vendor_string="GenuineIntel", brand_string=" Intel(R) Pentium(R) 4 CPU " +cpuid: mmx=true, apic=xapic, simd=sse2, sse4a=false, misaligned_sse=false, sep=true +cpuid: movbe=false, adx=false, aes=false, sha=false, xsave=false, xsaveopt=false, avx_f16c=false +cpuid: avx_fma=false, bmi=0, xop=false, fma4=false, tbm=false, x86_64=true, 1g_pages=false +cpuid: pcid=false, fsgsbase=false, smep=false, smap=false, mwait=true +print_timestamps: enabled=0 +debugger_log: bochs/dblog.txt +magic_break: enabled=1 +port_e9_hack: enabled=0 +private_colormap: enabled=0 +clock: sync=none, time0=local, rtc_sync=0 +# no cmosimage +log: bochs/log.txt +logprefix: %t%e%d +debug: action=ignore +info: action=report +error: action=report +panic: action=ask +keyboard: type=mf, serial_delay=250, paste_delay=100000, user_shortcut=none +mouse: type=ps2, enabled=false, toggle=ctrl+mbutton +speaker: enabled=true, mode=system +parport1: enabled=true, file=none +parport2: enabled=false +com1: enabled=true, mode=null +com2: enabled=false +com3: enabled=false +com4: enabled=false @@ -1,6 +1,9 @@ OUT_DIR = out SRC = src BUILD = build +BOCHS = bochs +TESTS = tests +TEST = $(TESTS)/debug.rc TARGET = i686-elf ISO = myos @@ -43,6 +46,9 @@ all: $(OUT_DIR)/$(ISO).iso run: all qemu-system-i386 -cdrom $(OUT_DIR)/$(ISO).iso +test: all + mkdir -p $(BOCHS) + bochs -q -rc $(TEST) $(OUT_DIR)/$(ISO).iso : $(OUT_DIR)/isodir/boot/$(ISO).bin grub-mkrescue -o $@ $(OUT_DIR)/isodir @@ -62,6 +68,7 @@ $(BUILD)/%.o: $(SRC)/%.c clean: + rm -rf $(BOCHS) rm -rf $(INTERNAL_OBJS) rm -rf $(OUT_DIR)/$(ISO).iso rm -rf $(OUT_DIR)/isodir/boot/$(ISO).bin diff --git a/out/grub.cfg b/out/grub.cfg deleted file mode 100644 index f064685..0000000 --- a/out/grub.cfg +++ /dev/null @@ -1,3 +0,0 @@ -menuentry "myos" { - multiboot /boot/myos.bin -} diff --git a/out/isodir/boot/grub/grub.cfg b/out/isodir/boot/grub/grub.cfg index f064685..a4c18a7 100644 --- a/out/isodir/boot/grub/grub.cfg +++ b/out/isodir/boot/grub/grub.cfg @@ -1,3 +1,7 @@ +set timeout=0 +set default=0 # Set the default menu entry + menuentry "myos" { multiboot /boot/myos.bin -} + boot +} diff --git a/src/boot/boot.s b/src/boot/boot.s index aba32ff..22d32f3 100644 --- a/src/boot/boot.s +++ b/src/boot/boot.s @@ -19,10 +19,17 @@ resb 16384 stack_top: section .text + global gdtr gdtr: dw 0 dd 0 + +global idtr +idtr: + dw 0 + dd 0 + global _start:function (_start.end - _start) _start: mov esp, stack_top @@ -37,10 +44,17 @@ _start: call reloadSegments + extern get_idtr + call get_idtr + lidt [idtr] + [bits 32] extern kernel_main call kernel_main + ; BOCHS + xchg bx, bx + cli .hang: hlt diff --git a/src/include/asm.h b/src/include/asm.h new file mode 100644 index 0000000..97ea45a --- /dev/null +++ b/src/include/asm.h @@ -0,0 +1,15 @@ +#pragma once +#include <stdint.h> + +// IO +static inline void outb(uint16_t port, uint8_t val) { + asm volatile("outb %0, %1" : : "a"(val), "Nd"(port) : "memory"); +} + +static inline uint8_t inb(uint16_t port) { + uint8_t ret; + asm volatile("inb %1, %0" : "=a"(ret) : "Nd"(port) : "memory"); + return ret; +} + +static inline void io_wait(void) { outb(0x80, 0); } diff --git a/src/include/gdt.h b/src/include/gdt.h index 06a0d96..8cc2542 100644 --- a/src/include/gdt.h +++ b/src/include/gdt.h @@ -16,11 +16,13 @@ typedef struct GDTR { uint32_t offset; } __attribute__((packed)) GDTR_t; -typedef struct GDT { - Segment_Descriptor_t nulldesc; - Segment_Descriptor_t codedesc; - Segment_Descriptor_t datadesc; -} __attribute__((packed)) GDT_t; +// typedef struct GDT { +// Segment_Descriptor_t nulldesc; +// Segment_Descriptor_t codedesc; +// Segment_Descriptor_t datadesc; +// } __attribute__((packed)) GDT_t; + +typedef Segment_Descriptor_t *GDT_t; uint16_t make_code(uint8_t priv, uint8_t dc, uint8_t rw); uint16_t make_data(uint8_t priv, uint8_t dc, uint8_t rw); diff --git a/src/include/idt.h b/src/include/idt.h new file mode 100644 index 0000000..b8413b8 --- /dev/null +++ b/src/include/idt.h @@ -0,0 +1,17 @@ +#pragma once +#include <stdint.h> + +typedef struct Gate_Descriptor { + uint16_t offset_low; + uint16_t segment_selector; + uint8_t reserved; + uint8_t attrs; + uint16_t offset_high; +} __attribute__((packed)) Gate_Descriptor_t; + +typedef Gate_Descriptor_t *IDT_t; + +Gate_Descriptor_t make_gate(uint32_t offset, uint8_t segment_selector, + uint8_t attrs); + +void get_idtr(); diff --git a/src/kernel/gdt/gdt.c b/src/kernel/gdt.c index 4886dc3..406b40c 100644 --- a/src/kernel/gdt/gdt.c +++ b/src/kernel/gdt.c @@ -1,19 +1,15 @@ #include "gdt.h" #include <stdint.h> -GDT_t *table = 0x0; +GDT_t table = 0x0; extern GDTR_t gdtr; void get_gdtr() { uint32_t base = 0x0000; - *table = (GDT_t){ - // NULL - make_descriptor(0, 0, 0), - // Code segment, read - make_descriptor(base, 0x8FFFF, make_code(0, 0, 1)), - // Data segment, read write - make_descriptor(base, 0x8FFFF, make_data(0, 0, 1)), - }; + table[0] = make_descriptor(0, 0, 0); + table[1] = make_descriptor(base, 0x3FFFF, make_code(0, 0, 1)); + table[2] = make_descriptor(base, 0x3FFFF, make_data(0, 0, 1)); + gdtr.size = sizeof(Segment_Descriptor_t) * 3 - 1; gdtr.offset = base; } diff --git a/src/kernel/gdt/compile_flags.txt b/src/kernel/gdt/compile_flags.txt deleted file mode 100644 index 2af49c7..0000000 --- a/src/kernel/gdt/compile_flags.txt +++ /dev/null @@ -1 +0,0 @@ --I../../include/ diff --git a/src/kernel/idt.c b/src/kernel/idt.c new file mode 100644 index 0000000..f3fea4f --- /dev/null +++ b/src/kernel/idt.c @@ -0,0 +1,28 @@ +#include "idt.h" +#include "gdt.h" +#include <stdint.h> + +IDT_t idt = (IDT_t)0x7fffe; +extern GDTR_t idtr; + +void get_idtr() { + int base = 0x7fffe; + uint8_t code_seg = (0b1000 << 3) | 0b000; + + // idtr.size = sizeof(Gate_Descriptor_t) * n - 1; + idtr.size = 0; + idtr.offset = base; +} + +Gate_Descriptor_t make_gate(uint32_t offset, uint8_t segment_selector, + uint8_t type) { + Gate_Descriptor_t ret = (Gate_Descriptor_t){ + .offset_low = offset, + .reserved = 0, + .attrs = (0b1000 << 4) | type, + .offset_high = offset >> 16, + .segment_selector = segment_selector, + }; + + return ret; +} diff --git a/src/kernel/keyboard/pic.c b/src/kernel/keyboard/pic.c new file mode 100644 index 0000000..0c81629 --- /dev/null +++ b/src/kernel/keyboard/pic.c @@ -0,0 +1 @@ +#include "asm.h" diff --git a/src/utils/compile_flags.txt b/src/utils/compile_flags.txt new file mode 100644 index 0000000..b02b210 --- /dev/null +++ b/src/utils/compile_flags.txt @@ -0,0 +1 @@ +-I../include |