git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://localhost/acess2
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
arch
/
x86
/
start.asm
diff --git
a/KernelLand/Kernel/arch/x86/start.asm
b/KernelLand/Kernel/arch/x86/start.asm
index
1d4a35d
..
7602b9b
100644
(file)
--- a/
KernelLand/Kernel/arch/x86/start.asm
+++ b/
KernelLand/Kernel/arch/x86/start.asm
@@
-55,7
+55,7
@@
mboot:
; dd 8
;mboot2_end:
; dd 8
;mboot2_end:
-[section .text]
+[section .
init
text]
[extern kmain]
[extern Desctab_Install]
[global start]
[extern kmain]
[extern Desctab_Install]
[global start]
@@
-137,13
+137,13
@@
APStartup:
; Load initial GDT
mov ax, 0xFFFF
mov ds, ax
; 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
; 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
[bits 32]
.ProtectedMode:
; Load segment registers
@@
-218,6
+218,10
@@
APStartup:
jmp .hlt
%endif
jmp .hlt
%endif
+;
+;
+;
+[section .text]
[global GetEIP]
GetEIP:
mov eax, [esp]
[global GetEIP]
GetEIP:
mov eax, [esp]
UCC
git Repository :: git.ucc.asn.au