From 0e73954ea4321abf69f3e2ce4cfd5adf347214b9 Mon Sep 17 00:00:00 2001 From: Morten Delenk Date: Thu, 4 Feb 2016 12:57:35 +0100 Subject: [PATCH] Make build work and created a stub kernel --- kernel.settings | 9 +- kernel/Makefile | 9 +- kernel/hal/x86/boot/boot.S | 2 + kernel/hal/x86/c_include/multiboot.h | 274 +++++++++++++++++++++++++++ kernel/hal/x86/init/init.cpp | 11 +- kernel/kernel/Makefile | 23 +++ kernel/kernel/init.cpp | 9 + 7 files changed, 328 insertions(+), 9 deletions(-) create mode 100644 kernel/hal/x86/c_include/multiboot.h create mode 100644 kernel/kernel/Makefile create mode 100644 kernel/kernel/init.cpp diff --git a/kernel.settings b/kernel.settings index 42aa897..fe4af82 100644 --- a/kernel.settings +++ b/kernel.settings @@ -1,5 +1,6 @@ -MODE = debug -#MODE = release # enables optimization +arch = x86 +#MODE = debug +MODE = release # enables optimization export PATH := $(HOME)/opt/bin:$(PATH) #PREFIX = @@ -9,6 +10,6 @@ ifeq ($(MODE),debug) CFLAGS += -g3 -DDEBUG CPPFLAGS += -g3 -DDEBUG else -# CFLAGS += -# CPPFLAGS += + CFLAGS += -O2 + CPPFLAGS += -O2 endif diff --git a/kernel/Makefile b/kernel/Makefile index 1179e98..d973f22 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -1,16 +1,21 @@ include ../kernel.settings SRCS = $(shell find hal/$(arch) -name '*.cpp' -o -name '*.[cS]') +KERNSRCS = $(shell find kernel -name '*.cpp' -o -name '*.c') OBJS = $(addsuffix .o,$(basename $(SRCS))) +OBJS += $(addsuffix .o,$(basename $(KERNSRCS))) LD = $(PREFIX)g++ LDFLAGS = -nostdlib -nodefaultlibs -nostdlib -fno-builtin ifeq ($(arch),x86) LDFLAGS += -m32 -T kernel.ld endif -all: hal +all: hal kernel $(LD) $(LDFLAGS) -o mtgos $(OBJS) hal: make -C hal +kernel: + make -C kernel clean: make -C hal clean + make -C kernel clean -.PHONY: all hal clean +.PHONY: all hal kernel clean diff --git a/kernel/hal/x86/boot/boot.S b/kernel/hal/x86/boot/boot.S index 2b6f13a..d1f84b0 100644 --- a/kernel/hal/x86/boot/boot.S +++ b/kernel/hal/x86/boot/boot.S @@ -11,6 +11,8 @@ .global _start _start: mov $kernel_stack, %esp + push %ebx + push %eax call init _stop: cli diff --git a/kernel/hal/x86/c_include/multiboot.h b/kernel/hal/x86/c_include/multiboot.h new file mode 100644 index 0000000..b5c1bce --- /dev/null +++ b/kernel/hal/x86/c_include/multiboot.h @@ -0,0 +1,274 @@ +/* multiboot.h - Multiboot header file. */ +/* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY + * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef MULTIBOOT_HEADER +#define MULTIBOOT_HEADER 1 + +/* How many bytes from the start of the file we search for the header. */ +#define MULTIBOOT_SEARCH 8192 +#define MULTIBOOT_HEADER_ALIGN 4 + +/* The magic field should contain this. */ +#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 + +/* This should be in %eax. */ +#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 + +/* Alignment of multiboot modules. */ +#define MULTIBOOT_MOD_ALIGN 0x00001000 + +/* Alignment of the multiboot info structure. */ +#define MULTIBOOT_INFO_ALIGN 0x00000004 + +/* Flags set in the 'flags' member of the multiboot header. */ + +/* Align all boot modules on i386 page (4KB) boundaries. */ +#define MULTIBOOT_PAGE_ALIGN 0x00000001 + +/* Must pass memory information to OS. */ +#define MULTIBOOT_MEMORY_INFO 0x00000002 + +/* Must pass video information to OS. */ +#define MULTIBOOT_VIDEO_MODE 0x00000004 + +/* This flag indicates the use of the address fields in the header. */ +#define MULTIBOOT_AOUT_KLUDGE 0x00010000 + +/* Flags to be set in the 'flags' member of the multiboot info structure. */ + +/* is there basic lower/upper memory information? */ +#define MULTIBOOT_INFO_MEMORY 0x00000001 +/* is there a boot device set? */ +#define MULTIBOOT_INFO_BOOTDEV 0x00000002 +/* is the command-line defined? */ +#define MULTIBOOT_INFO_CMDLINE 0x00000004 +/* are there modules to do something with? */ +#define MULTIBOOT_INFO_MODS 0x00000008 + +/* These next two are mutually exclusive */ + +/* is there a symbol table loaded? */ +#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010 +/* is there an ELF section header table? */ +#define MULTIBOOT_INFO_ELF_SHDR 0X00000020 + +/* is there a full memory map? */ +#define MULTIBOOT_INFO_MEM_MAP 0x00000040 + +/* Is there drive info? */ +#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080 + +/* Is there a config table? */ +#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100 + +/* Is there a boot loader name? */ +#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200 + +/* Is there a APM table? */ +#define MULTIBOOT_INFO_APM_TABLE 0x00000400 + +/* Is there video information? */ +#define MULTIBOOT_INFO_VBE_INFO 0x00000800 +#define MULTIBOOT_INFO_FRAMEBUFFER_INFO 0x00001000 + +#ifndef ASM_FILE + +typedef unsigned char multiboot_uint8_t; +typedef unsigned short multiboot_uint16_t; +typedef unsigned int multiboot_uint32_t; +typedef unsigned long long multiboot_uint64_t; + +struct multiboot_header +{ + /* Must be MULTIBOOT_MAGIC - see above. */ + multiboot_uint32_t magic; + + /* Feature flags. */ + multiboot_uint32_t flags; + + /* The above fields plus this one must equal 0 mod 2^32. */ + multiboot_uint32_t checksum; + + /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ + multiboot_uint32_t header_addr; + multiboot_uint32_t load_addr; + multiboot_uint32_t load_end_addr; + multiboot_uint32_t bss_end_addr; + multiboot_uint32_t entry_addr; + + /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ + multiboot_uint32_t mode_type; + multiboot_uint32_t width; + multiboot_uint32_t height; + multiboot_uint32_t depth; +}; + +/* The symbol table for a.out. */ +struct multiboot_aout_symbol_table +{ + multiboot_uint32_t tabsize; + multiboot_uint32_t strsize; + multiboot_uint32_t addr; + multiboot_uint32_t reserved; +}; +typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; + +/* The section header table for ELF. */ +struct multiboot_elf_section_header_table +{ + multiboot_uint32_t num; + multiboot_uint32_t size; + multiboot_uint32_t addr; + multiboot_uint32_t shndx; +}; +typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t; + +struct multiboot_info +{ + /* Multiboot info version number */ + multiboot_uint32_t flags; + + /* Available memory from BIOS */ + multiboot_uint32_t mem_lower; + multiboot_uint32_t mem_upper; + + /* "root" partition */ + multiboot_uint32_t boot_device; + + /* Kernel command line */ + multiboot_uint32_t cmdline; + + /* Boot-Module list */ + multiboot_uint32_t mods_count; + multiboot_uint32_t mods_addr; + + union + { + multiboot_aout_symbol_table_t aout_sym; + multiboot_elf_section_header_table_t elf_sec; + } u; + + /* Memory Mapping buffer */ + multiboot_uint32_t mmap_length; + multiboot_uint32_t mmap_addr; + + /* Drive Info buffer */ + multiboot_uint32_t drives_length; + multiboot_uint32_t drives_addr; + + /* ROM configuration table */ + multiboot_uint32_t config_table; + + /* Boot Loader Name */ + multiboot_uint32_t boot_loader_name; + + /* APM table */ + multiboot_uint32_t apm_table; + + /* Video */ + multiboot_uint32_t vbe_control_info; + multiboot_uint32_t vbe_mode_info; + multiboot_uint16_t vbe_mode; + multiboot_uint16_t vbe_interface_seg; + multiboot_uint16_t vbe_interface_off; + multiboot_uint16_t vbe_interface_len; + + multiboot_uint64_t framebuffer_addr; + multiboot_uint32_t framebuffer_pitch; + multiboot_uint32_t framebuffer_width; + multiboot_uint32_t framebuffer_height; + multiboot_uint8_t framebuffer_bpp; +#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 +#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 +#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 + multiboot_uint8_t framebuffer_type; + union + { + struct + { + multiboot_uint32_t framebuffer_palette_addr; + multiboot_uint16_t framebuffer_palette_num_colors; + }; + struct + { + multiboot_uint8_t framebuffer_red_field_position; + multiboot_uint8_t framebuffer_red_mask_size; + multiboot_uint8_t framebuffer_green_field_position; + multiboot_uint8_t framebuffer_green_mask_size; + multiboot_uint8_t framebuffer_blue_field_position; + multiboot_uint8_t framebuffer_blue_mask_size; + }; + }; +}; +typedef struct multiboot_info multiboot_info_t; + +struct multiboot_color +{ + multiboot_uint8_t red; + multiboot_uint8_t green; + multiboot_uint8_t blue; +}; + +struct multiboot_mmap_entry +{ + multiboot_uint32_t size; + multiboot_uint64_t addr; + multiboot_uint64_t len; +#define MULTIBOOT_MEMORY_AVAILABLE 1 +#define MULTIBOOT_MEMORY_RESERVED 2 +#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3 +#define MULTIBOOT_MEMORY_NVS 4 +#define MULTIBOOT_MEMORY_BADRAM 5 + multiboot_uint32_t type; +} __attribute__((packed)); +typedef struct multiboot_mmap_entry multiboot_memory_map_t; + +struct multiboot_mod_list +{ + /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */ + multiboot_uint32_t mod_start; + multiboot_uint32_t mod_end; + + /* Module command line */ + multiboot_uint32_t cmdline; + + /* padding to take it to 16 bytes (must be zero) */ + multiboot_uint32_t pad; +}; +typedef struct multiboot_mod_list multiboot_module_t; + +/* APM BIOS info. */ +struct multiboot_apm_info +{ + multiboot_uint16_t version; + multiboot_uint16_t cseg; + multiboot_uint32_t offset; + multiboot_uint16_t cseg_16; + multiboot_uint16_t dseg; + multiboot_uint16_t flags; + multiboot_uint16_t cseg_len; + multiboot_uint16_t cseg_16_len; + multiboot_uint16_t dseg_len; +}; + +#endif /* ! ASM_FILE */ + +#endif /* ! MULTIBOOT_HEADER */ \ No newline at end of file diff --git a/kernel/hal/x86/init/init.cpp b/kernel/hal/x86/init/init.cpp index 6363d9e..317c95e 100644 --- a/kernel/hal/x86/init/init.cpp +++ b/kernel/hal/x86/init/init.cpp @@ -6,7 +6,9 @@ #include #include #include +#include extern "C" void intr_stub_0(void); +void main(); namespace MTGosHAL { Serial debug; Screen out; @@ -15,9 +17,11 @@ namespace MTGosHAL { IDT idt; GDT gdt; Multitasking tasks; - void main() { + void main(int eax, struct multiboot_info* ebx) { out << BG_color::BLACK << FG_color::WHITE << "Loading MTGos...\n"; err << BG_color::BLACK << FG_color::RED; + if(eax!=0x2BADB002) + err << "System wasn't loaded by a Multiboot-conformant launcher!\n"; debug << "Hello debugger! This is MTGos v00r01\nThese logs are probably very long, so please redirect the output to a file.\n"; gdt.setEntry(0, 0, 0, 0); gdt.setEntry(1, 0, 0xfffff, GDT_FLAG_SEGMENT | GDT_FLAG_32_BIT | GDT_FLAG_CODESEG | GDT_FLAG_4K_GRAN | GDT_FLAG_PRESENT); @@ -35,16 +39,17 @@ namespace MTGosHAL { idt.setEntry(8, (void *)((uint32_t)&intr_stub_0+128), SEG_DBL_FAULT, IDT_TASK_GATE | IDT_SEG_32_BIT | IDT_RING_0 | IDT_USED); idt.apply(); sti(); + ::main(); for(;;); } } typedef void (*constructor)(); extern "C" constructor start_ctors; extern "C" constructor end_ctors; -extern "C" void init() { +extern "C" void init(int eax, struct multiboot_info* ebx) { for(constructor* i = &start_ctors; i != &end_ctors; ++i) (*i)(); - MTGosHAL::main(); + MTGosHAL::main(eax, ebx); } extern "C" void __cxa_pure_virtual() { MTGosHAL::debug << "A pure virtual function just got called.\n"; diff --git a/kernel/kernel/Makefile b/kernel/kernel/Makefile new file mode 100644 index 0000000..ed799b3 --- /dev/null +++ b/kernel/kernel/Makefile @@ -0,0 +1,23 @@ +include ../../kernel.settings +SRCS = $(shell find -name '*.cpp' -o -name '*.c') +OBJS = $(addsuffix .o,$(basename $(SRCS))) +CPP = $(PREFIX)g++ +CC = $(PREFIX)gcc +ASFLAGS = -m32 +CFLAGS = -m32 -Wall -fno-stack-protector -nostdinc -Ic_include/ -I../hal/dummy/c_include -ffreestanding -march=native -std=c11 -fno-builtin -Werror -nostdlib -g +CPPFLAGS = -m32 -Wall -fno-stack-protector -nostdinc -std=c++14 -Iinclude/ -Ic_include/ -I../hal/dummy/include -I../hal/dummy/c_include -fno-rtti -fno-exceptions -ffreestanding -march=native -fno-builtin -Werror -nostdlib -fno-use-cxa-atexit -Wextra -Wno-unused -g +all: $(OBJS) + +%.o: %.cpp + $(CPP) $(CPPFLAGS) -c -o $@ $^ + +%.o: %.c + $(CC) $(CFLAGS) -c -o $@ $^ + +%.o: $.S + $(CC) $(CFLAGS) -c -o $@ $^ + +clean: + rm -rf $(OBJS) + +.PHONY: clean all \ No newline at end of file diff --git a/kernel/kernel/init.cpp b/kernel/kernel/init.cpp new file mode 100644 index 0000000..a7c077c --- /dev/null +++ b/kernel/kernel/init.cpp @@ -0,0 +1,9 @@ +#include +#include +#include +#include +#include +#include +void main() { + MTGosHAL::out << "Initializing Kernel!\n"; +} \ No newline at end of file