Kernel/x86_64 - Bugfixing, cleaning up scheduling

[tpg/acess2.git] / Kernel / arch / x86_64 / desctab.asm

diff --git a/Kernel/arch/x86_64/desctab.asm b/Kernel/arch/x86_64/desctab.asm
index 50fc126..2d96180 100644 (file)
--- a/Kernel/arch/x86_64/desctab.asm
+++ b/Kernel/arch/x86_64/desctab.asm
@@ -44,7 +44,7 @@ Desctab_Init:
        %endrep
        
        ; Install IRQs
-       SETIDT  0xF0, SchedulerIRQ
+       SETIDT  0xF0, PIT_IRQ
        SETIDT  0xF1, Irq1
        SETIDT  0xF2, Irq2
        SETIDT  0xF3, Irq3
@@ -123,12 +123,12 @@ Desctab_Init:
        ; Set IA32_STAR (Kernel/User CS)
        mov ecx, 0xC0000081
        rdmsr
-       mov edx, 0x8 | (0x18 << 16)     ; Kernel CS (and Kernel DS/SS - 8), User CS
+       mov edx, 0x8 | (0x1B << 16)     ; Kernel CS (and Kernel DS/SS - 8), User CS
        wrmsr
        
        ret
 
-; int IRQ_AddHandler(int IRQ, void (*Handler)(int IRQ))
+; int IRQ_AddHandler(int IRQ, void (*Handler)(int IRQ), void *Ptr)
 ; Return Values:
 ;  0 on Success
 ; -1 on an invalid IRQ Number
@@ -137,6 +137,7 @@ Desctab_Init:
 IRQ_AddHandler:
        ; RDI - IRQ Number
        ; RSI - Callback
+       ; RDX - Ptr
        
        ; Check for RDI >= 16
        cmp rdi, 16
@@ -153,8 +154,8 @@ IRQ_AddHandler:
        
        ; Find a free callback slot
        %rep NUM_IRQ_CALLBACKS
-       mov rdx, [rax]
-       test rdx, rdx
+       mov rcx, [rax]
+       test rcx, rcx
        jz .assign
        add rax, 8
        %endrep
@@ -170,6 +171,7 @@ IRQ_AddHandler:
        push rdi
        push rsi
        push rax
+       push rdx
        sub rsp, 8
        mov rcx, rdi    ; IRQ Number
        mov rdx, rsi    ; Callback
@@ -177,12 +179,15 @@ IRQ_AddHandler:
        mov rdi, csIRQ_Assigned
        call Log
        add rsp, 8
+       pop rdx
        pop rax
        pop rsi
        pop rdi
 
        ; Assign and return
        mov [rax], rsi
+       add rax, gaIRQ_DataPtrs - gaIRQ_Handlers
+       mov [rax], rdx
        xor rax, rax
 
 .ret:
@@ -191,6 +196,8 @@ IRQ_AddHandler:
 [section .rodata]
 csIRQ_Assigned:
        db      "IRQ %p := %p (IRQ %i)",0
+csIRQ_Fired:
+       db      "IRQ %i fired",0
 [section .text]
 
 %macro ISR_NOERRNO     1
@@ -277,10 +284,13 @@ IrqCommon:
        PUSH_GPR
        push gs
        push fs
+
+;      mov rdi, csIRQ_Fired
+;      mov rsi, [rsp+(16+2)*8]
+;      call Log
        
-       mov rbx, [rsp+(16+2)*8] ; Get interrupt number (16 GPRS + 2 SRs)
-;      xchg bx, bx     ; Bochs Magic break (NOTE: will clear the high-bits of RBX)
-       shl rbx, 2      ; *8*4
+       mov ebx, [rsp+(16+2)*8] ; Get interrupt number (16 GPRS + 2 SRs)
+       shl ebx, 2      ; *4
        mov rax, gaIRQ_Handlers
        lea rbx, [rax+rbx*8]
        
@@ -294,6 +304,7 @@ IrqCommon:
        jz .skip.%[i]
        ; Set RDI to IRQ number
        mov rdi, [rsp+(16+2+1)*8]       ; Get IRQ number
+       mov rsi, [rbx-gaIRQ_Handlers+gaIRQ_DataPtrs]
        call rax        ; Call
 .skip.%[i]:
        add rbx, 8      ; Next!
@@ -303,74 +314,63 @@ IrqCommon:
        
        ; ACK
        mov al, 0x20
-       mov rdi, [rsp+16*8]     ; Get IRQ number
+       mov rdi, [rsp+(16+2)*8] ; Get IRQ number
        cmp rdi, 8
        jb .skipAckSecondary
-       mov dx, 0x00A0
-       out dx, al
+       out 0xA0, al
 .skipAckSecondary:
-       mov dx, 0x0020
-       out dx, al
+       out 0x20, al
        
        pop fs
        pop gs
        POP_GPR
        add rsp, 8*2
-       ;xchg bx, bx
        iretq
 
-[extern Proc_Scheduler]
-[global SchedulerIRQ]
-;
-; NOTE: Proc_Scheduler makes assumptions about the stack state when called 
-;
-SchedulerIRQ:
-       push 0  ; Error code
-       push 0  ; IRQNum
+[extern Time_UpdateTimestamp]
+
+%if USE_MP
+[global APIC_Timer_IRQ]
+APIC_Timer_IRQ:
        PUSH_GPR
        push gs
        push fs
+
+       ; TODO: What to do?
+
+       mov eax, DWORD [gpMP_LocalAPIC]
+       mov DWORD [eax+0x0B0], 0
+
+       pop fs
+       pop gs
+       POP_GPR
+       iretq
+%endif
+
+[global PIT_IRQ]
+PIT_IRQ:
+       PUSH_GPR
        ;PUSH_FPU
        ;PUSH_XMM
        
-       ; Save Thread Pointer
-       mov rax, dr0
-       push rax
-       
-       mov rdi, dr1    ; Get the CPU Number
-       mov rsi, rsp    ; Save stack pointer
-       mov rdx, SchedulerIRQ.restoreState
-       ; Call the Scheduler
-       call Proc_Scheduler
-.restoreState:
-       
-       ; Restore Thread Pointer
-       pop rax
-       mov dr0, rax
-       
-       ; Send EOI (To either the APIC or the PIC)
-       %if USE_MP
-       test ebx, ebx
-       jnz .sendEOI
+       call Time_UpdateTimestamp
+
+       %if 0
+[section .rodata]
+csUserSS:      db      "User SS: 0x%x",0
+[section .text]
+       mov rdi, csUserSS
+       mov rsi, [rsp+0x80+0x20]
+       call Log
        %endif
-       ; PIC
+
+       ; Send EOI
        mov al, 0x20
        out 0x20, al            ; ACK IRQ
-       %if USE_MP
-       jmp .ret
-       ; APIC
-.sendEOI:
-       mov eax, DWORD [gpMP_LocalAPIC]
-       mov DWORD [eax+0x0B0], 0
-       %endif
-.ret:
        
        ;POP_XMM
        ;POP_FPU
-       pop fs
-       pop gs
        POP_GPR
-       add rsp, 2*8    ; Dummy error code and IRQ num
        iretq
 
 [extern ci_offsetof_tThread_KernelStack]
@@ -405,6 +405,16 @@ SyscallStub:
        mov rdi, rsp
        sub rsp, 8
        call SyscallHandler
+
+       %if 0
+[section .rodata]
+csSyscallReturn:       db      "Syscall Return: 0x%x",0
+[section .text]
+       mov rdi, csSyscallReturn
+       mov rsi, [rsp+0+8]
+       call Log
+       %endif
+
        add rsp, 8
        mov ebx, [rsp+8]        ; Get errno
        mov rax, [rsp+0]        ; Get return
@@ -413,6 +423,9 @@ SyscallStub:
        pop r11
        pop rcx
        pop rsp         ; Change back to user stack
+       ; TODO: Determine if user is 64 or 32 bit
+
+       db 0x48 ; REX, nasm doesn't have a sysretq opcode
        sysret
 
 [section .data]
@@ -425,3 +438,5 @@ gIDTPtr:
 
 gaIRQ_Handlers:
        times   16*NUM_IRQ_CALLBACKS    dq      0
+gaIRQ_DataPtrs:
+       times   16*NUM_IRQ_CALLBACKS    dq      0