kernel: fix sysfn 68.30 (unload driver)

- restore the SRV handle after DRV_EXIT (ecx is clobbered by the driver)
- restore esp via ebp: START may be cdecl or stdcall
- pass the SRV to free in eax, not on the stack
- check SRV.base before calling DRV_EXIT

data/Tupfile.lua

@@ -166,7 +166,6 @@ extra_files = {
  {"kolibrios/demos/rpento.lif", "common/demos/rpento.lif"},
  {"kolibrios/develop/fpc/", "common/develop/fpc/*"},
  {"kolibrios/develop/fpc/examples/", "../programs/develop/fp/examples/src/*"},
- {"kolibrios/develop/fasm/fasm.txt", SRC_PROGS .. "/develop/fasm/1.73/fasm.txt"},
  {"kolibrios/develop/oberon07/compiler.kex", SRC_PROGS .. "/develop/oberon07/Compiler.kex"},
  {"kolibrios/develop/oberon07/LICENSE", SRC_PROGS .. "/develop/oberon07/LICENSE"},
  {"kolibrios/develop/oberon07/doc/CC.txt", SRC_PROGS .. "/develop/oberon07/doc/CC.txt"},

data/ru_RU/docs/guide/guide.htm

@@ -20,13 +20,13 @@
 <a href="hardware_support.htm">Поддержка оборудования</a>
 
 <strong>Разработка</strong>
-<a href="/sys/docpack|d">Справочник по системным функциям Колибри</a>
-<a href="/sys/docpack|c">Использование отладчика</a>
-<a href="/kolibrios/develop/fasm/fasm.txt">Руководство FASM</a>
+<a href="/sys/docpack|f">Справочник по системным функциям Колибри</a>
+<a href="/sys/docpack|e">Использование отладчика</a>
+<a href="/sys/docpack|d">Руководство FASM</a>
 
 <strong>Использование библиотек</strong>
-<a href="/sys/docpack|g">Ini</a>
-<a href="/sys/docpack|h">Диалог открытия файла OpenDial</a>
+<a href="/sys/docpack|i">Ini</a>
+<a href="/sys/docpack|j">Диалог открытия файла OpenDial</a>
 
 <strong>Смотрите также</strong>
 Вики проекта <a href="http://wiki.kolibrios.org/">wiki.kolibrios.org</a>

kernel/trunk/core/memory.inc

@@ -1233,25 +1233,27 @@ f68:
         mov     eax, [ecx + SRV.entry]
         test    eax, eax
         jz      .fail
-        push    ecx    ;save handl
+        mov     eax, -2 ;error free RAM
+        cmp     [ecx + SRV.base], 0
+        je      .fail
 
+        push    ecx         ;save handl
+        mov     ebp, esp    ;START may be cdecl or stdcall
         push    edx         ;cmdline
         push    DRV_EXIT
-        call    eax   ;the result is not checked
-        lea     esp, [esp+8]
-        push    ecx
+        call    [ecx + SRV.entry]   ;the result is not checked
+        mov     esp, ebp
+        pop     esi
 
-        mov     ebx, [ecx + SRV.base]
-        mov     eax, -2 ;error free RAM
-        test    ebx, ebx
-        jz      .fail
-        stdcall kernel_free, ebx ;del driver
-
-        mov     eax, [ecx + SRV.fd]
-        mov     edx, [ecx + SRV.bk]
+        mov     eax, [esi + SRV.fd]
+        mov     edx, [esi + SRV.bk]
         mov     [edx + SRV.fd], eax
         mov     [eax + SRV.bk], edx
-        stdcall free, ecx
+        push    eax
+        stdcall kernel_free, [esi + SRV.base] ;del driver
+        mov     eax, esi
+        call    free        ;eax = mem
+        pop     eax
         ;dec     [count_services]
 
         mov     [esp + SYSCALL_STACK.eax], eax

programs/system/docpack/Tupfile.lua

@@ -15,6 +15,9 @@ then tup.append_table(deps,
 else tup.append_table(deps,
   tup.rule("../../../kernel/trunk/docs/sysfuncs.txt", cp_cmd, "SysFuncs.txt"))
 end
+tup.append_table(deps,
+  tup.rule("../../develop/fasm/1.73/fasm.txt", cp_cmd, "Fasm.txt")
+)
 tup.append_table(deps,
   tup.rule("../../../kernel/trunk/docs/stack.txt", cp_cmd, "Stack.txt")
 )

programs/system/docpack/docpack.asm

@@ -9,7 +9,7 @@
 ;---------------------------------------------------------------------
 
 FILE_COUNT=0
-DEF_FILE equ 'f'
+DEF_FILE equ 'g'
 
 macro embed_docdir_file fn
 {
@@ -197,17 +197,18 @@ embedded:
 
   embed_docdir_file 'Copying.txt'      ;a
   embed_docdir_file 'Hot_Keys.txt'     ;b
-  embed_docdir_file 'Mtdbg.txt'        ;c
+  embed_local_file 'Fasm.txt'          ;c
+  embed_docdir_file 'Mtdbg.txt'        ;d
 if lang eq ru_RU
-  embed_local_file  'SysFuncr.txt'     ;d
+  embed_local_file 'SysFuncr.txt'      ;e
 else ; Default to en_US
-  embed_local_file  'SysFuncs.txt'     ;d
+  embed_local_file 'SysFuncs.txt'      ;e
 end if
-  embed_local_file  'Stack.txt'        ;e
-  embed_docdir_file 'KFAR_Keys.txt'    ;f
-  embed_docdir_file 'INI.txt'          ;g
-  embed_docdir_file 'OpenDial.txt'     ;h
-  embed_docdir_file 'Credits.txt'      ;i
+  embed_local_file 'Stack.txt'         ;f
+  embed_docdir_file 'KFAR_Keys.txt'    ;g
+  embed_docdir_file 'INI.txt'          ;h
+  embed_docdir_file 'OpenDial.txt'     ;i
+  embed_docdir_file 'Credits.txt'      ;j
 ; -- End of embedding area  -------
 
   dd 0