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
SpiderScript - Bugs, Documentation and a few language features
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
start.asm
diff --git
a/Kernel/arch/x86/start.asm
b/Kernel/arch/x86/start.asm
index
0a4f920
..
4be4130
100644
(file)
--- a/
Kernel/arch/x86/start.asm
+++ b/
Kernel/arch/x86/start.asm
@@
-59,6
+59,8
@@
mboot:
[extern kmain]
[global start]
start:
[extern kmain]
[global start]
start:
+ ; Just show we're here
+ mov WORD [0xB8000], 0x0741 ; 'A'
; Set up stack
mov esp, Kernel_Stack_Top
; Set up stack
mov esp, Kernel_Stack_Top
@@
-71,13
+73,20
@@
start:
or ecx, 0x80010000 ; PG and WP
mov cr0, ecx
or ecx, 0x80010000 ; PG and WP
mov cr0, ecx
+ mov WORD [0xB8002], 0x0763 ; 'c'
+ mov WORD [0xB8004], 0x0765 ; 'e'
+
lea ecx, [.higherHalf]
jmp ecx
.higherHalf:
lea ecx, [.higherHalf]
jmp ecx
.higherHalf:
+
+ mov WORD [0xB8006], 0x0773 ; 's'
+ mov WORD [0xB8008], 0x0773 ; 's'
; Call the kernel
push ebx ; Multiboot Info
push eax ; Multiboot Magic Value
; Call the kernel
push ebx ; Multiboot Info
push eax ; Multiboot Magic Value
+ mov WORD [0xB800A], 0x0732 ; '2'
call kmain
; Halt the Machine
call kmain
; Halt the Machine
@@
-118,8
+127,8
@@
APStartup:
mov ds, ax
lgdt [DWORD ds:lGDTPtr-KERNEL_BASE-0xFFFF0]
mov eax, cr0
mov ds, ax
lgdt [DWORD ds:lGDTPtr-KERNEL_BASE-0xFFFF0]
mov eax, cr0
- or
al, 1
- mov
cr0, eax
+ or al, 1
+ mov cr0, eax
jmp 08h:DWORD .ProtectedMode-KERNEL_BASE
[bits 32]
.ProtectedMode:
jmp 08h:DWORD .ProtectedMode-KERNEL_BASE
[bits 32]
.ProtectedMode:
@@
-134,7
+143,7
@@
APStartup:
mov eax, gaInitPageDir - KERNEL_BASE
mov cr3, eax
mov eax, cr0
mov eax, gaInitPageDir - KERNEL_BASE
mov cr3, eax
mov eax, cr0
- or
eax, 0x80010000
; PG and WP
+ or
eax, 0x80010000
; PG and WP
mov cr0, eax
; Jump to higher half
lea eax, [.higherHalf]
mov cr0, eax
; Jump to higher half
lea eax, [.higherHalf]
@@
-222,7
+231,7
@@
CallWithArgArray:
align 0x1000
gaInitPageDir:
dd gaInitPageTable-KERNEL_BASE+3 ; 0x000 - Low kernel
align 0x1000
gaInitPageDir:
dd gaInitPageTable-KERNEL_BASE+3 ; 0x000 - Low kernel
- times 0x300-
1
dd 0
+ times 0x300-
0x000-1
dd 0
dd gaInitPageTable-KERNEL_BASE+3 ; 0xC00 - High kernel
times 0x3F0-0x300-1 dd 0
dd gaInitPageDir-KERNEL_BASE+3 ; 0xFC0 - Fractal
dd gaInitPageTable-KERNEL_BASE+3 ; 0xC00 - High kernel
times 0x3F0-0x300-1 dd 0
dd gaInitPageDir-KERNEL_BASE+3 ; 0xFC0 - Fractal
UCC
git Repository :: git.ucc.asn.au