Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2433 → Rev 2434

/kernel/branches/Kolibri-acpi/sec_loader/trunk/boot/after_win/kordldr.win.asm
47,7 → 47,8
mov si, load_question + 100h - 600h
call out_string
; mov si, answer + 100h - 0600h ; already is
xxy: mov ah, 0
xxy:
mov ah, 0
int 16h
or al, 20h
mov [si], al
904,7 → 905,8
 
rootcache_size dw ? ; must be immediately before foldcache_clus
if $-dat >= 0x80
warning: unoptimal data displacement!
warning:
unoptimal data displacement!
end if
foldcache_clus rd 7
foldcache_mark rw 7
912,7 → 914,8
fat_filename rb 11
 
if $ > 2000h
error: file is too big
error:
file is too big
end if
 
; for NT/2k/XP, file must be 16 sectors = 0x2000 bytes long
/kernel/branches/Kolibri-acpi/sec_loader/trunk/boot/fat1x/kordldr.f1x.asm
663,5 → 663,6
foldcache_size rw 7
filename rb 11
if $ > 0x8200
error: table overwritten
error:
table overwritten
end if
/kernel/branches/Kolibri-acpi/sec_loader/trunk/boot/mkfloppy.inc
82,9 → 82,10
 
macro stof id, name
{
id#_base: file name
id#_base:
file name
id#_size=$-id#_base
reset id
}
 
defdir fix macro
defdir fix macro
/kernel/branches/Kolibri-acpi/sec_loader/trunk/kolibri_ldm/bootstr.inc
35,7 → 35,8
; store byte ' ' at d80x25_top+cur_line_pos
; store dword ' SVN' at d80x25_top+cur_line_pos-4
 
space_msg: line_space
space_msg:
line_space
;verstr:
; line_space
; version string
/kernel/branches/Kolibri-acpi/sec_loader/trunk/kolibri_ldm/bootvesa.inc
93,7 → 93,8
push edx
call int2str
pop eax
@@: or al,0x30
@@:
or al, 0x30
mov [ds:di],al
inc di
ret
106,7 → 107,8
push edx
call int2strnz
pop eax
@@: or al,0x30
@@:
or al, 0x30
mov [es:di],al
inc di
ret
243,7 → 245,8
jb .lp1
 
or cx,0x4000 ; use LFB
.lp1: mov [es:bx+6],cx ; +6 : mode number
.lp1:
mov [es:bx+6], cx ; +6 : mode number
movzx ax,byte [es:mi.BitsPerPixel]
mov word [es:bx+8],ax ; +8 : bits per pixel
add bx,size_of_step ; size of record
402,7 → 405,8
 
mov ecx,long_v_table
 
.loop: add ax,size_of_step
.loop:
add ax, size_of_step
cmp ax,word [end_cursor]
jae .next_step
loop .loop
435,13 → 439,16
je .ok
cmp word [es:si+8],24
je .ok
.next: add si,size_of_step
.next:
add si, size_of_step
cmp word [es:si],-1
je .exit
jmp .loops
.ok: xor ax,ax
.ok:
xor ax, ax
ret
.exit: or ax,-1
.exit:
or ax, -1
ret
 
 
484,7 → 491,8
jmp .ok
 
 
.low: sub cx,size_of_step
.low:
sub cx, size_of_step
cmp cx,modes_table
jb .ok
push cx
/kernel/branches/Kolibri-acpi/sec_loader/trunk/kolibri_ldm/kolibri_ldm.asm
455,7 → 455,8
sub word [cursor_pos],size_of_step
jmp .loops
 
.down: cmp ah,0x50;x,0x50E0 ; down
.down:
cmp ah, 0x50;x,0x50E0 ; down
jne .pgup
cmp word[es:si+10],-1
je .loops
462,7 → 463,8
add word [cursor_pos],size_of_step
jmp .loops
 
.pgup: cmp ah,0x49 ; page up
.pgup:
cmp ah, 0x49 ; page up
jne .pgdn
sub si, size_of_step*long_v_table
cmp si, modes_table
479,7 → 481,8
mov word [home_cursor], si
jmp .loops
 
.pgdn: cmp ah,0x51 ; page down
.pgdn:
cmp ah, 0x51 ; page down
jne .enter
mov ax, [end_cursor]
add si, size_of_step*long_v_table
499,7 → 502,8
mov word [home_cursor], si
jmp .loops
 
.enter: cmp al,0x0D;x,0x1C0D ; enter
.enter:
cmp al, 0x0D;x,0x1C0D ; enter
jne .loops
push word [cursor_pos]
pop bp
535,7 → 539,8
popf
jz @f
mov si, off_msg
@@: jmp printplain
@@:
jmp printplain
; novesa and vervesa strings are not used at the moment of executing this code
virtual at novesa
.oldtimer dd ?
576,7 → 581,8
mov cl, 'ã'
jz @f
mov cl, 'ë'
@@: mov [time_str+9], cl
@@:
mov [time_str+9], cl
else if lang eq et
cmp al, 1
ja @f
589,7 → 595,8
mov cl, 's'
ja @f
mov cl, ' '
@@: mov [time_str+9], cl
@@:
mov [time_str+9], cl
end if
add al, '0'
mov [time_str+1], al
/kernel/branches/Kolibri-acpi/sec_loader/trunk/parse_any.inc
219,7 → 219,8
mov point_default,ax
jmp .show_active_cursor
 
@@: call find_next_sect
@@:
call find_next_sect
jmp .show_all_scr
 
.pgup:
624,7 → 625,8
push di
xor ax,ax
 
@@: mov cx,38
@@:
mov cx, 38
push di
rep stosw
pop di
637,7 → 639,8
dec bx
jnz @b
 
@@: pop di
@@:
pop di
;enter in mess
.show_mess_prev_eq:
lodsb
/kernel/branches/Kolibri-acpi/sec_loader/trunk/parse_def_sect.inc
135,7 → 135,8
mov word [es:di-4],ax
mov word [es:di-2],16 ;êîë-âî áëîêîâ ïî 4 êá =64 êá ò.å. áîëüøå íå ñ÷èòàåì
;;;;;; ïîèñê êîíöà ñòðî÷êè
@@: mov al,byte [es:di]
@@:
mov al, byte [es:di]
cmp al,' '
jz .found_end_str
cmp al,0xa
280,7 → 281,8
;;;;;;;;;;;;;;;;;;;;;;;;;;
xor bx,bx
mov cx,5
@@: mov al,byte [es:di]
@@:
mov al, byte [es:di]
cmp al,'0'
jb .CS
cmp al,'9'
494,9 → 496,11
test ax,ax
jnz @f ;îøèáêà åñëè ñþäà ïðûãíóëè âñå òàêè ...
 
.RS1: mov word [fat12_buffer.BPB_BytsPerSec],512
.RS1:
mov word [fat12_buffer.BPB_BytsPerSec], 512
;;;;;;;;;;ñêàæåì ÷òî ïî äåôîëòó áóäåì þçàòü çíà÷åíèå...
@@: mov word [fat12_buffer.BPB_BytsPerSec],ax ;òóò âñå îê
@@:
mov word [fat12_buffer.BPB_BytsPerSec], ax;òóò âñå îê
 
;BPB_SecPerClus êîë-âî ñåêòîðîâ â êëàñòåðå
use_RamdiskCluster ;âîçðàùàåìîå çíà÷åíèå â al
758,7 → 762,8
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
xor bx,bx
mov cx,4
@@: movzx ax,byte [es:di]
@@:
movzx ax, byte [es:di]
cmp al,'0'
jb .end_RamdiskSector
cmp al,'9'
852,7 → 857,8
inc cx
dec di
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@: movzx ax,byte [es:di]
@@:
movzx ax, byte [es:di]
cmp al,'0'
jb .end_RamdiskCluster
cmp al,'9'
955,7 → 961,8
mov word [es:di-4],ax
mov word [es:di-2],16 ;êîë-âî áëîêîâ ïî 4 êá =64 êá ò.å. áîëüøå íå ñ÷èòàåì
;;;;;; ïîèñê êîíöà ñòðî÷êè
@@: mov al,byte [es:di]
@@:
mov al, byte [es:di]
cmp al,' '
jz .found_end_str
cmp al,0xa
1089,7 → 1096,8
;ñîõðàíèëè ïåâûå 2 word
 
;
@@: mov al,byte [es:di]
@@:
mov al, byte [es:di]
cmp al,',' ; ò.å. èùåì ðàçäåëèòåëü
jz .found_end_str
inc di
1430,7 → 1438,8
mov si,shot_name_fat
mov cx,11
;çàïèøåì â ñòðóêòóðó èìÿ
@@: lodsb
@@:
lodsb
stosb
loop @b
 
1489,7 → 1498,8
;ìû îáðàáîòàåì çàïèñü äëÿ ôàò ïîëíîñòüþ, â íå çàâèñèìîñòè îò ïðåäåëà áóôåðà ãäå âîçìîæíà ÷àñòü ôàéëà.
mov ebx,save_file_size ;ðàçìåð ôàéëà â áàéòàõ
@@: sub ebx,eax
@@:
sub ebx, eax
cmp ebx,eax
jbe .eof_file
 
1510,7 → 1520,8
add cx,ax
jmp @b
 
.step2: and cx,0x0FFF
.step2:
and cx, 0x0FFF
mov word[es:si],cx
inc si
add cx,ax
1524,10 → 1535,12
mov word[es:si],cx
jmp .end
 
.step3: and cx,0x0FFF
.step3:
and cx, 0x0FFF
mov word[es:si],cx
 
.end: inc point_next_fat_str
.end:
inc point_next_fat_str
 
pop di
;DIR_FileSize 32-áèòíûé DWORD ñîäåðæèò ðàçìåð ôàéëà â áàéòàõ.
1549,7 → 1562,8
mov cx,11
 
;çàïèøåì â ñòðóêòóðó èìÿ
@@: mov al,byte [es:di]
@@:
mov al, byte [es:di]
inc di
mov byte [ds:si],al
inc si
1776,7 → 1790,8
lea si,[check_name_fat_msg_y]
call printplain
lea si,[alarm_msg]
@@: call printplain
@@:
call printplain
popad
end if
 
1883,23 → 1898,28
jbe .st2_l
xor al,0x20 ;ñäåëàåì çàãëàâíûå áóêâû
.st2_l: mov byte [si],al
.st2_l:
mov byte [si], al
inc di
inc si
; dec cx
; jnz @b
loop @b
.st5: xor ax,ax
.st5:
xor ax, ax
jmp @f
 
;;;;;;;;ôàéë çàêîí÷èëñÿ, è íóæíî âíåñòè â êîíåö ïðîáåëû
.st4_s: mov al,' '
.st4: mov byte [si],al
.st4_s:
mov al, ' '
.st4:
mov byte [si], al
inc si
loop .st4
jmp .st5
 
.error: or ax,-1
.error:
or ax, -1
@@:
 
if DEBUG
1909,7 → 1929,8
test ax,ax
jz @f
mov si,convertion_file_name_msg_n
@@: call printplain
@@:
call printplain
 
mov si,shot_name_fat
mov byte [si+12],0
1971,7 → 1992,8
 
mov dl,0x10
 
@@: cmp eax,0x00010000
@@:
cmp eax, 0x00010000
jb @f
 
sub eax,0x00010000
1979,7 → 2001,8
jmp @b
 
 
@@: mov byte [si+8*3+3],dl ;êóäà ïèñàòü
@@:
mov byte [si+8*3+3], dl ;êóäà ïèñàòü
mov word [si+8*3+2],ax
 
mov ecx,save_file_size ;ðàçìåð ôàéëà â áàéòàõ.
2000,13 → 2023,15
;/óçíàåì ðàçìåð êëàñòåðà
pop eax ;restore size of claster
push ecx
@@: inc data_offset
@@:
inc data_offset
 
cmp eax,ecx
jae @f
sub ecx,eax
jmp @b
@@: pop ecx
@@:
pop ecx
 
 
 
2014,7 → 2039,8
test ecx,0x1
jz .st1
inc ecx
.st1: shr ecx,1 ; ïðåîáðàçîâàòü çíà÷åíèå äëÿ 0x87 function
.st1:
shr ecx, 1 ; ïðåîáðàçîâàòü çíà÷åíèå äëÿ 0x87 function
 
;ïåðåíåñåì áëîê çà 1 ìá
push es
2068,7 → 2094,8
test ecx,0x1
jz .st1
inc ecx
.st1: shr ecx,1
.st1:
shr ecx, 1
 
push es
push ds
/kernel/branches/Kolibri-acpi/sec_loader/trunk/parse_loader.inc
130,7 → 130,8
mov bx,cx
mov dx,di
 
@@: mov al,byte [es:di]
@@:
mov al, byte [es:di]
inc di
dec cx
test cx,cx
291,7 → 292,8
push cx
xor bx,bx
mov cx,2
@@: mov al,byte [es:di]
@@:
mov al, byte [es:di]
cmp al,'0'
jb .end_get_val_t
cmp al,'9'
317,7 → 319,8
mov word [value_timeout],default_timeout_value
mov si,set_default_timeout_val
call printplain
@@: pop cx
@@:
pop cx
jmp .get_next_str
 
;///////here end block loader
/kernel/branches/Kolibri-acpi/sec_loader/trunk/sl_proc.inc
48,7 → 48,8
push edx
call decode
pop eax
@@: or al,0x30
@@:
or al, 0x30
mov [ds:di],al
inc di
ret
146,7 → 147,8
.not_space:
cmp al,';'
jz .first_com
.exit: ret
.exit:
ret
;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
show_name_section:
226,8 → 228,9
jz @f
cmp al,"'"
jnz .end_sh_name_sec
@@: lodsb
@@:
lodsb
@@:
stosw
lodsb
cmp al,'"'
473,7 → 476,8
push dx
call .decode
pop ax
@@: or al,0x30
@@:
or al, 0x30
push ax
mov ah,9
stosw