Implements a .run function that runs until breakpoint

asm_env.c

@@ -230,6 +230,30 @@ err:
 }
 
 
+int asmsh_env_run(asmsh_env_t *env, int *status)
+{
+	while(1)
+	{
+		int ret;
+		if((ret = asmsh_env_update_regs(env)) < 0)
+		{
+			return ret;
+		}
+		const unsigned long rip = env->regs.rip;
+		if(asmsh_brk_isset(&(env->brks), rip))
+		{
+			asmsh_log_info("Breakpoint %016lx reached", rip);
+			*status = 0;
+			return 0;
+		}
+		if((ret = asmsh_env_step(env, status)) != 0)
+		{
+			return ret;
+		}
+	}
+}
+
+
 int asmsh_env_update(asmsh_env_t *asmenv)
 {
 	if(asmsh_env_update_regs(asmenv) < 0)

asm_env.h

@@ -101,13 +101,22 @@ int asmsh_env_write_code(asmsh_env_t *env, asmsh_bytecode_t *bcode);
 
 /** Run the next instruction
  * @param asmsh_env_t* The run environment
- * @param int* If not null will be set to the status of the child PID (error
+ * @param int* Will be set to the status of the child PID (error
  * cases)
  * @return 0 if no error else -1, if the child is not trapped as expected, 1 is
  * returned and wstatus is set to the child status (see man 2 waitpid)
  */
 int asmsh_env_step(asmsh_env_t *env, int *status);
 
+/** Run until next breakpoint
+ * @param asmsh_env_t* The run environment
+ * @param int* Will be set to the status of the child PID (error
+ * cases)
+ * @return 0 if no error else -1, if the child is not trapped as expected, 1 is
+ * returned and wstatus is set to the child status (see man 2 waitpid)
+ */
+int asmsh_env_run(asmsh_env_t *env, int *status);
+
 /** Update both registers and memory maps */
 int asmsh_env_update(asmsh_env_t *asmenv);
 /** Update env registers from child */

asmsh.h

@@ -111,14 +111,15 @@ asmsh@0x7f6e312e5022 >
 
 @section TODO TODOLIST
 
-@todo Implement breakpoints
 @todo Implement command for memory read/dump
 @todo Implement symbols for jumps
 @todo Add support for label declarations & references
 @todo Implement write without exec
 @todo Implement function declaration
 @todo Add switch between intel's & AT&T's syntaxes.
-@todo Rationalise commands argument parsing
+@todo Implement a command to run until syscall only (and another for run until
+		breakpoint or syscall ?)
+@todo Rationalise commands argument parsing (at the moment .breakpoints allready uses special stuff :/)
 
 @section AUTHOR
 Written by Yann Weber <yann.weber@members.fsf.org>

shell_cmds.c

@@ -320,6 +320,25 @@ int asmsh_cmd_syscalls(asmsh_t *sh, asmsh_cmd_args_t *args)
 	return 0;
 }
 
+
+int asmsh_cmd_run(asmsh_t *sh, asmsh_cmd_args_t *args)
+{
+	int ret, status;
+	ret = asmsh_env_run(sh->env, &status);
+	if(ret < 0)
+	{
+		perror("Unable to run as expected");
+		asmsh_log_fatal("Error while child runs...");
+		return -1;
+	}
+	else if(ret > 0)
+	{
+		return 1+WEXITSTATUS(status);
+	}
+	return 0;
+}
+
+
 int asmsh_cmd_reset(asmsh_t *sh, asmsh_cmd_args_t *args)
 {
 	char *childpath = sh->child_path?strdup(sh->child_path):NULL;

shell_cmds.h

@@ -106,6 +106,8 @@ int asmsh_cmd_step(asmsh_t *sh, asmsh_cmd_args_t *args);
 
 int asmsh_cmd_syscalls(asmsh_t *sh, asmsh_cmd_args_t *args);
 
+int asmsh_cmd_run(asmsh_t *sh, asmsh_cmd_args_t *args);
+
 // Reset the shell (restart the child etc)a
 int asmsh_cmd_reset(asmsh_t *sh, asmsh_cmd_args_t *args);
 
@@ -140,6 +142,9 @@ static const asmsh_cmd_t asmsh_CMDS[] = {
 	{".regs", asmsh_cmd_print_regs, 1,
 	".(regs)", "",
 	"display registers value"},
+	{".run", asmsh_cmd_run, 3,
+	 ".ru(n)", "",
+	 "Run until a breakpoint is reached"},
 	{".step", asmsh_cmd_step, 2,
 	 ".s(tep)", "",
 	 "Run the instruction pointed by RIP"},