Merge pull request #38 from os-k-team/master
Merging the multiboot interface into better term
This commit is contained in:
Adrien Bourmault
GitHub
commit
01f2fdef08
26
.stylehlp
26
.stylehlp
|
|
@ -24,3 +24,29 @@
|
||||||
|
|
||||||
//------------------------------------------//
|
//------------------------------------------//
|
||||||
|
|
||||||
|
|
||||||
|
;=----------------------------------------------------------------------------=;
|
||||||
|
; GNU GPL OS/K ;
|
||||||
|
; ;
|
||||||
|
; Desc: ;
|
||||||
|
; ;
|
||||||
|
; ;
|
||||||
|
; Copyright © 2018-2019 The OS/K Team ;
|
||||||
|
; ;
|
||||||
|
; This file is part of OS/K. ;
|
||||||
|
; ;
|
||||||
|
; OS/K is free software: you can redistribute it and/or modify ;
|
||||||
|
; it under the terms of the GNU General Public License as published by ;
|
||||||
|
; the Free Software Foundation, either version 3 of the License, or ;
|
||||||
|
; (at your option) any later version. ;
|
||||||
|
; ;
|
||||||
|
; OS/K is distributed in the hope that it will be useful, ;
|
||||||
|
; but WITHOUT ANY WARRANTY; without even the implied warranty of ;
|
||||||
|
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;
|
||||||
|
; GNU General Public License for more details. ;
|
||||||
|
; ;
|
||||||
|
; You should have received a copy of the GNU General Public License ;
|
||||||
|
; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ;
|
||||||
|
;=----------------------------------------------------------------------------=;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,11 +23,12 @@
|
||||||
; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ;
|
; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ;
|
||||||
;=----------------------------------------------------------------------------=;
|
;=----------------------------------------------------------------------------=;
|
||||||
|
|
||||||
[global temporize]
|
global temporize
|
||||||
[global bitemporize]
|
global bitemporize
|
||||||
[global tritemporize]
|
global tritemporize
|
||||||
|
|
||||||
[BITS 64]
|
[BITS 64]
|
||||||
|
[section .text]
|
||||||
|
|
||||||
temporize:
|
temporize:
|
||||||
push rcx
|
push rcx
|
||||||
|
|
@ -59,16 +60,3 @@ tritemporize:
|
||||||
loop .looping
|
loop .looping
|
||||||
pop rcx
|
pop rcx
|
||||||
ret
|
ret
|
||||||
|
|
||||||
|
|
||||||
; ---------------------------------------------------------------------------- ;
|
|
||||||
; Returns the CPU Vendor String.pointer in eax ;
|
|
||||||
; ---------------------------------------------------------------------------- ;
|
|
||||||
cpu_vendor:
|
|
||||||
|
|
||||||
;; Calling the competent authorities
|
|
||||||
mov eax, 0
|
|
||||||
cpuid
|
|
||||||
|
|
||||||
ret
|
|
||||||
.string db " "
|
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@
|
||||||
;=----------------------------------------------------------------------------=;
|
;=----------------------------------------------------------------------------=;
|
||||||
|
|
||||||
[BITS 32]
|
[BITS 32]
|
||||||
|
[section .text]
|
||||||
|
|
||||||
; ---------------------------------------------------------------------------- ;
|
; ---------------------------------------------------------------------------- ;
|
||||||
; Checks if the CPU is compatible with 64-bits operating systems ;
|
; Checks if the CPU is compatible with 64-bits operating systems ;
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,9 @@
|
||||||
; You should have received a copy of the GNU General Public License ;
|
; You should have received a copy of the GNU General Public License ;
|
||||||
; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ;
|
; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ;
|
||||||
;=----------------------------------------------------------------------------=;
|
;=----------------------------------------------------------------------------=;
|
||||||
[global testf]
|
|
||||||
|
[BITS 64]
|
||||||
|
[section .text]
|
||||||
|
|
||||||
;;VIDEO
|
;;VIDEO
|
||||||
%define TRAM 0xB8000 ; [T]ext[RAM]
|
%define TRAM 0xB8000 ; [T]ext[RAM]
|
||||||
|
|
@ -30,16 +32,12 @@
|
||||||
%define VGA_HEIGHT 80
|
%define VGA_HEIGHT 80
|
||||||
|
|
||||||
;; GLOBAL DATA
|
;; GLOBAL DATA
|
||||||
|
|
||||||
NextTRAM dq 0xB8000 ; Last position of cursor
|
NextTRAM dq 0xB8000 ; Last position of cursor
|
||||||
NextTRAM32 dq 0xB8000 ; Last position of cursor
|
NextTRAM32 dq 0xB8000 ; Last position of cursor
|
||||||
VGA_X32 dq 0
|
VGA_X32 dq 0
|
||||||
VGA_HEIGHT64 dq VGA_HEIGHT
|
VGA_HEIGHT64 dq VGA_HEIGHT
|
||||||
VGA_X dq 0
|
VGA_X dq 0
|
||||||
|
|
||||||
;; TEXT
|
|
||||||
|
|
||||||
[BITS 64]
|
|
||||||
|
|
||||||
testf:
|
testf:
|
||||||
push rsi
|
push rsi
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,10 @@
|
||||||
%include "boot/loader/cpu/cpu.inc"
|
%include "boot/loader/cpu/cpu.inc"
|
||||||
%include "boot/loader/mem/structures.inc"
|
%include "boot/loader/mem/structures.inc"
|
||||||
|
|
||||||
[BITS 32]
|
global MB_start
|
||||||
[global MB_start]
|
extern StartKern
|
||||||
|
|
||||||
|
[BITS 32]
|
||||||
[section .multiboot]
|
[section .multiboot]
|
||||||
|
|
||||||
;; MAGNIFICENT MULTIBOOT HEADER FOR GRUB ------------------------------------ ;;
|
;; MAGNIFICENT MULTIBOOT HEADER FOR GRUB ------------------------------------ ;;
|
||||||
|
|
@ -50,8 +51,8 @@ MB_start:
|
||||||
mov esp, KERNEL_STACK ; Setup the stack
|
mov esp, KERNEL_STACK ; Setup the stack
|
||||||
push 0 ; Reset EFLAGS
|
push 0 ; Reset EFLAGS
|
||||||
popf
|
popf
|
||||||
push eax ; 2nd argument is magic number
|
mov [mbInfo], ebx
|
||||||
push ebx ; 1st argument multiboot info pointer
|
mov [mbMagic], eax
|
||||||
mov ecx, eax ; For debug
|
mov ecx, eax ; For debug
|
||||||
call _loader
|
call _loader
|
||||||
add esp, 8 ; Cleanup arguments "A la MIPS"
|
add esp, 8 ; Cleanup arguments "A la MIPS"
|
||||||
|
|
@ -95,7 +96,9 @@ Die:
|
||||||
_loader:
|
_loader:
|
||||||
jmp lbegin
|
jmp lbegin
|
||||||
|
|
||||||
LOGO: db 219, 219, 219, " OS/K", 0
|
LOGO db 219, 219, 219, " OS/K", 0
|
||||||
|
mbInfo dq 0
|
||||||
|
mbMagic dq 0
|
||||||
|
|
||||||
lbegin:
|
lbegin:
|
||||||
call clear ; Clear the screen
|
call clear ; Clear the screen
|
||||||
|
|
@ -152,7 +155,8 @@ _loader64:
|
||||||
;; Launch the kernel !
|
;; Launch the kernel !
|
||||||
call tritemporize ; Let time to see
|
call tritemporize ; Let time to see
|
||||||
|
|
||||||
extern StartKern
|
mov rdi, [mbInfo]
|
||||||
|
mov rsi, [mbMagic]
|
||||||
call StartKern
|
call StartKern
|
||||||
|
|
||||||
;; We must never reach this point ------------------------------------------- ;;
|
;; We must never reach this point ------------------------------------------- ;;
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
;=----------------------------------------------------------------------------=;
|
;=----------------------------------------------------------------------------=;
|
||||||
|
|
||||||
[BITS 32]
|
[BITS 32]
|
||||||
|
[section .text]
|
||||||
; ---------------------------------------------------------------------------- ;
|
; ---------------------------------------------------------------------------- ;
|
||||||
; Constructor for the page tables in protected mode ;
|
; Constructor for the page tables in protected mode ;
|
||||||
; ---------------------------------------------------------------------------- ;
|
; ---------------------------------------------------------------------------- ;
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
;=----------------------------------------------------------------------------=;
|
;=----------------------------------------------------------------------------=;
|
||||||
|
|
||||||
[BITS 32]
|
[BITS 32]
|
||||||
section .rodata
|
[section .rodata]
|
||||||
;; GDT WITH DOC
|
;; GDT WITH DOC
|
||||||
ALIGN 4096
|
ALIGN 4096
|
||||||
GDT64:
|
GDT64:
|
||||||
|
|
@ -44,7 +44,7 @@ GDT64:
|
||||||
dq GDT64
|
dq GDT64
|
||||||
|
|
||||||
;; EMPTY PAGE TABLES (identity of the first 1GiB)
|
;; EMPTY PAGE TABLES (identity of the first 1GiB)
|
||||||
section .bss
|
[section .bss]
|
||||||
ALIGN 4096
|
ALIGN 4096
|
||||||
PML4_table:
|
PML4_table:
|
||||||
resb 4096
|
resb 4096
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,6 @@ MB_ALIGN equ 1 << 0 ; Ask to align loaded modules on page bounda
|
||||||
MB_MEMINFO equ 1 << 1 ; Ask to provide memory map
|
MB_MEMINFO equ 1 << 1 ; Ask to provide memory map
|
||||||
MB_HEADER_MAGIC equ 0x1badb002
|
MB_HEADER_MAGIC equ 0x1badb002
|
||||||
MB_GRUB_MAGIC equ 0x2badb002
|
MB_GRUB_MAGIC equ 0x2badb002
|
||||||
MB_HEADER_FLAGS equ 0x0 ; MB_AOUT_KLUDGE|MB_ALIGN|MB_MEMINFO
|
MB_HEADER_FLAGS equ MB_AOUT_KLUDGE|MB_ALIGN|MB_MEMINFO
|
||||||
CHECKSUM equ -(MB_HEADER_MAGIC + MB_HEADER_FLAGS)
|
CHECKSUM equ -(MB_HEADER_MAGIC + MB_HEADER_FLAGS)
|
||||||
KERNEL_STACK equ 0x00200000 ; Stack starts at the 2mb address & grows down
|
KERNEL_STACK equ 0x00200000 ; Stack starts at the 2mb address & grows down
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ size_t snprintf(char *str, size_t n, const char *fmt, ...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Size of the buffer is for convertions
|
// Size of the buffer is for convertions
|
||||||
#define CONVBUF 4096
|
#define CONVBUF 64
|
||||||
|
|
||||||
size_t vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
|
size_t vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
|
||||||
{
|
{
|
||||||
|
|
@ -82,10 +82,13 @@ size_t vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
|
||||||
char mod;
|
char mod;
|
||||||
char convbuf[CONVBUF] = { 0 };
|
char convbuf[CONVBUF] = { 0 };
|
||||||
|
|
||||||
char c;
|
char c, *s;
|
||||||
int d;
|
int d;
|
||||||
uint u;
|
uint u;
|
||||||
char *s;
|
|
||||||
|
assert(str && fmt);
|
||||||
|
|
||||||
|
if (n == 0) return 0;
|
||||||
|
|
||||||
// For aesthetic reasons...
|
// For aesthetic reasons...
|
||||||
n--;
|
n--;
|
||||||
|
|
@ -235,6 +238,7 @@ size_t vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
|
||||||
}
|
}
|
||||||
|
|
||||||
// We fallthrough here from the "while (1)"
|
// We fallthrough here from the "while (1)"
|
||||||
|
lflag = hflag = hhflag = altflag = 0;
|
||||||
fmt++;
|
fmt++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,282 +1,198 @@
|
||||||
/* multiboot2.h - Multiboot 2 header file. */
|
//----------------------------------------------------------------------------//
|
||||||
/* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc.
|
// GNU GPL OS/K //
|
||||||
*
|
// //
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
// Desc: multiboot.h - Multiboot header file. //
|
||||||
* 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
|
// Copyright © 1999,2003,2007-2010 Free Software Foundation, Inc. //
|
||||||
* sell copies of the Software, and to permit persons to whom the Software is
|
// Copyright © 2018-2019 The OS/K Team //
|
||||||
* furnished to do so, subject to the following conditions:
|
// //
|
||||||
*
|
// This file is part of OS/K. //
|
||||||
* The above copyright notice and this permission notice shall be included in
|
// //
|
||||||
* all copies or substantial portions of the Software.
|
// OS/K is free software: you can redistribute it and/or modify //
|
||||||
*
|
// it under the terms of the GNU General Public License as published by //
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
// the Free Software Foundation, either version 3 of the License, or //
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
// any later version. //
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY
|
// //
|
||||||
* DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
// OS/K is distributed in the hope that it will be useful, //
|
||||||
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
|
// but WITHOUT ANY WARRANTY//without even the implied warranty of //
|
||||||
* IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||||
*/
|
// GNU General Public License for more details. //
|
||||||
|
// //
|
||||||
|
// You should have received a copy of the GNU General Public License //
|
||||||
|
// along with OS/K. If not, see <https://www.gnu.org/licenses/>. //
|
||||||
|
//----------------------------------------------------------------------------//
|
||||||
|
|
||||||
#ifndef MULTIBOOT_HEADER
|
#ifndef MULTIBOOT_HEADER
|
||||||
#define MULTIBOOT_HEADER 1
|
#define MULTIBOOT_HEADER 1
|
||||||
|
|
||||||
/* How many bytes from the start of the file we search for the header. */
|
/* How many bytes from the start of the file we search for the header. */
|
||||||
#define MULTIBOOT_SEARCH 32768
|
#define MULTIBOOT_SEARCH 8192
|
||||||
#define MULTIBOOT_HEADER_ALIGN 8
|
#define MULTIBOOT_HEADER_ALIGN 4
|
||||||
|
|
||||||
/* The magic field should contain this. */
|
/* The magic field should contain this. */
|
||||||
#define MULTIBOOT2_HEADER_MAGIC 0xe85250d6
|
#define MULTIBOOT_HEADER_MAGIC 0x1BADB002
|
||||||
|
|
||||||
/* This should be in %eax. */
|
/* This should be in %eax. */
|
||||||
#define MULTIBOOT2_BOOTLOADER_MAGIC 0x36d76289
|
#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002
|
||||||
|
|
||||||
/* Alignment of multiboot modules. */
|
/* Alignment of multiboot modules. */
|
||||||
#define MULTIBOOT_MOD_ALIGN 0x00001000
|
#define MULTIBOOT_MOD_ALIGN 0x00001000
|
||||||
|
|
||||||
/* Alignment of the multiboot info structure. */
|
/* Alignment of the multiboot info structure. */
|
||||||
#define MULTIBOOT_INFO_ALIGN 0x00000008
|
#define MULTIBOOT_INFO_ALIGN 0x00000004
|
||||||
|
|
||||||
/* Flags set in the 'flags' member of the multiboot header. */
|
/* Flags set in the 'flags' member of the multiboot header. */
|
||||||
|
|
||||||
#define MULTIBOOT_TAG_ALIGN 8
|
/* Align all boot modules on i386 page (4KB) boundaries. */
|
||||||
#define MULTIBOOT_TAG_TYPE_END 0
|
#define MULTIBOOT_PAGE_ALIGN 0x00000001
|
||||||
#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
|
/* Must pass memory information to OS. */
|
||||||
#define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1
|
#define MULTIBOOT_MEMORY_INFO 0x00000002
|
||||||
#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
|
/* Must pass video information to OS. */
|
||||||
#define MULTIBOOT_ARCHITECTURE_MIPS32 4
|
#define MULTIBOOT_VIDEO_MODE 0x00000004
|
||||||
#define MULTIBOOT_HEADER_TAG_OPTIONAL 1
|
|
||||||
|
|
||||||
#define MULTIBOOT_LOAD_PREFERENCE_NONE 0
|
/* This flag indicates the use of the address fields in the header. */
|
||||||
#define MULTIBOOT_LOAD_PREFERENCE_LOW 1
|
#define MULTIBOOT_AOUT_KLUDGE 0x00010000
|
||||||
#define MULTIBOOT_LOAD_PREFERENCE_HIGH 2
|
|
||||||
|
|
||||||
#define MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED 1
|
|
||||||
#define MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2
|
#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
|
#ifndef ASM_FILE
|
||||||
|
|
||||||
typedef unsigned char multiboot_uint8_t;
|
typedef unsigned char multiboot_uint8_t;
|
||||||
typedef unsigned short multiboot_uint16_t;
|
typedef unsigned short multiboot_uint16_t;
|
||||||
typedef unsigned int multiboot_uint32_t;
|
typedef unsigned int multiboot_uint32_t;
|
||||||
typedef unsigned long long multiboot_uint64_t;
|
typedef unsigned long long multiboot_uint64_t;
|
||||||
|
|
||||||
struct multiboot_header
|
struct multiboot_header
|
||||||
{
|
{
|
||||||
/* Must be MULTIBOOT_MAGIC - see above. */
|
/* Must be MULTIBOOT_MAGIC - see above. */
|
||||||
multiboot_uint32_t magic;
|
multiboot_uint32_t magic;
|
||||||
|
|
||||||
/* ISA */
|
/* Feature flags. */
|
||||||
multiboot_uint32_t architecture;
|
multiboot_uint32_t flags;
|
||||||
|
|
||||||
/* Total header length. */
|
|
||||||
multiboot_uint32_t header_length;
|
|
||||||
|
|
||||||
/* The above fields plus this one must equal 0 mod 2^32. */
|
/* The above fields plus this one must equal 0 mod 2^32. */
|
||||||
multiboot_uint32_t checksum;
|
multiboot_uint32_t checksum;
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_header_tag
|
/* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */
|
||||||
{
|
|
||||||
multiboot_uint16_t type;
|
|
||||||
multiboot_uint16_t flags;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_header_tag_information_request
|
|
||||||
{
|
|
||||||
multiboot_uint16_t type;
|
|
||||||
multiboot_uint16_t flags;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t requests[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_header_tag_address
|
|
||||||
{
|
|
||||||
multiboot_uint16_t type;
|
|
||||||
multiboot_uint16_t flags;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t header_addr;
|
multiboot_uint32_t header_addr;
|
||||||
multiboot_uint32_t load_addr;
|
multiboot_uint32_t load_addr;
|
||||||
multiboot_uint32_t load_end_addr;
|
multiboot_uint32_t load_end_addr;
|
||||||
multiboot_uint32_t bss_end_addr;
|
multiboot_uint32_t bss_end_addr;
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_header_tag_entry_address
|
|
||||||
{
|
|
||||||
multiboot_uint16_t type;
|
|
||||||
multiboot_uint16_t flags;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t entry_addr;
|
multiboot_uint32_t entry_addr;
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_header_tag_console_flags
|
/* These are only valid if MULTIBOOT_VIDEO_MODE is set. */
|
||||||
{
|
multiboot_uint32_t mode_type;
|
||||||
multiboot_uint16_t type;
|
|
||||||
multiboot_uint16_t flags;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t console_flags;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_header_tag_framebuffer
|
|
||||||
{
|
|
||||||
multiboot_uint16_t type;
|
|
||||||
multiboot_uint16_t flags;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t width;
|
multiboot_uint32_t width;
|
||||||
multiboot_uint32_t height;
|
multiboot_uint32_t height;
|
||||||
multiboot_uint32_t depth;
|
multiboot_uint32_t depth;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct multiboot_header_tag_module_align
|
/* The symbol table for a.out. */
|
||||||
|
struct multiboot_aout_symbol_table
|
||||||
{
|
{
|
||||||
multiboot_uint16_t type;
|
multiboot_uint32_t tabsize;
|
||||||
multiboot_uint16_t flags;
|
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 size;
|
||||||
|
multiboot_uint32_t addr;
|
||||||
|
multiboot_uint32_t shndx;
|
||||||
};
|
};
|
||||||
|
typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t;
|
||||||
|
|
||||||
struct multiboot_header_tag_relocatable
|
struct multiboot_info
|
||||||
{
|
{
|
||||||
multiboot_uint16_t type;
|
/* Multiboot info version number */
|
||||||
multiboot_uint16_t flags;
|
multiboot_uint32_t flags;
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t min_addr;
|
|
||||||
multiboot_uint32_t max_addr;
|
|
||||||
multiboot_uint32_t align;
|
|
||||||
multiboot_uint32_t preference;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_color
|
/* Available memory from BIOS */
|
||||||
{
|
|
||||||
multiboot_uint8_t red;
|
|
||||||
multiboot_uint8_t green;
|
|
||||||
multiboot_uint8_t blue;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_mmap_entry
|
|
||||||
{
|
|
||||||
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;
|
|
||||||
multiboot_uint32_t zero;
|
|
||||||
};
|
|
||||||
typedef struct multiboot_mmap_entry multiboot_memory_map_t;
|
|
||||||
|
|
||||||
struct multiboot_tag
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_string
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
char string[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_module
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t mod_start;
|
|
||||||
multiboot_uint32_t mod_end;
|
|
||||||
char cmdline[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_basic_meminfo
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t mem_lower;
|
multiboot_uint32_t mem_lower;
|
||||||
multiboot_uint32_t mem_upper;
|
multiboot_uint32_t mem_upper;
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_bootdev
|
/* "root" partition */
|
||||||
{
|
multiboot_uint32_t boot_device;
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t biosdev;
|
|
||||||
multiboot_uint32_t slice;
|
|
||||||
multiboot_uint32_t part;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_mmap
|
/* Kernel command line */
|
||||||
{
|
multiboot_uint32_t cmdline;
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t entry_size;
|
|
||||||
multiboot_uint32_t entry_version;
|
|
||||||
struct multiboot_mmap_entry entries[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_vbe_info_block
|
/* Boot-Module list */
|
||||||
{
|
multiboot_uint32_t mods_count;
|
||||||
multiboot_uint8_t external_specification[512];
|
multiboot_uint32_t mods_addr;
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_vbe_mode_info_block
|
union
|
||||||
{
|
{
|
||||||
multiboot_uint8_t external_specification[256];
|
multiboot_aout_symbol_table_t aout_sym;
|
||||||
};
|
multiboot_elf_section_header_table_t elf_sec;
|
||||||
|
} u;
|
||||||
|
|
||||||
struct multiboot_tag_vbe
|
/* Memory Mapping buffer */
|
||||||
{
|
multiboot_uint32_t mmap_length;
|
||||||
multiboot_uint32_t type;
|
multiboot_uint32_t mmap_addr;
|
||||||
multiboot_uint32_t size;
|
|
||||||
|
|
||||||
|
/* 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_mode;
|
||||||
multiboot_uint16_t vbe_interface_seg;
|
multiboot_uint16_t vbe_interface_seg;
|
||||||
multiboot_uint16_t vbe_interface_off;
|
multiboot_uint16_t vbe_interface_off;
|
||||||
multiboot_uint16_t vbe_interface_len;
|
multiboot_uint16_t vbe_interface_len;
|
||||||
|
|
||||||
struct multiboot_vbe_info_block vbe_control_info;
|
|
||||||
struct multiboot_vbe_mode_info_block vbe_mode_info;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_framebuffer_common
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
|
|
||||||
multiboot_uint64_t framebuffer_addr;
|
multiboot_uint64_t framebuffer_addr;
|
||||||
multiboot_uint32_t framebuffer_pitch;
|
multiboot_uint32_t framebuffer_pitch;
|
||||||
multiboot_uint32_t framebuffer_width;
|
multiboot_uint32_t framebuffer_width;
|
||||||
|
|
@ -284,21 +200,14 @@ struct multiboot_tag_framebuffer_common
|
||||||
multiboot_uint8_t framebuffer_bpp;
|
multiboot_uint8_t framebuffer_bpp;
|
||||||
#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
|
#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
|
||||||
#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1
|
#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1
|
||||||
#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2
|
#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2
|
||||||
multiboot_uint8_t framebuffer_type;
|
multiboot_uint8_t framebuffer_type;
|
||||||
multiboot_uint16_t reserved;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_framebuffer
|
|
||||||
{
|
|
||||||
struct multiboot_tag_framebuffer_common common;
|
|
||||||
|
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
|
multiboot_uint32_t framebuffer_palette_addr;
|
||||||
multiboot_uint16_t framebuffer_palette_num_colors;
|
multiboot_uint16_t framebuffer_palette_num_colors;
|
||||||
struct multiboot_color framebuffer_palette[0];
|
|
||||||
};
|
};
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
|
|
@ -311,21 +220,46 @@ struct multiboot_tag_framebuffer
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
typedef struct multiboot_info multiboot_info_t;
|
||||||
|
|
||||||
struct multiboot_tag_elf_sections
|
struct multiboot_color
|
||||||
{
|
{
|
||||||
multiboot_uint32_t type;
|
multiboot_uint8_t red;
|
||||||
multiboot_uint32_t size;
|
multiboot_uint8_t green;
|
||||||
multiboot_uint32_t num;
|
multiboot_uint8_t blue;
|
||||||
multiboot_uint32_t entsize;
|
|
||||||
multiboot_uint32_t shndx;
|
|
||||||
char sections[0];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct multiboot_tag_apm
|
struct multiboot_mmap_entry
|
||||||
{
|
{
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
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 version;
|
||||||
multiboot_uint16_t cseg;
|
multiboot_uint16_t cseg;
|
||||||
multiboot_uint32_t offset;
|
multiboot_uint32_t offset;
|
||||||
|
|
@ -337,81 +271,6 @@ struct multiboot_tag_apm
|
||||||
multiboot_uint16_t dseg_len;
|
multiboot_uint16_t dseg_len;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct multiboot_tag_efi32
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t pointer;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_efi64
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint64_t pointer;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_smbios
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint8_t major;
|
|
||||||
multiboot_uint8_t minor;
|
|
||||||
multiboot_uint8_t reserved[6];
|
|
||||||
multiboot_uint8_t tables[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_old_acpi
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint8_t rsdp[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_new_acpi
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint8_t rsdp[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_network
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint8_t dhcpack[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_efi_mmap
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t descr_size;
|
|
||||||
multiboot_uint32_t descr_vers;
|
|
||||||
multiboot_uint8_t efi_mmap[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_efi32_ih
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t pointer;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_efi64_ih
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint64_t pointer;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct multiboot_tag_load_base_addr
|
|
||||||
{
|
|
||||||
multiboot_uint32_t type;
|
|
||||||
multiboot_uint32_t size;
|
|
||||||
multiboot_uint32_t load_base_addr;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* ! ASM_FILE */
|
#endif /* ! ASM_FILE */
|
||||||
|
|
||||||
#endif /* ! MULTIBOOT_HEADER */
|
#endif /* ! MULTIBOOT_HEADER */
|
||||||
|
|
|
||||||
|
|
@ -31,11 +31,8 @@ extern void testf(void);
|
||||||
//
|
//
|
||||||
// Entry point of the Kaleid kernel
|
// Entry point of the Kaleid kernel
|
||||||
//
|
//
|
||||||
noreturn void StartKern(void *mbInfo, int mbMagic)
|
noreturn void StartKern(multiboot_info_t *mbInfo, int mbMagic)
|
||||||
{
|
{
|
||||||
(void)mbInfo;
|
|
||||||
(void)mbMagic;
|
|
||||||
|
|
||||||
// We're not ready to deal with interrupts
|
// We're not ready to deal with interrupts
|
||||||
DisableIRQs();
|
DisableIRQs();
|
||||||
|
|
||||||
|
|
@ -43,6 +40,20 @@ noreturn void StartKern(void *mbInfo, int mbMagic)
|
||||||
InitTerms();
|
InitTerms();
|
||||||
|
|
||||||
// We're out
|
// We're out
|
||||||
StartPanic("Goodbye World :(");
|
StartPanic( "We were loaded by : %s\n\n\n"
|
||||||
}
|
"We get\n"
|
||||||
|
" *mbInfo : %p\n"
|
||||||
|
" mbMagic : %x\n"
|
||||||
|
" mbBootdrv : %x\n"
|
||||||
|
" *mbMmap : %p\n"
|
||||||
|
" `-length : %d\n"
|
||||||
|
"\nGoodbye World :(",
|
||||||
|
|
||||||
|
mbInfo->boot_loader_name,
|
||||||
|
mbInfo,
|
||||||
|
mbMagic,
|
||||||
|
mbInfo->boot_device,
|
||||||
|
mbInfo->mmap_addr,
|
||||||
|
mbInfo->mmap_length
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,5 +29,3 @@ Processor_t cpuTable[NCPUS] = {0};
|
||||||
|
|
||||||
Terminal_t *stdOut = 0, *stdDbg = 0;
|
Terminal_t *stdOut = 0, *stdDbg = 0;
|
||||||
|
|
||||||
volatile ushort *vga = (volatile ushort *)0xB8000;
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue