Corrected build system & step positionment in child

Makefile.am

@@ -5,6 +5,14 @@ libcheck_asmsh_a_SOURCES = mmap_parse.c asm_env.c compile.c logger.c
 asmsh_SOURCES = asmsh.c $(libasmsh_a_SOURCES)
 child_SOURCES = child.s
 
+asmsh_LDFLAGS=-g -O2
+
+CCASFLAGS=-g -O0
+child_LDFLAGS=-nostdlib
+
+child$(EXEEXT): $(child_SOURCES:.s=.o)
+	ld -g -o $@ $^
+
 SUBDIRS = 
 if CHECK
 noinst_LIBRARIES = libcheck_asmsh.a
@@ -32,7 +40,3 @@ clean-local:
 
 endif
 
-child$(EXEEXT): $(child_SOURCES:.s=.o)
-	ld $(child_LDFLAGS) -o $@ $<
-
-

asm_env.c

@@ -17,6 +17,11 @@ asmsh_env_t* asmsh_env(const char *childpath)
 	}
 	child_mmap_init(&(res->mmap));
 
+	if((res->childpath = strdup(childpath)) == NULL)
+	{
+		goto err_pathdup;
+	}
+
 	if(_asmsh_env_spawn(res, childpath) < 0)
 	{
 		err = errno;
@@ -78,6 +83,8 @@ asmsh_env_t* asmsh_env(const char *childpath)
 
 	return res;
 err:
+	free(res->childpath);
+err_pathdup:
 	free(res);
 	errno = err;
 	return NULL;
@@ -91,6 +98,7 @@ void asmsh_env_free(asmsh_env_t *asmenv)
 		free(asmenv->mmap.maps);
 	}
 	kill(asmenv->pid, SIGKILL);
+	free(asmenv->childpath);
 	free(asmenv);
 }
 
@@ -211,17 +219,58 @@ static int _asmsh_env_spawn(asmsh_env_t *env, const char *childpath)
 		}
 	}
 	// mmap done by child process
+	
+	// WARNING totally depends on child.s source
+	// right now there is only 4 instructions (the fourth is the jmp to the txt_map)
+	// before reaching the start of the code mmap
+	for(int i=0; i<4; i++)
+	{
+		/* // DEBUG to monitor placement in child exec
+		asmsh_env_update_regs(env);
+		dprintf(2, "%d) rax: %08X rip : %08X mmap_addr = %08X\n",
+				i, env->regs.rax, env->regs.rip, env->txt_map_ptr);
+		*/
+		if(ptrace(PTRACE_SINGLESTEP, env->pid, NULL, 0) < 0)
+		{
+			err = errno;
+			perror("Unable to ptrace singlestep");
+			dprintf(2, "ptrace syscall failed on %d time\n", i+1);
+			goto err;
+		}
+		if(waitpid(env->pid, &wstatus, 0) < 0)
+		{
+			err = errno;
+			perror("Unable to wait for child process to stop on step");
+			goto err;
+		}
+		if(wstatus != 1407)
+		{
+			goto err_wstatus;
+		}
+
+	}
 
 	return 0;
 
 err_wstatus:
-	if(WCOREDUMP(wstatus))
+	if(WIFEXITED(wstatus))
+	{
+		dprintf(2, "Child exited with status %d\n", WEXITSTATUS(wstatus));
+	}
+	else if(WIFSIGNALED(wstatus))
 	{
-		dprintf(2, "Child segfault\n");
+		if(WCOREDUMP(wstatus))
+		{
+			dprintf(2, "Child segfault\n");
+		}
+		else
+		{
+			dprintf(2, "Child killed by sig %d\n", WTERMSIG(wstatus));
+		}
 	}
-	else if(WIFEXITED(wstatus))
+	else if(WIFSTOPPED(wstatus))
 	{
-		dprintf(2, "Child exited with status %d\n", WEXITSTATUS(wstatus));
+		dprintf(2, "Child stopped by sig %d\n", WSTOPSIG(wstatus));
 	}
 	else
 	{

asm_env.h

@@ -21,6 +21,7 @@ typedef struct asmsh_env_s asmsh_env_t;
 
 struct asmsh_env_s
 {
+	char *childpath;
 	///! Child process pid
 	pid_t pid;
 	///! Child process registers value

child.s

@@ -14,19 +14,11 @@ _start:
 	xor %r9, %r9
 	syscall
 
+	push %rax
 	cmp $0, %rax
 	jle .errmap
 
-	push %rax
-	#xor %rax, %rax
-	#push %rax
-
-
-	#mov $-1, %r15
-	#mov $34, %rax # sys_pause
-	#syscall
-
-	jmp *(%rsp)
+	jmp *(%rsp) # STOP HERE
 
 	mov $60, %rax
 	xor %rdi, %rdi

tests/regen.sh

@@ -9,18 +9,25 @@ TESTS = $progs
 check_PROGRAMS = $progs
 noinst_HEADERS = asmsh_check.h
 EXTRA_DIST = samples
-SUBDIRS  = samples
+SUBDIRS = samples
 
 TESTLIB_NAME=libcheck_asmsh.a
 TESTLIB=\$(top_builddir)/\$(TESTLIB_NAME)
+CHILD_NAME=child
+CHILD=\$(top_builddir)/\$(CHILD_NAME)
+
+BUILT_SOURCES = \$(CHILD)
 
 clean-local:
 	-rm -rf *.gcov *.gcda *.gcno
 
+\$(CHILD):
+	make -C \$(top_builddir) \$(CHILD_NAME)
+
 \$(TESTLIB):
 	make -C \$(top_builddir) \$(TESTLIB_NAME)
 
-.PHONY: \$(TESTLIB)
+.PHONY: \$(TESTLIB) \$(CHILD)
 __EOF__
 
 for p in $progs

tests/samples/Makefile.am

@@ -1,6 +1,9 @@
+if CHECK
 bin_PROGRAMS = asm_env_stamps
 
 asm_env_stamps_SOURCES = asm_env_stamps.s
+asm_env_stamps_CCASFLAGS = -g -O0
 
 asm_env_stamps$(EXEEXT): $(asm_env_stamps_SOURCES:.s=.o)
 	ld  $(child_LDFLAGS) -o $@ $<
+endif

tests/samples/asm_env_stamps.s

@@ -25,7 +25,7 @@ _start:
 	push %rax
 
 
-	mov $-1, %r15
+	#mov $-1, %r15
 	mov $34, %rax # sys_pause
 	syscall
 

tests/tests_asm_env.c

@@ -9,14 +9,19 @@
 #include "asmsh_check.h"
 #include "asm_env.h"
 
+#define REAL_CHILD "../child"
+#define STAMP_CHILD "samples/asm_env_stamps"
+
 static const long int stamp1 = 0x4242; // %r15
 static const long int stamp2 = -1; // %r14
 
 START_TEST(test_env)
 {
-	asmsh_env_t *env = asmsh_env("../child");
+	const char childpath[] = REAL_CHILD;
+	asmsh_env_t *env = asmsh_env(childpath);
 	
 	ck_assert_ptr_nonnull(env);
+	ck_assert_str_eq(childpath, env->childpath);
 
 	asmsh_env_free(env);
 }
@@ -24,9 +29,11 @@ END_TEST
 
 START_TEST(test_asm_stamps)
 {
-	asmsh_env_t *env = asmsh_env("samples/asm_env_stamps");
+	const char childpath[] = STAMP_CHILD;
+	asmsh_env_t *env = asmsh_env(childpath);
 	
 	ck_assert_ptr_nonnull(env);
+	ck_assert_str_eq(env->childpath, childpath);
 
 	ck_assert_mem_eq(&stamp1, &(env->regs.r15), 8);
 	ck_assert_mem_eq(&stamp2, &(env->regs.r14), 8);
@@ -37,15 +44,14 @@ END_TEST
 
 START_TEST(test_env_update)
 {
-	asmsh_env_t *env = asmsh_env("samples/asm_env_stamps");
+	const char childpath[] = STAMP_CHILD;
+	asmsh_env_t *env = asmsh_env(childpath);
 
 	ck_assert_ptr_nonnull(env);
+	ck_assert_str_eq(env->childpath, childpath);
 
 	asmsh_env_update_maps(env);
 
-	ck_assert_mem_eq(&stamp1, &(env->regs.r15), 8);
-	ck_assert_mem_eq(&stamp2, &(env->regs.r14), 8);
-
 	asmsh_env_free(env);
 }