WebSVN – Kolibri OS – Diff – /kernel/trunk/fs/fs.inc

 ; eax = 16 ; start application
+;
 ; OUT:
+;
 ; eax = 0  : read ok
-; eax = 1  : no fd base and/or partition defined
+; eax = 1  : no hd base and/or partition defined
 ; eax = 2  : yet unsupported FS
 ; eax = 3  : unknown FS
 ; eax = 4  : partition not defined at hd
 ; eax = 5  : file not found
 ; eax = 6  : end of file
 ; eax = 9  : fat table corrupted
 ; eax = 10 : access denied
+;
 ; ebx = size
+; \begin{diamond}[18.03.2006]
+; for subfunction 16 (start application) error codes must be negative
+;	because positive values are valid PIDs
+; so possible return values are:
+; eax > 0 : process created, eax=PID
+; -0x10 <= eax < 0 : -eax is filesystem error code:
+; eax = -1  = 0xFFFFFFFF : no hd base and/or partition defined
+; eax = -3  = 0xFFFFFFFD : unknown FS
+; eax = -5  = 0xFFFFFFFB : file not found
+; eax = -6  = 0xFFFFFFFA : unexpected end of file (probably not executable file)
+; eax = -9  = 0xFFFFFFF7 : fat table corrupted
+; eax = -10 = 0xFFFFFFF6 : access denied
+; -0x20 <= eax < -0x10: eax is process creation error code:
+; eax = -0x20 = 0xFFFFFFE0 : too many processes
+; eax = -0x1F = 0xFFFFFFE1 : not Menuet/Kolibri executable
+; eax = -0x1E = 0xFFFFFFE2 : no memory
+; ebx is not changed
-    ; Extract parameters
+; \end{diamond}[18.03.2006]
-    mov   edi,[0x3010]
+    ; Extract parameters
-    add   eax,[edi+0x10]        ; abs start of info block
+	add	eax, std_application_base_address	; abs start of info block
     cmp   dword [eax+0],12      ; Get file size
     cmp   dword [eax+0],2       ; DELETE - dont care about read&write blocks
     je    fs_read
     cmp   dword [0x3000],1      ; no memory checks for kernel requests
-    jz    no_checks_for_kernel
-;iglobal
-;  buffer_failed db 'Buffer check failed',13,10,0
-;endg
+    jz    no_checks_for_kernel
     mov   edx,eax
     cmp   dword [eax+0],1
     jz    .check_for_write_op
     cmp   dword [eax+0],3
     jnz   area_in_app_mem
 .error_output:
     mov   esi,buffer_failed
     call  sys_msg_board_str
-    mov   eax,7
+;    mov   eax,7
     mov   dword [esp+36],7
     ret
 iglobal
-  buffer_failed db 'Buffer check failed',13,10,0
+  buffer_failed db 'K : Buffer check failed',13,10,0
 endg
 .usual_check:
     cmp   dword [eax+0],0
     mov   ecx,512
     mov   ebx,[eax+12]
     add   ebx,std_application_base_address
     call  check_region
     test  eax,eax
     jz    .error_output
-    jmp   area_in_app_mem
-;    mov   ebx,[0x3000]          ; pointer in application memory ?
-;    shl   ebx,8
-;    mov   ebx,[ebx+0x80000+0x8c]
-;    mov   ebp,ebx               ; save for checking at stack save
-;    sub   ebp,[eax+12]
-;    shr   ebp,9
-;    sub   ebx,512               ; need atleast one block
-;    cmp   ebx,[eax+12]
-;    ja    area_in_app_mem
-;    mov   eax,7
-;    mov   dword [esp+36],7
-;    ret
   area_in_app_mem:
     mov   eax,edx
   no_checks_for_kernel:
     cmp   dword [eax+0],3       ; APPEND - allow write 0 bytes (truncate)
     je    fs_read
     cmp   dword [eax+8],0       ; read or write 0 blocks/bytes ?
     jne   fs_read
-    mov   dword [esp+36],0
+    and   dword [esp+36],0
     ret
   fs_read:
     mov   ebx,[eax+20]          ; program wants root directory ?
     test  bl,bl
     je    fs_getroot
+    test  bh,bh
+    jne   fs_noroot
+  fs_getroot:
+; \begin{diamond}[18.03.2006]
+; root - only read is allowed
+; other operations return "access denied", eax=10
+; (execute operation returns eax=-10)
-    test  bh,bh
+	cmp	dword [eax], 0
+	jz	.read_root
+	mov	ecx, 10
+	cmp	dword [eax], 16
+	jnz	@f
+	neg	ecx
+@@:	mov	[esp+36], ecx
-    jne   fs_noroot
+	ret
-  fs_getroot:
+.read_root:
-    mov   edx,[edi+0x10]
+; \end{diamond}[18.03.2006]
     mov   esi,dir0
     mov   edi,[eax+12]
+    add   edi,std_application_base_address
-    add   edi,edx
+    mov   ecx,11
-    mov   ecx,11
+    push  ecx
-    cld
+;    cld	; already is
     rep   movsb
-    mov   eax,0x10
+    mov   al,0x10
     stosb
     add   edi,32-11-1
-    mov   ecx,11
+    pop   ecx
     rep   movsb
     stosb
-    mov   dword [esp+36],0      ; ok read
+    and   dword [esp+36],0      ; ok read
-    mov   dword [esp+24],32*2   ; size of root
-    ret
+    mov   dword [esp+24],32*2   ; size of root
     ret
   fs_info:                      ;start of code - Mihasik
-    mov   edi,eax
+  fs_info:                      ;start of code - Mihasik
-    push  edi
+    push  eax
     cmp   [eax+21],byte 'h'
     mov   [edi],edx              ; cluster size in bytes
     ret                          ;end of code - Mihasik
-  fs_noroot:
+  fs_noroot:
-    mov   ebx,[eax+0]
-    push  ebx                   ; read/write/delete/.../makedir/rename/lba/run
-    mov   ebx,[eax+4]
-    push  ebx                   ; 512 block number to read
-    mov   ebx,[eax+8]
-;    cmp   dword [eax+0],0       ; if read, check that the data stays at
-;    jne   ret_size_fine         ; application memory
-;    cmp   ebx,ebp
-;    jbe   ret_size_fine
-;    mov   ebx,ebp
-;  ret_size_fine:
+    push  dword [eax+0]         ; read/write/delete/.../makedir/rename/lba/run
     push  dword [eax+4]         ; 512 block number to read
-    push  ebx                   ; bytes to write/append or 512 blocks to read
+    push  dword [eax+8]         ; bytes to write/append or 512 blocks to read
     mov   ebx,[eax+12]
-    add   ebx,[edi+0x10]
+    add   ebx,std_application_base_address
-    push  ebx                   ; abs start of return/save area
+    push  ebx                   ; abs start of return/save area
     lea   esi,[eax+20]          ; abs start of dir + filename
-    mov   edi,[edi+0x10]        ; abs start of work area
+    mov   edi,[eax+16]
-    add   edi,[eax+16]
+    add   edi,std_application_base_address	; abs start of work area
     call  expand_pathz
     call  expand_pathz
     push  edi                   ; dir start
-    push  ebx                   ; name of file start
+    push  edi                   ; dir start
     push  ebx                   ; name of file start
     mov   ebx,[dir0+11]         ; /RAMDISK
     mov   eax,[edi+1]
     cmp   eax,'RD  '
-    je    fs_yesramdisk
-    cmp   eax,ebx
+    je    fs_yesramdisk
-    jne   fs_noramdisk
+    cmp   eax,'RAMD'
     jne   fs_noramdisk
-  fs_yesramdisk:
   fs_yesramdisk:
     cmp   byte [edi+1+11],0
-    je    fs_give_dir1
+    cmp   byte [edi+1+11],0
     mov   eax,[esp+4]           ; fname
     add   eax,2*12+1
     xor   ebx,ebx               ; parameters to pass
-    cmp   dword [esp+12],0
-    je    no_fl_start_param
+    cmp   dword [esp+12],ebx;0
-    mov   ebx,[0x3010]
+    je    no_fl_start_param
-    mov   ebx,[ebx+0x10]
+    mov   ebx, [esp+12]
-    add   ebx,[esp+12]
+    add   ebx, std_application_base_address
   no_fl_start_param:
     mov   edx,[esp+16]		; flags
     call  start_application_fl
-    jmp   file_system_return
+    jmp   file_system_startapp_return
   fs_noramdisk_getinfo:             ;End of code - Mihasik
   fs_noramdisk:
   ;********************************************************************
-    mov   ebx,[dir0+22]         ; /FLOPPYDISK
+  ;********************************************************************
     mov   eax,[edi+1]
     cmp   eax,'FD  '
     je    fs_yesflpdisk
-    cmp   eax,ebx
+    cmp   eax,'FLOP'
     jne   fs_noflpdisk
   fs_yesflpdisk:
-    call   reserve_flp
     call   reserve_flp
     cmp   byte [edi+1+11],0
-    je    fs_give_dir1
+    cmp   byte [edi+1+11],0
+    je    fs_give_dir1
     mov   ebx,[dir1]            ; /FIRST
-    mov   eax,[edi+1+12]
-    cmp   eax,'1   '
+    mov   eax,[edi+1+12]
-    je    fs_yesflpdisk_first
+    cmp   eax,'1   '
-    cmp   eax,ebx
+    je    fs_yesflpdisk_first
-    je    fs_yesflpdisk_first
+    cmp   eax,'FIRS'
-    mov   ebx,[dir1+11]         ; /SECOND
+    je    fs_yesflpdisk_first
     cmp   eax,'2   '
     je    fs_yesflpdisk_second
     mov   eax,[esp+4]           ; fname
     add   eax,2*12+1
     xor   ebx,ebx               ; parameters to pass
-    cmp   dword [esp+12],0
+    cmp   dword [esp+12],ebx;0
     je    no_flp_start_param
     mov   ebx,[0x3010]
     mov   ebx,[ebx+0x10]
     add   ebx,[esp+12]
+  no_flp_start_param:
+    mov   edx,[esp+16]		; flags
   no_flp_start_param:
-    mov   edx,[esp+16]		; flags
+    call  start_application_floppy
 choice_necessity_partition:
     mov   eax,[edi+1+12]
     call  StringToNumber
         mov   [fat32part],eax
 choice_necessity_partition_1:
-    mov   [0xfe10],dword 0    ; entries in hd cache
     mov   ecx,[hdpos]
     xor   eax,eax
+    mov   [0xfe10], eax    ; entries in hd cache
     mov   edx,0x40002
  search_partition_array:
     mov   bl,[edx]
     movzx ebx,bl
     add   eax,ebx
     mov   [transfer_adress],eax
     call  partition_data_transfer_1
     ret
- old_path_harddisk:
-    mov   ebx,[dir0]            ; /HARDDISK
+ old_path_harddisk:
     mov   eax,[edi+1]
     cmp   eax,'HD  '
     je    fs_yesharddisk
-    cmp   eax,ebx
+    cmp   eax,'HARD'
     jne   fs_noharddisk
  fs_for_new_semantic:
     call  choice_necessity_partition
   fs_yesharddisk_all:
+    mov   eax,1
+	cmp	dword [esp+20], 16
+	jnz	@f
+	neg	eax
-    mov   eax,1
+@@:	mov	ebx, [esp+24+24]
     cmp   [hdpos],0             ; is hd base set?
     jz    file_system_return    ; no
     cmp   [fat32part],0         ; is partition set?
     mov   edi,[esp+0]           ; start of source file name
     add   edi,12+1              ; continue after name
-    call  expand_pathz          ; convert destination name
     call  expand_pathz          ; convert destination name
     mov   edx,[dir0]            ; /HARDDISK
     mov   eax,[edi+1]
     cmp   eax,'HD  '
     je    fs_rename_test1
-    cmp   eax,edx
+    cmp   eax,'HARD'
-    jne   fs_rename_error
     jne   fs_rename_error
   fs_rename_test1:
-    mov   edx,[dir1]            ; /FIRST
+  fs_rename_test1:
     mov   eax,[edi+1+12]
     cmp   eax,'1   '
     je    fs_rename_start
-    cmp   eax,edx
+    cmp   eax,'FIRS'
     jne   fs_rename_error
     mov   ecx,[esp+4]           ; work area
     add   ecx,512
     xor   ebp,ebp               ; parameters to pass
-    cmp   dword [esp+12],0
-    je    no_hd_start_param
+    cmp   dword [esp+12],ebp;0
-    mov   ebp,[0x3010]
+    je    no_hd_start_param
-    mov   ebp,[ebp+0x10]
+    mov   ebp, [esp+12]
-    add   ebp,[esp+12]
+    add   ebp, std_application_base_address
   no_hd_start_param:
     mov   edx,[esp+16]		; flags
     call  start_application_hd
+    jmp   file_system_startapp_return
+  fs_noharddisk_start_application:
+  fs_noharddisk:
+; \begin{diamond}[18.03.2006]
+	mov	eax, 5		; file not found
 ; à ìîæåò áûòü, âîçâðàùàòü äðóãîé êîä îøèáêè?
-    jmp   file_system_return
+	cmp	dword [esp+20], 16
     ret
+  fs_give_dir1:
+; \begin{diamond}[18.03.2006]
+; /RD,/FD,/HD - only read is allowed
+; other operations return "access denied", eax=10
+; (execute operation returns eax=-10)
+	cmp	dword [esp+20], 0
+	jz	.read
+	add	esp, 20
+	pop	ecx
+	mov	eax, 10
+	cmp	ecx, 16
+	jnz	@f
+	neg	eax
+@@:	mov	[esp+36], eax
+	ret
-  fs_give_dir1:
+.read:
 ; \end{diamond}[18.03.2006]
-    mov   eax,0x10
+    mov   al,0x10
     mov   ebx,1
     mov   edi,[esp+8]
     mov   esi,dir1
   fs_d1_new:
     mov   ecx,11
-    cld
+;    cld
     rep   movsb
     stosb
     add   edi,32-11-1
     dec   ebx
     jne   fs_d1_new
     mov   esi,eax
     shl   esi,9
     add   esi,0x100000
     mov   ecx,512/4
-    cld
+;    cld
     rep   movsd

Subversion Repositories Kolibri OS

(root)/kernel/trunk/fs/fs.inc – Rev 40 → 61