Merge branch 'cpu' into BetterTerm

This commit is contained in:
Adrien Bourmault 2019-05-09 10:53:00 +02:00
commit 7d8253cf3e
4 changed files with 11 additions and 2 deletions

View File

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

View File

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

View File

@ -22,5 +22,10 @@
; 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

View File

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