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
Updated the build files to use $(xCP), allows use of mcopy to a mtools disk
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
start.asm
diff --git
a/Kernel/arch/x86/start.asm
b/Kernel/arch/x86/start.asm
index
0c2508b
..
4135160
100644
(file)
--- a/
Kernel/arch/x86/start.asm
+++ b/
Kernel/arch/x86/start.asm
@@
-21,14
+21,14
@@
mboot:
dd mboot - KERNEL_BASE ;Location of Multiboot Header
\r
\r
[section .text]
\r
dd mboot - KERNEL_BASE ;Location of Multiboot Header
\r
\r
[section .text]
\r
-[extern
_
kmain]
\r
+[extern kmain]
\r
[global start]
\r
start:
\r
; Set up stack
\r
[global start]
\r
start:
\r
; Set up stack
\r
- mov esp,
_
Kernel_Stack_Top
\r
+ mov esp, Kernel_Stack_Top
\r
\r
; Start Paging
\r
\r
; Start Paging
\r
- mov ecx,
_
gaInitPageDir - KERNEL_BASE
\r
+ mov ecx, gaInitPageDir - KERNEL_BASE
\r
mov cr3, ecx
\r
\r
mov ecx, cr0
\r
mov cr3, ecx
\r
\r
mov ecx, cr0
\r
@@
-39,12
+39,12
@@
start:
jmp ecx
\r
.higherHalf:
\r
\r
jmp ecx
\r
.higherHalf:
\r
\r
- mov DWORD [
_
gaInitPageDir], 0
\r
+ mov DWORD [gaInitPageDir], 0
\r
\r
; Call the kernel
\r
push ebx ; Multiboot Info
\r
push eax ; Multiboot Magic Value
\r
\r
; Call the kernel
\r
push ebx ; Multiboot Info
\r
push eax ; Multiboot Magic Value
\r
- call
_
kmain
+ call kmain
; Halt the Machine
\r
cli
\r
; Halt the Machine
\r
cli
\r
@@
-52,20
+52,20
@@
start:
hlt
\r
jmp .hlt
\r
\r
hlt
\r
jmp .hlt
\r
\r
-[global
_
GetEIP]
\r
-
_
GetEIP:
\r
+[global GetEIP]
\r
+GetEIP:
\r
mov eax, [esp]
\r
ret
\r
\r
mov eax, [esp]
\r
ret
\r
\r
-[extern
_
Proc_Clone]
\r
-[extern
_
Threads_Exit]
\r
-[global
_
SpawnTask]
\r
-
_
SpawnTask:
\r
+[extern Proc_Clone]
\r
+[extern Threads_Exit]
\r
+[global SpawnTask]
\r
+SpawnTask:
\r
; Call Proc_Clone with Flags=0
\r
xor eax, eax
\r
push eax
push eax
\r
; Call Proc_Clone with Flags=0
\r
xor eax, eax
\r
push eax
push eax
\r
- call
_
Proc_Clone
\r
+ call Proc_Clone
\r
add esp, 8 ; Remove arguments from stack
\r
\r
test eax, eax
\r
add esp, 8 ; Remove arguments from stack
\r
\r
test eax, eax
\r
@@
-77,29
+77,29
@@
_SpawnTask:
; Child
\r
push edx ; Argument
\r
call ebx ; Function
\r
; Child
\r
push edx ; Argument
\r
call ebx ; Function
\r
- call
_Threads_Exit
; Kill Thread
\r
+ call
Threads_Exit
; Kill Thread
\r
\r
.parent:
\r
ret
\r
\r
[section .initpd]
\r
\r
.parent:
\r
ret
\r
\r
[section .initpd]
\r
-[global
_
gaInitPageDir]
\r
-[global
_
gaInitPageTable]
\r
+[global gaInitPageDir]
\r
+[global gaInitPageTable]
\r
align 0x1000
\r
align 0x1000
\r
-
_
gaInitPageDir:
\r
- dd
_gaInitPageTable-KERNEL_BASE+3
; 0x00
\r
+gaInitPageDir:
\r
+ dd
gaInitPageTable-KERNEL_BASE+3
; 0x00
\r
times 1024-256-1 dd 0
\r
times 1024-256-1 dd 0
\r
- dd
_gaInitPageTable-KERNEL_BASE+3
; 0xC0
\r
+ dd
gaInitPageTable-KERNEL_BASE+3
; 0xC0
\r
times 256-1 dd 0
\r
align 0x1000
\r
times 256-1 dd 0
\r
align 0x1000
\r
-
_
gaInitPageTable:
\r
+gaInitPageTable:
\r
%assign i 0
\r
%rep 1024
\r
dd i*0x1000+3
\r
%assign i i+1
\r
%endrep
\r
%assign i 0
\r
%rep 1024
\r
dd i*0x1000+3
\r
%assign i i+1
\r
%endrep
\r
-[global
_
Kernel_Stack_Top]
\r
+[global Kernel_Stack_Top]
\r
ALIGN 0x1000
\r
times 1024 dd 0
\r
ALIGN 0x1000
\r
times 1024 dd 0
\r
-
_
Kernel_Stack_Top:
\r
+Kernel_Stack_Top:
\r
UCC
git Repository :: git.ucc.asn.au