@@ -1,3 +1,6 @@ +cc = gcc +cc_flags = -Wall -Wstrict-prototypes -pedantic + common_dir = src/common vm_dir = src/vm asm_dir = src/asm @@ -5,15 +8,16 @@ common_files = $(common_dir)/stack.c $(common_dir)/utils.c $(common_dir)/opcodes vm_files = $(vm_dir)/main.c $(vm_dir)/stupidvm.c asm_files = $(asm_dir)/assembler.c $(asm_dir)/instructions.c +vm_out = svm +asm_out= sasm + all: sasm svm svm: $(common_files) $(vm_files) - gcc -Wall -Wstrict-prototypes -ansi -pedantic $(common_files) $(vm_files) -o svm + $(cc) $(cc_flags) $(common_files) $(vm_files) -o $(vm_out) sasm: $(common_files) $(asm_files) - gcc -Wall -Wstrict-prototypes -pedantic $(common_files) $(asm_files) -o sasm + $(cc) $(cc_flags) $(common_files) $(asm_files) -o $(asm_out) doc: doxygen clean: - rm -f src/*.o - rm -f svm - rm -f sasm + rm -f $(vm_out) $(asm_out) rm -rf doc/ \ No newline at end of file Makefile @@ -33,7 +33,11 @@ Opcode opcode_from_string(char *string) { length = sizeof(opcodes) / MAX_OPCODE_LENGTH; for(i = 0; i < length; i++) { - if(strncmp(opcodes[i], string, strlen(string)) == 0) { + /* + ignore the case, so we allow instrunctions written in lower + case as well + */ + if(strncasecmp(opcodes[i], string, strlen(string)) == 0) { return (Opcode)i; } } src/common/opcodes.c c338e4bb04a3e9d4da67b7124dc8b36a5bfea90f Christopher Bertels bakkdoor@flasht.de http://github.com/bakkdoor/stupidvm/commit/40d1f2dc2ec44aa37531ff0d0a07ad1ccabb5f35 40d1f2dc2ec44aa37531ff0d0a07ad1ccabb5f35 2009-10-31T19:59:19-07:00 2009-10-31T19:59:19-07:00 pimped Makefile & made opcode_from_string case insensitive, allowing sasm files to be written in lower case as well (nicer to type). f6d8d43728081865533c5d32531f57bfd749b7fc Christopher Bertels bakkdoor@flasht.de