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

programs/develop/fasm/trunk/fasm.asm

@@ -131,6 +131,10 @@ NoOutDebugInfo:
 	cmp	[esi], dword ',run'
 	jne	@f
 	mov	[_run_outfile],1
+@@:
+	cmp	[esi], dword ',dbg'
+	jne	@f
+	mov	[_run_outfile],2
 @@:
 	mov	[_mode],CONSOLE_MODE
 	jmp	start
@@ -662,6 +666,12 @@ display_bytes_count:
 	mov	edx,outfile
 	call	make_fullpaths
 	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
 @@:
 	jmp	exit_program

programs/develop/fasm/trunk/version.inc

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

programs/develop/tinypad/trunk/data/tp-defines.inc

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

programs/develop/tinypad/trunk/data/tp-locale.inc

@@ -58,13 +58,13 @@ popup_res mm.File,\
   et,'-'		 ,''		,      ,\
   et,'V<>lju'		 ,'Alt+X'	,Exit,\
 \
-  sp,'Nuevo'   ,'Ctrl+N'  ,New   ,\
+  sp,'Nuevo'   ,'Ctrl+N'  ,New	 ,\
   sp,'Abrir...'   ,'Ctrl+O'  ,Open  ,\
-  sp,'Guardar'  ,'Ctrl+S'  ,Save  ,\
+  sp,'Guardar'	,'Ctrl+S'  ,Save  ,\
   sp,'Guardar como...','Ctrl+Shift+S',SaveAs,\
-  sp,'-'   ,''    ,      ,\
+  sp,'-'   ,''	  ,	 ,\
-  sp,'Cerrar'   ,'Ctrl+F4' ,Close ,\
+  sp,'Cerrar'	,'Ctrl+F4' ,Close ,\
-  sp,'-'   ,''    ,      ,\
+  sp,'-'   ,''	  ,	 ,\
   sp,'Salir'  ,'Alt+X' ,Exit
 
 popup_res mm.Edit,\
@@ -89,11 +89,11 @@ popup_res mm.Edit,\
   et,'-'	 ,''	  ,	 ,\
   et,'Vali k<>ik' ,'Ctrl+A',SelAll,\
 \
-  sp,'Cortar'   ,'Ctrl+X',Cut   ,\
+  sp,'Cortar'	,'Ctrl+X',Cut	,\
   sp,'Copiar'  ,'Ctrl+C',Copy  ,\
   sp,'Pegar'   ,'Ctrl+V',Insert,\
-  sp,'Eliminar'  ,''    ,Delete,\
+  sp,'Eliminar'  ,''	,Delete,\
-  sp,'-'   ,''    ,  ,\
+  sp,'-'   ,''	  ,  ,\
   sp,'Seleccionar todo','Ctrl+A',SelAll
 
 popup_res mm.Search,\
@@ -116,34 +116,38 @@ popup_res mm.Search,\
   et,'Asenda...'    ,'Ctrl+H',Replace ,\
 \
   sp,'Posici<63>n...','Ctrl+G',Position,\
-  sp,'-'    ,''    ,      ,\
+  sp,'-'    ,''    ,	  ,\
   sp,'Buscar...'    ,'Ctrl+F',Find    ,\
-  sp,'Buscar siguiente'  ,'F3'    ,FindNext,\
+  sp,'Buscar siguiente'  ,'F3'	  ,FindNext,\
   sp,'Reemplazar...' ,'Ctrl+H',Replace
 
 popup_res mm.Run,\
   ru,'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'	,'F9'	  ,Run	   ,\
+  ru,'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','F10',Debug   ,\
   ru,'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><E0AEA2><EFBFBD>'	,'Ctrl+F9',Compile ,\
   ru,'-'		,''	  ,	   ,\
   ru,'<27><>᪠ <20>⫠<EFBFBD><E2ABA0><EFBFBD>'	,''	  ,DbgBoard,\
   ru,'<27><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD> <20>㭪樨',''	  ,SysFuncs,\
 \
   en,'Run'		,'F9'	  ,Run	   ,\
+  en,'Run in debugger'	,'F10'	  ,Debug   ,\
   en,'Compile'		,'Ctrl+F9',Compile ,\
   en,'-'		,''	  ,	   ,\
   en,'Debug board'	,''	  ,DbgBoard,\
   en,'System functions' ,''	  ,SysFuncs,\
 \
   et,'K<>ivita'		,'F9'	  ,Run	   ,\
+  et,'K<>ivita aastal siluri'	 ,'F10'    ,Debug   ,\
   et,'Kompileeri'	,'Ctrl+F9',Compile ,\
   et,'-'		,''	  ,	   ,\
   et,'Silumis paneel'	,''	  ,DbgBoard,\
   et,'S<>steemi funktsioonid' ,''	  ,SysFuncs,\
 \
   sp,'Ejecutar'    ,'F9'   ,Run     ,\
+  sp,'Ejecutar en el depurador'     ,'F10'    ,Debug   ,\
   sp,'Compilar'    ,'Ctrl+F9',Compile ,\
   sp,'-'    ,''   ,    ,\
-  sp,'Depuraci<63>n'  ,''   ,DbgBoard,\
+  sp,'Depuraci<63>n'  ,''	 ,DbgBoard,\
   sp,'Funciones del sistema' ,''   ,SysFuncs
 
 popup_res mm.Encoding,\
@@ -187,14 +191,14 @@ popup_res mm.Options,\
   et,'-'		     ,'',	     ,\
   et,'Rea numbrid'	     ,'',LineNumbers ,\
 \
-  sp,'Apariencia...'       ,'',Appearance  ,\
+  sp,'Apariencia...'	   ,'',Appearance  ,\
-  sp,'-'         ,'',      ,\
+  sp,'-'	 ,'',	   ,\
   sp,'Selecci<63>n segura'      ,'',SecureSel   ,\
-  sp,'Par<61>ntesis autom<6F>ticos'    ,'',AutoBrackets,\
+  sp,'Par<61>ntesis autom<6F>ticos'	 ,'',AutoBrackets,\
-  sp,'Identaci<63>n autom<6F>tica'     ,'',AutoIndents ,\
+  sp,'Identaci<63>n autom<6F>tica'	 ,'',AutoIndents ,\
-  sp,'Tabulaci<63>n inteligente'      ,'',SmartTabs   ,\
+  sp,'Tabulaci<63>n inteligente'	   ,'',SmartTabs   ,\
   sp,'Llenado <20>ptimo al guardar','',OptimalFill ,\
-  sp,'-'         ,'',      ,\
+  sp,'-'	 ,'',	   ,\
   sp,'N<>meros en l<>neas'      ,'',LineNumbers
 
 lsz s_defname,\

programs/develop/tinypad/trunk/data/tp-tables.inc

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

programs/develop/tinypad/trunk/history.txt

@@ -1,6 +1,10 @@
 
 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)
   new features:
     - Select file path with OpenDialog for Load and Save.

programs/develop/tinypad/trunk/tinypad.asm

@@ -2,8 +2,8 @@
 ; project name:      TINYPAD
 ; compiler:          flat assembler 1.67.21
 ; 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)
 ;-----------------------------------------------------------------------------
 ; 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
 
-APP_VERSION equ 'SVN (4.0.6)'
+APP_VERSION equ 'SVN (4.0.7)'
 
 TRUE = 1
 FALSE = 0
@@ -193,9 +193,9 @@ section @CODE ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 	xor	eax,eax
 	mov	[edi],al
 ;---------------------------------------------------------------------
-;OpenDialog	initialisation
+;OpenDialog     initialisation
-	push    dword OpenDialog_data
+	push	dword OpenDialog_data
-	call    [OpenDialog_Init]
+	call	[OpenDialog_Init]
 ;---------------------------------------------------------------------
 
 
@@ -242,8 +242,8 @@ still:
 	mov	[OpenDialog_data.type],eax
 	popa
 ; invoke OpenDialog
-	push    dword OpenDialog_data
+	push	dword OpenDialog_data
-	call    [OpenDialog_Start]
+	call	[OpenDialog_Start]
 
 	cmp	[OpenDialog_data.status],1
 	jne	.3
@@ -293,7 +293,7 @@ copy_str_2:
 	xor	eax,eax
 	mov	[esi],al
 	inc	esi
-	mov	edi,edx	; edi filename_area
+	mov	edi,edx ; edi filename_area
 	call	copy_str_1
 	ret
 ;-----------------------------------------------------------------------------
@@ -466,7 +466,9 @@ endp
 ;-----------------------------------------------------------------------------
 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]
 ;-----------------------------------------------------------------------------
@@ -516,11 +518,15 @@ proc start_fasm ;/////////////////////////////////////////////////////////////
 	sub	ecx,esi
 	rep	movsb
 
-	cmp	bl,0 ; run outfile ?
+	cmp	bl,0 ; compile outfile ?
 	je	@f
 	mov	dword[edi],',run'
+	cmp	bl,1 ; run outfile ?
+	je	do_run
+	mov	dword[edi],',dbg'
+do_run:
 	add	edi,4
-    @@:
+		@@:
 	mov	al,0
 	stosb
 
@@ -696,7 +702,7 @@ temp_dir_pach:
 	rb 4096
 ;---------------------------------------------------------------------
 fname_Info:
-	rb 4096            ; filename
+	rb 4096 	   ; filename
 ;---------------------------------------------------------------------
 filename_area:
 	rb 256