From f6a101596a44cc19cfa2939cfd4d00c7ddce6845 Mon Sep 17 00:00:00 2001
From: "Sergey Semyonov (Serge)" <ion2@mail.ru>
Date: Wed, 22 Jul 2015 15:07:12 +0000
Subject: [PATCH] kolibri-acpi: destroy_futex()

git-svn-id: svn://kolibrios.org@5597 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/branches/Kolibri-acpi/const.inc     |   9 +-
 kernel/branches/Kolibri-acpi/core/sync.inc | 105 ++++++++++++++-------
 2 files changed, 77 insertions(+), 37 deletions(-)

diff --git a/kernel/branches/Kolibri-acpi/const.inc b/kernel/branches/Kolibri-acpi/const.inc
index 252a85f571..331d527138 100644
--- a/kernel/branches/Kolibri-acpi/const.inc
+++ b/kernel/branches/Kolibri-acpi/const.inc
@@ -354,6 +354,10 @@ EVENT_EXTENDED     equ 0x00000400
 
 EV_INTR            equ 1
 
+STDIN_FILENO    equ 0
+STDOUT_FILENO   equ 1
+STDERR_FILENO   equ 2
+
 struct SYSCALL_STACK
         _eip            dd ?
         _edi            dd ?    ;  +4
@@ -399,8 +403,9 @@ struct  FUTEX
 ends
 
 FUTEX_INIT      equ 0
-FUTEX_WAIT      equ 1
-FUTEX_WAKE      equ 2
+FUTEX_DESTROY   equ 1
+FUTEX_WAIT      equ 2
+FUTEX_WAKE      equ 3
 
 struct  PROC
         list            LHEAD
diff --git a/kernel/branches/Kolibri-acpi/core/sync.inc b/kernel/branches/Kolibri-acpi/core/sync.inc
index 93cf9a9f68..cb87a2a923 100644
--- a/kernel/branches/Kolibri-acpi/core/sync.inc
+++ b/kernel/branches/Kolibri-acpi/core/sync.inc
@@ -28,20 +28,71 @@ create_futex:
 .fail:
         ret
 
+align 4
+;int __fastcall destroy_futex(struct futex *futex)
+destroy_futex:
+        push    esi
+        mov     esi, [current_process]
+        mov     edx, [ecx+FUTEX.handle]
+
+        pushfd
+        cli
+
+        lea     eax, [ecx+FUTEX.wait_list]
+        cmp     eax, [eax+LHEAD.next]
+        jne     .fail
+
+        mov     eax, [esi+PROC.ht_next]
+        mov     [esi+PROC.htab+edx*4], eax
+        mov     [esi+PROC.ht_next], edx
+        inc     [esi+PROC.ht_free]
+
+        popfd
+        pop     esi
+
+        mov     eax, ecx
+        call    free
+        xor     eax, eax
+        ret
+
+.fail:
+        popfd
+        pop     esi
+        mov     eax, -1
+        ret
+
+
 iglobal
 align 4
 f77call:
         dd f77.futex_init     ;0
-        dd f77.futex_wait     ;1
-        dd f77.futex_wake     ;2
+        dd f77.futex_destroy  ;1
+        dd f77.futex_wait     ;2
+        dd f77.futex_wake     ;3
 .end:
 endg
 
 align 4
 sys_synchronization:
 f77:
+        test    ebx, ebx
+        jz      .futex_init
+
         cmp     ebx, (f77call.end-f77call)/4
-        jae .fail
+        jae     .fail
+
+        cmp     ecx, STDERR_FILENO
+        jbe     .fail
+        cmp     ecx, (PROC.pdt_0 - PROC.htab)/4
+        jae     .fail
+
+        mov     esi, [current_process]
+        mov     edi, [esi+PROC.htab+ecx*4]
+
+        cmp     [edi+FUTEX.magic], 'FUTX'
+        jne     .fail
+        cmp     [edi+FUTEX.handle], ecx
+        jne     .fail
 
         jmp     dword [f77call+ebx*4]
 
@@ -49,7 +100,6 @@ f77:
         mov     [esp+SYSCALL_STACK._eax], -1
         ret
 
-
 align 4
 .futex_init:
         call    create_futex
@@ -60,25 +110,24 @@ align 4
         mov     [esp+SYSCALL_STACK._eax], eax
         ret
 
+
 align 4
 ;ecx futex handle
+;esi current process
+;edi futex object
+.futex_destroy:
+        mov     ecx, edi
+        call    destroy_futex
+        mov     [esp+SYSCALL_STACK._eax], eax
+        ret
+
+align 4
+;ecx futex handle
+;esi current process
+;edi futex object
 ;edx control value
 .futex_wait:
-        cmp     ecx, 3
-        jb      .epicfail
-        cmp     ecx, (PROC.pdt_0 - PROC.htab)/4
-        jae     .epicfail
-
-        mov     esi, [current_process]
-        mov     edi, [esi+PROC.htab+ecx*4]
-
-        cmp     [edi+FUTEX.magic], 'FUTX'
-        jne     .epicfail
-        cmp     [edi+FUTEX.handle], ecx
-        jne     .epicfail
-
         mov     ecx, [edi+FUTEX.pointer]
-
         mov     eax, edx
         lock cmpxchg [ecx], edx         ;wait until old_value == new_value
         jz .wait_slow
@@ -111,26 +160,12 @@ align 4
         mov     [esp+SYSCALL_STACK._eax], 0
         ret
 
-.epicfail:
-        mov     [esp+SYSCALL_STACK._eax], -1
-        ret
-
 align 4
 ;ecx futex handle
+;esi current process
+;edi futex object
 ;edx threads count
 .futex_wake:
-        cmp     ecx, 3
-        jb      .epicfail
-        cmp     ecx, (PROC.pdt_0 - PROC.htab)/4
-        jae     .epicfail
-
-        mov     esi, [current_process]
-        mov     edi, [esi+PROC.htab+ecx*4]
-
-        cmp     [edi+FUTEX.magic], 'FUTX'
-        jne     .epicfail
-        cmp     [edi+FUTEX.handle], ecx
-        jne     .epicfail
 
         xor     ecx, ecx
 
@@ -138,7 +173,7 @@ align 4
         cli
 
         lea     ebx, [edi+FUTEX.wait_list]
-        mov     esi, [edi+FUTEX.wait_list.next]
+        mov     esi, [ebx+LHEAD.next]
 @@:
         cmp     esi, ebx
         je      @F