XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

1) Fix handling of parameters of the broken in revision 1361

Browse Source 
2) Now the library Box_lib, not loaded when the "shadow" compilation.
3) Small code cleaning

git-svn-id: svn://kolibrios.org@1395 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2010-02-07 22:24:35 +00:00
parent cca30001ba
commit 63b44af949
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
programs/develop/fasm/trunk/fasm.asm
View File

@ -47,19 +47,6 @@ include '..\..\..\develop\libraries\box_lib\load_lib.mac'
center fix true center fix true
START: ; Start of execution START: ; Start of execution
sys_load_library library_name, cur_dir_path, library_path, system_path, \
err_message_found_lib, head_f_l, myimport, err_message_import, head_f_i
cmp eax,-1
jne @f
mcall -1 ;exit if not open box_lib.obj
@@:
mcall 40,0x27 ;¬ áª  á¨á⥬­ëå ᮡë⨩
get_sys_colors 1,0
edit_boxes_set_sys_color edit1,editboxes_end,sc
check_boxes_set_sys_color ch1_dbg,ch1_dbg+ch_struc_size,sc
mov edi, fileinfos mov edi, fileinfos
mov ecx, (fileinfos_end-fileinfos)/4 mov ecx, (fileinfos_end-fileinfos)/4
or eax, -1 or eax, -1
@ -71,7 +58,7 @@ sys_load_library library_name, cur_dir_path, library_path, system_path, \
mcall mcall
cmp [params],0 cmp [params],0
jz red jz start_1
mov ecx,10 mov ecx,10
mov eax,' ' mov eax,' '
@ -92,17 +79,15 @@ sys_load_library library_name, cur_dir_path, library_path, system_path, \
call mov_param_str call mov_param_str
; mov edi,infile ; mov edi,infile
; DEBUGF " input: %s\n",edi ; DEBUGF " input: %s\n",edi
inc esi
mov edi,outfile mov edi,outfile
call mov_param_str call mov_param_str
; mov edi,outfile ; mov edi,outfile
; DEBUGF "output: %s\n",edi ; DEBUGF "output: %s\n",edi
inc esi
mov edi,path mov edi,path
call mov_param_str call mov_param_str
; mov edi,path ; mov edi,path
; DEBUGF " path: %s\n",edi ; DEBUGF " path: %s\n",edi
dec esi
cmp [esi], dword ',run' cmp [esi], dword ',run'
jne @f jne @f
mov [_run_outfile],1 mov [_run_outfile],1
@ -111,6 +96,19 @@ sys_load_library library_name, cur_dir_path, library_path, system_path, \
mov [_mode],CONSOLE_MODE mov [_mode],CONSOLE_MODE
jmp start jmp start
start_1:
sys_load_library library_name, cur_dir_path, library_path, system_path, \
err_message_found_lib, head_f_l, myimport, err_message_import, head_f_i
cmp eax,-1
jne @f
mcall -1 ;exit if not open box_lib.obj
@@:
mcall 40,0x27 ;¬ áª  á¨á⥬­ëå ᮡë⨩
get_sys_colors 1,0
edit_boxes_set_sys_color edit1,editboxes_end,sc
check_boxes_set_sys_color ch1_dbg,ch1_dbg+ch_struc_size,sc
red: ; Redraw red: ; Redraw
call draw_window call draw_window
@ -412,20 +410,20 @@ lf db 13,10,0
mov_param_str: mov_param_str:
@@: cld
mov al,[esi] @@:
lodsb
cmp al,',' cmp al,','
je @f je @f
cmp al,0
je @f
mov [edi],al
inc esi
inc edi
jmp @b
@@:
mov al,0
stosb stosb
ret test al,al
jnz @b
@@:
xor al,al
stosb
ret
start: start:
cmp [_mode],NORMAL_MODE cmp [_mode],NORMAL_MODE
@ -540,14 +538,12 @@ times $04 db $00,$01
times $08 db $00 times $08 db $00
;include_debug_strings ;include_debug_strings
params db 0 ; 'TINYPAD.ASM,TINYPAD,/HD/1/TPAD4/',
cur_dir_path rb 4096
library_path rb 4096
program_end: program_end:
; params db 0 ; 'TINYPAD.ASM,TINYPAD,/HD/1/TPAD4/',
params rb 4096
cur_dir_path rb 4096
library_path rb 4096
rb 1000h
align 4 align 4
include 'variable.inc' include 'variable.inc'