🆕 切换为grub2引导,能进入Start_Kernel函数(未能完成初始化)

This commit is contained in:
fslongjin
2022-02-21 14:39:48 +08:00
parent a2aea12510
commit 0b0cce9326
21 changed files with 1128 additions and 1377 deletions

View File

@ -7,11 +7,13 @@ DIR_LIB=lib
lib_patterns := *.a
LIB_FILES := $(foreach DIR,$(DIR_LIB),$(addprefix $(DIR)/,$(lib_patterns)))
all: kernel
objcopy -I elf64-x86-64 -S -R ".eh_frame" -R ".comment" -O binary kernel ../bin/kernel/kernel.bin
#objcopy -I elf64-x86-64 -S -R ".comment" -O elf64-x86-64 kernel ../bin/kernel/kernel.elf
cp kernel ../bin/kernel/kernel.elf
kernel: head.o entry.o main.o printk.o trap.o mm.o irq.o 8259A.o process.o syscall.o
ld -b elf64-x86-64 -z muldefs -o kernel head.o exception/entry.o main.o common/printk.o exception/trap.o exception/irq.o exception/8259A.o mm/mm.o process/process.o syscall/syscall.o -T link.lds
kernel: head.o entry.o main.o printk.o trap.o mm.o irq.o 8259A.o process.o syscall.o multiboot2.o
ld -b elf64-x86-64 -z muldefs -o kernel head.o exception/entry.o main.o common/printk.o exception/trap.o exception/irq.o exception/8259A.o mm/mm.o process/process.o syscall/syscall.o driver/multiboot2/multiboot2.o \
-T link.lds
head.o: head.S
gcc -E head.S > head.s # 预处理
@ -49,5 +51,8 @@ process.o: process/process.c
syscall.o: syscall/syscall.c
gcc -mcmodel=large -fno-builtin -m64 -c syscall/syscall.c -o syscall/syscall.o
multiboot2.o: driver/multiboot2/multiboot2.c
gcc -mcmodel=large -fno-builtin -m64 -c driver/multiboot2/multiboot2.c -o driver/multiboot2/multiboot2.o
clean:
rm -rf $(GARBAGE)

65
kernel/common/boot_info.h Normal file
View File

@ -0,0 +1,65 @@
/**
* @file boot_info.h
* @brief 启动信息接口
* @author Zone.N (Zone.Niuzh@hotmail.com)
* @version 1.0
* @date 2021-09-18
* @copyright MIT LICENSE
* https://github.com/Simple-XX/SimpleKernel
* @par change log:
* <table>
* <tr><th>Date<th>Author<th>Description
* <tr><td>2021-09-18<td>digmouse233<td>迁移到 doxygen
* </table>
*/
#ifndef _BOOT_INFO_H_
#define _BOOT_INFO_H_
#include "stdint.h"
//#include "resource.h"
/**
* @brief 启动信息接口
* 由引导传递的机器信息处理
* 如 grub2 传递的 multiboot2 结构
* opensbi 传递的 dtb 结构
* 注意这部分是通过内存传递的,在重新保存之前不能被覆盖
* 架构专有的数据在 dtb.h 或 multiboot2.h
* 实现在 dtb.cpp 或 multiboot2.cpp
*/
namespace BOOT_INFO {
/// 声明,定义在具体的实现中
/// 地址
extern "C" uintptr_t boot_info_addr;
/// 长度
extern size_t boot_info_size;
/**
* @brief 初始化,定义在具体实现中
* @return true 成功
* @return false 成功
*/
extern bool init(void);
/**
* @brief 获取物理内存信息
* @return resource_t 物理内存资源信息
*/
extern resource_t get_memory(void);
/**
* @brief 获取 clint 信息
* @return resource_t clint 资源信息
*/
extern resource_t get_clint(void);
/**
* @brief 获取 plic 信息
* @return resource_t plic 资源信息
*/
extern resource_t get_plic(void);
};
#endif /* _BOOT_INFO_H_ */

View File

@ -0,0 +1,225 @@
// multiboot2
// How many bytes from the start of the file we search for the header.
#define MULTIBOOT_SEARCH 32768
#define MULTIBOOT_HEADER_ALIGN 8
// The magic field should contain this.
#define MULTIBOOT2_HEADER_MAGIC 0xe85250d6
// This should be in %eax.
#define MULTIBOOT2_BOOTLOADER_MAGIC 0x36d76289
// Alignment of multiboot modules.
#define MULTIBOOT_MOD_ALIGN 0x00001000
// Alignment of the multiboot info structure.
#define MULTIBOOT_INFO_ALIGN 0x00000008
// Flags set in the 'flags' member of the multiboot header.
#define MULTIBOOT_TAG_ALIGN 8
#define MULTIBOOT_TAG_TYPE_END 0
#define MULTIBOOT_TAG_TYPE_CMDLINE 1
#define MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME 2
#define MULTIBOOT_TAG_TYPE_MODULE 3
#define MULTIBOOT_TAG_TYPE_BASIC_MEMINFO 4
#define MULTIBOOT_TAG_TYPE_BOOTDEV 5
#define MULTIBOOT_TAG_TYPE_MMAP 6
#define MULTIBOOT_TAG_TYPE_VBE 7
#define MULTIBOOT_TAG_TYPE_FRAMEBUFFER 8
#define MULTIBOOT_TAG_TYPE_ELF_SECTIONS 9
#define MULTIBOOT_TAG_TYPE_APM 10
#define MULTIBOOT_TAG_TYPE_EFI32 11
#define MULTIBOOT_TAG_TYPE_EFI64 12
#define MULTIBOOT_TAG_TYPE_SMBIOS 13
#define MULTIBOOT_TAG_TYPE_ACPI_OLD 14
#define MULTIBOOT_TAG_TYPE_ACPI_NEW 15
#define MULTIBOOT_TAG_TYPE_NETWORK 16
#define MULTIBOOT_TAG_TYPE_EFI_MMAP 17
#define MULTIBOOT_TAG_TYPE_EFI_BS 18
#define MULTIBOOT_TAG_TYPE_EFI32_IH 19
#define MULTIBOOT_TAG_TYPE_EFI64_IH 20
#define MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR 21
#define MULTIBOOT_HEADER_TAG_END 0
#define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1
#define MULTIBOOT_HEADER_TAG_ADDRESS 2
#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS 3
#define MULTIBOOT_HEADER_TAG_CONSOLE_FLAGS 4
#define MULTIBOOT_HEADER_TAG_FRAMEBUFFER 5
#define MULTIBOOT_HEADER_TAG_MODULE_ALIGN 6
#define MULTIBOOT_HEADER_TAG_EFI_BS 7
#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI32 8
#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI64 9
#define MULTIBOOT_HEADER_TAG_RELOCATABLE 10
#define MULTIBOOT_ARCHITECTURE_I386 0
#define MULTIBOOT_ARCHITECTURE_MIPS32 4
#define MULTIBOOT_HEADER_TAG_OPTIONAL 1
#define MULTIBOOT_LOAD_PREFERENCE_NONE 0
#define MULTIBOOT_LOAD_PREFERENCE_LOW 1
#define MULTIBOOT_LOAD_PREFERENCE_HIGH 2
#define MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED 1
#define MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2
// -m64 64
// 32 32 64
// 64 -m32 long -m64
// x86_64(IA32E)
// See https://wiki.osdev.org/Creating_a_64-bit_kernel:
// With a 32-bit bootstrap in your kernel
// long
// 32bit
// 32
.code32
// multiboot2
//
.SET HEADER_LENGTH, multiboot_header_end - multiboot_header
//
.SET CHECKSUM, -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + HEADER_LENGTH)
// 8
.align MULTIBOOT_HEADER_ALIGN
//
.section .multiboot_header
multiboot_header:
//
.long MULTIBOOT2_HEADER_MAGIC
//
.long MULTIBOOT_ARCHITECTURE_I386
//
.long HEADER_LENGTH
//
.long CHECKSUM
// Multiboot2 Specification version 2.0.pdf
.short MULTIBOOT_HEADER_TAG_END
//
.short 0
.long 8
multiboot_header_end:
// 4KB/
.section .data
.align 0x1000
pml4:
.skip 0x1000
pdpt:
.skip 0x1000
pd:
.skip 0x1000
pt:
.skip 0x1000
// GDT
.align 16
gdt64:
null_desc:
.short 0xFFFF
.short 0
.byte 0
.byte 0
.byte 0
.byte 0
code_desc:
.short 0
.short 0
.byte 0
.byte 0x9A
.byte 0x20
.byte 0
data_desc:
.short 0
.short 0
.byte 0
.byte 0x92
.byte 0
.byte 0
user_code_desc:
.short 0
.short 0
.byte 0
.byte 0xFA
.byte 0x20
.byte 0
user_data_desc:
.short 0
.short 0
.byte 0
.byte 0xF2
.byte 0
.byte 0
gdt64_pointer:
.short gdt64_pointer-gdt64-1
.quad gdt64
gdt64_pointer64:
.short gdt64_pointer-gdt64-1
.quad gdt64
.section .text
.global _start
.type _start, @function
# multiboot2.cpp
.extern boot_info_addr
.extern multiboot2_magic
_start:
//
cli
// multiboot2_info
//mov %ebx, boot_info_addr
//
// mov %eax, multiboot2_magic
//
// 1. PAE
mov %cr4, %eax
or $(1<<5), %eax
mov %eax, %cr4
// 2.
//
mov $pml4, %eax
mov $pdpt, %ebx
or $0x3, %ebx
mov %ebx, 0(%eax)
//
mov $pdpt, %eax
mov $pd, %ebx
or $0x3, %ebx
mov %ebx, 0(%eax)
//
mov $pd, %eax
mov $pt, %ebx
or $0x3, %ebx
mov %ebx, 0(%eax)
//
// 512
mov $512, %ecx
mov $pt, %eax
mov $0x3, %ebx
.fill_pt:
mov %ebx, 0(%eax)
add $0x1000, %ebx
add $8, %eax
loop .fill_pt
// CR3
mov $pml4, %eax
mov %eax, %cr3
// 3. long
mov $0xC0000080, %ecx
rdmsr
or $(1<<8), %eax
wrmsr
// 4.
mov %cr0, %eax
or $(1<<31), %eax
mov %eax, %cr0
// 5. GDT
mov $gdt64_pointer, %eax
lgdt 0(%eax)
// 6. 64
jmp $0x8, $_start64
hlt
ret

View File

@ -0,0 +1,3 @@
int *boot_info_addr;
int *multiboot2_magic;

View File

@ -0,0 +1,104 @@
/**
* @file multiboot2.cpp
* @brief multiboot2 解析实现
* @author Zone.N (Zone.Niuzh@hotmail.com)
* @version 1.0
* @date 2021-09-18
* @copyright MIT LICENSE
* https://github.com/Simple-XX/SimpleKernel
* @par change log:
* <table>
* <tr><th>Date<th>Author<th>Description
* <tr><td>2021-09-18<td>digmouse233<td>迁移到 doxygen
* </table>
*/
#include "assert.h"
#include "stdio.h"
//#include "common.h"
#include "multiboot2.h"
#include "boot_info.h"
//#include "resource.h"
//#include "pmm.h"
/// @todo 优化
void MULTIBOOT2::multiboot2_iter(bool (*_fun)(const iter_data_t *, void *),
void *_data) {
uintptr_t addr = BOOT_INFO::boot_info_addr;
// 下一字节开始为 tag 信息
iter_data_t *tag = (iter_data_t *)(addr + 8);
for (; tag->type != MULTIBOOT_TAG_TYPE_END;
tag = (iter_data_t *)((uint8_t *)tag + COMMON::ALIGN(tag->size, 8))) {
if (_fun(tag, _data) == true) {
return;
}
}
return;
}
bool MULTIBOOT2::multiboot2_init(void) {
uintptr_t addr = BOOT_INFO::boot_info_addr;
// 判断魔数是否正确
assert(BOOT_INFO::multiboot2_magic == MULTIBOOT2_BOOTLOADER_MAGIC);
assert((reinterpret_cast<uintptr_t>(addr) & 7) == 0);
// addr+0 保存大小
BOOT_INFO::boot_info_size = *(uint32_t *)addr;
return true;
}
// 读取 grub2 传递的物理内存信息,保存到 e820map_t 结构体中
// 一般而言是这样的
// 地址(长度) 类型
// 0x00(0x9F000) 0x1
// 0x9F000(0x1000) 0x2
// 0xE8000(0x18000) 0x2
// 0x100000(0x7EF0000) 0x1
// 0x7FF0000(0x10000) 0x3
// 0xFFFC0000(0x40000) 0x2
bool MULTIBOOT2::get_memory(const iter_data_t *_iter_data, void *_data) {
if (_iter_data->type != MULTIBOOT2::MULTIBOOT_TAG_TYPE_MMAP) {
return false;
}
resource_t *resource = (resource_t *)_data;
resource->type = resource_t::MEM;
resource->name = (char *)"available phy memory";
resource->mem.addr = 0x0;
resource->mem.len = 0;
MULTIBOOT2::multiboot_mmap_entry_t *mmap =
((MULTIBOOT2::multiboot_tag_mmap_t *)_iter_data)->entries;
for (; (uint8_t *)mmap < (uint8_t *)_iter_data + _iter_data->size;
mmap = (MULTIBOOT2::multiboot_mmap_entry_t
*)((uint8_t *)mmap +
((MULTIBOOT2::multiboot_tag_mmap_t *)_iter_data)
->entry_size)) {
// 如果是可用内存或地址小于 1M
// 这里将 0~1M 的空间全部算为可用,在 c++ 库可用后进行优化
if (mmap->type == MULTIBOOT_MEMORY_AVAILABLE ||
mmap->addr < 1 * COMMON::MB) {
// 长度+
resource->mem.len += mmap->len;
}
}
return true;
}
namespace BOOT_INFO {
// 地址
uintptr_t boot_info_addr;
// 长度
size_t boot_info_size;
// 魔数
uint32_t multiboot2_magic;
bool init(void) {
auto res = MULTIBOOT2::multiboot2_init();
info("BOOT_INFO init.\n");
return res;
}
resource_t get_memory(void) {
resource_t resource;
MULTIBOOT2::multiboot2_iter(MULTIBOOT2::get_memory, &resource);
return resource;
}
};

View File

@ -0,0 +1,334 @@
/**
* @file multiboot2.h
* @brief multiboot2 解析
* @author Zone.N (Zone.Niuzh@hotmail.com)
* @version 1.0
* @date 2021-09-18
* @copyright MIT LICENSE
* https://github.com/Simple-XX/SimpleKernel
* @par change log:
* <table>
* <tr><th>Date<th>Author<th>Description
* <tr><td>2021-09-18<td>digmouse233<td>迁移到 doxygen
* </table>
*/
#ifndef _MULTIBOOT2_H_
#define _MULTIBOOT2_H_
#include "stdint.h"
#include "stdbool.h"
#include "boot_info.h"
/// @see Multiboot2 Specification version 2.0.pdf
// 启动后,在 32 位内核进入点,机器状态如下:
// 1. CS 指向基地址为 0x00000000限长为4G 1的代码段描述符。
// 2. DSSSESFS 和 GS 指向基地址为0x00000000限长为4G
// 1的数据段描述符。
// 3. A20 地址线已经打开。
// 4. 页机制被禁止。
// 5. 中断被禁止。
// 6. EAX = 0x2BADB002
// 7. 系统信息和启动信息块的线性地址保存在 EBX中相当于一个指针
// 以下即为这个信息块的结构
/**
* @brief MULTIBOOT2 接口抽象
*/
class MULTIBOOT2 {
private:
/* How many bytes from the start of the file we search for the header. */
static constexpr const uint32_t MULTIBOOT_SEARCH = 32768;
static constexpr const uint32_t MULTIBOOT_HEADER_ALIGN = 8;
/* The magic field should contain this. */
static constexpr const uint32_t MULTIBOOT2_HEADER_MAGIC = 0xe85250d6;
/* This should be in %eax. */
static constexpr const uint32_t MULTIBOOT2_BOOTLOADER_MAGIC = 0x36d76289;
/* Alignment of multiboot modules. */
static constexpr const uint32_t MULTIBOOT_MOD_ALIGN = 0x00001000;
/* Alignment of the multiboot info structure. */
static constexpr const uint32_t MULTIBOOT_INFO_ALIGN = 0x00000008;
/* Flags set in the 'flags' member of the multiboot header. */
static constexpr const uint32_t MULTIBOOT_TAG_ALIGN = 8;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_END = 0;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_CMDLINE = 1;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME = 2;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_MODULE = 3;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_BASIC_MEMINFO = 4;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_BOOTDEV = 5;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_MMAP = 6;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_VBE = 7;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_FRAMEBUFFER = 8;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_ELF_SECTIONS = 9;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_APM = 10;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_EFI32 = 11;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_EFI64 = 12;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_SMBIOS = 13;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_ACPI_OLD = 14;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_ACPI_NEW = 15;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_NETWORK = 16;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_EFI_MMAP = 17;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_EFI_BS = 18;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_EFI32_IH = 19;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_EFI64_IH = 20;
static constexpr const uint32_t MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR = 21;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_END = 0;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST =
1;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_ADDRESS = 2;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS = 3;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_CONSOLE_FLAGS = 4;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_FRAMEBUFFER = 5;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_MODULE_ALIGN = 6;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_EFI_BS = 7;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI32 =
8;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI64 =
9;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_RELOCATABLE = 10;
static constexpr const uint32_t MULTIBOOT_ARCHITECTURE_I386 = 0;
static constexpr const uint32_t MULTIBOOT_ARCHITECTURE_MIPS32 = 4;
static constexpr const uint32_t MULTIBOOT_HEADER_TAG_OPTIONAL = 1;
static constexpr const uint32_t MULTIBOOT_LOAD_PREFERENCE_NONE = 0;
static constexpr const uint32_t MULTIBOOT_LOAD_PREFERENCE_LOW = 1;
static constexpr const uint32_t MULTIBOOT_LOAD_PREFERENCE_HIGH = 2;
static constexpr const uint32_t MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED =
1;
static constexpr const uint32_t MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED =
2;
struct multiboot_header_t {
// Must be MULTIBOOT_MAGIC - see above.
uint32_t magic;
// ISA
uint32_t architecture;
// Total header length.
uint32_t header_length;
// The above fields plus this one must equal 0 mod 2^32.
uint32_t checksum;
};
struct multiboot_header_tag_t {
uint16_t type;
uint16_t flags;
uint32_t size;
};
struct multiboot_header_tag_information_request_t : multiboot_header_tag_t {
uint32_t requests[0];
};
struct multiboot_header_tag_address_t : multiboot_header_tag_t {
uint32_t header_addr;
uint32_t load_addr;
uint32_t load_end_addr;
uint32_t bss_end_addr;
};
struct multiboot_header_tag_entry_address_t : multiboot_header_tag_t {
uint32_t entry_addr;
};
struct multiboot_header_tag_console_flags_t : multiboot_header_tag_t {
uint32_t console_flags;
};
struct multiboot_header_tag_framebuffer_t : multiboot_header_tag_t {
uint32_t width;
uint32_t height;
uint32_t depth;
};
struct multiboot_header_tag_module_align_t : multiboot_header_tag_t {
;
};
struct multiboot_header_tag_relocatable_t : multiboot_header_tag_t {
uint32_t min_addr;
uint32_t max_addr;
uint32_t align;
uint32_t preference;
};
struct multiboot_color_t {
uint8_t red;
uint8_t green;
uint8_t blue;
};
static constexpr const uint32_t MULTIBOOT_MEMORY_AVAILABLE = 1;
static constexpr const uint32_t MULTIBOOT_MEMORY_RESERVED = 2;
static constexpr const uint32_t MULTIBOOT_MEMORY_ACPI_RECLAIMABLE = 3;
static constexpr const uint32_t MULTIBOOT_MEMORY_NVS = 4;
static constexpr const uint32_t MULTIBOOT_MEMORY_BADRAM = 5;
struct multiboot_mmap_entry_t {
uint64_t addr;
uint64_t len;
uint32_t type;
uint32_t zero;
};
struct multiboot_tag_t {
uint32_t type;
uint32_t size;
};
struct multiboot_tag_string_t : multiboot_tag_t {
char string[0];
};
struct multiboot_tag_module_t : multiboot_tag_t {
uint32_t mod_start;
uint32_t mod_end;
char cmdline[0];
};
struct multiboot_tag_basic_meminfo_t : multiboot_tag_t {
uint32_t mem_lower;
uint32_t mem_upper;
};
struct multiboot_tag_bootdev_t : multiboot_tag_t {
uint32_t biosdev;
uint32_t slice;
uint32_t part;
};
struct multiboot_tag_mmap_t : multiboot_tag_t {
uint32_t entry_size;
uint32_t entry_version;
multiboot_mmap_entry_t entries[0];
};
struct multiboot_vbe_info_block_t {
uint8_t external_specification[512];
};
struct multiboot_vbe_mode_info_block_t {
uint8_t external_specification[256];
};
struct multiboot_tag_vbe_t : multiboot_tag_t {
uint16_t vbe_mode;
uint16_t vbe_interface_seg;
uint16_t vbe_interface_off;
uint16_t vbe_interface_len;
multiboot_vbe_info_block_t vbe_control_info;
multiboot_vbe_mode_info_block_t vbe_mode_info;
};
struct multiboot_tag_elf_sections_t : multiboot_tag_t {
uint32_t num;
uint32_t entsize;
// 段字符串表索引
uint32_t shndx;
char sections[0];
};
struct multiboot_tag_apm_t : multiboot_tag_t {
uint16_t version;
uint16_t cseg;
uint32_t offset;
uint16_t cseg_16;
uint16_t dseg;
uint16_t flags;
uint16_t cseg_len;
uint16_t cseg_16_len;
uint16_t dseg_len;
};
struct multiboot_tag_efi32_t : multiboot_tag_t {
uint32_t pointer;
};
struct multiboot_tag_efi64_t : multiboot_tag_t {
uint64_t pointer;
};
struct multiboot_tag_smbios_t : multiboot_tag_t {
uint8_t major;
uint8_t minor;
uint8_t reserved[6];
uint8_t tables[0];
};
struct multiboot_tag_old_acpi_t : multiboot_tag_t {
uint8_t rsdp[0];
};
struct multiboot_tag_new_acpi_t : multiboot_tag_t {
uint8_t rsdp[0];
};
struct multiboot_tag_network_t : multiboot_tag_t {
uint8_t dhcpack[0];
};
struct multiboot_tag_efi_mmap_t : multiboot_tag_t {
uint32_t descr_size;
uint32_t descr_vers;
uint8_t efi_mmap[0];
};
struct multiboot_tag_efi32_ih_t : multiboot_tag_t {
uint32_t pointer;
};
struct multiboot_tag_efi64_ih_t : multiboot_tag_t {
uint64_t pointer;
};
struct multiboot_tag_load_base_addr_t : multiboot_tag_t {
uint32_t load_base_addr;
};
// 迭代变量
// 与 multiboot_tag_t 相同
struct iter_data_t {
uint32_t type;
uint32_t size;
};
public:
/**
* @brief 初始化
* @return true 成功
* @return false 失败
*/
static bool multiboot2_init(void);
/**
* @brief 迭代器
* @param _fun 迭代操作
* @param _data 数据
*/
static void multiboot2_iter(bool (*_fun)(const iter_data_t *, void *),
void *_data);
/**
* @brief 获取内存信息
* @param _iter_data 迭代变量
* @param _data 数据
* @return true 成功
* @return false 失败
*/
static bool get_memory(const iter_data_t *_iter_data, void *_data);
};
namespace BOOT_INFO {
/// 魔数
extern "C" uint32_t multiboot2_magic;
};
#endif /* _MULTIBOOT2_H_ */

View File

@ -4,11 +4,247 @@
#include "common/asm.h"
// multiboot2
// How many bytes from the start of the file we search for the header.
#define MULTIBOOT_SEARCH 32768
#define MULTIBOOT_HEADER_ALIGN 8
// The magic field should contain this.
#define MULTIBOOT2_HEADER_MAGIC 0xe85250d6
// This should be in %eax.
#define MULTIBOOT2_BOOTLOADER_MAGIC 0x36d76289
// Alignment of multiboot modules.
#define MULTIBOOT_MOD_ALIGN 0x00001000
// Alignment of the multiboot info structure.
#define MULTIBOOT_INFO_ALIGN 0x00000008
// Flags set in the 'flags' member of the multiboot header.
#define MULTIBOOT_TAG_ALIGN 8
#define MULTIBOOT_TAG_TYPE_END 0
#define MULTIBOOT_TAG_TYPE_CMDLINE 1
#define MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME 2
#define MULTIBOOT_TAG_TYPE_MODULE 3
#define MULTIBOOT_TAG_TYPE_BASIC_MEMINFO 4
#define MULTIBOOT_TAG_TYPE_BOOTDEV 5
#define MULTIBOOT_TAG_TYPE_MMAP 6
#define MULTIBOOT_TAG_TYPE_VBE 7
#define MULTIBOOT_TAG_TYPE_FRAMEBUFFER 8
#define MULTIBOOT_TAG_TYPE_ELF_SECTIONS 9
#define MULTIBOOT_TAG_TYPE_APM 10
#define MULTIBOOT_TAG_TYPE_EFI32 11
#define MULTIBOOT_TAG_TYPE_EFI64 12
#define MULTIBOOT_TAG_TYPE_SMBIOS 13
#define MULTIBOOT_TAG_TYPE_ACPI_OLD 14
#define MULTIBOOT_TAG_TYPE_ACPI_NEW 15
#define MULTIBOOT_TAG_TYPE_NETWORK 16
#define MULTIBOOT_TAG_TYPE_EFI_MMAP 17
#define MULTIBOOT_TAG_TYPE_EFI_BS 18
#define MULTIBOOT_TAG_TYPE_EFI32_IH 19
#define MULTIBOOT_TAG_TYPE_EFI64_IH 20
#define MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR 21
#define MULTIBOOT_HEADER_TAG_END 0
#define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1
#define MULTIBOOT_HEADER_TAG_ADDRESS 2
#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS 3
#define MULTIBOOT_HEADER_TAG_CONSOLE_FLAGS 4
#define MULTIBOOT_HEADER_TAG_FRAMEBUFFER 5
#define MULTIBOOT_HEADER_TAG_MODULE_ALIGN 6
#define MULTIBOOT_HEADER_TAG_EFI_BS 7
#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI32 8
#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI64 9
#define MULTIBOOT_HEADER_TAG_RELOCATABLE 10
#define MULTIBOOT_ARCHITECTURE_I386 0
#define MULTIBOOT_ARCHITECTURE_MIPS32 4
#define MULTIBOOT_HEADER_TAG_OPTIONAL 1
#define MULTIBOOT_LOAD_PREFERENCE_NONE 0
#define MULTIBOOT_LOAD_PREFERENCE_LOW 1
#define MULTIBOOT_LOAD_PREFERENCE_HIGH 2
#define MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED 1
#define MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2
// -m64 64
// 32 32 64
// 64 -m32 long -m64
// x86_64(IA32E)
// See https://wiki.osdev.org/Creating_a_64-bit_kernel:
// With a 32-bit bootstrap in your kernel
// long
// 32bit
// 32
.code32
// multiboot2
//
.SET HEADER_LENGTH, multiboot_header_end - multiboot_header
//
.SET CHECKSUM, -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + HEADER_LENGTH)
// 8
.align MULTIBOOT_HEADER_ALIGN
//
.section .multiboot_header
multiboot_header:
//
.long MULTIBOOT2_HEADER_MAGIC
//
.long MULTIBOOT_ARCHITECTURE_I386
//
.long HEADER_LENGTH
//
.long CHECKSUM
// Multiboot2 Specification version 2.0.pdf
.short MULTIBOOT_HEADER_TAG_END
//
.short 0
.long 8
multiboot_header_end:
// 4KB/
.section .data
.align 0x1000
pml4:
.skip 0x1000
pdpt:
.skip 0x1000
pd:
.skip 0x1000
pt:
.skip 0x1000
// GDT
.align 16
gdt64:
null_desc:
.short 0xFFFF
.short 0
.byte 0
.byte 0
.byte 0
.byte 0
code_desc:
.short 0
.short 0
.byte 0
.byte 0x9A
.byte 0x20
.byte 0
data_desc:
.short 0
.short 0
.byte 0
.byte 0x92
.byte 0
.byte 0
user_code_desc:
.short 0
.short 0
.byte 0
.byte 0xFA
.byte 0x20
.byte 0
user_data_desc:
.short 0
.short 0
.byte 0
.byte 0xF2
.byte 0
.byte 0
gdt64_pointer:
.short gdt64_pointer-gdt64-1
.quad gdt64
gdt64_pointer64:
.short gdt64_pointer-gdt64-1
.quad gdt64
.section .text
.global _start
.type _start, @function
# multiboot2.cpp
.extern boot_info_addr
.extern multiboot2_magic
_start:
//
cli
// multiboot2_info
//mov %ebx, boot_info_addr
//
//mov %eax, multiboot2_magic
/
// 1. PAE
mov %cr4, %eax
or $(1<<5), %eax
mov %eax, %cr4
// 2.
//
mov $pml4, %eax
mov $pdpt, %ebx
or $0x3, %ebx
mov %ebx, 0(%eax)
//
mov $pdpt, %eax
mov $pd, %ebx
or $0x3, %ebx
mov %ebx, 0(%eax)
//
mov $pd, %eax
mov $pt, %ebx
or $0x3, %ebx
mov %ebx, 0(%eax)
//
// 512
mov $512, %ecx
mov $pt, %eax
mov $0x3, %ebx
.fill_pt:
mov %ebx, 0(%eax)
add $0x1000, %ebx
add $8, %eax
loop .fill_pt
// CR3
mov $pml4, %eax
mov %eax, %cr3
// 3. long
mov $0xC0000080, %ecx
rdmsr
or $(1<<8), %eax
wrmsr
// 4.
mov %cr0, %eax
or $(1<<31), %eax
mov %eax, %cr0
// 5. GDT
mov $gdt64_pointer, %eax
lgdt 0(%eax)
// 6. 64
jmp $0x8, $_start64
hlt
ret
.section .text
.global _start
_start:
.code64
.global _start64
.type _start64, @function
.extern Start_Kernel
ENTRY(_start64)
//
mov $0x10, %ax
mov %ax, %ds
@ -28,14 +264,26 @@ _start:
mov %ax, %fs
mov %ax, %ss
mov %ax, %gs
movq $0x7e00, %rsp
// 2.
//
mov $__PML4E, %eax
mov $__PDPTE, %ebx
or $0x7, %ebx
mov %ebx, 0(%eax)
//
mov $__PDPTE, %eax
mov $__PDE, %ebx
or $0x7, %ebx
mov %ebx, 0(%eax)
// ==== CR3
movq $0x101000, %rax //
movq $__PML4E, %rax //
movq %rax, %cr3
movq switch_seg(%rip), %rax
movq switch_seg(%rip), %rax
// ljmplcallGASlretcs
// Amazing
pushq $0x08 //
@ -44,9 +292,11 @@ _start:
// 64
switch_seg:
.quad entry64
entry64:
movq $0x10, %rax
movq %rax, %ds
movq %rax, %es
@ -119,11 +369,8 @@ SetUp_TSS64:
// mov $0x50, %ax // 80
// ltr %ax
//
movq go_to_kernel(%rip), %rax
pushq $0x08
pushq %rax
lretq
call Start_Kernel
go_to_kernel:
.quad Start_Kernel
@ -148,13 +395,14 @@ ENTRY(_stack_start)
//
.align 8 //8byte
.align 0x1000 //8byte
.org 0x1000 //0x1000
__PML4E:
.quad 0x102007 // 访 31~12
.fill 255,8,0
.quad 0x102007
.quad 0x102007
.fill 255,8,0
.org 0x2000
@ -185,6 +433,7 @@ __PDE:
// GDT
.section .data
.align 16
.global GDT_Table // 使GDT访
GDT_Table:

View File

@ -5,10 +5,14 @@ ENTRY(_start)
SECTIONS
{
. = 0xffff800000000000 + 0x100000;
. = 0;
. = 1M;
.text :
{
_text = .;
*(.multiboot_header)
*(.text)
_etext = .;
@ -19,6 +23,7 @@ SECTIONS
_data = .;
*(.data)
*(.eh_frame)
_edata = .;
}
.rodata :

View File

@ -13,10 +13,10 @@
#include "syscall/syscall.h"
unsigned int *FR_address = (unsigned int *)0xffff800000a00000; //帧缓存区的地址
// char fxsave_region[512] __attribute__((aligned(16)));
// char fxsave_region[512] __attribute__((aligned(16)));
struct memory_desc memory_management_struct = {{0}, 0};
//struct Global_Memory_Descriptor memory_management_struct = {{0}, 0};
struct memory_desc memory_management_struct = {{0}, 0};
// struct Global_Memory_Descriptor memory_management_struct = {{0}, 0};
void show_welcome()
{
@ -37,7 +37,6 @@ void show_welcome()
printk_color(0x00e0ebeb, 0x00e0ebeb, " \n\n");
}
// 测试内存管理单元
/*
void test_mm()
@ -63,18 +62,16 @@ void test_mm()
// 初始化系统各模块
void system_initialize()
{
// 初始化printk
init_printk(1440, 900, FR_address, 1440 * 900 * 4, 8, 16);
// 初始化printk
init_printk(1024, 768, FR_address, 1024 * 768 * 4, 8, 16);
printk("11111\n");
load_TR(10); // 加载TR寄存器
while(1);
// 初始化任务状态段表
ul tss_item_addr = 0xffff800000007c00;
set_TSS64(_stack_start, _stack_start, _stack_start, tss_item_addr, tss_item_addr,
tss_item_addr, tss_item_addr, tss_item_addr, tss_item_addr, tss_item_addr);
// 初始化中断描述符表
init_sys_vector();
@ -96,12 +93,10 @@ void Start_Kernel(void)
{
system_initialize();
// show_welcome();
// test_mm();
while (1)
;
}

View File

@ -264,6 +264,8 @@ unsigned long do_fork(struct pt_regs *regs, unsigned long clone_flags, unsigned
thd->rbp = (ul)tsk + STACK_SIZE;
thd->rip = regs->rip;
thd->rsp = (ul)tsk + STACK_SIZE - sizeof(struct pt_regs);
thd->fs = KERNEL_DS;
thd->gs = KERNEL_DS;
// 若进程不是内核层的进程则跳转到ret from system call
if (!(tsk->flags & PF_KTHREAD))