Porting a bugfix from VM + shell_cmds refactoring

shell_cmds.c

@@ -134,7 +134,7 @@ void asmsh_cmd_args_free(asmsh_cmd_args_t *args)
 }
 
 
-int asmsh_cmd_bcode(asmsh_t *sh, char *argbuf, int bufsz, int argc, char **args)
+int asmsh_cmd_bcode_(asmsh_t *sh, char *argbuf, int bufsz, int argc, char **args)
 {
 	asmsh_bytecode_t bcode;
 	char _buf[256], *buf;
@@ -176,7 +176,6 @@ int asmsh_cmd_bcode(asmsh_t *sh, char *argbuf, int bufsz, int argc, char **args)
 			}
 		}
 		code[sz]='\0';
-dprintf(2, "INSTR='%s'\n", code);
 		if(asmsh_asmc_compile(sh->cctx, code, &bcode) < 0)
 		{
 			return -1;
@@ -202,3 +201,157 @@ dprintf(2, "INSTR='%s'\n", code);
 	return 0;
 }
 
+
+
+int asmsh_cmd_quit(asmsh_t *sh, asmsh_cmd_args_t *args)
+{
+	asmsh_cleanup(sh);
+	return 1;
+}
+
+
+int asmsh_cmd_bcode(asmsh_t *sh, asmsh_cmd_args_t *args)
+{
+	char str[256];
+	int ret;
+
+	ret = asmsh_cmd_bcode_(sh, str, 256, args->argc, args->args);
+	if(ret)
+	{
+		return ret;
+	}
+	printf("%s\n", str);
+	return 0;
+}
+
+int asmsh_cmd_maps(asmsh_t *sh, asmsh_cmd_args_t *args)
+{
+	if(asmsh_env_update_maps(sh->env) < 0)
+	{
+		perror("Unable to update maps info");
+		return -1;
+	}
+	printf("%12s-%-12s perm %-8s %-6s %-10s %s\n", "start", "stop", "offset", "device",
+			"inode", "path");
+	for(int i=0; i<sh->env->mmap.size; i++)
+	{
+		const child_mmap_t *m = &sh->env->mmap.maps[i];
+		printf("%012llx-%012llx %c%c%c  %08lx  %02lx:%02lx %10lu %s\n",
+				(unsigned long long int)m->start,
+				(unsigned long long int)m->stop,
+				m->perm & PROT_READ ?'r':'-',
+				m->perm & PROT_WRITE?'w':'-',
+				m->perm & PROT_EXEC ?'x':'-',
+				m->offset,
+				(m->device & 0xFF00)>>8,
+				m->device & 0xFF,
+				m->inode,
+				m->pathname);
+	}
+	return 0;
+}
+
+int asmsh_cmd_print_regs(asmsh_t *sh, asmsh_cmd_args_t *args)
+{
+	asmsh_env_t *env = sh->env;
+	asmsh_env_update_regs(env);
+	struct user_regs_struct *r = &env->regs;
+	
+#define FLG(b, l) ( (r->eflags & (1<<b))?l:'-' )
+
+	printf("rax: %016llx rbx: %016llx rcx: %016llx rdx: %016llx\n\
+rbp: %016llx rsi: %016llx rdi: %016llx rsp: %016llx\n\
+ r8: %016llx  r9: %016llx r10: %016llx r11: %016llx\n\
+r12: %016llx r13: %016llx r14: %016llx r15: %016llx\n\
+rip: %016llx flg: %016llx\n\
+cs: %04llx ds: %04llx es: %04llx fs:%04llx gs: %04llx ss:%04llx\n\
+flags: %c%c%c%c|%c%c%c\n\
+       ODSZ|APC\n\
+",	r->rax, r->rbx, r->rcx, r->rdx,\
+	r->rbp, r->rsi, r->rdi, r->rsp,\
+	r->r8, r->r9, r->r10, r->r11,\
+	r->r12, r->r13, r->r14, r->r15,\
+	r->rip, r->eflags,\
+	r->cs, r->ds, r->es, r->fs, r->gs, r->ss,
+	FLG(11,'O'), FLG(10, 'D'), FLG(7, 'S'), FLG(6, 'Z'),
+	FLG(4, 'A'), FLG(2, 'P'), FLG(0, 'C'));
+
+#undef FLG
+	return 0;
+}
+
+int asmsh_cmd_syscalls(asmsh_t *sh, asmsh_cmd_args_t *args)
+{
+	const int sz = sizeof(syscall_infos)/sizeof(*syscall_infos);
+	int printed;
+	char buf[512];
+
+	printed = 0;
+	for(int i=0; i<sz; i++)
+	{
+		int ret = snprintf(buf, 512, "%3d 0x%03x %20s ",
+			syscall_infos[i].nr,
+			syscall_infos[i].nr,
+			syscall_infos[i].name);
+		buf[ret] = '\0';
+		printed += ret;
+		if(printed > 80)
+		{
+			printf("\n");
+			printed = ret;
+		}
+		printf(buf);
+	}
+	printf("\n");
+	return 0;
+}
+
+int asmsh_cmd_reset(asmsh_t *sh, asmsh_cmd_args_t *args)
+{
+	char *childpath = sh->child_path?strdup(sh->child_path):NULL;
+	asmsh_cleanup(sh);
+	int ret = asmsh_init(sh, childpath)<0?2:0;
+	if(childpath) { free(childpath); }
+	return ret;
+}
+
+// Display CPU flag resister values
+int asmsh_cmd_flags(asmsh_t *sh, asmsh_cmd_args_t *args)
+{
+	printf("Flags :\n");
+#define printFLG(name, b) printf(" (%2d)%16s : %d\n", b, name,\
+		(sh->env->regs.eflags & (1<<b))?1:0);
+	printFLG("Overflow", 11);
+	printFLG("Direction", 10);
+	printFLG("Sign", 7);
+	printFLG("Zero", 6);
+	printFLG("Auxiliary carry", 4);
+	printFLG("Parity", 2);
+	printFLG("Carry", 0);
+#undef printFLG
+#define EFLG(b,n) ((sh->env->regs.eflags & (1<<b))?n:'-')
+	printf("%c%c%c%c %c%c%c\n",
+			EFLG(11,'O'), EFLG(10, 'D'), EFLG(7,'S'), EFLG(6,'Z'),
+			EFLG(4,'A'), EFLG(2, 'P'), EFLG(0, 'C'));
+	return 0;
+}
+
+// Print help (command list + help)
+int asmsh_cmd_help_(asmsh_t *sh, asmsh_cmd_args_t *args)
+{
+	char buf[4096], abuf[64];
+	int ret;
+
+	ret = snprintf(buf, 4096, "Available commands :\n");
+	for(const asmsh_cmd_t *cmd = asmsh_CMDS; cmd->str; cmd++)
+	{
+		snprintf(abuf, 64, "%s %s", cmd->sms, cmd->usage);
+		ret += snprintf(buf+ret, 4096-ret, "  %-18s : %s\n", 
+				abuf, cmd->desc);
+	}
+	dprintf(2, buf);
+	return 0;
+}
+
+
+

shell_cmds.h

@@ -80,7 +80,6 @@ void asmsh_cmd_args_free(asmsh_cmd_args_t *args);
 const char *asmsh_cmd_help(asmsh_t *sh);
 
 
-
 /*
  * Commands declaration
  *
@@ -89,196 +88,58 @@ const char *asmsh_cmd_help(asmsh_t *sh);
  */
 
 // Quit the shell
-static int _quit(asmsh_t *sh, asmsh_cmd_args_t *args)
-{
-	asmsh_cleanup(sh);
-	return 1;
-}
+int asmsh_cmd_quit(asmsh_t *sh, asmsh_cmd_args_t *args);
 
 // Print an instruction bytecode 
-int asmsh_cmd_bcode(asmsh_t *sh, char *buf, int bufsz, int argc, char **args);
-
-
-static int _bcode(asmsh_t *sh, asmsh_cmd_args_t *args)
-{
-	char str[256];
-	int ret;
-
-	ret = asmsh_cmd_bcode(sh, str, 256, args->argc, args->args);
-	if(ret)
-	{
-		return ret;
-	}
-	printf("%s\n", str);
-	return 0;
-}
-
-static int _maps(asmsh_t *sh, asmsh_cmd_args_t *args)
-{
-	if(asmsh_env_update_maps(sh->env) < 0)
-	{
-		perror("Unable to update maps info");
-		return -1;
-	}
-	printf("%12s-%-12s perm %-8s %-6s %-10s %s\n", "start", "stop", "offset", "device",
-			"inode", "path");
-	for(int i=0; i<sh->env->mmap.size; i++)
-	{
-		const child_mmap_t *m = &sh->env->mmap.maps[i];
-		printf("%012llx-%012llx %c%c%c  %08lx  %02lx:%02lx %10lu %s\n",
-				(unsigned long long int)m->start,
-				(unsigned long long int)m->stop,
-				m->perm & PROT_READ ?'r':'-',
-				m->perm & PROT_WRITE?'w':'-',
-				m->perm & PROT_EXEC ?'x':'-',
-				m->offset,
-				(m->device & 0xFF00)>>8,
-				m->device & 0xFF,
-				m->inode,
-				m->pathname);
-	}
-	return 0;
-}
+int asmsh_cmd_bcode_(asmsh_t *sh, char *buf, int bufsz, int argc, char **args);
+int asmsh_cmd_bcode(asmsh_t *sh, asmsh_cmd_args_t *args);
 
-// Print the registers
-static int _print_regs(asmsh_t *sh, asmsh_cmd_args_t *args)
-{
-	asmsh_env_t *env = sh->env;
-	asmsh_env_update_regs(env);
-	struct user_regs_struct *r = &env->regs;
-	
-#define FLG(b, l) ( (r->eflags & (1<<b))?l:'-' )
-
-	printf("rax: %016llx rbx: %016llx rcx: %016llx rdx: %016llx\n\
-rbp: %016llx rsi: %016llx rdi: %016llx rsp: %016llx\n\
- r8: %016llx  r9: %016llx r10: %016llx r11: %016llx\n\
-r12: %016llx r13: %016llx r14: %016llx r15: %016llx\n\
-rip: %016llx flg: %016llx\n\
-cs: %04llx ds: %04llx es: %04llx fs:%04llx gs: %04llx ss:%04llx\n\
-flags: %c%c%c%c|%c%c%c\n\
-       ODSZ|APC\n\
-",	r->rax, r->rbx, r->rcx, r->rdx,\
-	r->rbp, r->rsi, r->rdi, r->rsp,\
-	r->r8, r->r9, r->r10, r->r11,\
-	r->r12, r->r13, r->r14, r->r15,\
-	r->rip, r->eflags,\
-	r->cs, r->ds, r->es, r->fs, r->gs, r->ss,
-	FLG(11,'O'), FLG(10, 'D'), FLG(7, 'S'), FLG(6, 'Z'),
-	FLG(4, 'A'), FLG(2, 'P'), FLG(0, 'C'));
+int asmsh_cmd_maps(asmsh_t *sh, asmsh_cmd_args_t *args);
 
-#undef FLG
-	return 0;
-}
-
-static int _syscalls(asmsh_t *sh, asmsh_cmd_args_t *args)
-{
-	const int sz = sizeof(syscall_infos)/sizeof(*syscall_infos);
-	int printed;
-	char buf[512];
+int asmsh_cmd_print_regs(asmsh_t *sh, asmsh_cmd_args_t *args);
 
-	printed = 0;
-	for(int i=0; i<sz; i++)
-	{
-		int ret = snprintf(buf, 512, "%3d 0x%03x %20s ",
-			syscall_infos[i].nr,
-			syscall_infos[i].nr,
-			syscall_infos[i].name);
-		buf[ret] = '\0';
-		printed += ret;
-		if(printed > 80)
-		{
-			printf("\n");
-			printed = ret;
-		}
-		printf(buf);
-	}
-	printf("\n");
-	return 0;
-}
+int asmsh_cmd_syscalls(asmsh_t *sh, asmsh_cmd_args_t *args);
 
-// Reset the shell (restart the child etc)
-static int _reset(asmsh_t *sh, asmsh_cmd_args_t *args)
-{
-	char *childpath = strdup(sh->child_path);
-	asmsh_cleanup(sh);
-	asmsh_init(sh, childpath);
-	free(childpath);
-	return 0;
-}
+// Reset the shell (restart the child etc)a
+int asmsh_cmd_reset(asmsh_t *sh, asmsh_cmd_args_t *args);
 
 // Display CPU flag resister values
-static int _flags(asmsh_t *sh, asmsh_cmd_args_t *args)
-{
-	printf("Flags :\n");
-#define printFLG(name, b) printf(" (%2d)%16s : %d\n", b, name,\
-		(sh->env->regs.eflags & (1<<b))?1:0);
-	printFLG("Overflow", 11);
-	printFLG("Direction", 10);
-	printFLG("Sign", 7);
-	printFLG("Zero", 6);
-	printFLG("Auxiliary carry", 4);
-	printFLG("Parity", 2);
-	printFLG("Carry", 0);
-#undef printFLG
-#define EFLG(b,n) ((sh->env->regs.eflags & (1<<b))?n:'-')
-	printf("%c%c%c%c %c%c%c\n",
-			EFLG(11,'O'), EFLG(10, 'D'), EFLG(7,'S'), EFLG(6,'Z'),
-			EFLG(4,'A'), EFLG(2, 'P'), EFLG(0, 'C'));
-	return 0;
-}
+int asmsh_cmd_flags(asmsh_t *sh, asmsh_cmd_args_t *args);
 
-// Declared because referenced in command list but not implemented
-// because the _help function needs a reference to the command list
-static int _help(asmsh_t *sh, asmsh_cmd_args_t *args);
+int asmsh_cmd_help_(asmsh_t *sh, asmsh_cmd_args_t *args);
 
 
 /* 
  * The list of shell commands
  */
 static const asmsh_cmd_t asmsh_CMDS[] = {
-	{".bytecode", _bcode, 2,
+	{".bytecode", asmsh_cmd_bcode, 2,
 	 ".b(ytecode)", "",
 	 "display last instruction bytecode"},
-	{".flags", _flags, 2,
+	{".flags", asmsh_cmd_flags, 2,
 	 ".f(lags)", "",
 	 "display CPU flags"},
-	{".help", _help, 2,
+	{".help", asmsh_cmd_help_, 2,
 	 ".h(elp)","[cmd]",
 	 "display this help or the help of specified command"},
-	{".maps", _maps, 2,
+	{".maps", asmsh_cmd_maps, 2,
 	 ".m(aps)", "",
 	 "display memory maps"},
-	{".quit", _quit, 2,
+	{".quit", asmsh_cmd_quit, 2,
 	 ".q(uit)","",
 	 "quit asmsh"},
-	{".regs", _print_regs, 1,
+	{".regs", asmsh_cmd_print_regs, 1,
 	".(regs)", "",
 	"display registers value"},
-	{".syscalls", _syscalls, 2,
+	{".syscalls", asmsh_cmd_syscalls, 2,
 	 ".s(yscalls)", "",
 	 "print syscalls name & numbers"},
-	{".reset", _reset, 0,
+	{".reset", asmsh_cmd_reset, 0,
 	 ".reset", "",
 	 "reset the shell"},
 	{NULL, NULL, 0},
 };
 
 
-// Print help (command list + help)
-static int _help(asmsh_t *sh, asmsh_cmd_args_t *args)
-{
-	char buf[4096], abuf[64];
-	int ret;
-
-	ret = snprintf(buf, 4096, "Available commands :\n");
-	for(const asmsh_cmd_t *cmd = asmsh_CMDS; cmd->str; cmd++)
-	{
-		snprintf(abuf, 64, "%s %s", cmd->sms, cmd->usage);
-		ret += snprintf(buf+ret, 4096-ret, "  %-18s : %s\n", 
-				abuf, cmd->desc);
-	}
-	dprintf(2, buf);
-	return 0;
-}
 
 #endif