From 8d83c4684de9eb18242cc62883d1d7ef48e8ae76 Mon Sep 17 00:00:00 2001
From: Rus <Rus@kolibrios.org>
Date: Sat, 1 Mar 2008 11:43:09 +0000
Subject: [PATCH] Deleted cross order of registers in functions 44, 45. Some
 optimizations of them.

git-svn-id: svn://kolibrios.org@765 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/core/syscall.inc | 10 ++---
 kernel/trunk/kernel.asm       | 78 +++++++++++++++++------------------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/kernel/trunk/core/syscall.inc b/kernel/trunk/core/syscall.inc
index 8ae056bdea..7430d5841e 100644
--- a/kernel/trunk/core/syscall.inc
+++ b/kernel/trunk/core/syscall.inc
@@ -145,10 +145,10 @@ iglobal
       dd sys_getbackground	 ; 39-GetBackgroundSize,ReadBgrData,.
       dd 0
       dd 0
-      dd 0	     ; 42-ReadIrqData
+      dd 0
       dd sys_outport		 ; 43-SendDeviceData
-      dd sys_programirq 	 ; 44-ProgramIrqs
-      dd reserve_free_irq	 ; 45-ReserveIrq and FreeIrq
+      dd 0
+      dd 0
       dd syscall_reserveportarea ; 46-ReservePortArea and FreePortArea
       dd display_number 	 ; 47-WriteNum
       dd display_settings	 ; 48-SetRedrawType and SetButtonType
@@ -227,8 +227,8 @@ iglobal
       dd syscall_getirqowner	 ; 41-GetIrqOwner
       dd get_irq_data		 ; 42-ReadIrqData
       dd cross_order		 ; 43-SendDeviceData
-      dd cross_order		 ; 44-ProgramIrqs
-      dd cross_order		 ; 45-ReserveIrq and FreeIrq
+      dd sys_programirq 	 ; 44-ProgramIrqs
+      dd reserve_free_irq	 ; 45-ReserveIrq and FreeIrq
       dd cross_order		 ; 46-ReservePortArea and FreePortArea
       dd cross_order		 ; 47-WriteNum
       dd cross_order		 ; 48-SetRedrawType and SetButtonType
diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm
index a9bd7b8cdd..5c7042fb4e 100644
--- a/kernel/trunk/kernel.asm
+++ b/kernel/trunk/kernel.asm
@@ -3888,28 +3888,29 @@ align 4
 
 sys_programirq:
 
-    mov   edi,[TASK_BASE]
-    add   eax,[edi+TASKDATA.mem_start]
+    mov   eax, [TASK_BASE]
+    add   ebx, [eax + TASKDATA.mem_start]
 
-    cmp   ebx,16
+    cmp   ecx, 16
     jae   .not_owner
-    mov   edi,[TASK_BASE]
-    mov   edi,[edi+TASKDATA.pid]
-    cmp   edi,[irq_owner+ebx*4]
-    je	  spril1
+    mov   edi, [eax + TASKDATA.pid]
+    cmp   edi, [irq_owner + 4 * ecx]
+    je	  .spril1
 .not_owner:
-    mov   [esp+36],dword 1
-    ret
-  spril1:
+    xor   ecx, ecx
+    jmp   .end
+  .spril1:
+
+    shl   ecx, 6
+    mov   esi, ebx
+    lea   edi, [irq00read + ecx]
+    push  16
+    pop   ecx
 
-    mov   esi,eax
-    shl   ebx,6
-    add   ebx,irq00read
-    mov   edi,ebx
-    mov   ecx,16
     cld
     rep   movsd
-    mov   [esp+36],dword 0
+  .end:
+    mov   [esp+32], ecx
     ret
 
 
@@ -4173,35 +4174,34 @@ free_port_area:
 
 reserve_free_irq:
 
-     mov   ecx, 1
-     cmp   ebx, 16
-     jae   fril1
-     test  eax,eax
-     jz    reserve_irq
+     xor   esi, esi
+     inc   esi
+     cmp   ecx, 16
+     jae   ril1
 
-     lea   edi,[irq_owner+ebx*4]
-     mov   edx,[edi]
-     mov   eax,[TASK_BASE]
-     cmp   edx,[eax+TASKDATA.pid]
-     jne   fril1
-     dec   ecx
-     mov   [edi],ecx
-   fril1:
-     mov   [esp+36],ecx ; return in eax
-     ret
+     lea   ecx, [irq_owner + 4 * ecx]
+     mov   edx, [ecx]
+     mov   eax, [TASK_BASE]
+     mov   edi, [eax + TASKDATA.pid]
+     dec   ebx
+     jnz   reserve_irq
+
+     cmp   edx, edi
+     jne   ril1
+     dec   esi
+     mov   [ecx], esi
+
+     jmp   ril1
 
   reserve_irq:
 
-     lea   edi,[irq_owner+ebx*4]
-     cmp   dword [edi], 0
-     jnz   ril1
+     cmp   dword [ecx], 0
+     jne   ril1
 
-     mov   edx,[TASK_BASE]
-     mov   edx,[edx+TASKDATA.pid]
-     mov   [edi],edx
-     dec   ecx
+     mov   [ecx], edi
+     dec   esi
    ril1:
-     mov   [esp+36],ecx ; return in eax
+     mov   [esp+32], esi ; return in eax
      ret
 
 drawbackground: