X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fdesctab.asm;h=739b219f6a51fc27c2a42de1cb7a74ce9df5f8e4;hb=bc55dc5d60469521269a41928d3d15809e2c8134;hp=50fc126c7dad84efa383205637be0ece59f179cf;hpb=d1d3bfa26bd78e298ad2431c4f86e2ea94515aab;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/desctab.asm b/Kernel/arch/x86_64/desctab.asm
index 50fc126c..739b219f 100644
--- a/Kernel/arch/x86_64/desctab.asm
+++ b/Kernel/arch/x86_64/desctab.asm
@@ -191,6 +191,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 +279,14 @@ 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)
+	mov ebx, [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
+	shl ebx, 2	; *4
 	mov rax, gaIRQ_Handlers
 	lea rbx, [rax+rbx*8]
 	
@@ -303,20 +309,17 @@ 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]
@@ -371,6 +374,7 @@ SchedulerIRQ:
 	pop gs
 	POP_GPR
 	add rsp, 2*8	; Dummy error code and IRQ num
+;	xchg bx, bx
 	iretq
 
 [extern ci_offsetof_tThread_KernelStack]
@@ -413,6 +417,10 @@ SyscallStub:
 	pop r11
 	pop rcx
 	pop rsp 	; Change back to user stack
+	; TODO: Determine if user is 64 or 32 bit
+
+;	xchg bx, bx	
+	db 0x48	; REX, nasm doesn't have a sysretq opcode
 	sysret
 
 [section .data]