fix param

asm_rules.c

@@ -1,20 +1,22 @@
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
-void asm_rules(char *in, char _asm[27]){
+void trit_flip(char *in, char *instruction) {
+	for (int i = 0; i<27; i++) {
+		in[i] = instruction[i];
+	}
+}
+int asm_rules(char *in, char *_asm){
 	
 	for (int i = 0; i < 27; i++) {
 		_asm[i] = 0;
 	}
+	int pass = 0;
 
 	char *word = strtok(in, " ");
-
 	while(word != NULL) {
 
-		//instruction set
-		//aaaaaa bbbbbbb ccccccc ddddddd	
-		//a = opcode, b = input 0, c = input 1, d = output
-
 		if (strcmp(word, "nop") == 0) {
 			//keeps the default value (0) if nop
 		} else if (word[0] == ';') {
@@ -22,80 +24,57 @@ void asm_rules(char *in, char _asm[27]){
 			break;
 		} else {
 			//cases make larger checks harder to read
+			if (strstr(word, "max")) { 
+				trit_flip(_asm, "000000+00000+");
+			} else if (strstr(word, "min")) {
+				trit_flip(_asm, "000000+00000-");
+			} else if (strstr(word, "any")) {
+				trit_flip(_asm, "000000+000000");
+			} else if (strstr(word, "cons")) {
+				trit_flip(_asm, "000000+0000+-");
+			} else if (strstr(word, "add")) {
+				trit_flip(_asm, "000000+000+-+");
+			} else if (strstr(word, "sub")) {
+				trit_flip(_asm, "000000+000--+");
+			} else if (strstr(word, "mul")) {
+				trit_flip(_asm, "000000+000+0+");
+			} else if (strstr(word, "div")) {
+				trit_flip(_asm, "000000+000+0-");
+			} else if (strstr(word, "dec")) {
+				trit_flip(_asm, "000000+0000--");
+			} else if (strstr(word, "inc")) {
+				trit_flip(_asm, "000000+0000+-");
+			} else if (strstr(word, "iou")) {
+				trit_flip(_asm, "000000-0000--");
+			} else if (strstr(word, "ieq")) {
+				trit_flip(_asm, "000000-0000-+");
+			} else if (strstr(word, "jmp")) {
+				trit_flip(_asm, "000000-000000");
+			} else if (strstr(word, "jec")) {
+				trit_flip(_asm, "000000-00000+");
+			} else if (strstr(word, "mov")) {
+				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[1] = 1; 
+				_asm[5] = '0'; 
 			} else if(word[0] == 'f') {
 				//floating
-				_asm[1] = 2;
+				_asm[5] = '-'; 
 			}
-			if (word[0] == '$') {
-				//constants
-				_asm[0] = 2; //set constant loading (on input 1)
+			if (word[0] == '$' || word[0] == '@') {
 
-			} else if (word[0] == '@') {
-				//address location
-
-			//beware: beginning yandev style
-			} else if (strstr(word, "max")) { 
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 0;
-				_asm[4] = 0;
-				_asm[5] = 1;
-			} else if (strstr(word, "min")) {
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 0;
-				_asm[4] = 0;
-				_asm[5] = 2;
-			} else if (strstr(word, "any")) {
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 0;
-				_asm[4] = 2;
-				_asm[5] = 2;
-			} else if (strstr(word, "cons")) {
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 0;
-				_asm[4] = 1;
-				_asm[5] = 1;
-			} else if (strstr(word, "add")) {
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 1;
-				_asm[4] = 0;
-				_asm[5] = 1;
-			} else if (strstr(word, "sub")) {
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 1;
-				_asm[4] = 0;
-				_asm[5] = 2;
-			} else if (strstr(word, "mul")) {
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 1;
-				_asm[4] = 1;
-				_asm[5] = 0;
-			} else if (strstr(word, "div")) {
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 1;
-				_asm[4] = 2;
-				_asm[5] = 0;
-			} else if (strstr(word, "dec")) {
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 2;
-				_asm[4] = 2;
-				_asm[5] = 0;
-			} else if (strstr(word, "inc")) {
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 2;
-				_asm[4] = 2;
-				_asm[5] = 1;
-			} else if (strstr(word, "not")) {
-				_asm[2] = 2; //set layer to arithmetics and logic
-				_asm[3] = 2;
-				_asm[4] = 2;
-				_asm[5] = 2;
 			}
 
 		}
 
 		word = strtok(NULL, " ");
 	}
+	pass = 0;
+	return 0;
 }
+

main.c

@@ -1,98 +1,15 @@
 #include <stdio.h>
 #include "asm_rules.c"
 
-void bin_to_hex(char *tryte, int *hex) {
-	char *a = tryte;
-	int num = 0;
-	do {
-		int b = *a=='1'?1:0;
-		num = (num<<1)|b;
-		a++;
-	} while (*a);
-	*hex = num;
-	//printf("%d\n",num);
-
-}
-void asm_to_hex(char *_asm, int *opcode, int *in0, int *in1, int *out){
-
-	char tryte[54];
-	char t0[18]; 
-	char t1[18]; 
-	char t2[18]; 
-	char t3[18]; 
-	for (int i = 0; i < 18; i++) {
- 		t0[i] = 0;
- 		t1[i] = 0;
- 		t2[i] = 0;
- 		t3[i] = 0;
-	}
-	for (int i = 0; i < 54; i++) {
- 		tryte[i] = 0;
-	}
-
-	//convert assembly to formated binary representation of ternary
-	for (int i = 0; i < 27; i++) {
-		
-		//printf("%c",_asm[i]);
-		if(_asm[i]==2) {
-			strcat(tryte, "10");
-		} else if (_asm[i]==1) {
-			strcat(tryte, "01");
-		} else {
-			strcat(tryte, "00");
-		}
-	}
-	int j = 0;
-	for (int i = 0; i < 12; i++) {
-		t0[i] = tryte[j];
-		j++;
-	}
-	for (int i = 0; i < 14; i++) {
-		t1[i] = tryte[j];
-		j++;
-	}
-	for (int i = 0; i < 14; i++) {
-		t2[i] = tryte[j];
-		j++;
-	}
-	for (int i = 0; i < 14; i++) {
-		t3[i] = tryte[j];
-		j++;
-	}
-
-	bin_to_hex(t0, opcode);
-	bin_to_hex(t1, in0);
-	bin_to_hex(t2, in1);
-	bin_to_hex(t3, out);
-}
-
-
-int main(int argc, char **argv) {
+void bin_to_hex(char *tryte, int *hex);
+void asm_to_hex(char *_asm, int *opcode, int *in0, int *in1, int *out);
+int params(int argc, char **argv);
 
 FILE *dest_asm;
 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");
+int main(int argc, char **argv) {
+	int p = params(argc, argv);
+	if (p==1) {
 		return 1;
 	}
 
@@ -111,7 +28,6 @@ int main(int argc, char **argv) {
 		hex_in1 = 0;
 		hex_out = 0;
 
-		printf("%s/n",in_asm);
 		if (in_asm[strlen(in_asm)-1] == '\n') {
 			in_asm[strlen(in_asm)-1] = '\0'; //cleans newline from string
 		}
@@ -120,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);
-
-			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);
+			printf("%.7x %.7x %.7x %.7x\n", hex_op, hex_in0, hex_in1, hex_out);
 			// Write the hex to a file
-
-			size = size + 3; //1 word = 3trytes
+			fprintf(dest_asm,"%.7x ", hex_op);
+			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
@@ -143,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;
+		}
+	}
+}
+