fix param

asm_rules.c

@@ -3,12 +3,15 @@
 #include <stdlib.h>
 
 void trit_flip(char *in, char *instruction) {
-	for (int i = 0; i<(sizeof(in)/sizeof(in[0])); i++) {
+	for (int i = 0; i<27; i++) {
 		in[i] = instruction[i];
 	}
 }
-int asm_rules(char *in, char _asm[27], char _asm_addr[27]){
+int asm_rules(char *in, char *_asm){
 	
+	for (int i = 0; i < 27; i++) {
+		_asm[i] = 0;
+	}
 	int pass = 0;
 
 	char *word = strtok(in, " ");
@@ -20,47 +23,53 @@ int asm_rules(char *in, char _asm[27], char _asm_addr[27]){
 			//comments
 			break;
 		} else {
-			if(word[0] == 'i') {
-				//integer
-				_asm[7] = '0'; 
-			} else if(word[0] == 'f') {
-				//floating
-				_asm[7] = '-'; 
-			}
-			if (word[0] == '$' || word[0] == '@') {
-
 			//cases make larger checks harder to read
-			} else if (strstr(word, "max")) { 
+			if (strstr(word, "max")) { 
-				trit_flip(_asm, "+00000+000000");
+				trit_flip(_asm, "000000+00000+");
 			} else if (strstr(word, "min")) {
-				trit_flip(_asm, "-00000+000000");
+				trit_flip(_asm, "000000+00000-");
 			} else if (strstr(word, "any")) {
 				trit_flip(_asm, "000000+000000");
 			} else if (strstr(word, "cons")) {
-				trit_flip(_asm, "-+0000+000000");
+				trit_flip(_asm, "000000+0000+-");
 			} else if (strstr(word, "add")) {
-				trit_flip(_asm, "+-+000+000000");
+				trit_flip(_asm, "000000+000+-+");
 			} else if (strstr(word, "sub")) {
-				trit_flip(_asm, "+--000+000000");
+				trit_flip(_asm, "000000+000--+");
 			} else if (strstr(word, "mul")) {
-				trit_flip(_asm, "+0+000+000000");
+				trit_flip(_asm, "000000+000+0+");
 			} else if (strstr(word, "div")) {
-				trit_flip(_asm, "+0-000+000000");
+				trit_flip(_asm, "000000+000+0-");
 			} else if (strstr(word, "dec")) {
-				trit_flip(_asm, "--0000+000000");
+				trit_flip(_asm, "000000+0000--");
 			} else if (strstr(word, "inc")) {
-				trit_flip(_asm, "-+0000+000000");
+				trit_flip(_asm, "000000+0000+-");
 			} else if (strstr(word, "iou")) {
-				trit_flip(_asm, "--0000-000000");
+				trit_flip(_asm, "000000-0000--");
 			} else if (strstr(word, "ieq")) {
-				trit_flip(_asm, "+-0000-000000");
+				trit_flip(_asm, "000000-0000-+");
 			} else if (strstr(word, "jmp")) {
 				trit_flip(_asm, "000000-000000");
 			} else if (strstr(word, "jec")) {
-				trit_flip(_asm, "+00000-000000");
+				trit_flip(_asm, "000000-00000+");
 			} else if (strstr(word, "mov")) {
-				trit_flip(_asm, "+000000000000");
+				trit_flip(_asm, "000000000000+");
+			} else if (strstr(word, "Nst")) { //underflow test
+				trit_flip(_asm, "-------------");
+			} else if (strstr(word, "Pst")) { //overflow test
+				trit_flip(_asm, "+++++++++++++");
 			}
+			if(word[0] == 'i') {
+				//integer
+				_asm[5] = '0'; 
+			} else if(word[0] == 'f') {
+				//floating
+				_asm[5] = '-'; 
+			}
+			if (word[0] == '$' || word[0] == '@') {
+
+			}
+
 		}
 
 		word = strtok(NULL, " ");
@@ -68,3 +77,4 @@ int asm_rules(char *in, char _asm[27], char _asm_addr[27]){
 	pass = 0;
 	return 0;
 }
+

main.c

@@ -1,72 +1,15 @@
 #include <stdio.h>
 #include "asm_rules.c"
 
-void bin_to_hex(char *tryte, int *hex) {
+void bin_to_hex(char *tryte, int *hex);
-	char *a = tryte;
+void asm_to_hex(char *_asm, int *opcode, int *in0, int *in1, int *out);
-	long num = 0;
+int params(int argc, char **argv);
-	do {
-		long b = *a=='1'?1:0;
-		num = (num<<1)|b;
-		a++;
-	} while (*a);
-	*hex = num;
-
-}
-void asm_to_hex(char *_asm, int *opcode, int *in0, int *in1, int *out){
-
-	char tryte[108] = "\0";
-	char t0[26] = "\0"; 
-	char t1[26] = "\0"; 
-	char t2[26] = "\0"; 
-	char t3[26] = "\0"; 
-
-	int size = sizeof(_asm)/sizeof(_asm[0]);
-	//convert assembly to formated binary representation of ternary
-	for (int i = 0; i < sizeof(_asm)/4; i++) {
-		
-		//printf("%c",_asm[i]);
-		if(_asm[i]=='-') {
-			strcat(tryte, "10");
-		} else if (_asm[i]=='+') {
-			strcat(tryte, "01");
-		} else {
-			strcat(tryte, "00");
-		}
-	}
-
-	bin_to_hex(t0, opcode);
-	bin_to_hex(t1, in0);
-	bin_to_hex(t2, in1);
-	bin_to_hex(t3, out);
-}
-
 
+FILE *dest_asm;
+FILE *src_asm;
 int main(int argc, char **argv) {
-
+	int p = params(argc, argv);
-	FILE *dest_asm;
+	if (p==1) {
-	FILE *src_asm;
-	if (argc > 2) {
-		for (int i = 1 ; i < argc; i++) {
-			if (strcmp("-i", argv[i]) == 0 || strcmp("--input", argv[i]) == 0) {
-				src_asm = fopen(argv[i+1], "r");
-				i=i+1;
-			} else if (strcmp("-o", argv[i]) == 0 || strcmp("--output", argv[i]) == 0) {
-				dest_asm = fopen(argv[i+1], "w");
-				i=i+1;
-			} else if (strcmp("-h", argv[i]) == 0 || strcmp("--help", argv[i]) == 0) {
-				printf("Usage: tasm [options] file...\n");
-				printf("Options:\n");
-				printf("-h,--help		Prints this information\n");
-				printf("-i,--input <arg> 	Path of input file\n");
-				printf("-o,--output <arg>	Path of output file\n");
-				return 0; 
-			} else {
-				printf("unknown argument: %s\n", argv[i]);
-				return 1;
-			}
-		}
-	} else {
-		printf("tasm: no input file\n");
 		return 1;
 	}
 
@@ -93,20 +36,17 @@ int main(int argc, char **argv) {
 			asm_rules(in_asm, out_asm);
 			asm_to_hex(out_asm, &hex_op, &hex_in0, &hex_in1, &hex_out);
 
-			printf("%.5x %.5x %.5x %.5x\n", hex_op, hex_in0, hex_in1, hex_out);
+			printf("%.7x %.7x %.7x %.7x\n", hex_op, hex_in0, hex_in1, hex_out);
-
-			fprintf(dest_asm,"%.5x ", hex_op);
-			fprintf(dest_asm,"%.5x ", hex_in0);
-			fprintf(dest_asm,"%.5x ", hex_in1);
-			fprintf(dest_asm,"%.5x \n", hex_out);
 			// Write the hex to a file
-
+			fprintf(dest_asm,"%.7x ", hex_op);
-			size = size + 3; //1 word = 3trytes
+			fprintf(dest_asm,"%.7x ", hex_in0);
+			fprintf(dest_asm,"%.7x ", hex_in1);
+			fprintf(dest_asm,"%.7x \n", hex_out);
+			size = size + 2; //1 word = 2trytes
 		}
-
 	}
 
-	printf("\n%u trytes\n\n", size);
+	printf("\nfilesize: %u trytes\n\n", size);
 
 
 	// Close the file
@@ -116,3 +56,109 @@ int main(int argc, char **argv) {
 	return 0;
 }
 
+int params(int argc, char **argv){
+	//{{{
+	printf("%s\n", *argv);
+	char in = 0;
+	char out = 0;
+	char ret = 1;
+	if (argc > 1) {
+		for (int i = 1 ; i < argc; i++) {
+			if (strcmp("-i", argv[i]) == 0 || strcmp("--input", argv[i]) == 0) {
+				if (argv[i+1]==NULL) {
+					//empty
+				} else {
+					in = 1;
+					if((src_asm = fopen(argv[i+1],"r"))!=NULL) {
+						//src_asm = fopen(argv[i+1], "r");
+						i=i+1;
+						ret = 0;
+					} else {
+						printf("tasm: file '%s' does not exist \n", argv[i+1]);
+						ret = 1;
+					}
+				}
+			} else if (strcmp("-o", argv[i]) == 0 || strcmp("--output", argv[i]) == 0) {
+				if (argv[i+1]==NULL) {
+					//empty
+				} else {
+					dest_asm = fopen(argv[i+1], "w");
+					i=i+1;
+					out = 1;
+					ret = 0;
+				}
+			} else if (strcmp("-h", argv[i]) == 0 || strcmp("--help", argv[i]) == 0) {
+				printf("Usage: tasm [options] file...\n");
+				printf("Options:\n");
+				printf("-h,--help		Prints this information\n");
+				printf("-i,--input <arg> 	Path of input file\n");
+				printf("-o,--output <arg>	Path of output file\n");
+			} else {
+				printf("unknown argument: %s\n", argv[i]);
+			}
+		}
+	}
+	if (in == 0) {
+		printf("tasm: no input file\n");
+		ret = 1;
+	} else {
+		if (out == 0) {
+			printf("tasm: no output file, using default: output\n\n");
+			dest_asm = fopen("output", "w");
+		}
+	}
+
+	return ret;
+	//}}}
+}
+
+void asm_to_hex(char *_asm, int *opcode, int *in0, int *in1, int *out){
+
+	char tryte[54];
+	char t0[27]; 
+	char t1[26]; 
+	char t2[26]; 
+	char t3[26]; 
+	for (int i = 0; i < 18; i++) {
+ 		t0[i] = 0;
+ 		t1[i] = 0;
+ 		t2[i] = 0;
+ 		t3[i] = 0;
+	}
+	tryte[0] = '\0';
+
+	//convert assembly to formated binary representation of ternary
+	int i = 0;
+	do {
+		if(_asm[i]=='-') {
+			strcat(tryte, "10");
+		} else if (_asm[i]=='+') {
+			strcat(tryte, "01");
+		} else {
+			strcat(tryte, "00");
+		}
+		i++;
+	} while (i<13);
+		
+	int j = 0;
+	for (int i = 0; i < 27; i++) {
+		t0[i] = tryte[j];
+		j++;
+	}
+
+	bin_to_hex(t0, opcode);
+	bin_to_hex(t1, in0);
+	bin_to_hex(t2, in1);
+	bin_to_hex(t3, out);
+}
+
+void bin_to_hex(char *tryte, int *hex) {
+	for (int i = 0; i < 26; ++i){
+		if (tryte[i] == '1' ){
+			*hex = (*hex << 1)|1;
+		} else {
+			*hex = (*hex << 1)|0;
+		}
+	}
+}
+