KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

uefi64kos: Fix reporting of file size

Browse Source 
git-svn-id: svn://kolibrios.org@9286 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2021-11-17 23:17:45 +00:00
parent 09e9a9558f
commit 0dc168b130
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/trunk/bootloader/uefi4kos/uefi64kos.asm
View File

@ -45,9 +45,6 @@ E820_UNUSABLE = 5
E820_PMEM = 7 E820_PMEM = 7
proc load_file _root, _name, _buffer, _size, _fatal proc load_file _root, _name, _buffer, _size, _fatal
locals
.status dq ?
endl
mov [_root], rcx mov [_root], rcx
mov [_name], rdx mov [_name], rdx
mov [_buffer], r8 mov [_buffer], r8
@ -58,7 +55,7 @@ endl
r11, EFI_FILE_MODE_READ, 0 r11, EFI_FILE_MODE_READ, 0
test eax, eax test eax, eax
jz @f jz @f
xor eax, eax mov [_size], 0
cmp [_fatal], 1 cmp [_fatal], 1
jnz .done jnz .done
mov rcx, [rbx+EFI_SYSTEM_TABLE.ConOut] mov rcx, [rbx+EFI_SYSTEM_TABLE.ConOut]
@ -69,17 +66,15 @@ endl
fstcall [rcx+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], rcx, [_name] fstcall [rcx+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], rcx, [_name]
jmp $ jmp $
@@: @@:
lea rdx, [_size] lea rdx, [_size]
mov r8, [_buffer] mov r8, [_buffer]
mov r10, [file_handle] mov r10, [file_handle]
fstcall [r10+EFI_FILE_PROTOCOL.Read], [file_handle], rdx, r8 fstcall [r10+EFI_FILE_PROTOCOL.Read], [file_handle], rdx, r8
mov r10, [file_handle] mov r10, [file_handle]
fstcall [r10+EFI_FILE_PROTOCOL.Close], [file_handle] fstcall [r10+EFI_FILE_PROTOCOL.Close], [file_handle]
mov rax, [_size]
.done: .done:
mov [.status], rax
call clearbuf call clearbuf
mov rax, [_size]
mov rdi, msg mov rdi, msg
call num2dec call num2dec
mov rcx, [rbx+EFI_SYSTEM_TABLE.ConOut] mov rcx, [rbx+EFI_SYSTEM_TABLE.ConOut]
@ -87,7 +82,7 @@ endl
msg_file_size msg_file_size
mov rcx, [rbx+EFI_SYSTEM_TABLE.ConOut] mov rcx, [rbx+EFI_SYSTEM_TABLE.ConOut]
fstcall [rcx+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], rcx, msg fstcall [rcx+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], rcx, msg
mov rax, [.status] mov rax, [_size]
ret ret
endp endp
@ -302,7 +297,7 @@ proc read_options_from_config
sfsp_interface sfsp_interface
test eax, eax test eax, eax
jz @f jz @f
mov rcx, [rbx+EFI_SYSTEM_TABLE.ConOut] mov rcx, [rbx+EFI_SYSTEM_TABLE.ConOut]
fstcall [rcx+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], rcx, \ fstcall [rcx+EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString], rcx, \
msg_error_lip_dev_sfsp msg_error_lip_dev_sfsp
jmp $ jmp $