More real mode instruction and interrupt mechanics tests.

README.md

@@ -125,11 +125,15 @@ executed:
 | ---- | ------------------------------------------------------------------ |
 | 0x00 | Real mode initialisation                                           |
 | 0x01 | Conditional jumps and loops                                        |
+| 0x1D | Flag instructions in real mode                                     |
 | 0x02 | Quick tests of unsigned 32-bit multiplication and division         |
 | 0x03 | Move segment registers in real mode                                |
 | 0x04 | Store, move, scan, and compare string data in real mode            |
 | 0x05 | Calls in real mode                                                 |
 | 0x06 | Load full pointer in real mode                                     |
+| 0x1E | Load and store GDTR and IDTR in real mode **                       |
+| 0x1F | XLAT in real mode **                                               |
+| 0x07 | Interrupts in real mode **                                         |
 | 0x08 | GDT, LDT, PDT, and PT setup, enter protected mode                  |
 | 0x09 | Stack functionality *                                              |
 | 0x20 | Test user mode (ring 3) switching                                  |

src/protected_inth.asm

@@ -1,36 +1,3 @@
-;
-; Kernel mode interrupt handler
-;
-kernelInterrupt: 
-	testCPL 0                  ; Elevates to CPL 0
-	push  ebx
-	push  ecx
-	push  ds
-	lds   ebx, [cs:ptrTSSprot] ; Get the TSS
-	mov   ecx, [ebx+4]         ; Get TSS ESP0
-	sub   ecx, 0x14+0xC        ; Where we should end up on the kernel stack, taking into account what we just pushed
-	cmp   esp, ecx             ; Did the stack decrease correctly?
-	jne   error
-	mov   cx, ss
-	cmp   cx, word [ebx+8]     ; Did the stack pointer load correctly?
-	jne   error
-	pop   ds
-	pop   ecx
-	mov   bx, cs
-	cmp   bx, C_SEG_PROT32     ; Did we end up in kernel mode correctly?
-	jne   error
-	pop   ebx
-	cmp   dword [esp+0x00], kernelModeInterruptReturn
-	jne   error                ; Invalid return address
-	cmp   dword [esp+0x04], CU_SEG_PROT32|3
-	jne   error                ; Invalid return code segment
-	; Ignore eflags
-	cmp   dword [esp+0x0C], ESP_R3_PROT
-	jne   error                ; Invalid return ESP
-	cmp   dword [esp+0x10], SU_SEG_PROT32|3
-	jne   error                ; Invalid user stack segment
-	iret                       ; Simply return to user mode
-
 ;
 ; Kernel mode interrupt handler
 ;
@@ -39,7 +6,7 @@ kernelInterrupt286:
 	push  ebx
 	push  ecx
 	push  ds
-	lds   ebx, [cs:ptrTSSprot] ; Get the TSS
+	lds   ebx, [cs:ptrTSSprot_R0] ; Get the TSS
 	mov   ecx, [ebx+4]         ; Get TSS ESP0
 	sub   ecx, 0x0A+0xC        ; Where we should end up on the kernel stack, taking into account what we just pushed
 	cmp   esp, ecx             ; Did the stack decrease correctly?
@@ -50,12 +17,12 @@ kernelInterrupt286:
 	pop   ds
 	pop   ecx
 	mov   bx, cs
-	cmp   bx, C_SEG_PROT32     ; Did we end up in kernel mode correctly?
+	cmp   bx, C_SEG_PROT32low     ; Did we end up in kernel mode correctly?
 	jne   error
 	pop   ebx
 	cmp   word [esp+0x00], kernelModeInterruptReturn286
 	jne   error                ; Invalid return address
-	cmp   word [esp+0x02], CU_SEG_PROT32|3
+	cmp   word [esp+0x02], CU_SEG_PROT32low|3
 	jne   error                ; Invalid return code segment
 	; Ignore eflags
 	cmp   word [esp+0x06], ESP_R3_PROT
@@ -90,7 +57,7 @@ kernelInterruptRestoreKernelStack:
 	pop   ebx
 	cmp   dword [esp+0x00], kernelModeInterruptKernelStackReturn
 	jne   error                ; Invalid return address
-	cmp   dword [esp+0x04], CU_SEG_PROT32|3
+	cmp   dword [esp+0x04], CU_SEG_PROT32low|3
 	jne   error                ; Invalid return code segment
 	; Ignore eflags
 	cmp   dword [esp+0x0C], ESP_R3_PROT
@@ -110,7 +77,7 @@ kernelOnlyInterrupt:
 	push  ebx
 	push  ds
 	push  ecx
-	lds   ebx, [cs:ptrTSSprot] ; Get the TSS
+	lds   ebx, [cs:ptrTSSprot_R0] ; Get the TSS
 	mov   ecx, eax             ; Get ESP for the kernel mode program (stored into eax)
 	sub   ecx, 0xC+0xC         ; Where we should end up on the kernel stack, taking into account what we just pushed
 	cmp   esp, ecx             ; Did the stack decrease correctly?
@@ -121,13 +88,13 @@ kernelOnlyInterrupt:
 	jne   error
 	pop   ecx
 	mov   bx, cs
-	cmp   bx, C_SEG_PROT32     ; Did we arrive at proper kernel code?
+	cmp   bx, C_SEG_PROT32low     ; Did we arrive at proper kernel code?
 	jne   error
 	pop   ds
 	pop   ebx
 	cmp   dword [esp+0x00], kernelModeOnlyInterruptReturn
 	jne   error                ; Invalid return address
-	cmp   dword [esp+0x04],C_SEG_PROT32
+	cmp   dword [esp+0x04],C_SEG_PROT32low
 	jne   error                ; Invalid return code segment
 	; Ignore eflags
 	iret                       ; Simply return to kernel mode
@@ -150,12 +117,12 @@ kernelConformingInterrupt:
 	jne   error
 	pop   ecx
 	mov   bx, cs
-	cmp   bx, CC_SEG_PROT32|3 ; Did we arrive at proper conforming code?
+	cmp   bx, CC_SEG_PROT32low|3 ; Did we arrive at proper conforming code?
 	jne   error
 	pop   ebx
 	cmp   dword [esp+0x00], kernelConformingInterruptReturn
 	jne   error               ; Invalid return address
-	cmp   dword [esp+0x04], CU_SEG_PROT32|3
+	cmp   dword [esp+0x04], CU_SEG_PROT32low|3
 	jne   error               ; Invalid return code segment
 	; Ignore eflags
 	iret                      ; Simply return to user mode, stays at CPL 3
@@ -171,7 +138,7 @@ kernelOnlyConformingInterrupt:
 	push  ebx
 	push  ds
 	push  ecx
-	lds   ebx, [cs:ptrTSSprot] ; Get the TSS
+	lds   ebx, [cs:ptrTSSprot_R0] ; Get the TSS
 	mov   ecx, eax             ; Get ESP for the kernel mode program (stored into eax)
 	sub   ecx, 0xC+0xC         ; Where we should end up on the kernel stack, taking into account what we just pushed
 	cmp   esp, ecx             ; Did the stack decrease correctly?
@@ -182,13 +149,13 @@ kernelOnlyConformingInterrupt:
 	jne   error
 	pop   ecx
 	mov   bx, cs
-	cmp   bx, CC_SEG_PROT32    ; Did we arrive at proper conforming kernel code?
+	cmp   bx, CC_SEG_PROT32low    ; Did we arrive at proper conforming kernel code?
 	jne   error
 	pop   ds
 	pop   ebx
 	cmp   dword [esp+0x00], kernelOnlyConformingInterruptReturn
 	jne   error                ; Invalid return address
-	cmp   dword [esp+0x04],C_SEG_PROT32
+	cmp   dword [esp+0x04],C_SEG_PROT32low
 	jne   error                ; Invalid return code segment
 	; Ignore eflags
 	iret                       ; Simply return to kernel mode
@@ -211,12 +178,12 @@ userModeInterrupt:
 	jne   error
 	pop   ecx
 	mov   bx, cs
-	cmp   bx, CU_SEG_PROT32|3   ; Did we arrive at proper user mode code?
+	cmp   bx, CU_SEG_PROT32low|3   ; Did we arrive at proper user mode code?
 	jne   error
 	pop   ebx
 	cmp   dword [esp+0x00], userInterruptReturn
 	jne   error                 ; Invalid return address
-	cmp   dword [esp+0x04],CU_SEG_PROT32|3
+	cmp   dword [esp+0x04],CU_SEG_PROT32low|3
 	jne   error                 ; Invalid return code segment
 	; Ignore eflags
 	iret                        ; Simply return to caller, stays as user mode.
@@ -239,3 +206,6 @@ kernelInterrupt_validateIsV86mode:
 	test dword [esp+8],0x20000 ;V86 bit set?
 	jz error ;V86 bit not properly set?
 	iret
+
+DefaultExcHandlerLow:
+	jmp C_SEG_PROT32:DefaultExcHandler