KolibriOS/kolibrios64
11
7
Fork 1
Code Issues 1 Pull Requests 1 Wiki Activity

don't use proc & fastcall when not necessary i.e with my own simple internal functions. But we keep using it i.e when invoking uefi functions cause then follow calling convention

Browse Source
This commit is contained in:
rgimad
2025-01-26 01:01:31 +03:00
parent 17c2ae5818
commit f7729c3cbf
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
kernel/boot/bootx64.asm
View File

@@ -19,46 +19,35 @@ include '../const.inc'
purge DQ ; because of some struct DQ in const.inc purge DQ ; because of some struct DQ in const.inc
include 'uefi64.inc' include 'uefi64.inc'
; hmm proc64.inc uses TCHAR. to define string literals (?)
struc TCHAR [val] {
common match any, val \{ . du val \}
match , val \{ . du ? \}
}
sizeof.TCHAR = 2
; rcx - color = fore | back ; rcx - color = fore | back
proc efi_set_text_color efi_set_text_color:
mov rax, [efi_table] mov rax, [efi_table]
mov rax, [rax+EFI_SYSTEM_TABLE.ConOut] mov rax, [rax+EFI_SYSTEM_TABLE.ConOut]
mov rdx, rcx ; arg2 - color mov rdx, rcx ; arg2 - color
mov rcx, rax ; arg1 - this mov rcx, rax ; arg1 - this
fstcall [rax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetAttribute] fstcall [rax+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetAttribute]
ret ret
endp
; rcx - null-terminated string ; rcx - null-terminated string
proc efi_puts efi_puts:
mov rax, [efi_table] mov rax, [efi_table]
mov rax, [rax+EFI_SYSTEM_TABLE.ConOut] mov rax, [rax+EFI_SYSTEM_TABLE.ConOut]
mov rdx, rcx ; arg2 - string mov rdx, rcx ; arg2 - string
mov rcx, rax ; arg1 - this mov rcx, rax ; arg1 - this
fstcall [rcx+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString] fstcall [rcx+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString]
ret ret
endp
; rcx - char ; rcx - char
proc efi_putc efi_putc:
locals
cstr dq 0
endl
mov rax, [efi_table] mov rax, [efi_table]
mov rax, [rax+EFI_SYSTEM_TABLE.ConOut] mov rax, [rax+EFI_SYSTEM_TABLE.ConOut]
mov byte [cstr], cl push qword 0
lea rdx, [cstr] mov byte [rsp], cl
mov rdx, rsp
mov rcx, rax mov rcx, rax
fstcall [rcx+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString] fstcall [rcx+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString]
add rsp, 8
ret ret
endp
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -73,15 +62,20 @@ proc main _efi_handle, _efi_table
test eax, eax test eax, eax
jnz $ ; loop if fail to init text jnz $ ; loop if fail to init text
fstcall efi_set_text_color, EFI_BLUE or EFI_BACKGROUND_GREEN mov rcx, EFI_BLUE or EFI_BACKGROUND_GREEN
fstcall efi_puts, msg_hello_k64_loader call efi_set_text_color
fstcall efi_puts, <'hi there', 13, 10> ;; didnt work unless declared TCHAR mov rcx, msg_hello_k64_loader
call efi_puts
fstcall efi_set_text_color, EFI_LIGHTRED mov rcx, EFI_LIGHTRED
fstcall efi_puts, msg_2 call efi_set_text_color
mov rcx, msg_2
call efi_puts
fstcall efi_set_text_color, EFI_CYAN mov rcx, EFI_CYAN
fstcall efi_putc, 0+'a' ;; 0+ is to cast it to number to put in register it itself, not the address of string literal 'a' but function expects char in rcx call efi_set_text_color
mov rcx, 'a'
call efi_putc
;; TODO: print some dec, hex. => impl simple printf. fdo.inc ;; TODO: print some dec, hex. => impl simple printf. fdo.inc