WebSVN – Kolibri OS – Diff – /kernel/trunk/video/vesa12.inc

         ret
+vesa12_putimage:
+; ebx = pointer to image
+; ecx = size [x|y]
+; edx = coordinates [x|y]
 ; ebp = pointer to 'get' function
 ; esi = pointer to 'init' function
-vesa12_putimage:
+; edi = parameter for 'get' function
     mov   ecx,[0x3010]
     add   eax,[ecx-twdw+WDATA.box.left]
     add   ebx,[ecx-twdw+WDATA.box.top]
     push  eax
     mov   eax,ebx         ; y
-    mov   ebx,[0xfe08]
+    mul   dword [0xfe08]
-    mul   ebx
     pop   ecx
     add   eax,ecx         ; x
     add   eax,ecx
     add   eax,ecx
     cmp  [0xfbf1],byte 24     ; 24 or 32 bpp ? - x start
     add  eax,[0xfe80]
     mov  edi,eax
     ; x size
-    movzx eax,word [esp+6]
-    mov   ecx,eax
-    add   ecx,eax
-    add   ecx,eax
-    cmp   [0xfbf1],byte 24     ; 24 or 32 bpp ? - x size
-    jz    pi24312
-    add   ecx,eax
-  pi24312:
+    movzx ecx,word [esp+6]
-    mov   esi,[esp+8]
-    movzx ebx,word [esp+4]
+    mov   esi,[esp+8]
     movzx ebx,word [esp+4]
-    ; check limits while draw ?
-    push  eax
+    ; check limits while draw ?
-    push  ecx
-    mov  eax,[0x3010]
-    mov  ecx,[eax+draw_data-0x3000+RECT.left]
+    push  ecx
-    cmp  ecx,0
+    mov  eax,[0x3010]
-    jnz  dbcblimitlset212
+    cmp  dword [eax+draw_data-0x3000+RECT.left], 0
-    mov  ecx,[eax+draw_data-0x3000+RECT.top]
+    jnz  dbcblimitlset212
-    cmp  ecx,0
+    cmp  dword [eax+draw_data-0x3000+RECT.top], 0
     jnz  dbcblimitlset212
     mov  ecx,[eax+draw_data-0x3000+RECT.right]
     cmp  ecx,[0xfe00]
-    jnz  dbcblimitlset212
-    mov  ecx,[eax+draw_data-0x3000+RECT.bottom]
+    jnz  dbcblimitlset212
-    cmp  ecx,[0xfe04]
+    mov  ecx,[eax+draw_data-0x3000+RECT.bottom]
-    jnz  dbcblimitlset212
+    cmp  ecx,[0xfe04]
-    pop  ecx
+    jnz  dbcblimitlset212
-    pop  eax
-    push dword 0
+    pop  ecx
-    jmp  dbcblimitlno212
+    push 0
     jmp  dbcblimitlno212
-  dbcblimitlset212:
-    pop  ecx
+  dbcblimitlset212:
-    pop  eax
-    push dword 1
-  dbcblimitlno212:
-    cmp  [0xfbf1],byte 24     ; 24 or 32 bpp ?
-    jz   pi24bit12
-    jmp  pi32bit12
-  pi24bit12:
-    cld
-    push  eax
     push  ebx
-    push  edx
+    pop  ecx
-    xor   edx,edx
-    mov   eax,ecx
+    push 1
     mov   ebx,3
-    div   ebx
-    mov   ecx,eax
+  dbcblimitlno212:
-    pop   edx
-    pop   ebx
+    cmp  [0xfbf1],byte 24     ; 24 or 32 bpp ?
-    pop   eax
+    jnz  pi32bit12
-  newpi12:
+  pi24bit12:
-    push edi
+  newpi12:
-    push esi
-    push ecx
+    push edi
-    push ebx
+    push ecx
+    push ebx
+      mov  edx,edi
-      xor  edx,edx
+      sub  edx,[0xfe80]
-      mov  eax,edi
+      mov  ebx,3
-      sub  eax,[0xfe80]
+      div  ebx
-      mov  ebx,3
+      add  edx,WinMapAddress
-      div  ebx
-      add  eax,WinMapAddress
+      mov  ebx,[0x3000]
+      mov  bh,[esp+4*3]
       mov  ebx,[0x3000]
-      mov  bh,[esp+4*4]
+      np2412:
-      np2412:
+        cmp  bl,[edx]
+        jnz  imp24no12
 ;        mov  eax,[esi]
-        cmp  bl,[eax]
+        push    dword [esp+4*3+20]
-        jnz  imp24no12
+        call    ebp
-        mov  edx,[esi]
+;        cmp  bh,0
-        cmp  bh,0
+;        jz   imp24yes12
-        jz   imp24yes12
 ;        call dbcplimit
-;        jnz  imp24no12
 ;        jnz  imp24no12
-     imp24yes12:
+     imp24yes12:
         push eax
         push edi
-        mov  eax,edi
+        push eax
-        sub  eax,[0xfe80]
+        mov  eax,edi
-        shr  eax,16
+        sub  eax,[0xfe80]
-        call set_bank
+        shr  eax,16
-        and  edi,0xffff
-        add  edi,0xa0000
+        call set_bank
-        mov  [edi],edx
+        pop  eax
-        shr  edx,2
-        mov  [edi+2],dl
-        sti
-        pop  edi
-        pop  eax
+        and  edi,0xffff
-     imp24no12:
+        add  edi,0xa0000
         mov  [edi],ax
-        inc  eax
+        shr  eax,16
-        add  esi,3
+        mov  [edi+2],al
-        add  edi,3
+        pop  edi
         dec  ecx
-        jnz  np2412
-      np24d12:
      imp24no12:
      pop  ebx
-     pop  ecx
-     pop  esi
+        inc  edx
-     pop  edi
+;        add  esi,3
+        add  edi,3
-    add  edi,[0xfe08]
+        dec  ecx
-    xor  eax,eax
+        jnz  np2412
-    mov  ax,[esp+4+2+4]
-    lea  eax,[eax+eax*2]
+      np24d12:
-    add  esi,eax
-    dec  ebx
+     pop  ebx
-    jz   nonewpi12
+     pop  ecx
-    jmp  newpi12
+     pop  edi
+    add  edi,[0xfe08]
+    dec  ebx
-  nonewpi12:
+    jnz  newpi12
-    add  esp,7*4
+  nonewpi12:
     mov  eax,0
-    ret
+        pop     eax edx ecx ebx eax edi esi
         xor     eax, eax
+        ret
   pi32bit12:
-    cld
+  pi32bit12:
     shr  ecx,2
+   newpi3212:
-   newpi3212:
+    push edi
-    push edi
-    push esi
+    push ecx
-    push ecx
     push ebx
-      mov  eax,edi
+      mov  edx,edi
-      sub  eax,[0xfe80]
+      sub  edx,[0xfe80]
-      shr  eax,2
+      shr  edx,2
-      add  eax,WinMapAddress
+      add  edx,WinMapAddress
       mov   ebx,[0x3000]
-      mov   bh,[esp+4*4]
+      mov   bh,[esp+4*3]
-      np3212:
       np3212:
         cmp  bl,[eax]
-        jnz  imp32no12
-        mov  edx,[esi]
-        cmp  bh,0
-        jz   imp32yes12
+        cmp  bl,[edx]
-;        call dbcplimit
-;        jnz  imp32no12
+        jnz  imp32no12
 ;        mov  eax,[esi]
-      imp32yes12:
+        push    dword [esp+4*3+20]
+        call    ebp
-        push eax
+;        cmp  bh,0
-        push edi
+;        jz   imp32yes12

Subversion Repositories Kolibri OS

(root)/kernel/trunk/video/vesa12.inc – Rev 115 → 283