Tinypad - Run in debugger by F10 key. Fasm - support debug parameter in command mode added

git-svn-id: svn://kolibrios.org@4274 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
tserj 2013-11-21 16:10:45 +00:00
parent 1842871f8f
commit 005bd6ea09
8 changed files with 1898 additions and 1864 deletions

View File

@ -131,6 +131,10 @@ NoOutDebugInfo:
cmp [esi], dword ',run' cmp [esi], dword ',run'
jne @f jne @f
mov [_run_outfile],1 mov [_run_outfile],1
@@:
cmp [esi], dword ',dbg'
jne @f
mov [_run_outfile],2
@@: @@:
mov [_mode],CONSOLE_MODE mov [_mode],CONSOLE_MODE
jmp start jmp start
@ -662,6 +666,12 @@ display_bytes_count:
mov edx,outfile mov edx,outfile
call make_fullpaths call make_fullpaths
xor ecx,ecx xor ecx,ecx
cmp [_run_outfile],2 ; param is ',dbg'
jne run
mcall 70,file_info_debug
jmp @f
run:
mcall 70,file_info_start mcall 70,file_info_start
@@: @@:
jmp exit_program jmp exit_program

View File

@ -33,7 +33,7 @@
; cannot simply be copied and put under another distribution licence ; cannot simply be copied and put under another distribution licence
; (including the GNU Public Licence). ; (including the GNU Public Licence).
VERSION_STRING equ "1.71.13" VERSION_STRING equ "1.71.14"
VERSION_MAJOR = 1 VERSION_MAJOR = 1
VERSION_MINOR = 71 VERSION_MINOR = 71

View File

@ -18,6 +18,7 @@ define mm.Search.FindNext key.f3
define mm.Search.Replace key.ctrl_h define mm.Search.Replace key.ctrl_h
define mm.Run.Run key.f9 define mm.Run.Run key.f9
define mm.Run.Debug key.f10
define mm.Run.Compile key.ctrl_f9 define mm.Run.Compile key.ctrl_f9
define mm.Run.DbgBoard open_debug_board define mm.Run.DbgBoard open_debug_board
define mm.Run.SysFuncs open_sysfuncs_txt define mm.Run.SysFuncs open_sysfuncs_txt

View File

@ -123,24 +123,28 @@ popup_res mm.Search,\
popup_res mm.Run,\ popup_res mm.Run,\
ru,'‡ ¯ãáâ¨âì' ,'F9' ,Run ,\ ru,'‡ ¯ãáâ¨âì' ,'F9' ,Run ,\
ru,'‡ ¯ãáâ¨âì ¢ ¤¥¡ ££¥à¥','F10',Debug ,\
ru,'Š®¬¯¨«¨à®¢ âì' ,'Ctrl+F9',Compile ,\ ru,'Š®¬¯¨«¨à®¢ âì' ,'Ctrl+F9',Compile ,\
ru,'-' ,'' , ,\ ru,'-' ,'' , ,\
ru,'„®áª  ®â« ¤ª¨' ,'' ,DbgBoard,\ ru,'„®áª  ®â« ¤ª¨' ,'' ,DbgBoard,\
ru,'‘¨á⥬­ë¥ ä㭪樨','' ,SysFuncs,\ ru,'‘¨á⥬­ë¥ ä㭪樨','' ,SysFuncs,\
\ \
en,'Run' ,'F9' ,Run ,\ en,'Run' ,'F9' ,Run ,\
en,'Run in debugger' ,'F10' ,Debug ,\
en,'Compile' ,'Ctrl+F9',Compile ,\ en,'Compile' ,'Ctrl+F9',Compile ,\
en,'-' ,'' , ,\ en,'-' ,'' , ,\
en,'Debug board' ,'' ,DbgBoard,\ en,'Debug board' ,'' ,DbgBoard,\
en,'System functions' ,'' ,SysFuncs,\ en,'System functions' ,'' ,SysFuncs,\
\ \
et,'Käivita' ,'F9' ,Run ,\ et,'Käivita' ,'F9' ,Run ,\
et,'Käivita aastal siluri' ,'F10' ,Debug ,\
et,'Kompileeri' ,'Ctrl+F9',Compile ,\ et,'Kompileeri' ,'Ctrl+F9',Compile ,\
et,'-' ,'' , ,\ et,'-' ,'' , ,\
et,'Silumis paneel' ,'' ,DbgBoard,\ et,'Silumis paneel' ,'' ,DbgBoard,\
et,'Süsteemi funktsioonid' ,'' ,SysFuncs,\ et,'Süsteemi funktsioonid' ,'' ,SysFuncs,\
\ \
sp,'Ejecutar' ,'F9' ,Run ,\ sp,'Ejecutar' ,'F9' ,Run ,\
sp,'Ejecutar en el depurador' ,'F10' ,Debug ,\
sp,'Compilar' ,'Ctrl+F9',Compile ,\ sp,'Compilar' ,'Ctrl+F9',Compile ,\
sp,'-' ,'' , ,\ sp,'-' ,'' , ,\
sp,'Depuración' ,'' ,DbgBoard,\ sp,'Depuración' ,'' ,DbgBoard,\

View File

@ -62,6 +62,7 @@ accel_table_main dd \
0x0000001C,key.return ,\ ; Return 0x0000001C,key.return ,\ ; Return
0x0000003D,key.f3 ,\ ; F3 0x0000003D,key.f3 ,\ ; F3
0x00000043,key.f9 ,\ ; F9 0x00000043,key.f9 ,\ ; F9
0x00000044,key.f10 ,\ ; F10
0x00000147,key.home ,\ ; Home 0x00000147,key.home ,\ ; Home
0x00000148,key.up ,\ ; Up 0x00000148,key.up ,\ ; Up
0x00000149,key.pgup ,\ ; PageUp 0x00000149,key.pgup ,\ ; PageUp

View File

@ -1,6 +1,10 @@
HISTORY: HISTORY:
4.0.7 (21/11/2013, Sergey Tyrnov aka tserj)
new feature:
- Run in debugger by F10
4.0.6 (26/09/2010, Marat Zakiyanov aka Mario79, aka Mario) 4.0.6 (26/09/2010, Marat Zakiyanov aka Mario79, aka Mario)
new features: new features:
- Select file path with OpenDialog for Load and Save. - Select file path with OpenDialog for Load and Save.

View File

@ -2,8 +2,8 @@
; project name: TINYPAD ; project name: TINYPAD
; compiler: flat assembler 1.67.21 ; compiler: flat assembler 1.67.21
; memory to compile: 3.0/9.0 MBytes (without/with size optimizations) ; memory to compile: 3.0/9.0 MBytes (without/with size optimizations)
; version: SVN (4.0.5) ; version: SVN (4.0.7)
; last update: 2008-07-18 (Jul 18, 2008) ; last update: 2013-11-21 (Nov 21, 2013)
; minimal kernel: revision #823 (svn://kolibrios.org/kernel/trunk) ; minimal kernel: revision #823 (svn://kolibrios.org/kernel/trunk)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; originally by: Ville Michael Turjanmaa >> villemt@aton.co.jyu.fi ; originally by: Ville Michael Turjanmaa >> villemt@aton.co.jyu.fi
@ -35,7 +35,7 @@ include 'tinypad.inc'
header '01',1,@CODE,TINYPAD_END,STATIC_MEM_END,MAIN_STACK,@PARAMS,ini_path header '01',1,@CODE,TINYPAD_END,STATIC_MEM_END,MAIN_STACK,@PARAMS,ini_path
APP_VERSION equ 'SVN (4.0.6)' APP_VERSION equ 'SVN (4.0.7)'
TRUE = 1 TRUE = 1
FALSE = 0 FALSE = 0
@ -466,7 +466,9 @@ endp
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
proc start_fasm ;///////////////////////////////////////////////////////////// proc start_fasm ;/////////////////////////////////////////////////////////////
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; BL = run after compile ; BL = 0 - compile
; BL = 1 - run after compile
; BL = 2 - run under mtdbg after compile
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; FASM infile,outfile,/path/to/files[,run] ; FASM infile,outfile,/path/to/files[,run]
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
@ -516,9 +518,13 @@ proc start_fasm ;/////////////////////////////////////////////////////////////
sub ecx,esi sub ecx,esi
rep movsb rep movsb
cmp bl,0 ; run outfile ? cmp bl,0 ; compile outfile ?
je @f je @f
mov dword[edi],',run' mov dword[edi],',run'
cmp bl,1 ; run outfile ?
je do_run
mov dword[edi],',dbg'
do_run:
add edi,4 add edi,4
@@: @@:
mov al,0 mov al,0

View File

@ -1606,6 +1606,14 @@ proc key.f9 ;///// COMPILE AND RUN ///////////////////////////////////////////
ret ret
endp endp
;-----------------------------------------------------------------------------
proc key.f10 ;///// COMPILE AND RUN UNDER DEBUG //////////////////////////////
;-----------------------------------------------------------------------------
mov bl,2
call start_fasm
ret
endp
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
proc key.ctrl_f9 ;///// COMPILE ////////////////////////////////////////////// proc key.ctrl_f9 ;///// COMPILE //////////////////////////////////////////////
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------