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

fixed address bug in fat12.inc

Browse Source 
git-svn-id: svn://kolibrios.org@445 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2007-03-31 14:34:07 +00:00
parent cf69f09b47
commit 46c7cf52d9
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/branches/flat_kernel/blkdev/flp_drv.inc
View File

@ -12,10 +12,10 @@ $Revision: 431 $
; Àâòîð èñõîäíîãî òåêñòà Êóëàêîâ Âëàäèìèð Ãåííàäüåâè÷. ; Àâòîð èñõîäíîãî òåêñòà Êóëàêîâ Âëàäèìèð Ãåííàäüåâè÷.
; Àäàïòàöèÿ è äîðàáîòêà Mario79 ; Àäàïòàöèÿ è äîðàáîòêà Mario79
give_back_application_data: ; ïåğåñëàòü ïğèëîæåíèş ;give_back_application_data: ; ïåğåñëàòü ïğèëîæåíèş
mov edi,[TASK_BASE] ; mov edi,[TASK_BASE]
mov edi,[edi+TASKDATA.mem_start] ; mov edi,[edi+TASKDATA.mem_start]
add edi,ecx ; add edi,ecx
give_back_application_data_1: give_back_application_data_1:
mov esi,FDD_BUFF ;FDD_DataBuffer ;0x40000 mov esi,FDD_BUFF ;FDD_DataBuffer ;0x40000
xor ecx,ecx xor ecx,ecx
@ -24,10 +24,10 @@ give_back_application_data_1:
rep movsd rep movsd
ret ret
take_data_from_application: ; âçÿòü èç ïğèëîæåíè ;take_data_from_application: ; âçÿòü èç ïğèëîæåíè
mov esi,[TASK_BASE] ; mov esi,[TASK_BASE]
mov esi,[esi+TASKDATA.mem_start] ; mov esi,[esi+TASKDATA.mem_start]
add esi,ecx ; add esi,ecx
take_data_from_application_1: take_data_from_application_1:
mov edi,FDD_BUFF ;FDD_DataBuffer ;0x40000 mov edi,FDD_BUFF ;FDD_DataBuffer ;0x40000
xor ecx,ecx xor ecx,ecx

2
kernel/branches/flat_kernel/core/malloc.inc
View File

@ -992,7 +992,7 @@ init_malloc:
mov [eax+12], eax mov [eax+12], eax
add eax, 16 add eax, 16
cmp eax, mst.smallbins+512 cmp eax, mst.smallbins+512
jl @B jb @B
ret ret

2
kernel/branches/flat_kernel/core/taskman.inc
View File

@ -1023,7 +1023,7 @@ proc set_app_params stdcall,slot:dword, params:dword,\
mov eax, [esi+0x08] ;app_eip mov eax, [esi+0x08] ;app_eip
mov [ebx+REG_EIP], eax ;app_entry mov [ebx+REG_EIP], eax ;app_entry
mov [ebx+REG_CS], dword app_code mov [ebx+REG_CS], dword app_code
mov [ebx+REG_EFLAGS], dword 0x3202 mov [ebx+REG_EFLAGS], dword 0x1202
mov eax, [esi+0x0C] ;app_esp mov eax, [esi+0x0C] ;app_esp
mov [ebx+REG_APP_ESP], eax ;app_stack mov [ebx+REG_APP_ESP], eax ;app_stack

10
kernel/branches/flat_kernel/fs/fat12.inc
View File

@ -1125,7 +1125,7 @@ fd_prev_prev_sector dd ?
endg endg
flp_root_next: flp_root_next:
cmp edi, 0xD200-0x20 cmp edi, OS_BASE+0xD200-0x20
jae @f jae @f
add edi, 0x20 add edi, 0x20
ret ; CF=0 ret ; CF=0
@ -1172,7 +1172,7 @@ flp_rootmem_extend_dir:
ret ret
flp_notroot_next: flp_notroot_next:
cmp edi, 0xD200-0x20 cmp edi, OS_BASE+0xD200-0x20
jae flp_notroot_next_sector jae flp_notroot_next_sector
add edi, 0x20 add edi, 0x20
ret ; CF=0 ret ; CF=0
@ -1223,7 +1223,7 @@ flp_notroot_end_write:
popa popa
ret ret
flp_notroot_next_write: flp_notroot_next_write:
cmp edi, 0xD200 cmp edi, OS_BASE+0xD200
jae @f jae @f
ret ret
@@: @@:
@ -1464,7 +1464,7 @@ fs_FloppyReadFolder:
cmp byte [edi+11], 0xF cmp byte [edi+11], 0xF
jnz .do_bdfe jnz .do_bdfe
add edi, 0x20 add edi, 0x20
cmp edi, 0xD200 cmp edi, OS_BASE+0xD200
jb .do_bdfe jb .do_bdfe
pop eax pop eax
inc eax inc eax
@ -1496,7 +1496,7 @@ fs_FloppyReadFolder:
call fat_entry_to_bdfe call fat_entry_to_bdfe
.l2: .l2:
add edi, 0x20 add edi, 0x20
cmp edi, 0xD200 cmp edi, OS_BASE+0xD200
jb .l1 jb .l1
pop eax pop eax
inc eax inc eax