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
Commenting for new function
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
desctab.asm
diff --git
a/Kernel/arch/x86/desctab.asm
b/Kernel/arch/x86/desctab.asm
index
bc37711
..
737570b
100644
(file)
--- a/
Kernel/arch/x86/desctab.asm
+++ b/
Kernel/arch/x86/desctab.asm
@@
-13,7
+13,6
@@
GDT_SIZE equ (1+2*2+1+MAX_CPUS)*8
[section .data]
; GDT
[global gGDT]
[section .data]
; GDT
[global gGDT]
-[global gGDTptr]
gGDT:
; PL0 - Kernel
; PL3 - User
gGDT:
; PL0 - Kernel
; PL3 - User
@@
-24,22
+23,25
@@
gGDT:
dd 0x0000FFFF, 0x00CFF200 ; 20 PL3 Data
dd 26*4-1, 0x00408900 ; Double Fault TSS
times MAX_CPUS dd 26*4-1, 0x00408900
dd 0x0000FFFF, 0x00CFF200 ; 20 PL3 Data
dd 26*4-1, 0x00408900 ; Double Fault TSS
times MAX_CPUS dd 26*4-1, 0x00408900
-gGDTptr:
+[global gGDTPtr]
+gGDTPtr:
dw GDT_SIZE-1
dd gGDT
; IDT
ALIGN 8
gIDT:
times 256 dd 0x00080000,0x00000F00
dw GDT_SIZE-1
dd gGDT
; IDT
ALIGN 8
gIDT:
times 256 dd 0x00080000,0x00000F00
+[global gIDTPtr]
gIDTPtr:
dw 256 * 16 - 1 ; Limit
dd gIDT ; Base
[section .text]
gIDTPtr:
dw 256 * 16 - 1 ; Limit
dd gIDT ; Base
[section .text]
+
[global Desctab_Install]
Desctab_Install:
; Set GDT
[global Desctab_Install]
Desctab_Install:
; Set GDT
- lgdt [gGDT
p
tr]
+ lgdt [gGDT
P
tr]
mov ax, 0x10 ; PL0 Data
mov ss, ax
mov ds, ax
mov ax, 0x10 ; PL0 Data
mov ss, ax
mov ds, ax
@@
-203,6
+205,7
@@
Isr240:
; ---------------------
[extern ErrorHandler]
ErrorCommon:
; ---------------------
[extern ErrorHandler]
ErrorCommon:
+ ;xchg bx, bx
pusha
push ds
push es
pusha
push ds
push es
UCC
git Repository :: git.ucc.asn.au