WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 1275 $
+$Revision: 1276 $
 ; -----------------------------------------
-;        movzx eax,byte [BOOT_VAR+0x9010]  ; mouse port
+;        movzx eax,byte [BOOT_VAR+0x9010]	; mouse port
 ;        mov   [0xF604],byte 1  ;al
-        mov     al, [BOOT_VAR+0x901F]   ; DMA access
+		mov	al, [BOOT_VAR+0x901F]   	; DMA access
-        mov     [allow_dma_access], al
+        mov	[allow_dma_access], al
-        movzx eax, byte [BOOT_VAR+0x9000]        ; bpp
+        mov al,[BOOT_VAR+0x9000]        ; bpp
-        mov   [ScreenBPP],al
+        mov [ScreenBPP],al
-        mov [_display.bpp], eax
-        mov [_display.vrefresh], 60
-        movzx eax,word [BOOT_VAR+0x900A]  ; X max
-        mov [_display.width], eax
+        movzx eax,word [BOOT_VAR+0x900A]  ; X max
         dec   eax
         mov   [Screen_Max_X],eax
         mov   [screen_workarea.right],eax
-        movzx eax,word [BOOT_VAR+0x900C]  ; Y max
-        mov [_display.height], eax
+        movzx eax,word [BOOT_VAR+0x900C]  ; Y max
         dec   eax
         mov   [Screen_Max_Y],eax
         mov   [screen_workarea.bottom],eax
         movzx eax,word [BOOT_VAR+0x9008]  ; screen mode
         mov   [BytesPerScanLine],word 640*4         ; Bytes PerScanLine
         cmp   [SCR_MODE],word 0x13          ; 320x200
         je    @f
         cmp   [SCR_MODE],word 0x12          ; VGA 640x480
         je    @f
-        movzx eax, word[BOOT_VAR+0x9001]        ; for other modes
+        mov   ax,[BOOT_VAR+0x9001]        ; for other modes
         mov   [BytesPerScanLine],ax
-        mov [_display.pitch], eax
 @@:
         mov     esi, BOOT_VAR+0x9080
         movzx   ecx, byte [esi-1]
         mov     [NumBiosDisks], ecx
         mov     edi, BiosDisksData
         rep     movsd
 ; GRAPHICS ADDRESSES
-        mov     byte [BOOT_VAR+0x901e],0x0
+        and     byte [BOOT_VAR+0x901e],0x0
         mov     eax,[BOOT_VAR+0x9018]
         mov     [LFBAddress],eax
         or      ecx, (10+29*6) shl 16 ; "Determining amount of memory"
         sub     ecx, 10
         mov     edx, 0xFFFFFF
         mov     ebx, [MEM_AMOUNT]
         shr     ebx, 20
-        mov     edi, 1
+        xor     edi,edi
         mov     eax, 0x00040000
+		inc		edi
         call    display_number_force
 ; BUILD SCHEDULER
         mov  dword [SLOT_BASE+256+APPDATA.cur_dir], sysdir_path
         mov dword [SLOT_BASE+256+APPDATA.tls_base], eax
+        ; task list
+        mov  dword [TASK_DATA+TASKDATA.mem_start],eax	; process base address
-        ; task list
+	inc  eax
-        mov  [CURRENT_TASK],dword 1
+        mov  dword [CURRENT_TASK],eax
-        mov  [TASK_COUNT],dword 1
+        mov  dword [TASK_COUNT],eax
         mov  [current_slot], SLOT_BASE+256
         mov  [TASK_BASE],dword TASK_DATA
-        mov  [TASK_DATA+TASKDATA.wnd_number], 1 ; on screen number
+        mov  byte[TASK_DATA+TASKDATA.wnd_number],al	; on screen number
-        mov  [TASK_DATA+TASKDATA.pid], 1        ; process id number
+        mov  dword [TASK_DATA+TASKDATA.pid], eax        ; process id number
         mov  [TASK_DATA+TASKDATA.mem_start], 0  ; process base address
         call init_cursors
         mov     ebx, edx
         movzx   ecx, word [boot_y]
         add     ecx, (10+17*6) shl 16 - 10 ; 'CPU frequency is '
         mov     edx, 0xFFFFFF
-        mov     edi, 1
+        xor     edi,edi
+        mov     eax, 0x00040000
-        mov     eax, 0x00040000
+		inc		edi
         call    display_number_force
 first_app_found:
         cli
+        ;mov   [TASK_COUNT],dword 2
-        ;mov   [TASK_COUNT],dword 2
+	push  1
-        mov   [CURRENT_TASK],dword 1       ; set OS task fisrt
+        pop   dword [CURRENT_TASK]      ; set OS task fisrt
-         mov   ebx,10*65536
+        mov   ebx,10*65536
-         mov   bx,word [boot_y]
+        mov   bx,word [boot_y]
-         add   [boot_y],dword 10
+        add   [boot_y],dword 10
+        mov   ecx,0x80ffffff   ; ASCIIZ string with white color
-         mov   ecx,0x80ffffff   ; ASCIIZ string with white color
+		xor	  edi,edi
-         mov   edx,esi
+        mov   edx,esi
-         mov   edi,1
+		inc	  edi
-         call  dtext
+        call  dtext
-         mov   [novesachecksum],1000
+        mov   [novesachecksum],1000
-         call  checkVga_N13
+        call  checkVga_N13
          popad
         popad
          ret
         ret
     test  edi,0x80000000 ; read ?
     jnz   sopl4
     mov   dx,bx          ; write
     out   dx,al
-    mov   [esp+36],dword 0
+    and   [esp+36],dword 0
     ret
   sopl4:
     mov   dx,bx          ; read
     in    al,dx
     and   eax,0xff
-    mov   [esp+36],dword 0
+    and   [esp+36],dword 0
      mov   ebp,[ebp+std_application_base_address]
      mov   ebx,[ebx+std_application_base_address]
-   displnl1:
+ displnl1:
      sub   esp,64
-     cmp   ah,0                  ; DECIMAL
+    test   ah,ah                  ; DECIMAL
-     jne   no_display_desnum
+    jnz   no_display_desnum
-     shr   eax,16
+    shr   eax,16
-     and   eax,0xC03f
+    and   eax,0xC03f
 ;     and   eax,0x3f
-     push  eax
+    push  eax
 ; 10 = sound dma channel
 ; 11 = enable lba read
 ; 12 = enable pci access
-     mov  [esp+36],dword 0
+     	and  [esp+32],dword 0
-     cmp  eax,1                      ; MIDI
+	dec	ebx				; MIDI
+	jnz  nsyse1
-     jnz  nsyse1
+	cmp  ecx,0x100
-     cmp  ebx,0x100
-     jb   nsyse1
+	jb   nsyse1
+	mov	esi,65535
-     mov  edx,65535
+	cmp	esi,ecx
-     cmp  edx,ebx
-     jb   nsyse1
+	jb   nsyse1
-     mov  [midi_base],bx
+	mov  [midi_base],cx	;bx
-     mov  word [mididp],bx
+	mov  word [mididp],cx	;bx
-     inc  bx
+	inc  cx		    	;bx
-     mov  word [midisp],bx
+	mov  word [midisp],cx	;bx
-     ret
+	ret
 iglobal
-midi_base dw 0
-endg
+midi_base dw 0
-   nsyse1:
+endg
-;     cmp  eax,2                      ; KEYBOARD
-     sub  eax,2
      jnz  nsyse2
-;     cmp  ebx,1
+   nsyse1:
-     dec  ebx
+	dec	ebx				 ; KEYBOARD
+	jnz  nsyse2
+	mov  edi,[TASK_BASE]
+	add  edi,[edi+TASKDATA.mem_start]
-     jnz  kbnobase
+	mov  eax,edi
      mov  edi,[TASK_BASE]
-     add  ecx,[edi+TASKDATA.mem_start]
+	dec	ecx
-     mov  eax,ecx
+	jnz  kbnobase
-     mov  ebx,keymap
+	mov  ebx,keymap
-     mov  ecx,128
-     call memmove
+	mov  ecx,128
-     ret
+	call memmove
-   kbnobase:
-;     cmp  ebx,2
-     dec  ebx
+	ret
-     jnz  kbnoshift
+   kbnobase:
-     mov  edi,[TASK_BASE]
+	dec  ecx
-     add  ecx,[edi+TASKDATA.mem_start]
+	jnz  kbnoshift
      mov  eax,ecx
-     mov  ebx,keymap_shift
+	mov  ebx,keymap_shift
-     mov  ecx,128
-     call memmove
+	mov  ecx,128
-     ret
+	call memmove
-   kbnoshift:
-;     cmp  ebx,3
-     dec  ebx
-     jnz  kbnoalt
+	ret
-     mov  edi,[TASK_BASE]
+   kbnoshift:
-     add  ecx,[edi+TASKDATA.mem_start]
+	dec  ecx
-     mov  eax,ecx
+	jnz  kbnoalt
-     mov  ebx,keymap_alt
+	mov  ebx,keymap_alt
-     mov  ecx,128
-     call memmove
+	mov  ecx,128
-     ret
+	call memmove
-   kbnoalt:
+	ret
-;     cmp  ebx,9
+   kbnoalt:
-     sub  ebx,6
+	sub  ecx,6
-     jnz  kbnocountry
+	jnz  kbnocountry
-     mov  word [keyboard],cx
+	mov  word [keyboard],dx
-     ret
+	ret
-   kbnocountry:
-     mov  [esp+36],dword 1
+   kbnocountry:
-     ret
+	mov  [esp+32],dword 1
+	ret
    nsyse2:
-;     cmp  eax,3                      ; CD
+	dec  ebx			    ; CD
+	jnz  nsyse4
-     dec  eax
-     jnz  nsyse4
+	test ecx,ecx
-     test ebx,ebx
+	jz   nosesl
-     jz   nosesl
+	cmp  ecx, 4
-     cmp  ebx, 4
+	ja   nosesl
-     ja   nosesl
+	mov  [cd_base],cl
      mov  [cd_base],bl
-     cmp  ebx,1
+	dec	ecx
+	jnz  noprma
-     jnz  noprma
+	mov  [cdbase],0x1f0
-     mov  [cdbase],0x1f0
+	mov  [cdid],0xa0
-     mov  [cdid],0xa0
+   noprma:
    noprma:
-     cmp  ebx,2
+	dec	ecx
-     jnz  noprsl
+	jnz  noprsl
-     mov  [cdbase],0x1f0
+	mov  [cdbase],0x1f0
-     mov  [cdid],0xb0
+	mov  [cdid],0xb0
    noprsl:
-     cmp  ebx,3
+	dec	ecx
-     jnz  nosema
+     	jnz  nosema
-     mov  [cdbase],0x170
+     	mov  [cdbase],0x170
-     mov  [cdid],0xa0
+     	mov  [cdid],0xa0
    nosema:
-     cmp  ebx,4
+	dec	ecx
-     jnz  nosesl
+     	jnz  nosesl
+     	mov  [cdbase],0x170
-     mov  [cdbase],0x170
+     	mov  [cdid],0xb0
+   nosesl:
-     mov  [cdid],0xb0
+     	ret
-   nosesl:
-     ret
 iglobal
 cd_base db 0
-   nsyse4:
+endg
-;     cmp  eax,5                      ; SYSTEM LANGUAGE
+   nsyse4:
      sub  eax,2
+     	sub  ebx,2		 ; SYSTEM LANGUAGE
-     jnz  nsyse5
+     	jnz  nsyse5
-     mov  [syslang],ebx
+     	mov  [syslang],ecx
+     	ret
-     ret
+   nsyse5:
    nsyse5:
+     	sub  ebx,2		; HD BASE
+     	jnz  nsyse7
-;     cmp  eax,7                      ; HD BASE
-     sub  eax,2
+     	test ecx,ecx
-     jnz  nsyse7
+     	jz   nosethd
-     test ebx,ebx
-     jz   nosethd
+     	cmp  ecx,4
-     cmp  ebx,4
+     	ja   nosethd
-     ja   nosethd
+     	mov  [hd_base],cl
-     mov  [hd_base],bl
+     	cmp  ecx,1
-     cmp  ebx,1
+     	jnz  noprmahd
-     jnz  noprmahd
+     	mov  [hdbase],0x1f0
-     mov  [hdbase],0x1f0
+     	and  dword [hdid],0x0
-     mov  [hdid],0x0
+     	mov  dword [hdpos],ecx
-     mov  [hdpos],1
+;     call set_FAT32_variables
-;     call set_FAT32_variables
+   noprmahd:
-   noprmahd:
+     	cmp  ecx,2
-     cmp  ebx,2
+     	jnz  noprslhd
-     jnz  noprslhd
+     	mov  [hdbase],0x1f0
-     mov  [hdbase],0x1f0
+     	mov  [hdid],0x10
-     mov  [hdid],0x10
+     	mov  dword [hdpos],ecx
-     mov  [hdpos],2
+;     call set_FAT32_variables
-;     call set_FAT32_variables
+   noprslhd:
-   noprslhd:
+     	cmp  ecx,3
-     cmp  ebx,3
+     	jnz  nosemahd
-     jnz  nosemahd
+     	mov  [hdbase],0x170
-     mov  [hdbase],0x170
+     	and  dword [hdid],0x0
-     mov  [hdid],0x0
+     	mov  dword [hdpos],ecx
-     mov  [hdpos],3
+;     call set_FAT32_variables
-;     call set_FAT32_variables
+   nosemahd:
    nosemahd:
-     cmp  ebx,4
+     	cmp  ecx,4
-     jnz  noseslhd
+     	jnz  noseslhd
-     mov  [hdbase],0x170
+     	mov  [hdbase],0x170
-     mov  [hdid],0x10
+     	mov  [hdid],0x10
-     mov  [hdpos],4
+     	mov  dword [hdpos],ecx
 ;     call set_FAT32_variables
    noseslhd:
-    call  reserve_hd1
+    	call  reserve_hd1
-    call  reserve_hd_channel
+    	call  reserve_hd_channel
-    call  free_hd_channel
+    	call  free_hd_channel
-    mov   [hd1_status],0        ; free
+    	and   dword [hd1_status],0        ; free
    nosethd:
-     ret
+     	ret
 iglobal
 hd_base db 0
 endg
 nsyse7:
 ;     cmp  eax,8                      ; HD PARTITION
-     dec  eax
+     	dec  ebx
-     jnz  nsyse8
+     	jnz  nsyse8
-     mov  [fat32part],ebx
+     	mov  [fat32part],ecx
 ;     call set_FAT32_variables
+    	call  reserve_hd1
-    call  reserve_hd1
+    	call  reserve_hd_channel
-    call  reserve_hd_channel
-    call  free_hd_channel
+    	call  free_hd_channel
-     pusha
+;     	pusha
-     call  choice_necessity_partition_1
+     	call  choice_necessity_partition_1
-     popa
+;     	popa
-    mov   [hd1_status],0        ; free
+    	and dword [hd1_status],0        ; free
-     ret
+     	ret
-nsyse8:
-;     cmp  eax,11                     ; ENABLE LBA READ
+nsyse8:
-     sub  eax,3
+;     cmp  eax,11                     ; ENABLE LBA READ
-     jnz  no_set_lba_read
+    	and  ecx,1
-     and  ebx,1
+	sub  ebx,3
-     mov  [lba_read_enabled],ebx
+    	jnz  no_set_lba_read
-     ret
+    	mov  [lba_read_enabled],ecx
+    	ret
 no_set_lba_read:
-;     cmp  eax,12                     ; ENABLE PCI ACCESS
+no_set_lba_read:
-     dec  eax
+;     cmp  eax,12                     ; ENABLE PCI ACCESS
 ; 5=system language, 1eng 2fi 3ger 4rus
 ; 7=hd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
 ; 8=fat32 partition in hd
 ; 9=get hs timer tic
+;     cmp  eax,1
-     cmp  eax,1
+	dec	ebx
-     jne  ngsyse1
+     	jnz  ngsyse1
-     movzx eax,[midi_base]
+     	movzx eax,[midi_base]
-     mov  [esp+36],eax
+     	mov  [esp+32],eax
-     ret
+     	ret
+ngsyse1:
+;     cmp  eax,2
+	dec	ebx
-ngsyse1:
-     cmp  eax,2
-     jne  ngsyse2
-     cmp  ebx,1
+     	jnz  ngsyse2
-     jnz  kbnobaseret
-     mov  edi,[TASK_BASE]
+     	mov  edi,[TASK_BASE]
+     	add  edi,[edi+TASKDATA.mem_start]
+     	mov  ebx,edi
+;     cmp  ebx,1
-     add  ecx,[edi+TASKDATA.mem_start]
+	dec	ecx
-     mov  ebx,ecx
+     	jnz  kbnobaseret
-     mov  eax,keymap
+     	mov  eax,keymap
-     mov  ecx,128
+     	mov  ecx,128
-     call memmove
+     	call memmove
-     ret
+     	ret
+kbnobaseret:
-kbnobaseret:
+;     cmp  ebx,2
-     cmp  ebx,2
-     jnz  kbnoshiftret
-     mov  edi,[TASK_BASE]
+	dec	ecx
-     add  ecx,[edi+TASKDATA.mem_start]
+     	jnz  kbnoshiftret
      mov  ebx,ecx
-     mov  eax,keymap_shift
+     	mov  eax,keymap_shift
-     mov  ecx,128
+     	mov  ecx,128
-     call memmove
+     	call memmove
-     ret
+     	ret
+kbnoshiftret:
-kbnoshiftret:
+;     cmp  ebx,3
-     cmp  ebx,3
-     jne  kbnoaltret
-     mov  edi,[TASK_BASE]
+	dec	ecx
+     	jne  kbnoaltret
      add  ecx,[edi+TASKDATA.mem_start]
      mov  ebx,ecx
-     mov  eax,keymap_alt
+     	mov  eax,keymap_alt
-     mov  ecx,128
+     	mov  ecx,128
-     call memmove
+     	call memmove
-     ret
+     	ret
+kbnoaltret:
-kbnoaltret:
+;     cmp  ebx,9
-     cmp  ebx,9
+	sub	ecx,6
-     jnz  ngsyse2
+     	jnz  ngsyse2
-     movzx eax,word [keyboard]
+     	movzx eax,word [keyboard]
-     mov  [esp+36],eax
+     	mov  [esp+32],eax
+     	ret
-     ret
 ngsyse2:
 ;         cmp  eax,3
-         cmp  eax,3
+	dec	ebx
-         jnz  ngsyse3
+        jnz  ngsyse3
-         movzx eax,[cd_base]
+        movzx eax,[cd_base]
-         mov  [esp+36],eax
+        mov  [esp+32],eax
+        ret
-         ret
+ngsyse3:
-ngsyse3:
+;         cmp  eax,5
-         cmp  eax,5
+	sub	ebx,2
-         jnz  ngsyse5
+        jnz  ngsyse5
-         mov  eax,[syslang]
+        mov  eax,[syslang]
-         mov  [esp+36],eax
+        mov  [esp+32],eax
+        ret
-         ret
+ngsyse5:
-ngsyse5:
+;     cmp  eax,7
-     cmp  eax,7
+	sub	ebx,2
-     jnz  ngsyse7
+     	jnz  ngsyse7
-     movzx eax,[hd_base]
+     	movzx eax,[hd_base]
-     mov  [esp+36],eax
+     	mov  [esp+32],eax
+     	ret
-     ret
+ngsyse7:
-ngsyse7:
+;     cmp  eax,8
-     cmp  eax,8
+	dec	ebx
-     jnz  ngsyse8
+     	jnz  ngsyse8
-     mov eax,[fat32part]
+     	mov eax,[fat32part]
-     mov  [esp+36],eax
+     	mov  [esp+32],eax
+     	ret
-     ret
+ngsyse8:
-ngsyse8:
+;     cmp  eax,9
-     cmp  eax,9
+	dec	ebx
-     jne  ngsyse9
+     	jnz  ngsyse9
-     mov  eax,[timer_ticks] ;[0xfdf0]
+     	mov  eax,[timer_ticks] ;[0xfdf0]
-     mov  [esp+36],eax
+     	mov  [esp+32],eax
+     	ret
-     ret
+ngsyse9:
-ngsyse9:
+;     cmp  eax,11
-     cmp  eax,11
+	sub	ebx,2
-     jnz  ngsyse11
+     	jnz  ngsyse11
-     mov eax,[lba_read_enabled]
+     	mov eax,[lba_read_enabled]
-     mov  [esp+36],eax
+     	mov  [esp+32],eax
+     	ret
-     ret
+ngsyse11:
-ngsyse11:
+;     cmp  eax,12
-     cmp  eax,12
+	dec	ebx
-     jnz  ngsyse12
+     	jnz  ngsyse12
-     mov eax,[pci_access_enabled]
+     	mov eax,[pci_access_enabled]
-     mov  [esp+36],eax
+     	mov  [esp+32],eax
-     ret
+     	ret
+ngsyse12:
-ngsyse12:
+     	mov  [esp+32],dword 1
-     mov  [esp+36],dword 1
+     	ret
      ret
            jne   @f
            mov   ax,[MOUSE_SCROLL_H]
            shl   eax,16
            mov   ax,[MOUSE_SCROLL_V]
            mov   [esp+36],eax
-           mov   [MOUSE_SCROLL_H],word 0
+           and   [MOUSE_SCROLL_H],word 0
-           mov   [MOUSE_SCROLL_V],word 0
+           and   [MOUSE_SCROLL_V],word 0
            ret
        @@:
-           mov  [esp+36],dword 0
+           and  [esp+36],dword 0
-           ret
+;           ret
 msset:
            ret
 app_load_cursor:
    out  dx,al
    pop  edx
    ret
+align 4
+sys_midi:
+	cmp  [mididp],0
+	jnz  sm0
+	mov  [esp+36],dword 1
+	ret
+sm0:
+	and  [esp+36],dword 0
 	dec  ebx
-setuart:
+	jnz  smn1
+ ;    call setuart
- su1:
+su1:
-   call is_output
+	call is_output
-   cmp  al,0
+	test al,al
-   jnz  su1
+	jnz  su1
-   mov  dx,word [midisp]
+	mov  dx,word [midisp]
-   mov  al,0xff
+	mov  al,0xff
-   out  dx,al
+	out  dx,al
- su2:
+su2:
-   mov  dx,word [midisp]
+	mov  dx,word [midisp]
-   mov  al,0xff
+	mov  al,0xff
-   out  dx,al
+	out  dx,al
-   call is_input
+	call is_input
-   cmp  al,0
+	test al,al
-   jnz  su2
+	jnz  su2
-   call get_mpu_in
+	call get_mpu_in
-   cmp  al,0xfe
+	cmp  al,0xfe
-   jnz  su2
+	jnz  su2
- su3:
+su3:
-   call is_output
+	call is_output
-   cmp  al,0
+	test  al,al
-   jnz  su3
+	jnz  su3
-   mov  dx,word [midisp]
-   mov  al,0x3f
-   out  dx,al
-   ret
-align 4
-sys_midi:
-     cmp  [mididp],0
-     jnz  sm0
-     mov  [esp+36],dword 1
-     ret
-   sm0:
-     cmp  eax,1
-     mov  [esp+36],dword 0
+	mov  dx,word [midisp]
-     jnz  smn1
+	mov  al,0x3f
-     call setuart
-     ret
+	out  dx,al
-   smn1:
+	ret
 smn1:
-     cmp  eax,2
+	dec  ebx
-     jnz  smn2
+	jnz  smn2
-   sm10:
+sm10:
-     call get_mpu_in
+	call get_mpu_in
-     call is_output
+	call is_output
-     test al,al
+	test al,al
-     jnz  sm10
-     mov  al,bl
+	jnz  sm10
-     call put_mpu_out
-     ret
+	mov  al,bl
-   smn2:
 	call put_mpu_out
-     ret
+	smn2:
 	ret
 detect_devices:
 ;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ;include 'detect/commouse.inc'
 ;include 'detect/ps2mouse.inc'
 ;include 'detect/dev_fd.inc'
-;include 'detect/dev_hdcd.inc'
-;include 'detect/sear_par.inc'
+;include 'detect/dev_hdcd.inc'
-;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+;include 'detect/sear_par.inc'
-    ret
+;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     ret
 nosb7:
     ret
 force_redraw_background:
-    mov   [draw_data+32 + RECT.left],dword 0
+    and   [draw_data+32 + RECT.left],dword 0
-    mov   [draw_data+32 + RECT.top],dword 0
+    and   [draw_data+32 + RECT.top],dword 0
     push  eax ebx
     mov   eax,[Screen_Max_X]
     mov   ebx,[Screen_Max_Y]
         pop   edx
         pop   ecx
-        ret
+        ret
 align 16	;very often call this subrutine
 memmove:       ; memory move in bytes
 ; eax = from
 ; ebx = to
-; ecx = no of bytes
-    test ecx, ecx
+; ecx = no of bytes
-    jle  .ret
+    test ecx, ecx
     jle  .ret
      mov   eax,[BytesPerScanLine]
      mov   [esp+36],eax
      ret
    no_gs3:
-     mov  [esp+36],dword -1
+     or  [esp+36],dword -1
      ret

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 1275 → 1276