Restructured build directory

electrojustin · May 20, 2015 · fc92acf · fc92acf
1 parent d80f089
commit fc92acf
Show file tree

Hide file tree

Showing 27 changed files with 507 additions and 38 deletions.
diff --git a/Makefile b/Makefile
@@ -1,36 +1,15 @@
-CFLAGS=-O2
-mrproper: triad clean
-debug: CFLAGS=-g
-debug: triad
-triad: main.o elf_parser.o jump_block.o function.o var.o lang_gen.o
-	gcc $(CFLAGS) main.o elf_parser.o jump_block.o function.o var.o lang_gen.o -o triad -lcapstone
-sys_tests: test arith_test control_flow_test sys_tests64
-sys_tests64: test64 arith_test64 control_flow_test64
-test: test.c
-	gcc -m32 test.c -o test
-arith_test: arith_test.c
-	gcc -m32 arith_test.c -o arith_test
-control_flow_test: control_flow_test.c
-	gcc -m32 control_flow_test.c -o control_flow_test
-test64: test.c
-	gcc test.c -o test64
-arith_test64: arith_test.c
-	gcc arith_test.c -o arith_test64
-control_flow_test64: control_flow_test.c
-	gcc control_flow_test.c -o control_flow_test64
-main.o: main.c elf_parser.h function.h
-	gcc $(CFLAGS) -c main.c
-elf_parser.o: elf_parser.h elf_parser.c
-	gcc $(CFLAGS) -c elf_parser.c
-jump_block.o: jump_block.c jump_block.h datastructs.h elf_parser.h
-	gcc $(CFLAGS) -c jump_block.c
-function.o: function.c function.h datastructs.h jump_block.h
-	gcc $(CFLAGS) -c function.c
-var.o: var.c var.h datastructs.h
-	gcc $(CFLAGS) -c var.c
-lang_gen.o: lang_gen.c lang_gen.h var.h function.h jump_block.h
-	gcc $(CFLAGS) -c lang_gen.c
+mrproper: triad sys_tests sys_tests64 clean clean_tests
+debug:
+	make -C src debug
+triad: 
+	make -C src triad
+sys_tests:
+	make -C tests sys_tests && tests/do_tests.sh
+sys_tests64:
+	make -C tests sys_tests64 && tests/do_tests64.sh
 clean:
-	rm main.o var.o lang_gen.o jump_block.o elf_parser.o function.o
+	make -C src clean
+clean_tests:
+	make -C tests clean
 install:
-	install ./triad /usr/bin/triad
+	install src/triad /usr/bin/triad
diff --git a/TODO b/TODO
@@ -1,6 +1,8 @@
 ++++CONTROL FLOW++++
 {
 
+Fix control flow decompilation (too brittle as is). Perhaps use AI? - LONG TERM
+
 Add Switches - LONG TERM
 
 }
@@ -15,12 +17,8 @@ Add support for datastructures and arrays - LONG TERM
 MISC
 {
 
-Add in a binary editor to inject code and edit the surrounding jumps - NEXT RELEASE
-
 MORE DOCUMENTATION
 
 CODE CLEANUPS
 
-Switch to capstone disassembler and support x86_64 - LONG TERM
-
 }
diff --git a/src/Makefile b/src/Makefile
@@ -0,0 +1,22 @@
+CFLAGS=-O2
+mrproper: triad clean
+debug: CFLAGS=-g
+debug: triad
+triad: main.o elf_parser.o jump_block.o function.o var.o lang_gen.o
+	gcc $(CFLAGS) main.o elf_parser.o jump_block.o function.o var.o lang_gen.o -o triad -lcapstone
+
+main.o: main.c elf_parser.h function.h
+	gcc $(CFLAGS) -c main.c
+elf_parser.o: elf_parser.h elf_parser.c
+	gcc $(CFLAGS) -c elf_parser.c
+jump_block.o: jump_block.c jump_block.h datastructs.h elf_parser.h
+	gcc $(CFLAGS) -c jump_block.c
+function.o: function.c function.h datastructs.h jump_block.h
+	gcc $(CFLAGS) -c function.c
+var.o: var.c var.h datastructs.h
+	gcc $(CFLAGS) -c var.c
+lang_gen.o: lang_gen.c lang_gen.h var.h function.h jump_block.h
+	gcc $(CFLAGS) -c lang_gen.c
+
+clean:
+	rm main.o var.o lang_gen.o jump_block.o elf_parser.o function.o
diff --git a/datastructs.h → src/datastructs.h b/datastructs.h → src/datastructs.h
diff --git a/elf_parser.c → src/elf_parser.c b/elf_parser.c → src/elf_parser.c
diff --git a/elf_parser.h → src/elf_parser.h b/elf_parser.h → src/elf_parser.h
diff --git a/function.c → src/function.c b/function.c → src/function.c
diff --git a/function.h → src/function.h b/function.h → src/function.h
diff --git a/jump_block.c → src/jump_block.c b/jump_block.c → src/jump_block.c
diff --git a/jump_block.h → src/jump_block.h b/jump_block.h → src/jump_block.h
diff --git a/lang_gen.c → src/lang_gen.c b/lang_gen.c → src/lang_gen.c
diff --git a/lang_gen.h → src/lang_gen.h b/lang_gen.h → src/lang_gen.h
diff --git a/main.c → src/main.c b/main.c → src/main.c
diff --git a/var.c → src/var.c b/var.c → src/var.c
diff --git a/var.h → src/var.h b/var.h → src/var.h
diff --git a/tests/Makefile b/tests/Makefile
@@ -0,0 +1,19 @@
+sys_tests: test arith_test control_flow_test
+
+sys_tests64: test64 arith_test64 control_flow_test64
+
+test: test.c
+	gcc -m32 test.c -o test
+arith_test: arith_test.c
+	gcc -m32 arith_test.c -o arith_test
+control_flow_test: control_flow_test.c
+	gcc -m32 control_flow_test.c -o control_flow_test
+test64: test.c
+	gcc test.c -o test64
+arith_test64: arith_test.c
+	gcc arith_test.c -o arith_test64
+control_flow_test64: control_flow_test.c
+	gcc control_flow_test.c -o control_flow_test64
+
+clean:
+	rm test test64 arith_test arith_test64 control_flow_test control_flow_test64 *trial
diff --git a/arith_test.c → tests/arith_test.c b/arith_test.c → tests/arith_test.c
diff --git a/tests/arith_test64_expected b/tests/arith_test64_expected
@@ -0,0 +1,92 @@
+
+int main (void)
+{
+	int a;
+	int e;
+	int d;
+	int c;
+	register long long esi;
+	register long long eax;
+	register long long edx;
+	int b;
+
+	a = 2;
+	b = 3;
+	edx = b;
+	eax = a;
+	esi = edx;
+	edx = eax;
+	eax = func1 ();
+	c = eax;
+	edx = b;
+	eax = a;
+	esi = edx;
+	edx = eax;
+	eax = func2 ();
+	d = eax;
+	edx = b;
+	eax = a;
+	esi = edx;
+	edx = eax;
+	eax = func3 ();
+	e = eax;
+	edx = c;
+	eax = d;
+	edx += eax;
+	eax = e;
+	eax += edx;
+	return eax;
+}
+
+
+int func3 (void)
+{
+	int f;
+	register long long r15;
+	register long long eax;
+	register long long esi;
+	int g;
+	register long long edi;
+
+	f = edi;
+	g = esi;
+	eax = f;
+	eax *= g;
+	return eax;
+	r15 = edi;
+	r15 = (long long)&rip;
+}
+
+
+int func2 (void)
+{
+	int h;
+	register long long eax;
+	register long long esi;
+	int i;
+	register long long edi;
+
+	h = edi;
+	i = esi;
+	eax = i;
+	eax -= h;
+	return eax;
+}
+
+
+int func1 (void)
+{
+	int j;
+	register long long eax;
+	register long long esi;
+	int k;
+	register long long edi;
+
+	j = edi;
+	k = esi;
+	edi = j;
+	eax = k;
+	eax += edi;
+	return eax;
+}
+
diff --git a/tests/arith_test_expected b/tests/arith_test_expected
@@ -0,0 +1,63 @@
+
+int main (void)
+{
+	register int ecx;
+	int f;
+	register int edx;
+	int e;
+	int d;
+	register int eax;
+	int c;
+	int b;
+	int a;
+
+	ecx = (int)&esp;
+	a = 2;
+	b = 3;
+	eax = func1 (a, b, *(int*)(ecx+(-4)));
+	c = eax;
+	eax = func2 (a, b);
+	d = eax;
+	eax = func3 (a, b);
+	e = eax;
+	edx = c;
+	eax = d;
+	edx += eax;
+	eax = e;
+	eax += edx;
+	ecx = f;
+	return eax;
+}
+
+
+int func3 (int g, int h)
+{
+	register int eax;
+
+	eax = g;
+	eax *= h;
+	return eax;
+}
+
+
+int func2 (int j, int i)
+{
+	register int eax;
+
+	eax = i;
+	eax -= j;
+	return eax;
+}
+
+
+int func1 (int k, int l)
+{
+	register int edx;
+	register int eax;
+
+	edx = k;
+	eax = l;
+	eax += edx;
+	return eax;
+}
+
diff --git a/control_flow_test.c → tests/control_flow_test.c b/control_flow_test.c → tests/control_flow_test.c
diff --git a/tests/control_flow_test64_expected b/tests/control_flow_test64_expected
@@ -0,0 +1,81 @@
+
+int main (void)
+{
+	int a;
+	register long long edi;
+	register long long r15;
+	register long long eax;
+	int d;
+	int c;
+	int b;
+
+	a = 1;
+	b = 10;
+0x4004c8:
+	c = 11;
+	d = 0;
+	while (a > 0)
+	{
+		a -= 1;
+		if (b != 0)
+		{
+			break;
+		}
+		b += 1;
+	}
+	do
+	{
+		b -= 1;
+		if (c != 0)
+		{
+			continue;
+		}
+		c -= 1;
+		eax = b;
+	} while (eax >= a);
+	if (b != 0)
+	{
+		if (a != 0)
+		{
+			c = 1;
+		}
+		else
+		{
+			c = 2;
+		}
+	}
+	else
+	{
+		if (d == 0)
+		{
+			c = 6;
+		}
+	}
+	a = 0;
+	if (a != 0)
+	{
+		a = 2;
+	}
+	else
+	{
+		a = 3;
+	}
+	while (a <= 9)
+	{
+		a += 1;
+	}
+	a = 11;
+	eax = c;
+	if (eax == b)
+	{
+		goto 0x4004c8;
+	}
+	c = 10;
+	eax = c;
+	b = eax;
+	eax = c;
+	return eax;
+	r15 = edi;
+	r15 = (long long)&rip;
+}
+