diff --git a/programs/develop/mtdbg/gui.inc b/programs/develop/mtdbg/gui.inc index 4a5033fab0..b48e82fb0c 100644 --- a/programs/develop/mtdbg/gui.inc +++ b/programs/develop/mtdbg/gui.inc @@ -56,43 +56,42 @@ end if ;----------------------------------------------------------------------------- -data_width equ 80 -data_x_pos equ 12 -data_x_size equ data_width*6 +data_width = 80 +data_x_pos = 12 +data_x_size = data_width*6 -title_x_pos equ 30 -title_y_pos equ 8 -title_y_size equ 10 +title_x_pos = 30 +title_y_pos = 8 +title_y_size = 10 -;dump_y_pos equ (registers_y_pos + registers_y_size + 5) -dump_y_pos equ (title_y_pos + title_y_size) -dump_height equ 6 -dump_y_size equ (dump_height*10) +dump_y_pos = (title_y_pos + title_y_size) +dump_height = 6 +dump_y_size = (dump_height*10) -disasm_y_pos equ (dump_y_pos + dump_y_size + 4) -disasm_height equ 18 -disasm_y_size equ (disasm_height*10) +disasm_y_pos = (dump_y_pos + dump_y_size + 4) +min_disasm_height = 18 +min_disasm_y_size = (min_disasm_height*10) -messages_width equ data_width -messages_height equ 8 -messages_x_pos equ data_x_pos -messages_y_pos equ (disasm_y_pos + disasm_y_size + 4) -messages_x_size equ messages_width*6 -messages_y_size equ messages_height*10 +messages_width = data_width +messages_height = 8 +messages_x_pos = data_x_pos +min_messages_y_pos = (disasm_y_pos + min_disasm_y_size + 4) +messages_x_size = messages_width*6 +messages_y_size = messages_height*10 -cmdline_width equ data_width -cmdline_x_pos equ data_x_pos -cmdline_y_pos equ (messages_y_pos + messages_y_size + 4) -cmdline_x_size equ messages_x_size -cmdline_y_size equ 10 +cmdline_width = data_width +cmdline_x_pos = data_x_pos +min_cmdline_y_pos = (min_messages_y_pos + messages_y_size + 4) +cmdline_x_size = messages_x_size +cmdline_y_size = 10 -registers_x_pos equ (data_x_pos + messages_x_size + 4) -registers_y_pos equ (title_y_pos + title_y_size - 3) -registers_x_size equ 134+2*6 -registers_y_size equ (cmdline_y_pos + cmdline_y_size - registers_y_pos+1) +registers_x_pos = (data_x_pos + messages_x_size + 4) +registers_y_pos = (title_y_pos + title_y_size - 3) +registers_x_size = 134+2*6 +registers_y_size = (min_cmdline_y_pos + cmdline_y_size - registers_y_pos+1) -wnd_x_size equ (data_x_pos + messages_x_size + data_x_pos + registers_x_size+3) + 10 -wnd_y_size equ (cmdline_y_pos + cmdline_y_size + data_x_pos) +wnd_x_size = (data_x_pos + messages_x_size + data_x_pos + registers_x_size+3) + 10 +wnd_y_size = (min_cmdline_y_pos + cmdline_y_size + data_x_pos) ;----------------------------------------------------------------------------- ; Entry point diff --git a/programs/develop/mtdbg/mtdbg.asm b/programs/develop/mtdbg/mtdbg.asm index 4631f3e50d..690f10981f 100644 --- a/programs/develop/mtdbg/mtdbg.asm +++ b/programs/develop/mtdbg/mtdbg.asm @@ -1956,7 +1956,7 @@ include 'disasm.inc' caption_str db 'Kolibri Debugger',0 -begin_str db 'Kolibri Debugger, version 0.34',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 @@ -1969,20 +1969,6 @@ help_groups: dd aBreakpoints, 0, 0, help_breaks_msg db 0 - -;----------------------------------------------------------------------------- -; Coordinates and sizes for GUI - -data_x_size_dd dd data_x_size shl 16, data_x_size -messages_x_size_dd dd messages_x_size shl 16, messages_x_size -registers_x_pos_dd dd registers_x_pos shl 16, registers_x_pos - -disasm_height_dd dd 18 -disasm_y_size_dd dd disasm_y_size shl 16, disasm_y_size -messages_y_pos_dd dd messages_y_pos shl 16, messages_y_pos -cmdline_y_pos_dd dd cmdline_y_pos shl 16, cmdline_y_pos -registers_y_size_dd dd registers_y_size shl 16, registers_y_size - ;----------------------------------------------------------------------------- ; Commands format definitions @@ -2539,7 +2525,20 @@ disasm_cur_pos dd ? disasm_cur_str dd ? disasm_string rb 256 -thread_info process_information +thread_info process_information + +;----------------------------------------------------------------------------- +; Coordinates and sizes for GUI + +data_x_size_dd dd ?, ? +messages_x_size_dd dd ?, ? +registers_x_pos_dd dd ?, ? + +disasm_height_dd dd ? +disasm_y_size_dd dd ?, ? +messages_y_pos_dd dd ?, ? +cmdline_y_pos_dd dd ?, ? +registers_y_size_dd dd ?, ? i_param rb 256