os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cpu' into BetterTerm

This commit is contained in:
Adrien Bourmault 2019-05-09 10:53:00 +02:00
parent bd5f99ed37 c0ded6f3a7
commit 7d8253cf3e
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boot/loader/loader.asm
View File

@ -170,6 +170,7 @@ _loader64:
call write call write
mov qword [newKernelEnd], KERNEL_STACK mov qword [newKernelEnd], KERNEL_STACK
mov qword [realKernelEnd], realKernelEnd
mov rdi, [mbInfo] mov rdi, [mbInfo]
mov rsi, [mbMagic] mov rsi, [mbMagic]
mov rdx, GDT64.code mov rdx, GDT64.code

3
boot/loader/mem/structures.inc
View File

@ -26,11 +26,12 @@
[BITS 32] [BITS 32]
extern kernelEnd extern kernelEnd
global newKernelEnd global newKernelEnd
global realKernelEnd
[section .text] [section .text]
KERNEL_STACK equ kernelEnd + 4096 * 2 * 1024 ; 8MB of stack KERNEL_STACK equ kernelEnd + 4096 * 2 * 1024 ; 8MB of stack
newKernelEnd dq 0x0 newKernelEnd dq 0x0
realKernelEnd dq 0x0
[section .rodata] [section .rodata]
;; GDT WITH DOC ;; GDT WITH DOC
ALIGN 4096 ALIGN 4096

7
kaleid/kernel/cpu/cpuf.asm
View File

@ -22,5 +22,10 @@
; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ; ; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ;
;=----------------------------------------------------------------------------=; ;=----------------------------------------------------------------------------=;
CpuCpuid: %include "kaleid/kernel/cpu/cpuf.inc"
CpuCpuid:
pushAll
mov rax, rsi
cpuid
popAll

2
kaleid/kernel/init/init.c
View File

@ -62,6 +62,8 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic, void *codeSeg)
IoGetRtcTimeChar(); IoGetRtcTimeChar();
IoPrintRtcTime(); IoPrintRtcTime();
KernLog("%d\n",realKernelEnd);
KeStartShell(); KeStartShell();
PoShutdown(); PoShutdown();