Merge branch 'develop'

kulp · Dec 17, 2011 · 1906f89 · 1906f89
2 parents c3b8abb + e589d8f
commit 1906f89
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -6,9 +6,13 @@ CFLAGS  += -Wall -Wextra
 
 CFILES = $(wildcard *.c)
 
+VPATH += src
+INCLUDES += src
+
 BUILD_NAME := $(shell git describe --long --always)
 DEFINES += BUILD_NAME='$(BUILD_NAME)'
-CPPFLAGS += $(patsubst %,-D%,$(DEFINES))
+CPPFLAGS += $(patsubst %,-D%,$(DEFINES)) \
+            $(patsubst %,-I%,$(INCLUDES))
 
 all: tas tsim
 tas: parser.o lexer.o

diff --git a/asm.c → src/asm.c b/asm.c → src/asm.c
diff --git a/asm.h → src/asm.h b/asm.h → src/asm.h
diff --git a/common.h → src/common.h b/common.h → src/common.h
diff --git a/lexer.l → src/lexer.l b/lexer.l → src/lexer.l
diff --git a/ops.h → src/ops.h b/ops.h → src/ops.h
diff --git a/parser.y → src/parser.y b/parser.y → src/parser.y
diff --git a/parser_global.h → src/parser_global.h b/parser_global.h → src/parser_global.h
diff --git a/tas.c → src/tas.c b/tas.c → src/tas.c
@@ -13,26 +13,6 @@
 
 int print_disassembly(FILE *out, struct instruction *i);
 
-static int binary_in(FILE *in, struct instruction *i)
-{
-    return fread(&i->u.word, 4, 1, in) == 1;
-}
-
-static int text_in(FILE *in, struct instruction *i)
-{
-    return fscanf(in, "%x", &i->u.word) == 1;
-}
-
-static int binary_out(FILE *stream, struct instruction *i)
-{
-    return fwrite(&i->u.word, sizeof i->u.word, 1, stream) == 1;
-}
-
-static int text_out(FILE *stream, struct instruction *i)
-{
-    return fprintf(stream, "0x%08x\n", i->u.word) > 0;
-}
-
 static const char shortopts[] = "df:o:p::hV";
 
 static const struct option longopts[] = {

diff --git a/tsim.c → src/tsim.c b/tsim.c → src/tsim.c