--no commit message

Imanol-Mikel Barba Sabariego
1 parent 824bccd3
Showing 4 changed files with 47 additions and 8 deletions
arith/Makefile
arith/bit_adder.c
common/auxiliar.c
common/auxiliar.h
-TARGETS = adder substractor multiplier divider negator comparator shifter
+TARGETS = adder substractor multiplier divider negator comparator shifter bit_adder
  
 .PHONY: all clean
  
@@ -20,4 +20,6 @@ negator:
 comparator:
 	gcc -I../common/ ../common/auxiliar.c comparator.c -o comparator
 shifter:
-	gcc -I../common/ ../common/auxiliar.c shifter.c -o shifter
 \ No newline at end of file
+	gcc -I../common/ ../common/auxiliar.c shifter.c -o shifter
+bit_adder:
+	gcc -I../common/ ../common/auxiliar.c bit_adder.c -o bit_adder
 \ No newline at end of file
@@ -2,8 +2,30 @@
 #include <string.h>
 #include "auxiliar.h"
  
+int check_length(char **inputs, uint8_t num_inputs)
+{
+	int input_length = strlen(inputs[0]);
+	int i;
+	for(i = 1; i < num_inputs; i++)
+	{
+		if(input_length != strlen(inputs[i]))
+		{
+			return -1;
+		}
+	}
+	int max_value = 1;
+	int max_bits = num_inputs * input_length;
+    i = 0;
+    while(max_value <= max_bits)
+    {
+    	max_value = 0x1 << ++i;
+    }
+    return i;
+}
+
 int main(int argc, char **argv)
 {
+	int i;
 	if(argc != 2)
 	{
 		error();
@@ -19,14 +41,13 @@ int main(int argc, char **argv)
 		error();
 	}
 	int num_inputs = num_occurrences(input,',');
-	if(num_inputs != 1)
+	int input_length = check_length(inputs,num_inputs);
+	int count = 0;
+	for(i = 0; i < num_inputs; i++)
 	{
-		error();
+		count += count_bits(inputs[i]);
 	}
-	int input_length = strlen(inputs[0]);
-	int num = bin2dec(inputs[0]);
-	num *= -1;
-	char *result = dec2bin(num,input_length);
+	char *result = dec2bin(count,input_length);
 	printf("%s",result);
 	free(result);
 	free_mem(inputs,num_inputs);
@@ -234,4 +234,19 @@ void reverse_two_complement(char *bin)
         char *bin_added = dec2bin(bin2dec(bin)+1,strlen(bin));
         strcpy(bin,bin_added);
         free(bin_added);
+}
+
+int count_bits(char *input)
+{
+        int i;
+        int count = 0;
+        int input_length = strlen(input);
+        for(i = 0; i < input_length; i++)
+        {
+                if(input[i] == '1')
+                {
+                        count++;
+                }
+        }
+        return count;
 }
 \ No newline at end of file
@@ -19,3 +19,4 @@ int bin2udec(char *bin);
 char* dec2bin(int dec, int length);
 void expand_input(char **input, int required_length);
 void reverse_two_complement(char *bin);
+int count_bits(char *input);
 \ No newline at end of file