badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

SEARCHAP - use f30.3, select of debugging messages code when compiling, optimizing the size of binary file

Browse Source 
git-svn-id: svn://kolibrios.org@3664 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2013-06-15 22:37:07 +00:00
parent 799f7cdc6b
commit d958c90d39
1 changed files with 108 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
programs/system/searchap/searchap.asm
View File

@ -37,8 +37,13 @@
dd 0x0 dd 0x0
dd 0x0 dd 0x0
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
debug equ no ;yes
include '../../macros.inc' include '../../macros.inc'
if debug eq yes
include '../../debug.inc' include '../../debug.inc'
end if
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
START: START:
mov ebx,start_dir mov ebx,start_dir
@ -48,12 +53,12 @@ START:
mov ebx,read_folder_1_name mov ebx,read_folder_1_name
mov [ebx],ax mov [ebx],ax
call device_detect_f70 call device_detect_f70
call print_retrieved_devices_table
mov [fileinfo.return],dword folder_data
;-------------------------------------- ;--------------------------------------
if debug eq yes
call print_retrieved_devices_table
dps 'get basic file' dps 'get basic file'
newline newline
end if
;-------------------------------------- ;--------------------------------------
call load_file ; download the master file call load_file ; download the master file
xor eax,eax xor eax,eax
@ -65,6 +70,8 @@ newline
call search_and_load_pointer_file_label call search_and_load_pointer_file_label
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
exit: exit:
;--------------------------------------
if debug eq yes
dps 'just exit' dps 'just exit'
;newline ;newline
; mov edx,read_folder_name ; mov edx,read_folder_name
@ -73,58 +80,78 @@ dps 'just exit'
; mov edx,read_folder_1_name ; mov edx,read_folder_1_name
; call debug_outstr ; call debug_outstr
;newline ;newline
end if
;--------------------------------------
mcall -1 mcall -1
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
device_detect_f70: device_detect_f70:
;-------------------------------------- ;--------------------------------------
if debug eq yes
dps 'read_folder_name: ' dps 'read_folder_name: '
mov edx,read_folder_name mov edx,read_folder_name
call debug_outstr call debug_outstr
newline newline
end if
;-------------------------------------- ;--------------------------------------
mcall 70,read_folder mcall 70,read_folder
test eax,eax test eax,eax
jz @f jz @f
cmp eax,6 cmp eax,6
je @f je @f
;--------------------------------------
if debug eq yes
dps 'read_folder_error' dps 'read_folder_error'
newline newline
; mov edx,read_folder_name ; mov edx,read_folder_name
; call debug_outstr ; call debug_outstr
;newline ;newline
end if
;--------------------------------------
jmp exit jmp exit
@@: @@:
;-------------------------------------- ;--------------------------------------
if debug eq yes
call print_root_dir call print_root_dir
end if
;--------------------------------------
mov [left_folder_block],ebx mov [left_folder_block],ebx
mov [temp_counter_1],0 xor eax,eax
mov [retrieved_devices_table_counter],0 mov [temp_counter_1],eax
mov [retrieved_devices_table_counter],eax
.start_temp_counter_1: .start_temp_counter_1:
imul esi,[temp_counter_1],304 imul esi,[temp_counter_1],304
add esi,[read_folder.return] add esi,[read_folder.return]
add esi,32+40 add esi,32+40
call copy_folder_name_1 call copy_folder_name_1
;--------------------------------------
if debug eq yes
;dps 'read_folder_1_name: ' ;dps 'read_folder_1_name: '
; mov edx,read_folder_1_name ; mov edx,read_folder_1_name
; call debug_outstr ; call debug_outstr
;newline ;newline
end if
;--------------------------------------
mcall 70,read_folder_1 mcall 70,read_folder_1
test eax,eax test eax,eax
jz @f jz @f
cmp eax,6 cmp eax,6
je @f je @f
;--------------------------------------
if debug eq yes
dps 'read_folder_error_1' dps 'read_folder_error_1'
newline newline
; mov edx,read_folder_1_name ; mov edx,read_folder_1_name
; call debug_outstr ; call debug_outstr
;newline ;newline
end if
;--------------------------------------
jmp exit jmp exit
@@: @@:
mov eax,[read_folder_1.return] mov eax,[read_folder_1.return]
cmp [eax+4],dword 0 cmp [eax+4],dword 0
je .continue je .continue
mov [right_folder_block],ebx mov [right_folder_block],ebx
mov ebp,0 xor ebp,ebp
.start_copy_device_patch: .start_copy_device_patch:
imul edi,[retrieved_devices_table_counter],10 imul edi,[retrieved_devices_table_counter],10
add edi,retrieved_devices_table add edi,retrieved_devices_table
@ -151,7 +178,7 @@ newline
mov esi,retrieved_devices_table+1 mov esi,retrieved_devices_table+1
call copy_folder_name call copy_folder_name
mov esi,retrieved_devices_table+3 mov esi,retrieved_devices_table+3
mov ecx,0 xor ecx,ecx
@@: @@:
add esi,8 add esi,8
cld cld
@ -174,30 +201,48 @@ load_file:
xor eax,eax xor eax,eax
mov [fileinfo.size],eax mov [fileinfo.size],eax
mov [fs_error],eax mov [fs_error],eax
;--------------------------------------
if debug eq yes
dps 'get file info' dps 'get file info'
newline newline
end if
;--------------------------------------
mcall 70,fileinfo mcall 70,fileinfo
mov [fs_error],eax mov [fs_error],eax
test eax,eax test eax,eax
jnz .file_error jnz .file_error
;--------------------------------------
if debug eq yes
dps 'file info ok' dps 'file info ok'
newline newline
mov [fileinfo.subfunction],dword 0 end if
;--------------------------------------
xor eax,eax
mov [fileinfo.subfunction],eax ;dword 0
mov eax,[fileinfo.return] mov eax,[fileinfo.return]
mov ecx,[eax+32] mov ecx,[eax+32]
;--------------------------------------
if debug eq yes
dps 'real file size: ' dps 'real file size: '
dpd ecx dpd ecx
newline newline
end if
;--------------------------------------
test ecx,ecx test ecx,ecx
jz .file_error jz .file_error
cmp ecx,304*32+32 ; 9 Kb mov eax,304*32+32 ; 9 Kb
cmp ecx,eax
jbe @f jbe @f
mov ecx,304*32+32 ; 9 Kb mov ecx,eax
;----------------------------------- ;-----------------------------------
@@: @@:
mov [fileinfo.size],ecx mov [fileinfo.size],ecx
;--------------------------------------
if debug eq yes
dps 'get file' dps 'get file'
newline newline
end if
;--------------------------------------
mcall 70,fileinfo mcall 70,fileinfo
mov [fs_error],eax mov [fs_error],eax
test eax,eax test eax,eax
@ -209,14 +254,22 @@ newline
; jmp @f ; jmp @f
;----------------------------------- ;-----------------------------------
.file_error: .file_error:
;--------------------------------------
if debug eq yes
dps 'read file - error!' dps 'read file - error!'
newline newline
end if
;--------------------------------------
ret ret
;----------------------------------- ;-----------------------------------
@@: @@:
;--------------------------------------
if debug eq yes
dps 'read file corrected size: ' dps 'read file corrected size: '
dpd dword[fileinfo.size] dpd dword[fileinfo.size]
newline newline
end if
;--------------------------------------
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
search_and_load_pointer_file_label: search_and_load_pointer_file_label:
@ -227,9 +280,13 @@ search_and_load_pointer_file_label:
mov esi,retrieved_devices_table mov esi,retrieved_devices_table
; sub esi,10 ; deleted because /rd/1/ no need to check ; sub esi,10 ; deleted because /rd/1/ no need to check
.next_entry: .next_entry:
;--------------------------------------
if debug eq yes
newline newline
dps 'copy next entry' dps 'copy next entry'
newline newline
end if
;--------------------------------------
add esi,10 add esi,10
push esi push esi
add esi,1 add esi,1
@ -238,11 +295,15 @@ newline
dec edi dec edi
call copy_folder_name.1 call copy_folder_name.1
pop esi pop esi
;--------------------------------------
if debug eq yes
mov edx,[fileinfo.name] mov edx,[fileinfo.name]
push ecx push ecx
call debug_outstr call debug_outstr
pop ecx pop ecx
newline newline
end if
;--------------------------------------
; mcall 5,10 ; mcall 5,10
push ecx push ecx
call load_file call load_file
@ -257,8 +318,12 @@ newline
@@: @@:
dec ecx dec ecx
jnz .next_entry jnz .next_entry
;--------------------------------------
if debug eq yes
dps 'additional parttition is not found!' dps 'additional parttition is not found!'
newline newline
end if
;--------------------------------------
ret ret
.sucess: .sucess:
call compare_files_and_mount call compare_files_and_mount
@ -282,54 +347,60 @@ compare_files_and_mount:
jnz .next_char jnz .next_char
mov [compare_flag],byte 0 mov [compare_flag],byte 0
pop esi ecx pop esi ecx
;--------------------------------------
if debug eq yes
dps 'compare files sucess!' dps 'compare files sucess!'
newline newline
dps 'mount directory:' dps 'mount directory:'
newline newline
mov edx,esi mov edx,esi
push esi
call debug_outstr call debug_outstr
pop esi
newline newline
end if
;--------------------------------------
; prepare real directory path for mounting
inc esi
mov edi,f30_3_work_area+64
call proc_copy_patch
; prepare fake directory name
mov esi,additional_dir_name
mov edi,f30_3_work_area
call proc_copy_patch
; here is call kernel function to mount the found partition ; here is call kernel function to mount the found partition
; as "/addappl" directory to root directory "/" ; as "/addappl" directory to root directory "/"
mcall 30,3,f30_3_work_area
ret ret
;-------------------------------------- ;--------------------------------------
.not_match: .not_match:
mov [compare_flag],byte 1 mov [compare_flag],byte 1
pop esi ecx pop esi ecx
;--------------------------------------
if debug eq yes
dps 'compare files is not match!' dps 'compare files is not match!'
newline newline
end if
;--------------------------------------
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
proc_copy_patch:
@@:
cld
lodsb
stosb
cmp al,0
jne @r
ret
;---------------------------------------------------------------------
copy_folder_name: copy_folder_name:
mov edi,read_folder_name+1 mov edi,read_folder_name+1
.1: .1:
@@: proc_copy_patch:
cld cld
@@:
lodsb lodsb
stosb stosb
cmp al,0 test al,al
jne @r jnz @r
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
copy_folder_name_1: copy_folder_name_1:
mov edi,read_folder_1_name+1 mov edi,read_folder_1_name+1
@@: jmp proc_copy_patch
cld
lodsb
stosb
cmp al,0
jne @r
ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
if debug eq yes
print_retrieved_devices_table: print_retrieved_devices_table:
mov ecx,[retrieved_devices_table_counter] mov ecx,[retrieved_devices_table_counter]
mov edx,retrieved_devices_table mov edx,retrieved_devices_table
@ -371,6 +442,7 @@ newline
dps '----------' dps '----------'
newline newline
ret ret
end if
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
read_folder: read_folder:
.subfunction dd 1 .subfunction dd 1
@ -390,7 +462,6 @@ read_folder_1:
db 0 db 0
.name: dd read_folder_1_name .name: dd read_folder_1_name
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
align 4
fileinfo: fileinfo:
.subfunction dd 5 .subfunction dd 5
.Offset dd 0 .Offset dd 0
@ -407,6 +478,8 @@ basic_file_path:
db '/rd/1/' db '/rd/1/'
basic_file_name: basic_file_name:
db 'kolibri.lbl',0 db 'kolibri.lbl',0
additional_dir_name:
db 'addappl',0
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
IM_END: IM_END:
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
@ -420,6 +493,10 @@ fs_error rd 1
compare_flag rb 1 compare_flag rb 1
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
align 4 align 4
f30_3_work_area:
rb 128
;-------------------------------------------------------------------------------
align 4
retrieved_devices_table: retrieved_devices_table:
rb 10*100 rb 10*100
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------