Add kvm timer code

Exclude floppy code by default

Author: Ian Seyler

src/init/timer.asm

@@ -26,10 +26,12 @@ init_timer_phys:
 	cmp rax, 0
 	jz init_timer_error
 	call init_timer_hpet
+	mov qword [sys_timer], hpet_delay
 	jmp init_timer_done
 
 init_timer_virt:
 	call init_timer_kvm
+	mov qword [sys_timer], kvm_delay
 
 init_timer_error:
 
@@ -239,6 +241,10 @@ kvm_get_usec_shift_done:
 	pop rcx				; Restore tsc_to_system_mul
 
 	; Calculate nanoseconds as (delta * mul) >> 32
+	mul rcx				; RDX:RAX = RAX * RCX
+	shl rdx, 32
+	shr rax, 32
+	or rax, rdx
 
 	; Add system time to nanoseconds
 	add rax, rbx
@@ -297,15 +303,9 @@ kvm_delay_wait:
 ;	There are 1,000 milliseconds in a second
 timer_delay:
 	push rax
-	push rbx
 
-	; Detect which timer is to be used
+	call [sys_timer]
 
-
-	call hpet_delay
-;	call kvm_delay
-
-	pop rbx
 	pop rax
 	ret
 ; -----------------------------------------------------------------------------

src/interrupt.asm

@@ -26,7 +26,7 @@ interrupt_gate:				; handler for all other interrupts
 ; -----------------------------------------------------------------------------
 ; Floppy drive interrupt. IRQ 0x06, INT 0x26
 ; This IRQ runs when floppy drive reads from or writes to whole disk
-%ifdef BIOS
+%ifdef FLOPPY
 align 16
 floppy_irq:
 	push rdi

src/pure64.asm

@@ -946,7 +946,7 @@ lfb_wc_end:
 	mov rsi, msg_kernel
 	call debug_msg
 
-%ifdef BIOS
+%ifdef FLOPPY
 	cmp byte [p_BootDisk], 'F'	; Check if sys is booted from floppy?
 	jnz clear_regs
 	call read_floppy		; Then load whole floppy at memory
@@ -977,7 +977,7 @@ clear_regs:
 %include "init/serial.asm"
 %include "init/smp.asm"
 %include "init/timer.asm"
-%ifdef BIOS
+%ifdef FLOPPY
 %include "fdc/dma.asm"
 %include "fdc/fdc_64.asm"
 %endif
@@ -1044,7 +1044,7 @@ nextline:
 ; -----------------------------------------------------------------------------
 %endif
 
-%ifdef BIOS
+%ifdef FLOPPY
 ; -----------------------------------------------------------------------------
 ; debug_progressbar
 ; IN:	EBX = Index #

src/sysvar.asm

@@ -37,9 +37,8 @@ VBEModeInfoBlock:	equ 0x0000000000005F00		; 256 bytes
 ; DQ - Starting at offset 0, increments by 0x8
 p_ACPITableAddress:	equ SystemVariables + 0x00
 p_LocalAPICAddress:	equ SystemVariables + 0x10
-p_Counter_Timer:	equ SystemVariables + 0x18
-p_Counter_RTC:		equ SystemVariables + 0x20
 p_HPET_Address:		equ SystemVariables + 0x28
+sys_timer:		equ SystemVariables + 0x30
 
 ; DD - Starting at offset 0x80, increments by 4
 p_BSP:			equ SystemVariables + 0x80
@@ -63,7 +62,7 @@ p_HPET_Timers:		equ SystemVariables + 0x184
 p_BootDisk:		equ SystemVariables + 0x185	; 'F' for Floppy drive
 p_1GPages:		equ SystemVariables + 0x186	; 1 if 1GB pages are supported
 
-p_timer:		equ SystemVariables + 0x1000
+p_timer:		equ SystemVariables + 0x1000	; This overwrites the memory details from firmware
 
 align 16
 GDTR32:					; Global Descriptors Table Register