start16 creo que andando pero falta corregir el load address en ld script

Author: federicogramos

.gdb_history

@@ -1,18 +1,3 @@
-siquit
-quit
-b *0x8000
-continue
-quit
-b *0x8000
-dashboard memory watch 0x60000 20
-dashboard memory watch 0x8000 20
-continue
-quir
-qut
-quit
-b *0x8000
-continue
-si
 quit
 b *0x8000
 continue
@@ -254,3 +239,18 @@ b *0x7c40
 continue
 b *0x7c40quit
 quit
+b *0x7e00
+continue
+quit
+b *0x7e00
+continue
+quit
+b *0x7e00
+continue
+b *0x8000
+continue
+quit
+b *0x7e00
+continue
+si
+quit

TO-DO.rm

@@ -1,5 +1,7 @@
 # Integracion uefi + bios
 
+-- corregir que start16 se carga en 0x7e00 y no en 8000 (ver tsl.ld).
+
 -- veo que tengo que ajustar ubicacion de tables de mapeo, revisar. Quiza no. Dejar en suspenso esto.
 
 -- lo que se va a hacer es: levanta mbr todo tsl que tiene 1ero que nada start16. Si. Ahora ya incorporado el start16 debo ajustar tanto uefi como bios para asegurar que cada uno comience en el lugar correcto.

asm/bios/mbr.asm

@@ -15,6 +15,7 @@
 
 
 %include "./asm/include/mbr.inc"
+%include "./asm/include/sysvar.inc"
 
 
 global print	;; Export symbol so to use this print function in start16.asm.
@@ -278,6 +279,55 @@ a20_check:
 	ret
 
 
+
+
+;;==============================================================================
+;; vesa | 
+;;==============================================================================
+;; No me gusta esta fun definida aqui y llamada en start. Luego veo que hacer.
+;; Esto es transitorio por cuestiones de espacio.
+;;==============================================================================
+
+
+
+vesa:
+
+	mov cx, 0x4000 - 1		; Start looking from here
+VBESearch:
+	inc cx
+	mov bx, cx			; Mode is saved to BX for the set command later
+	cmp cx, 0x5000
+
+	;;TO-DO: falta load mensaje error.
+	je failure
+
+	mov edi, VBEModeInfoBlock	; VBE data will be stored at this address
+	mov ax, 0x4F01			; VESA SuperVGA BIOS - GET SuperVGA MODE INFORMATION - http://www.ctyme.com/intr/rb-0274.htm
+	int 0x10
+	cmp ax, 0x004F			; Return value in AX should equal 0x004F if command supported and successful
+	jne VBESearch			; Try next mode
+	cmp byte [VBEModeInfoBlock.BitsPerPixel], 32 ; Desired bit depth
+	jne VBESearch			; If not equal, try next mode
+	cmp word [VBEModeInfoBlock.XResolution], Horizontal_Resolution ; Desired XRes here
+	jne VBESearch
+	cmp word [VBEModeInfoBlock.YResolution], Vertical_Resolution ; Desired YRes here
+	jne VBESearch
+	or bx, 0x4000			; Use linear/flat frame buffer model (set bit 14)
+	mov ax, 0x4F02			; VESA SuperVGA BIOS - SET SuperVGA VIDEO MODE - http://www.ctyme.com/intr/rb-0275.htm
+	int 0x10
+	cmp ax, 0x004F			; Return value in AX should equal 0x004F if supported and successful
+
+	;;TO-DO: falta load mensaje error.
+	jne failure
+
+
+ret
+
+
+
+
+
+
 ;;==============================================================================
 ;; section .data
 ;;==============================================================================

asm/bios/start16.asm

@@ -1,12 +1,18 @@
 ;;==============================================================================
-;; 
+;; pick real mode swich to protected mode | @file /asm/bios/start16.asm
 ;;==============================================================================
 
 
 %include "./asm/include/sysvar.inc"
 
 
+;; TO-DO: poner esto como un simbolo definido en donde mbr.ld hara el load de la
+;; funcion.
 ;;extern print
+print	equ 0xde + 0x7c00
+failure	equ 0x67 + 0x7c00
+vesa	equ 0x117 + 0x7c00
+
 
 ;; tsl_ap.asm
 extern GDTR32
@@ -26,7 +32,8 @@ BITS 16
 
 start16:
 
-
+	mov si, msg_e820
+	call print
 
 ; Get the BIOS E820 Memory Map
 ; https://wiki.osdev.org/Detecting_Memory_(x86)#BIOS_Function:_INT_0x15,_EAX_=_0xE820
@@ -88,29 +95,6 @@ memmapend:
 
 
 
-	mov cx, 0x4000 - 1		; Start looking from here
-VBESearch:
-	inc cx
-	mov bx, cx			; Mode is saved to BX for the set command later
-	cmp cx, 0x5000
-	je halt
-	mov edi, VBEModeInfoBlock	; VBE data will be stored at this address
-	mov ax, 0x4F01			; VESA SuperVGA BIOS - GET SuperVGA MODE INFORMATION - http://www.ctyme.com/intr/rb-0274.htm
-	int 0x10
-	cmp ax, 0x004F			; Return value in AX should equal 0x004F if command supported and successful
-	jne VBESearch			; Try next mode
-	cmp byte [VBEModeInfoBlock.BitsPerPixel], 32 ; Desired bit depth
-	jne VBESearch			; If not equal, try next mode
-	cmp word [VBEModeInfoBlock.XResolution], Horizontal_Resolution ; Desired XRes here
-	jne VBESearch
-	cmp word [VBEModeInfoBlock.YResolution], Vertical_Resolution ; Desired YRes here
-	jne VBESearch
-	or bx, 0x4000			; Use linear/flat frame buffer model (set bit 14)
-	mov ax, 0x4F02			; VESA SuperVGA BIOS - SET SuperVGA VIDEO MODE - http://www.ctyme.com/intr/rb-0275.htm
-	int 0x10
-	cmp ax, 0x004F			; Return value in AX should equal 0x004F if supported and successful
-	jne halt
-
 
 
 
@@ -138,14 +122,16 @@ jmp 8:start32
 ;; -- si: string.
 ;;==============================================================================
 
-failure:
-	call print
-halt:
+;; no se usa, puesto que reutiliza el del mbr.
+
+;;failure:
+;;	call print
+;;halt:
 ;;.halt:
-	;;mov si, msg_halt
-	call print
-	hlt
-	jmp $
+;;	mov si, msg_halt
+;;	call print
+;;	hlt
+;;	jmp $
 
 
 ;;msg_halt:		db "System halted", 0
@@ -320,5 +306,12 @@ pde_low_32:				; Create a 2 MiB page
 
 
 	;;;;;;;;;;;;;;;;;;;; delete this
-	print:
-	nop
+	;;print:
+	;;nop
+
+
+;;==============================================================================
+;; section .data
+;;==============================================================================
+
+msg_e820:	db "Performing e820..", 0