Merge branch 'compiler' into 'master'

Compiler

See merge request schnick/bfpu!5

bfpcompiler/src/assembling.c

@@ -1,5 +1,125 @@
 #include "../include/assembling.h"
 
+/**
+ *	@name intoVHDL
+ *	@return static char*
+ *  @brief Return binary as VHDL code.
+ *
+ *	@param char* tokens
+ */
+static char* intoVHDL (char* tokens) {
+    char* binary = 0;
+
+    /* The maximum size would be 256 instructions wide.
+     *  'b"000",' => one instruction has the length 7 which adds up to 256 * 7 = 1792 at max.
+     *  The declaration is wrapped in (code); which adds another 3 to the length.
+     *  At the end, the remaining registers are set to zero with 'others=>"000"', so another 13 characters are added:
+     *  Finally, the string must be terminated by '\0' (+1).
+     *  The buffer size is 1792 + 3 + 13 + 1 = 1809.
+     */
+    int binary_size = 1809;
+    int pos = 0; /* cursor to navigate the buffer. */
+
+    /* Allocate memory for binary */
+    binary = (char*)malloc(sizeof(char) * binary_size);
+    if (!binary) {
+        /* Error */
+        perror("malloc error on memory allocation of: binary");
+        exit(EXIT_FAILURE);
+    }
+
+    /* insert first bracket */
+    binary[pos++] = '(';
+
+    /* insert tokens */
+    for (int token = 0; tokens[token]; token++) {
+
+        /* check if maximum amount of 256 instructions is violated */
+        if (token > 256) {
+            (void)printf("ERROR: More instructions than possible!\n");
+            exit(EXIT_FAILURE);
+        }
+
+        binary[pos++] = 'b';
+        binary[pos++] = '"';
+
+        switch (tokens[token]) {
+            case '>':
+                binary[pos++] = '0';
+                binary[pos++] = '0';
+                binary[pos++] = '0';
+                break;
+            case '<':
+                binary[pos++] = '0';
+                binary[pos++] = '0';
+                binary[pos++] = '1';
+                break;
+            case '+':
+                binary[pos++] = '0';
+                binary[pos++] = '1';
+                binary[pos++] = '0';
+                break;
+            case '-':
+                binary[pos++] = '0';
+                binary[pos++] = '1';
+                binary[pos++] = '1';
+                break;
+            case ',':
+                binary[pos++] = '1';
+                binary[pos++] = '0';
+                binary[pos++] = '0';
+                break;
+            case '.':
+                binary[pos++] = '1';
+                binary[pos++] = '0';
+                binary[pos++] = '1';
+                break;
+            case '[':
+                binary[pos++] = '1';
+                binary[pos++] = '1';
+                binary[pos++] = '0';
+                break;
+            case ']':
+                binary[pos++] = '1';
+                binary[pos++] = '1';
+                binary[pos++] = '1';
+                break;
+            default:
+                (void)printf("ERROR: Unknown token %c (%d)!\n", token, token);
+                exit(EXIT_FAILURE);
+        }
+
+        binary[pos++] = '"';
+        binary[pos++] = ',';
+
+    }
+
+    /* This is the closing term. */
+    binary[pos++] = '(';
+    binary[pos++] = 'o';
+    binary[pos++] = 't';
+    binary[pos++] = 'h';
+    binary[pos++] = 'e';
+    binary[pos++] = 'r';
+    binary[pos++] = 's';
+    binary[pos++] = '=';
+    binary[pos++] = '>';
+    binary[pos++] = '\'';
+    binary[pos++] = '0';
+    binary[pos++] = '\'';
+    binary[pos++] = ')';
+
+    /* Close initial memory. */
+    binary[pos++] = ')';
+    binary[pos++] = ';';
+
+    /* Terminate string */
+    binary[pos++] = 0;
+
+    return binary;
+}
+
+
 /**
  *	@name intoLogisim
  *	@return static char*
@@ -74,86 +194,6 @@ static char* intoLogisim (char* tokens) {
     return binary;
 }
 
-/**
- *	@name intoC
- *	@return static char*
- *  @brief Return binary as c file.
- *
- *	@param char* tokens
- */
-static char* intoC (char* tokens) {
-
-    return 0;
-
-    char* binary = 0;
-
-    /* TODO: Change size to match C language */
-    /* Using c with the current memory space (256x4) has the fixed size of 533 bytes. */
-    int filesize = 533;
-    int pos = 0; /* used to navigate around binary */
-
-    /* Allocate memory for binary */
-    binary = (char*)malloc(sizeof(char) * filesize);
-    if (!binary) {
-        /* Error */
-        perror("malloc error on memory allocation of: binary");
-        exit(EXIT_FAILURE);
-    }
-
-    /* TODO: Replace by C program */
-    char version_number[] = "v3.0 hex words plain";
-    for (int i = 0; i < 20; i++) {
-        binary[i] = version_number[i];
-    }
-    pos = 20; /* position after loop */
-
-    binary[pos++] = '\n';
-
-    int pos_space = pos + 1; /* save the index to fill with spaces here */
-
-    /* Loop through tokens and add matching code to binary. */
-    for (char* cursor = tokens; *cursor; cursor++) {
-
-        /* TODO: Replace by C thingies */
-        /* Switch case holds all operands. */
-        switch (*cursor) {
-            case '>': binary[pos] = '0';break;
-            case '<': binary[pos] = '1';break;
-            case '+': binary[pos] = '2';break;
-            case '-': binary[pos] = '3';break;
-            case ',': binary[pos] = '4';break;
-            case '.': binary[pos] = '5';break;
-            case '[': binary[pos] = '6';break;
-            case ']': binary[pos] = '7';break;
-            default: return (char*)EXIT_FAILURE;
-        }
-
-        /* every second position is space or newline */
-        pos += 2;
-    }
-
-    /* fill remaining instruction space with > operations */
-    for (; pos < filesize; pos += 2) {
-        binary[pos] = '0';
-    }
-
-    /* reset position to the first space and start filling up */
-    pos = pos_space;
-    for (; pos < filesize; pos += 2) {
-        /* Calculate whether to use space or newline. */
-        if ((pos - 20) % 64 == 0) {
-            binary[pos] = '\n';
-        } else {
-            binary[pos] = ' ';
-        }
-    }
-
-    /* Finally, end the string. */
-    binary[filesize-1] = '\n';
-
-    return binary;
-}
-
 /**
  *	@name assemble
  *	@return char*
@@ -168,9 +208,9 @@ char* assemble (char* device, char* tokens) {
     /* supported devices are hardcoded here. */
     if (!strcmp(device, "logisim")) {
         rv = intoLogisim(tokens);
-    } else if (!strcmp(device, "c")) {
+    } else if (!strcmp(device, "FPGA")) {
-        rv = intoClang(tokens);
+        rv = intoVHDL(tokens);
-    }else {
+    } else {
         (void)printf("ERROR: Chosen device %s does not exist!\n", device);
         rv = (char*)EXIT_FAILURE;
     }

bfpcompiler/src/compilefuck.c

@@ -20,7 +20,7 @@ int main (int argc, char** argv) {
 
     /* Parse arguments */
     char* filename;
-    char* device = "logisim";
+    char* device = "FPGA";
 
     for (int i = 1; i < argc; i++) {
         if (argv[i][0] == '-' && ((i+1) < argc)) {

bfpcompiler/test.bf

@@ -1,5 +1,10 @@
-,>,< read two operands; return to cell zero
++[>
-> move to cell to add
+-[.-
-[ <+>- ] move cell to cell zero
+>-[-
-. print result
+>-[-
-[] endless loop
+>-[-
+]<
+]<
+]<
+]
+<]