mirror of
https://gitlab.os-k.eu/os-k-team/os-k.git
synced 2023-08-25 14:03:10 +02:00
Merge branch 'cpu' into BetterTerm
This commit is contained in:
commit
7d8253cf3e
@ -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
|
||||
|
@ -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
|
||||
|
@ -22,5 +22,10 @@
|
||||
; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ;
|
||||
;=----------------------------------------------------------------------------=;
|
||||
|
||||
%include "kaleid/kernel/cpu/cpuf.inc"
|
||||
|
||||
CpuCpuid:
|
||||
|
||||
pushAll
|
||||
mov rax, rsi
|
||||
cpuid
|
||||
popAll
|
||||
|
@ -62,6 +62,8 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic, void *codeSeg)
|
||||
IoGetRtcTimeChar();
|
||||
IoPrintRtcTime();
|
||||
|
||||
KernLog("%d\n",realKernelEnd);
|
||||
|
||||
KeStartShell();
|
||||
|
||||
PoShutdown();
|
||||
|
Loading…
Reference in New Issue
Block a user