WebSVN – Kolibri OS – Diff – /programs/develop/mtdbg/gui.inc

         mov     ecx, (needzeroend-needzerostart+3)/4
         rep stosd
         mov     esi, begin_str
         call    put_message_nodraw
-    ; set event mask - default events and debugging events
+        ; set event mask - default events and debugging events
-        ;push   40
-        ;pop    eax
-        ;mov    ebx, 0x107
         mcall   40, 0x107
-    ; set debug messages buffer
+        ; set debug messages buffer
         mov     ecx, dbgbufsize
         mov     dword [ecx], 256
         xor     ebx, ebx
 dodraw:
         call    draw_window
-waitevent:
         ;push   10
-        ;pop    eax
+waitevent:
         mcall   10
         cmp     al, 9
         jz      debugmsg
         dec     eax
         jz      dodraw
         dec     eax
         jz      keypressed
         dec     eax
-        jnz     waitevent
-    ; button pressed - we have only one button (close)
-        ;push   -1
+        jnz     waitevent
-        ;pop    eax
+        ; button pressed - we have only one button (close)
         mcall   -1
 clear_cmdline_end:
         mov     ebx, [cmdline_pos]
         mov     ecx, [cmdline_len]
-        sub     ecx, ebx
-        ;push   13
-        ;pop    eax
+        sub     ecx, ebx
         imul    ebx, 6
         imul    ecx, 6
         inc     ecx
         add     ebx, cmdline_x_pos
         shl     ebx, 16
         or      ebx, ecx
-        mov     ecx, cmdline_y_pos*10000h + cmdline_y_size
-        ; setting up container color scheme
-        ; COLOR_BG_NORMAL was 0xFFFFFF
+        mov     ecx, cmdline_y_pos*10000h + cmdline_y_size
         mov     edx, COLOR_BG_NORMAL
         ; draw container rectangle/box for cmdline
         mcall   13
         mov     ebx, [cmdline_pos]
     @@:
         mov     esi, [cmdline_len]
-        sub     esi, ebx
-        ;push   4
-        ;pop    eax
-        ; setting up text color scheme and attributes
+        sub     esi, ebx
         ; was 'xor     ecx, ecx'
         mov     ecx, COLOR_TXT_NORMAL
         lea     edx, [cmdline+ebx]
         imul    ebx, 6
         add     ebx, cmdline_x_pos
         shl     ebx, 16
         or      ebx, cmdline_y_pos+1
-        ; draw a text string in the window, color in ecx
+        ; draw a text string in the window
         mcall   4
         ret
 put_message:
         call    put_message_nodraw
-draw_messages:
-        ;push   13
-        ;pop    eax
-        ;mov    edx, 0xFFFFFF
-        ;mov    ebx, messages_x_pos*10000h+messages_x_size
-        ;mov    ecx, messages_y_pos*10000h+messages_y_size
-        ; draw container rectanle/box
+draw_messages:
-        ; COLOR_BG_NORMAL was 0xFFFFFF
+        ; draw container rectangle/box
         mcall   13, messages_x_pos*10000h+messages_x_size, messages_y_pos*10000h+messages_y_size, COLOR_BG_NORMAL
         mov     edx, messages
-        push    messages_width
-        pop     esi
-        ; setting up text color scheme/attributes
+        push    messages_width
-        ; was 'xor     ecx, ecx'
-        mov     ecx, COLOR_TXT_NORMAL
+        pop     esi
-        ;mov    al, 4
+        mov     ecx, COLOR_TXT_NORMAL
         mov     ebx, messages_x_pos*10000h+messages_y_pos
 ;-----------------------------------------------------------------------------
 ;                       Draw program window title
 ; FIXME: something wrong here
-redraw_title:
-        ;push   13
-        ;pop    eax
-        ;mov    edx, 0xFFFFFF
-        ;mov    ebx, title_x_pos*10000h + data_x_pos+data_x_size-title_x_pos
-        ;mov    ecx, title_y_pos*10000h + title_y_size
+redraw_title:
-        ; draw container rectangle/box
-        ; color was 0xFFFFFF
+        ; draw container rectangle/box
         mcall   13, title_x_pos*10000h+data_x_pos+data_x_size-title_x_pos, title_y_pos*10000h+title_y_size, COLOR_BG_NORMAL
-draw_title:
-        ;mov    al, 38
-        ;mov    ebx, (data_x_pos-2)*10000h + title_x_pos-5
         ;mov    ecx, (title_y_pos+5)*10001h
-        ; draw line with COLOR_LINE (in edx)
+draw_title:
         mcall   38, (data_x_pos-2)*10000h+title_x_pos-5, (title_y_pos+5)*10001h, COLOR_LINE
         push    NoPrgLoaded_len
         pop     esi
         push    edx
         push    ecx
         push    esi
         mov     eax, esi
         mov     esi, ecx
-    ; setting up registers colors
-    ; can be usual, inactive and changed
-        ; inactive color
-        ; was 0x40808080 - grey
         mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
         cmp     [debuggee_pid], 0
         jz      .cd
         cmp     [bSuspended], 0
         jz      .cd
-        ; normal color
-        ; was 0x40000000 - black
         mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
         push    edi
         mov     edi, [eax]
         cmp     dword [eax+oldcontext-context], edi
         pop     edi
         jz      .cd
-        ; changed register color
-        ; was 0x4000AA00 - green
         mov     ecx, (COLOR_TXT_CHANGED or 0x40000000)
-    .cd:
-        ;push   4
-        ;pop    eax
+    .cd:
         ; draw a text string in the window
         mcall   4
         imul    esi, 60000h
-        lea     edx, [ebx+esi]
-        ;mov    al, 47
-        ;mov    ebx, 80101h
+        lea     edx, [ebx+esi]
         mov     esi, ecx
+        pop     ecx
         pop     ecx
-        ; draw a number in the window
-        ; color in the esi (same value as for usual text)
+        ; draw a number in the window
         mcall   47, 80101h
         lea     ebx, [edx+60000h*18]
         mov     esi, ecx
         pop     ecx
         push    edx
         push    ecx
         push    esi
         mov     eax, esi
         mov     esi, ecx
-    ; setting up registers color
-    ; can be usual, inactive and changed
-        ; inactive color
-        ; was 0x40808080 - grey
         mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
         cmp     [debuggee_pid], 0
         jz      .cd
         cmp     [bSuspended], 0
         jz      .cd
-        ; normal color
-        ; was 0x40000000 - black
         mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
         push    edi
         mov     edi, [eax]
         cmp     dword [eax+oldcontext-context], edi
         pop     edi
         cmp     dword [eax+oldcontext-context+4], edi
         pop     edi
         jz      .cd
-    .scol:
-        ; changed register color
-        ; was 0x4000AA00 - green
+    .scol:
         mov     ecx, (COLOR_TXT_CHANGED or 0x40000000)
-    .cd:
         ;push   4
-        ;pop    eax
+    .cd:
         ; draw a text string in the window
         mcall   4
-        imul    esi, 60000h
-        lea     edx, [ebx+esi]
-        ;mov    al, 47
+        imul    esi, 60000h
-        ;mov    ebx, 40100101h ; [20] show 16 chars set [30] bit - qword
+        lea     edx, [ebx+esi]
         mov     esi, ecx
         pop     ecx
         ; draw a number in the window
         push    edx
         push    ecx
         push    esi
         mov     eax, esi
         mov     esi, ecx
-    ; setting up registers color
-    ; can be usual, inactive and changed
-        ; inactive color
-        ; was 0x40808080 - grey
         mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
         cmp     [debuggee_pid], 0
         jz      .cd
         cmp     [bSuspended], 0
         jz      .cd
-        ; normal color
-        ; was 0x40000000 - black
         mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
         push    edi
         mov     edi, [eax]
         cmp     dword [eax+oldcontext-context], edi
         pop     edi
         cmp     dword [eax+oldcontext-context+4], edi
         pop     edi
         jz      .cd
-    .scol:
-        ; changed color
-        ; was 0x4000AA00 - green
+    .scol:
         mov     ecx, (COLOR_TXT_CHANGED or 0x40000000)
-    .cd:
         ;push   4
-        ;pop    eax
+    .cd:
+        ; draw a text string in the window
-        ; draw a text string in the window
+        mcall   4
         mcall   4
-        imul    esi, 60000h
-        lea     edx, [ebx+esi]
-        ;mov    al, 47
+        imul    esi, 60000h
-        ;mov    ebx, 40100101h ; [20] show 16 chars set [30] bit - qword
+        lea     edx, [ebx+esi]
         mov     esi, ecx
         pop     ecx
         ; draw a number in the window
     .on:
         and     byte [edx], not 20h
-    .onoff:
-    ; setting up registers colors
-    ; can be usual, inactive and changed
         ; inactive color
-        ; was 0x40808080 - grey
+    .onoff:
         mov     ecx, (COLOR_TXT_INACTIVE or 0x40000000)
         cmp     [debuggee_pid], 0
         jz      .doit
-        cmp     [bSuspended], 0
-        jz      .doit
+        cmp     [bSuspended], 0
-        ; normal color
+        jz      .doit
         ; was 0x40000000 - black
         mov     ecx, (COLOR_TXT_NORMAL or 0x40000000)
         bt      [_eflags], edi
         lahf
         bt      dword [_eflags + oldcontext - context], edi
         rcl     ah, 1
-        test    ah, 3
-        jp      .doit
-        ; changed color
+        test    ah, 3
-        ; was 0x4000AA00 - green
+        jp      .doit
         mov     ecx, (COLOR_TXT_CHANGED or 0x40000000)
-    .doit:
         mov     ah, 0
-        ; background color for text string or number
+    .doit:
-        ; was 0xFFFFFF - white
+        mov     ah, 0
         mov     edi, COLOR_BG_NORMAL
         ; draw a text string in the window in one case
         add     esi, _mm6-_mm5
         call    draw_mmx_register
         mov     ebx, (registers_x_pos+2)*10000h+registers_y_pos+212
         add     esi, _mm7-_mm6
         call    draw_mmx_register
-        ;mov    al, 4
-        ; setting up text color
-        ; inactive color
-        ; was 0x808080 - grey
         mov     ecx, COLOR_TXT_INACTIVE
         cmp     [debuggee_pid], 0
         jz      @f
         cmp     [bSuspended], 0
         jz      @f
         ret
 ;-----------------------------------------------------------------------------
-;                   Display disassembled code
-; @@@@@ WAS:
-; redraw_disasm:
-;       push    13
-;       pop     eax
-;       mov     edx, 0xFFFFFF
-;       mov     ebx, data_x_pos*10000h + data_x_size
-;       mov     ecx, (disasm_y_pos-1)*10000h + (disasm_y_size+1)
-;       mcall
 ;                   Display disassembled code
-; @@@@@ NOW:
 draw_disasm:
 draw_disasm:
     .redraw:
         mov     eax, [disasm_start_pos]
         lea     ecx, [ebx+disasm_y_pos-1]
         shl     ecx, 16
         mov     cl, 11
         ; setting up background color for disassembled text
         mov     edx, COLOR_BG_NORMAL
-        ;mov    ebx, data_x_pos*10000h + data_x_size
-        ;push   13
-        ;pop    eax
         ; draw container rectangle/box with color COLOR_BG_NORMAL (was 0xFFFFFF - white)
         mcall   13, data_x_pos*10000h+data_x_size
         pop     ebx
         ; copy color value from edx (COLOR_BG_NORMAL)
         mov     edi, edx
         push    esi     ; Save color value for disassembled text
         ; draw container rectangle/box for disassembled text
         ; color in edx
-        mcall   13
-        ;mov    al, 47
+        mcall   13
         ;mov    ebx, 80100h
         mov     edx, [disasm_cur_str]
         imul    edx, 10
-        add     edx, data_x_pos*10000h + disasm_y_pos
-        ;mov    ecx, ebp
+        add     edx, data_x_pos*10000h + disasm_y_pos
         ; draw a number in the window, color in esi
-        mcall   47, 80100h, ebp
+        mcall   47, 80100h, ebp
         ;mov    al, 4
         lea     ebx, [edx+8*6*10000h]
         mov     ecx, esi    ; text color
         push    2
         pop     esi
         mov     esi, [disasm_cur_pos]
         dec     esi
         cmp     esi, ebp
         pop     esi
         jbe     .drawhex
-        ;mov    al, 4
         lea     ebx, [edx-6*10000h]
         ; copy color value from esi
         mov     ecx, esi
         push    3
         pop     esi
         dec     ecx
         xchg    ecx, esi
         mov     ebx, [disasm_cur_str]
         imul    ebx, 10
         add     ebx, (data_x_pos+6*40)*10000h+disasm_y_pos
-        ;mov    al, 4
         ; draw a text string in the window, color in ecx
         mcall   4
         inc     [disasm_cur_str]
         cmp     [disasm_cur_str], disasm_height
         jb      .loop
         inc     ecx
         mov     eax, disasm_y_pos + disasm_y_size
         sub     eax, ecx
         shl     eax, 16
         add     ecx, eax
-        ;push   13
-        ;pop    eax
-        ;mov    ebx, data_x_pos*65536 + data_x_size
-        ; set backroung color for disassembly container
-        ; was 0xFFFFFF - white
+        ; Draw filled rectangle
-        mov     edx, COLOR_BG_NORMAL
-        ; draw container rectangle/box with color COLOR_BG_NORMAL (in edx)
-        mcall   13, data_x_pos*65536+data_x_size
+        mcall   13, data_x_pos*10000h+data_x_size, , COLOR_BG_NORMAL
     @@:
         ret
         dec     ecx
         jz      .m
     @@:
         cmp     [_eip], eax
-        jz      draw_disasm.redraw
+        jz      draw_disasm
         push    ecx
         call    disasm_instr
         pop     ecx
         jc      .m
         mov     [disasm_start_pos], eax
 update_disasm:
         cmp     [debuggee_pid], 0
-        jz      .no
-        ;push   69
-        ;pop    eax
-        ;push   6
-        ;pop    ebx
-        ;mov    ecx, [debuggee_pid]
-        ;mov    edi, disasm_buffer
-        ;mov    edx, 256
+        jz      .no
         ;mov    esi, [disasm_start_pos]
         mcall   69, 6, [debuggee_pid], 256, [disasm_start_pos], disasm_buffer
         cmp     eax, -1
         jnz     @f
         mov     esi, read_mem_err
         xor     eax, eax
     @@:
         mov     [disasm_buf_size], eax
         call    restore_from_breaks
-        jmp     draw_disasm.redraw
+        jmp     draw_disasm
-    ; redraw whole window again
+        ; redraw whole window again
         call    redraw_title
         call    draw_registers
         call    draw_dump
-        call    draw_disasm.redraw
+        call    draw_disasm
-    ; end of window redraw
+        ; end of window redraw

Subversion Repositories Kolibri OS

(root)/programs/develop/mtdbg/gui.inc – Rev 4889 → 4890