stuff I don't remember
This commit is contained in:
Adrien Bourmault
parent
9ab5bbc58c
commit
ced75b51f2
|
|
@ -60,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 " "
|
|
||||||
|
|
|
||||||
|
|
@ -5,27 +5,22 @@
|
||||||
// //
|
// //
|
||||||
// //
|
// //
|
||||||
// Copyright © 1999,2003,2007-2010 Free Software Foundation, Inc. //
|
// Copyright © 1999,2003,2007-2010 Free Software Foundation, Inc. //
|
||||||
|
// Copyright © 2018-2019 The OS/K Team //
|
||||||
// //
|
// //
|
||||||
// Note: In this header, "the Software" refers to the multiboot.h file. //
|
// This file is part of OS/K. //
|
||||||
// //
|
// //
|
||||||
// Permission is hereby granted, free of charge, to any person //
|
// OS/K is free software: you can redistribute it and/or modify //
|
||||||
// obtaining a copy of this software and associated documentation //
|
// it under the terms of the GNU General Public License as published by //
|
||||||
// files (the "Software"), to deal in the Software without restriction, //
|
// the Free Software Foundation, either version 3 of the License, or //
|
||||||
// including without limitation the rights to use, copy, modify, merge, //
|
// any later version. //
|
||||||
// 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 //
|
// OS/K is distributed in the hope that it will be useful, //
|
||||||
// in all copies or substantial portions of the Software. //
|
// 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. //
|
||||||
// //
|
// //
|
||||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, //
|
// You should have received a copy of the GNU General Public License //
|
||||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF //
|
// along with OS/K. If not, see <https://www.gnu.org/licenses/>. //
|
||||||
// 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
|
#ifndef MULTIBOOT_HEADER
|
||||||
|
|
@ -61,9 +56,7 @@
|
||||||
/* This flag indicates the use of the address fields in the header. */
|
/* This flag indicates the use of the address fields in the header. */
|
||||||
#define MULTIBOOT_AOUT_KLUDGE 0x00010000
|
#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
|
#define MULTIBOOT_INFO_MEMORY 0x00000001
|
||||||
/* is there a boot device set? */
|
/* is there a boot device set? */
|
||||||
#define MULTIBOOT_INFO_BOOTDEV 0x00000002
|
#define MULTIBOOT_INFO_BOOTDEV 0x00000002
|
||||||
|
|
@ -77,7 +70,7 @@
|
||||||
/* is there a symbol table loaded? */
|
/* is there a symbol table loaded? */
|
||||||
#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010
|
#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010
|
||||||
/* is there an ELF section header table? */
|
/* is there an ELF section header table? */
|
||||||
#define MULTIBOOT_INFO_ELF_SHDR 0X00000020
|
#define MULTIBOOT_INFO_ELF_SHDR 0x00000020
|
||||||
|
|
||||||
/* is there a full memory map? */
|
/* is there a full memory map? */
|
||||||
#define MULTIBOOT_INFO_MEM_MAP 0x00000040
|
#define MULTIBOOT_INFO_MEM_MAP 0x00000040
|
||||||
|
|
|
||||||
|
|
@ -42,16 +42,18 @@ noreturn void StartKern(multiboot_info_t *mbInfo, int mbMagic)
|
||||||
// We're out
|
// We're out
|
||||||
StartPanic( "We were loaded by : %s\n\n\n"
|
StartPanic( "We were loaded by : %s\n\n\n"
|
||||||
"We get\n"
|
"We get\n"
|
||||||
" *mbInfo : %x\n"
|
" *mbInfo : %p\n"
|
||||||
" mbMagic : %x\n"
|
" mbMagic : %x\n"
|
||||||
" mbBootdrv : %x\n"
|
" mbBootdrv : %x\n"
|
||||||
|
" *mbMmap : %p\n"
|
||||||
|
" `-length : %d\n"
|
||||||
"\nGoodbye World :(",
|
"\nGoodbye World :(",
|
||||||
|
|
||||||
mbInfo->boot_loader_name,
|
mbInfo->boot_loader_name,
|
||||||
mbInfo,
|
mbInfo,
|
||||||
mbMagic,
|
mbMagic,
|
||||||
mbInfo->boot_device
|
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