Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 2287 → Rev 2288

/kernel/trunk/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
Property changes:
Added: svn:eol-style
+native
\ No newline at end of property