X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2Fstart.asm;h=7602b9b66cb3af449f84401424c2ac7fb90078a7;hb=018c8816a23abe82a8c71d1d7583fd49b2f9ce74;hp=1d4a35d8571c5e206d51b68cfa86ab08c608f1b3;hpb=e02f66c7125bf18f77c6c53587238cbd49da2c89;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/arch/x86/start.asm b/KernelLand/Kernel/arch/x86/start.asm index 1d4a35d8..7602b9b6 100644 --- a/KernelLand/Kernel/arch/x86/start.asm +++ b/KernelLand/Kernel/arch/x86/start.asm @@ -55,7 +55,7 @@ mboot: ; dd 8 ;mboot2_end: -[section .text] +[section .inittext] [extern kmain] [extern Desctab_Install] [global start] @@ -137,13 +137,13 @@ APStartup: ; Load initial GDT mov ax, 0xFFFF mov ds, ax - lgdt [DWORD ds:lGDTPtr-KERNEL_BASE-0xFFFF0] + lgdt [DWORD ds:lGDTPtr-0xFFFF0] ; Enable PMode in CR0 mov eax, cr0 or al, 1 mov cr0, eax ; Jump into PMode - jmp 08h:DWORD .ProtectedMode-KERNEL_BASE + jmp 08h:DWORD .ProtectedMode [bits 32] .ProtectedMode: ; Load segment registers @@ -218,6 +218,10 @@ APStartup: jmp .hlt %endif +; +; +; +[section .text] [global GetEIP] GetEIP: mov eax, [esp]