add strpbrk to EXPORTS

видимо в экспорт забыли добавить
2026-01-10 17:06:40 +00:00
10 changed files with 71 additions and 311 deletions
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -722,7 +722,6 @@ tup.append_table(img_files, {
 {"SHELL", VAR_PROGS .. "/system/shell/shell"},
 {"GAMES/DINO", VAR_PROGS .. "/games/dino/dino"},
 {"GAMES/FLPYBIRD", VAR_PROGS .. "/games/flpybird/flpybird"},
- {"LIB/LIBC.OBJ", VAR_PROGS .. "/develop/ktcc/trunk/libc.obj/source/libc.obj"},
 })
 tup.append_table(extra_files, {
 {"kolibrios/utils/thashview", VAR_PROGS .. "/other/TinyHashView/thashview"},
@@ -746,6 +745,7 @@ if tup.getconfig('NO_GCC') ~= 'full' then
 tup.append_table(img_files, {
 {"GAMES/REVERSI", VAR_PROGS .. "/games/reversi/reversi"},
 {"LIB/BASE64.OBJ", VAR_PROGS .. "/develop/libraries/base64/base64.obj"},
+ {"LIB/LIBC.OBJ", VAR_PROGS .. "/develop/ktcc/trunk/libc.obj/source/libc.obj"},
 {"LIB/ICONV.OBJ", VAR_PROGS .. "/develop/libraries/iconv/iconv.obj"},
 -- {"LIB/MTAR.OBJ", VAR_PROGS .. "/develop/libraries/microtar/mtar.obj"},
 })
--- a/programs/develop/cedit/SHORTCUT.TXT
+++ b/programs/develop/cedit/SHORTCUT.TXT
@@ -47,9 +47,3 @@
  перемещение по тексту:
  (ctrl+)Home, (ctrl+)End, (ctrl+)PageUp, (ctrl+)PageDown
  ctrl+Left, ctrl+Right
-
-  перемещение в панели поиска:
-  Tab         к следующему полю ввода
-  Shift-Tab   к предыдущему полю ввода
-  Enter       поиск следующего вхождения
-
--- a/programs/develop/cedit/SRC/CEdit.ob07
+++ b/programs/develop/cedit/SRC/CEdit.ob07
@@ -28,7 +28,7 @@ IMPORT
    RW, Ini, EB := EditBox, Tabs, Toolbar, SB := StatusBar;

 CONST
-    HEADER = "CEdit (11-jan-2026)";
+    HEADER = "CEdit (30-apr-2025)";

    ShellFilter = "";
    EditFilter = "sh|inc|txt|asm|ob07|c|cpp|h|pas|pp|lua|ini|json";
@@ -1750,15 +1750,7 @@ BEGIN
        ELSE
            IF EditBox_Focus(FindEdit) THEN
            	IF keyCode = 15 THEN (* Tab *)
-                    IF shift THEN
-            		    SetFocus(GotoEdit, TRUE)
-                    ELSE
-                        SetFocus(ReplaceEdit, TRUE)
-                    END
-                ELSIF keyCode = 28 THEN (* Enter *)    
-                    IF searchOpened & (searchText # "") THEN
-                        notFound := ~T.findNext(text, BKW.value)
-                    END
+            		SetFocus(ReplaceEdit, TRUE)
            	ELSE
 	                EB.key(FindEdit, key);
 	                EditBox_Get(FindEdit, new_searchText);
@@ -1769,26 +1761,14 @@ BEGIN
                END
            ELSIF EditBox_Focus(ReplaceEdit) THEN
            	IF keyCode = 15 THEN (* Tab *)
-                    IF shift THEN
-                        SetFocus(FindEdit, TRUE)
-                    ELSE
-                        SetFocus(GotoEdit, TRUE)
-                    END
-                ELSIF keyCode = 28 THEN (* Enter *)    
-                    IF searchOpened & (searchText # "") THEN
-                        notFound := ~T.findNext(text, BKW.value)
-                    END
+            		SetFocus(GotoEdit, TRUE)
            	ELSE
                	EB.key(ReplaceEdit, key);
                	EditBox_Get(ReplaceEdit, replaceText)
                END
            ELSIF EditBox_Focus(GotoEdit) THEN
            	IF keyCode = 15 THEN (* Tab *)
-                    IF shift THEN
-                        SetFocus(ReplaceEdit, TRUE)
-                    ELSE
-                        SetFocus(FindEdit, TRUE)
-                    END
+            		SetFocus(FindEdit, TRUE)
            	ELSE
 	                IF (key DIV 256) MOD 256 = 13 THEN
 	                    goto
--- a/programs/develop/ktcc/trunk/libc.obj/.gitignore
+++ b/programs/develop/ktcc/trunk/libc.obj/.gitignore
@@ -1,4 +0,0 @@
-.tup
-*.o
-*.obj
-*.kex
--- a/programs/develop/ktcc/trunk/libc.obj/lib/crt0.o
+++ b/programs/develop/ktcc/trunk/libc.obj/lib/crt0.o
--- a/programs/develop/ktcc/trunk/libc.obj/source/Tupfile.lua
+++ b/programs/develop/ktcc/trunk/libc.obj/source/Tupfile.lua
@@ -32,15 +32,11 @@ GAS_SRC = {
    "string/memmove.s"
 }

-FASM_SRC = {
-    "crt/crt0.asm",
-}
-
 OBJS = {"libc.c"}

-tup.append_table(OBJS, tup.foreach_rule(GAS_SRC, "as --32 %f -o %o", "%B.o"))
+tup.append_table(OBJS,
+  tup.foreach_rule(GAS_SRC, "as --32 %f -o %o", "%B.o")
+)

-tup.rule(OBJS, "kos32-tcc" .. CFLAGS .. INCLUDES .. " %f -o %o " .. " && strip %o --strip-unneeded ", "libc.o")
+tup.rule(OBJS, "kos32-tcc" .. CFLAGS .. INCLUDES .. " %f -o %o " .. " && strip %o --strip-unneeded " , "libc.o")
 tup.rule("libc.o", "objconv -fcoff32 %f %o " .. tup.getconfig("KPACK_CMD"), "%B.obj")
-
-tup.rule(FASM_SRC, "fasm %f %o", "%B.o")
--- a/programs/develop/mtdbg/gui.inc
+++ b/programs/develop/mtdbg/gui.inc
@@ -122,13 +122,7 @@ struc fpcvt
  .sizeof:
 }

-;-----------------------------------------------------------------------------
-;                         Command flags

-CMD_WITHOUT_PARAM       = 1b    ; command may be called without parameters
-CMD_WITH_PARAM          = 10b   ; command may be called with parameters
-CMD_WITHOUT_LOADED_APP  = 100b  ; command may be called without loaded program
-CMD_WITH_LOADED_APP     = 1000b ; command may be called with loaded program

 ;-----------------------------------------------------------------------------
 ;                          Entry point
@@ -455,56 +449,63 @@ z1:
        mov     esi, commands
        call    find_cmd
        mov     eax, aUnknownCommand
-        jc      .cmd_procg
+        jc      .x11
+
+        ; check command requirements
+        ; flags field:
+        ; &1: command may be called without parameters
+        ; &2: command may be called with parameters
+        ; &4: command may be called without loaded program
+        ; &8: command may be called with loaded program
        mov     eax, [esi+8]
        mov     ecx, [curarg]
        cmp     byte [ecx], 0
        jz      .noargs
-        test    byte [esi+16], CMD_WITH_PARAM
-        jz      .cmd_procg
+        test    byte [esi+16], 2
+        jz      .x11
        jmp     @f

    .noargs:
-        test    byte [esi+16], CMD_WITHOUT_PARAM
-        jz      .cmd_procg
+        test    byte [esi+16], 1
+        jz      .x11

    @@:
        cmp     [debuggee_pid], 0
        jz      .nodebuggee
        mov     eax, aAlreadyLoaded
-        test    byte [esi+16], CMD_WITH_LOADED_APP
-        jz      .cmd_procg
-        jmp     .run_cmd
+        test    byte [esi+16], 8
+        jz      .x11
+        jmp     .x9

    .nodebuggee:
        mov     eax, need_debuggee
-        test    byte [esi+16], CMD_WITHOUT_LOADED_APP
-        jnz     .run_cmd
+        test    byte [esi+16], 4
+        jnz     .x9

-    .cmd_procg:
+    .x11:
        xchg    esi, eax
        call    put_message

        ; store cmdline for repeating
-    .cmd_procg_no_put_msg:
+    .x10:
        mov     esi, cmdline
        mov     ecx, [cmdline_len]

    @@:
        cmp     ecx, 0
-        jle     .wait_event
+        jle     .we
        mov     al, [esi + ecx]
        mov     [cmdline_prev + ecx], al
        dec     ecx
        jmp     @b

-    .wait_event:
+    .we:
        mov     [cmdline_len], 0
        jmp     waitevent

-    .run_cmd:
+    .x9:
        call    dword [esi+4]
-        jmp     .cmd_procg_no_put_msg
+        jmp     .x10

 ;-----------------------------------------------------------------------------
 ;                            Cmdline handling
--- a/programs/develop/mtdbg/mtdbg.asm
+++ b/programs/develop/mtdbg/mtdbg.asm
@@ -2,10 +2,7 @@
 COLOR_THEME fix MOVIEOS

 format binary as ""
-
 include '../../macros.inc'
-include '../../KOSfuncs.inc'
-
 use32
        db      'MENUET01'
        dd      1
@@ -1148,105 +1145,6 @@ OnDump:
    .ret:
        ret

-;-----------------------------------------------------------------------------
-;                            Print Backtrace
-
-struct STACK_FRAME
-        prev_frame      rd 1
-        ret_addr        rd 1
-ends
-
-OnBacktrace:
-        push    ebp
-
-        ; Set max depth counter
-        xor     eax, eax
-        dec     eax
-
-        mov     esi, [curarg]
-        cmp     byte [esi], 0
-        jz      .save_depth
-
-        call    get_hex_number
-        mov     esi, aParseError
-        jc      .exit
-
-        ; If depth 0
-        test    eax, eax
-        jz      .done
-
-    .save_depth:
-        mov     [bt_depth], eax
-
-        ; Get start frame addres
-        mov     ebp, [_ebp]
-        test    ebp, ebp
-        jz      .done
-
-        mov     edi, stack_frame_dump
-
-    .next:
-        mcall   SF_DEBUG, SSF_READ_MEMORY, [debuggee_pid], sizeof.STACK_FRAME, ebp
-        cmp     eax, -1
-        mov     esi, read_mem_err
-        jz      .exit
-
-        ; The address of the previous frame must be less than the current one
-        mov     eax, [edi + STACK_FRAME.prev_frame]
-        test    eax, eax
-        jz      .done
-
-        ; Save stack_frame_dump
-        push    edi
-        ; Save previous frame
-        push    ebp
-        ; Save return address
-        mov     eax, [edi + STACK_FRAME.ret_addr]
-        push    eax
-
-        ; Print frame address and return address
-        push    eax         ; pop in put_message_nodraw
-        push    ebp         ; pop in put_message_nodraw
-        mov     esi, aBacktraceFmt
-        call    put_message_nodraw
-
-        ; Restore return address
-        pop     eax
-
-        ; Find symbol by return address
-        call    find_near_symbol
-        test    esi, esi
-        jnz     .print_sym
-
-        mov     esi, aBacktraceSymStub
-
-    .print_sym:
-        call    put_message_nodraw
-        mov     esi, newline
-        call    put_message_nodraw
-
-        ; Restore previous frame
-        pop     ebp
-        ; Restore stack_frame_dump
-        pop     edi
-
-        ; The address of the previous frame must be greater than the current one.
-        cmp     [edi + STACK_FRAME.prev_frame], ebp
-        jna     .done
-
-        ; Set previous frame
-        mov     ebp,  [edi + STACK_FRAME.prev_frame]
-        dec     [bt_depth]
-        jnz     .next
-
-    .done:
-        mov     esi, newline
-
-    .exit:
-        call    put_message
-        pop     ebp
-        ret
-
 ;-----------------------------------------------------------------------------
 ;                   Dissassemble block of executable event

@@ -1966,7 +1864,7 @@ include 'disasm.inc'

 caption_str db  'Kolibri Debugger',0

-begin_str db    'Kolibri Debugger, version 0.36',10
+begin_str db    'Kolibri Debugger, version 0.35',10
        db      'Hint: type "help" for help, "quit" to quit'
 newline db      10,0
 prompt  db      '> ',0
@@ -1982,88 +1880,66 @@ help_groups:
 ;-----------------------------------------------------------------------------
 ;                   Commands format definitions

+; TODO: make it with macros
+
+; flags field:
+; &1: command may be called without parameters
+; &2: command may be called with parameters
+; &4: command may be called without loaded program
+; &8: command may be called with loaded program
 commands:
        dd      _aH, OnHelp, HelpSyntax, HelpHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITHOUT_LOADED_APP or CMD_WITH_LOADED_APP
-
+        db      0Fh
        dd      aHelp, OnHelp, HelpSyntax, HelpHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITHOUT_LOADED_APP or CMD_WITH_LOADED_APP
-
+        db      0Fh
        dd      aQuit, OnQuit, QuitSyntax, QuitHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITHOUT_LOADED_APP or CMD_WITH_LOADED_APP
-
+        db      0Dh
        dd      aLoad, OnLoad, LoadSyntax, LoadHelp
-        db      CMD_WITH_PARAM or CMD_WITHOUT_LOADED_APP
-    
+        db      6
        dd      aReload, OnReload, ReloadSyntax, ReloadHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITHOUT_LOADED_APP or CMD_WITH_LOADED_APP
-
+        db      0Dh
        dd      aTerminate, OnTerminate, TerminateSyntax, TerminateHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_LOADED_APP
-
+        db      9
        dd      aDetach, OnDetach, DetachSyntax, DetachHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_LOADED_APP
-
+        db      9
        dd      aSuspend, OnSuspend, SuspendSyntax, SuspendHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_LOADED_APP
-
+        db      9
        dd      aResume, OnResume, ResumeSyntax, ResumeHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Bh
        dd      aStep, OnStepMultiple, StepSyntax, StepHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-    
+        db      0Bh
        dd      aProceed, OnProceedMultiple, ProceedSyntax, ProceedHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Bh
        dd      aCalc, OnCalc, CalcSyntax, CalcHelp
-        db      CMD_WITH_PARAM or CMD_WITHOUT_LOADED_APP or CMD_WITH_LOADED_APP
-
+        db      0Eh
        dd      aDump, OnDump, DumpSyntax, DumpHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
-        dd      aBacktrace, OnBacktrace, BacktraceSyntax, BacktraceHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Bh
        dd      aUnassemble, OnUnassemble, UnassembleSyntax, UnassembleHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Bh
        dd      aBp, OnBp, BpSyntax, BpHelp
-        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Ah
        dd      aBpm, OnBpmb, BpmSyntax, BpmHelp
-        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Ah
        dd      aBpmb, OnBpmb, BpmSyntax, BpmHelp
-        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Ah
        dd      aBpmw, OnBpmw, BpmSyntax, BpmHelp
-        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Ah
        dd      aBpmd, OnBpmd, BpmSyntax, BpmHelp
-        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Ah
        dd      aBl, OnBl, BlSyntax, BlHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Bh
        dd      aBc, OnBc, BcSyntax, BcHelp
-        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Ah
        dd      aBd, OnBd, BdSyntax, BdHelp
-        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Ah
        dd      aBe, OnBe, BeSyntax, BeHelp
-        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Ah
        dd      aReg, OnReg, RSyntax, RHelp
-        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Ah
        dd      aUnpack, OnUnpack, UnpackSyntax, UnpackHelp
-        db      CMD_WITHOUT_PARAM or CMD_WITH_LOADED_APP
-
+        db      9
        dd      aLoadSymbols, OnLoadSymbols, LoadSymbolsSyntax, LoadSymbolsHelp
-        db      CMD_WITH_PARAM or CMD_WITH_LOADED_APP
-
+        db      0Ah
        dd      0

 ;-----------------------------------------------------------------------------
@@ -2104,8 +1980,7 @@ help_data_msg db        'List of data commands:',10
        db      'd [<expression>]     - dump data at given address',10
        db      'u [<expression>]     - unassemble instructions at given address',10
        db      'r <register> <expression> or',10
-        db      'r <register>=<expression> - set register value',10
-        db      'bt [<number>]        - display backtrace / stacktrace',10,0
+        db      'r <register>=<expression> - set register value',10,0

 ;               Breakpoints commands group

@@ -2163,11 +2038,6 @@ DumpHelp db     'Dump data of debugged program',10
 DumpSyntax db   'Usage: d <expression> - dump data at specified address',10
        db      '   or: d              - continue current dump',10,0

-aBacktrace      db  3,'bt',0
-BacktraceHelp   db 'Display backtrace / stacktrace',10
-BacktraceSyntax db 'Usage: bt <number> - display backtrace with depth',10
-                db '   or: bt            display all backtrace',10,0
-
 aCalc   db      2,'?',0
 CalcHelp db     'Calculate value of expression',10
 CalcSyntax db   'Usage: ? <expression>',10,0
@@ -2232,11 +2102,6 @@ LoadSymbolsSyntax db 'Usage: load-symbols <symbols-file-name>',10,0

 aUnknownCommand db 'Unknown command',10,0

-;-----------------------------------------------------------------------------
-;                             Info messages
-aBacktraceSymStub  db '??',0
-aBacktraceFmt      db '[0x%8X] 0x%8X in ',0
-
 ;-----------------------------------------------------------------------------
 ;                             Error messages

@@ -2609,13 +2474,11 @@ disasm_cur_pos          dd ?
 disasm_cur_str          dd ?
 disasm_string           rb 256

-stack_frame_dump        rb sizeof.STACK_FRAME
-bt_depth                rd 1
+thread_info             process_information

 ;-----------------------------------------------------------------------------
 ;                  Coordinates and sizes for GUI

-thread_info             process_information
 data_x_size_dd          dd ?, ?
 messages_x_size_dd      dd ?, ?
 registers_x_pos_dd      dd ?, ?
--- a/programs/develop/mtdbg/symbols.inc
+++ b/programs/develop/mtdbg/symbols.inc
@@ -4,11 +4,6 @@

 include 'sort.inc'

-struct DEBUG_SYMBOL
-        addr    rd 1
-        string  rd 0
-ends
-
 ; compare proc for sorter
 compare:
        cmpsd
@@ -464,69 +459,4 @@ find_symbol_name:

  @@:
        pop     esi
-        ret
-
-;-----------------------------------------------------------------------------
-;   
-; Find the nearest symol using binary search
-;
-; in:  eax - target addres
-; out: esi - symbol name
-; destroys: ebx, ecx, edx, edi, ebp
-;
-find_near_symbol:
-        mov     edi, [symbols] 
-        
-        xor     esi, esi            ; Result
-        mov     ecx, esi            ; Left
-        mov     edx, [num_symbols]  ; Right
-        dec     edx
-        js      .end       
-
-        ; If the first address is already greater than the target
-        mov     ebp, [edi + ecx * sizeof.DEBUG_SYMBOL]
-        cmp     [ebp + DEBUG_SYMBOL.addr], eax
-        ja      .end
-
-        ; If the last address is less than or equal to the target
-        mov     ebp, [edi + edx * sizeof.DEBUG_SYMBOL]
-        cmp     [ebp + DEBUG_SYMBOL.addr], eax
-        jbe     .found
-
-    .loop:
-        cmp     ecx, edx
-        ja      .end
-
-        ; Calc middle:
-        mov     ebx, edx            ; Middle
-        sub     ebx, ecx            ; (right - left)
-        shr     ebx, 1              ;  / 2
-        add     ebx, ecx            ; + left
-
-        ; Equal
-        mov     ebp, [edi + ebx * sizeof.DEBUG_SYMBOL]
-        cmp     [ebp + DEBUG_SYMBOL.addr], eax
-        jz      .found
-        jb      .update_left
-
-        ; Update right
-        mov     edx, ebx
-        dec     edx
-        jmp     .loop
-
-    .update_left:
-        ; Save potential result
-        mov     esi, ebp
-        add     esi, DEBUG_SYMBOL.string
-
-        ; Update left
-        mov     ecx, ebx
-        inc     ecx
-        jmp     .loop
-
-    .found:
-        mov     esi, ebp
-        add     esi, DEBUG_SYMBOL.string
-
-    .end:
-        ret
+        ret
--- a/programs/network/ftpd/ftpd.asm
+++ b/programs/network/ftpd/ftpd.asm
@@ -135,7 +135,7 @@ start:
        mov     [sockaddr1.port], ax

        xchg    al, ah
-        invoke  con_printf, str1, ini_buf, eax
+        invoke  con_printf, str1, eax
        add     esp, 8

 ; open listening socket
@@ -341,7 +341,7 @@ thread_exit:
 ; initialized data

 title           db 'FTP daemon', 0
-str1            db 'Starting FTP daemon on %s:%u', 0
+str1            db 'Starting FTP daemon on port %u.', 0
 str2            db '.', 0
 str2b           db ' OK!',10,0
 str3            db 'Listen error',10,0