WebSVN – Kolibri OS – Diff – /programs/develop/mtdbg/mtdbg.asm

         dd      i_param
         dd      0
 ;-----------------------------------------------------------------------------
-REG_MODE_CPU equ 1
+REG_MODE_CPU = 1
-REG_MODE_MMX equ 2
+REG_MODE_MMX = 2
-REG_MODE_SSE equ 3
+REG_MODE_SSE = 3
-REG_MODE_AVX equ 4
+REG_MODE_AVX = 4
         and     [symbols], 0
         and     [num_symbols], 0
 ; TODO: make it local
-do_reload:
-        ;push    18
-        ;pop     eax
-        ;push    7
-        ;pop     ebx
+do_reload:
-        mcall    18, 7
+        mcall   18, 7
         mov     [dbgwnd], eax
-        xchg    ecx, eax
-        ;push    70
-        ;pop     eax
-        ;mov     ebx, fn70_load_block
+        xchg    ecx, eax
-        mcall    70, fn70_load_block
+        mcall   70, fn70_load_block
         test    eax, eax
         jns     .load_ok
         jmp     draw_messages
     .load_ok:
         mov     [debuggee_pid], eax
-        mov     [bSuspended], 1
-        mov     eax, 5
+        mov     [bSuspended], 1
-        mov     ebx, 20
-        int     0x40
+        mcall   5, 20
         push    ecx
         call    get_context
         mov     edi, oldcontext
         mov     ecx, (ctx_end-context)/4
         rep movsd
-    ; activate debugger window
-        pop     ecx
         ;mov     bl, 3
-        ;push    18
+    ; activate debugger window
-        ;pop     eax
+        pop     ecx
-        mcall    18, 3
+        mcall   18, 3
         call    redraw_title
         pop     esi
         call    put_message_nodraw
         mov     esi, aPacked2
         call    put_message
         call    hide_cursor
-        ;push    40
-        ;pop     eax
-        ;push    7
-        ;pop     ebx
-        mcall    40, 7
+        mcall   40, EVM_REDRAW or EVM_KEY or EVM_BUTTON
-    .wait:
-        ;push    10
-        ;pop     eax
+    .wait:
-        mcall    10
+        mcall   10
         dec     eax
         jz      .redraw
         dec     eax
         call    draw_window
         call    hide_cursor
         jmp     .wait
-    .key:
-        mov     al, 2
+    .key:
-        mcall
+        mcall   2
         cmp     ah, 'y'
         jz      .yes
         cmp     ah, 'Y'
         jz      .yes
         jz      .no
         cmp     ah, 'N'
         jnz     .wait
-    .no:
-        ;push    40
-        ;pop     eax
-        ;mov     ebx, 0x107
+    .no:
-        mcall    40, 0x107
+        mcall   40, EVM_REDRAW or EVM_KEY or EVM_BUTTON or EVM_DEBUG
         call    draw_cursor
         mov     esi, aN_str
         jmp     put_message
-    .yes:
-        ;push    40
-        ;pop     eax
-        ;mov     ebx, 0x107
+    .yes:
-        mcall    40, 0x107
+        mcall   40, EVM_REDRAW or EVM_KEY or EVM_BUTTON or EVM_DEBUG
         call    draw_cursor
         mov     esi, aY_str
         call    put_message
 ;-----------------------------------------------------------------------------
 ;                        Terminate process event
-OnTerminate:
-        ;mov     ecx, [debuggee_pid]
-        ;push    8
-        ;pop     ebx
         ;push    69
-        ;pop     eax
+OnTerminate:
-        mcall    69, 8, [debuggee_pid]
+        mcall   69, 8, [debuggee_pid]
         ret
         call    draw_dump.redraw
         call    update_disasm_eip
         ret
-OnSuspend:
-        ;mov     ecx, [debuggee_pid]
-        ;push    4
-        ;pop     ebx
-        ;push    69
-        ;pop     eax
+OnSuspend:
-        mcall    69, 4, [debuggee_pid]
+        mcall   69, 4, [debuggee_pid]
         call    AfterSuspend
         mov     esi, aSuspended
         jmp     put_message
 ;-----------------------------------------------------------------------------
-;                        Resume process event
-DoResume:
-        ;mov     ecx, [debuggee_pid]
-        ;push    5
-        ;pop     ebx
+;                        Resume process event
         ;push    69
-        ;pop     eax
+DoResume:
-        mcall    69, 5, [debuggee_pid]
+        mcall   69, 5, [debuggee_pid]
     ; TODO: fix for useful name
     .4:
         call    get_dump
         pop     eax
-    ; int3 command generates exception 0D, #GP
+    ; int3 command generates exception 0x0D, #GP
         push    eax
-        cmp     al, 0Dh
+        cmp     al, 0x0D
         jnz     .notdbg
     ; check for 0xCC byte at eip
         push    0
         mcall   69, 6, [debuggee_pid], 1, [_eip], esp
         cmp     byte [edi+5], 0xCD
         jz      .int
      @@:
-        push    0
-        ;push    69
-        ;pop     eax
-        ;push    6
-        ;pop     ebx
-        ;mov     ecx, [debuggee_pid]
-        ;push    3
-        ;pop     edx
-        ;mov     edi, esp
-        ;mov     esi, [_eip]
+        push    0
         mcall    69, 6, [debuggee_pid], 3, [_eip], esp
         cmp     eax, edx
         pop     eax
         jnz     .doit
         ret
     ; return address is [ebp-4]
     .sysenter:
-        push    0
-        ;push    69
-        ;pop     eax
+        push    0
         inc     edx     ; read 4 bytes
         mov     esi, [_ebp]
         sub     esi, 4
-        mcall    69
+        mcall   69
         mov     al, [edi+5]
         clc
         ret
-    .nobreak:
-        ;push    69
-        ;pop     eax
-        ;push    6
-        ;pop     ebx
-        ;mov     ecx, [debuggee_pid]
+    .nobreak:
         xor     edx, edx
         push    edx
         inc     edx
         mov     edi, esp
         xor     ecx, ecx
     .l1:
         cmp     [drx_break+ecx*4], 0
-        jnz     .l2
-        ;push    69
-        ;pop     eax
+        jnz     .l2
         push    ecx
-        mov     dl, cl
-        ;mov     ecx, [debuggee_pid]
+        mov     dl, cl
-        mov     esi, ebp
-        ;push    9
-        ;pop     ebx
+        mov     esi, ebp
-        mcall    69, 9, [debuggee_pid]
+        mcall   69, 9, [debuggee_pid]
         test    eax, eax
         jz      .ok
         jnz     .ret
         or      byte [edi-1], 2
         test    byte [edi-1], 8
         jnz     .dr
         push    esi
-        ;push    7
-        ;pop     ebx
-        ;push    69
-        ;pop     eax
-        ;mov     ecx, [debuggee_pid]
-        ;xor     edx, edx
-        ;inc     edx
-        ;mov     esi, [edi-5]
-        mcall    69, 7, [debuggee_pid], 1, [edi-5]
+        mcall   69, 7, [debuggee_pid], 1, [edi-5]
         pop     esi
     .ret:
         ret
     .dr:
         mov     dl, [edi]
-        shr     dl, 6
-        mov     dh, 80h
-        ;push    69
-        ;pop     eax
-        ;push    9
-        ;pop     ebx
+        shr     dl, 6
-        ;mov     ecx, [debuggee_pid]
+        mov     dh, 80h
-        mcall    69, 9, [debuggee_pid]
+        mcall   69, 9, [debuggee_pid]
         ret
         test    byte [edi-1], 2
         jz      .ret
         and     byte [edi-1], not 2
         test    byte [edi-1], 8
         jnz     .dr
-        ;push    6
-        ;pop     ebx
-        ;push    69
-        ;pop     eax
-        ;mov     esi, [edi-5]
-        ;mov     ecx, [debuggee_pid]
-        ;xor     edx, edx
-        ;inc     edx
-        mcall    69, 6, [debuggee_pid], 1, [edi-5]
+        mcall   69, 6, [debuggee_pid], 1, [edi-5]
         dec     eax
         jnz     .err
-        ;mov     al, 69
         push    0xCC
         mov     edi, esp
         inc     ebx
-        mcall    69
+        mcall   69
         pop     eax
         call    put_message
         pop     esi
         ret
-    .dr:
-        ;push    9
-        ;pop     ebx
-        ;push    69
-        ;pop     eax
+    .dr:
-        mov     esi, [edi-5]
-        ;mov     ecx, [debuggee_pid]
+        mov     esi, [edi-5]
         mov     dl, [edi]
         shr     dl, 6
         mov     dh, [edi]
         and     dh, 0xF
         mov     dx, 1111b*256
         push    0xC
         pop     esi
-    @@:
-        ;push    69
-        ;pop     eax
+    @@:
-        mcall    69
+        mcall   69
         test    eax, eax
         jz      .breakok
         inc     edx
     .breakok:
         call    GoOn
     ; now wait for event
-    .wait:
-        ;push    10
-        ;pop     eax
+    .wait:
-        mcall    10
+        mcall   10
         dec     eax
         jz      .redraw
         dec     eax
     .x1:
         push    edx esi
         call    put_message
         pop     esi edx
         or      dh, 80h
-        ;push    69
-        ;pop     eax
-        ;push    9
-        ;pop     ebx
-        ;mov     ecx, [debuggee_pid]
-        mcall    69, 9, [debuggee_pid]
+        mcall   69, 9, [debuggee_pid]
         cmp     esi, aUnpacked
         jnz     OnSuspend
         jmp     AfterSuspend
         mov     esi, aInterrupted
         push    edx
         call    put_message
         pop     edx
         or      dh, 80h
-        ;push    69
-        ;pop     eax
-        ;push    9
-        ;pop     ebx
-        ;mov     ecx, [debuggee_pid]
-        mcall    69, 9, [debuggee_pid]
+        mcall   69, 9, [debuggee_pid]
         jmp     debugmsg
     .our:
         and     [dbgbuflen], 0
         push    edx
         call    get_context
-        push    eax
-        ;mov     al, 69
-        ;mov     bl, 6
-        ;mov     ecx, [debuggee_pid]
-        ;mov     edi, esp
-        ;push    4
-        ;pop     edx
-        ;push    0xC
-        ;pop     esi
+        push    eax
-        mcall    69, 6, [debuggee_pid], 4, 0xC, esp
+        mcall   69, 6, [debuggee_pid], 4, 0xC, esp
         pop     eax
         pop     edx
         cmp     eax, [_eip]

Subversion Repositories Kolibri OS

(root)/programs/develop/mtdbg/mtdbg.asm – Rev 6344 → 7675