exercises/06/.vscode/launch.json

@@ -1,28 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            // for Linux
-            "name": "(gdb) Launch euclid codegen 2",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceRoot}/vslc/src/vslc",
-            "args": ["<", "${workspaceFolder}/vslc/vsl_programs/ps6-codegen2/euclid.vsl"],
-            "stopAtEntry": false,
-            "cwd": "${workspaceRoot}",
-            "environment": [],
-            "externalConsole": true,
-            "MIMode": "gdb",
-            "setupCommands": [
-              {
-                "description": "Enable pretty-printing for gdb",
-                "text": "-enable-pretty-printing",
-                "ignoreFailures": true
-              }
-            ]
-          }
-    ]
-}

exercises/06/vslc/src/generator.c

@@ -16,8 +16,7 @@
 static uint64_t 
     stack_depth,
     if_seq,
-    while_seq,
+    while_seq;
-    closest_while;
 
 /**Generate table of strings in a rodata section. */
 void generate_stringtable ( void );
@@ -252,9 +251,9 @@ generate_node ( node_t *node)
     switch (node->type)
     {
     case ASSIGNMENT_STATEMENT:
-        // First solve the rhs
         solve_expressions(node->children[1]);
-        // Then store in lhs
+        //ASM(popq, %rax);
+        //POP(%rax);
         writeback_variable(node->children[0], "%rax");
         break;
 
@@ -310,10 +309,10 @@ generate_node ( node_t *node)
         break;
 
     case WHILE_STATEMENT:
-        generate_while_statement(node);
+        /* DO NOTHING YET */
         break;
     case NULL_STATEMENT:
-        solve_continue_statement();
+        /* USED IN WHILE */
         break;
 
     
@@ -512,25 +511,13 @@ generate_function_call(node_t *node)
 
     for (int arg = 0; arg < MIN(NO_REG_RECORD, arg_list->n_children); arg++)
     {
-        switch (arg_list->children[arg]->type)
+        if (arg_list->children[arg]->type == NUMBER_DATA)
-        {
-        case NUMBER_DATA:
             printf("\tmovq\t$%ld, %s\n", 
                 *(int64_t*)arg_list->children[arg]->data, 
                 record[arg]
             );
-            break;
+        else
-        
-        case EXPRESSION:
-            solve_expressions(arg_list->children[arg]);
-            printf("\tmovq\t%%rax, %s\n",record[arg]);
-            break;
-        
-        default:
             fetch_variable(arg_list->children[arg], record[arg]);
-            break;
-        }
-            
     }
 
     if (arg_list->n_children > NO_REG_RECORD)
@@ -541,30 +528,19 @@ generate_function_call(node_t *node)
 
         for (int arg = arg_list->n_children - 1; arg >= NO_REG_RECORD; arg--)
         {
-            switch (arg_list->children[arg]->type)
+            if (arg_list->children[arg]->type == NUMBER_DATA)
-            {
-            case NUMBER_DATA:
                 printf("\tpushq\t$%ld\t\t\t\t# PUSH: %ld\n", 
                     *(int64_t*)arg_list->children[arg]->data,
                     ++stack_depth
                 );
-                break;
+            else
-            
+            {
-            // Arg can be an expression
-            case EXPRESSION:
-                solve_expressions(arg_list->children[arg]);
-                PUSH(%rax);
-                break;
-            
-            default:
                 printf("\tpushq\t");
                 generate_var_ident(arg_list->children[arg]);
                 printf("\t\t\t\t# PUSH: %ld", ++stack_depth);
                 putchar('\n');
-                break;
             }
         }
-
     }
 
     printf("\tcall\t_%s\n", (char*)node->children[0]->data);
@@ -572,7 +548,6 @@ generate_function_call(node_t *node)
     // Aaaand pop the stack to return back to stack alignment
     if (isStack16ByteAligned)
         POP(%rcx);
-    
     printf("# End of function call\n");
 
 }
@@ -596,10 +571,15 @@ solve_statements(node_t *node, char *operator)
     writeback_variable(node->children[0], "%rax");
 }
 
-// Takes in a relation/number node and sets %rax to true if the statement is true
 void
-solve_relations(node_t *relation_root)
+generate_if_statement(node_t *node)
 {
+    uint64_t current_if_seq = if_seq++;
+
+    COMMENT("Begin IF %ld", current_if_seq);
+
+    node_t *relation_root = node->children[0];
+
     switch (relation_root->type)
     {
     case NUMBER_DATA:
@@ -623,80 +603,47 @@ solve_relations(node_t *relation_root)
         POP(%rax);
 
         ASM(cmp, %r10, %rax);
-        ASM(movq, $0, %rax);
 
         switch (*(char*)relation_root->data)
         {
         case '=':
-            ASM(sete, %al);
+            ASM(sete, %rax);
             break;
         case '>':
-            ASM(setg, %al);
+            ASM(setg, %rax);
             break;
         case '<':
-            ASM(setl, %al);
+            ASM(setl, %rax);
             break;
         }
         break;
     }
-}
-
-void
-generate_if_statement(node_t *node)
-{
-    uint64_t current_if_seq = if_seq++;
-
-    COMMENT("Begin IF %ld", current_if_seq);
-
-    // The realtion is allways in the first part of the IF
-    solve_relations(node->children[0]);
     
     ASM(cmp, $1, %rax);
     printf("\tjne\t%s%03ld\n", (node->n_children > 2) ? "ELSE" : "ENDIF", current_if_seq);
-    generate_node(node->children[1]);
+    solve_expressions(node->children[1]);
 
     if (node->n_children > 2) {
-        printf("\tjmp \tENDIF%03ld\n", current_if_seq);
+        printf("\tjmp\tENDIF%03ld\n", current_if_seq);
         printf("ELSE%03ld:\n", current_if_seq);
-
+        solve_expressions(node->children[2]);
-        generate_node(node->children[2]);
     }
 
-    COMMENT("End IF %ld", current_if_seq);
     printf("ENDIF%03ld:\n", current_if_seq);
+
+    COMMENT("End IF %ld", current_if_seq);
 }
 
 void
 generate_while_statement(node_t *node)
 {
-    uint64_t current_while_seq = while_seq++;
-    
-    uint64_t prev_closest_while = closest_while;
-    closest_while = current_while_seq;
-
-    COMMENT("Begin WHILE %ld", current_while_seq);   
-    printf("WHILE%03ld:\n", current_while_seq);
-
-    // Relation is allways the first entry in a while
-    solve_relations(node->children[0]);
-
-    ASM(cmp, $1, %rax);
-
-    printf("\tjne\tENDWHILE%03ld\n", current_while_seq);
-
-    generate_node(node->children[1]);
-    closest_while = prev_closest_while;
-
-    printf("\tjmp \tWHILE%03ld\n", current_while_seq);
-    printf("ENDWHILE%03ld:\n", current_while_seq);
     
 }
 
 void
 solve_continue_statement()
 {
-    COMMENT("Continue to WHILE%03ld", closest_while);
+
-    printf("\tjmp \tWHILE%03ld\n", closest_while);
 }
 
 /**Generates the main function with argument parsing and calling of our

exercises/06/vslc/vsl_programs/ps3-simplify/lists.vsl

@@ -28,6 +28,4 @@ func main() begin
     if my_func(1, 2, 3, 5, 8, 13, 21, 34) > 3 then begin
         print "True!"
     end
-
-    return 0
 end

exercises/06/vslc/vsl_programs/ps3-simplify/while_test.vsl

@@ -1,57 +0,0 @@
-// This program is a simple test of while loops, counting down from 19 to 0
-// and skipping 10 (if continue is implemented)
-
-func while_test ()
-begin
-    var a, b
-    a := 20
-    
-    b := test_while()
-    
-    print a
-
-
-    if a > 0 then print "foobar"
-    while a > 0 do
-    begin
-        if a = 10 then
-        begin
-            a -= 1
-            print "Skip..."
-            continue
-        end
-        else
-            a -= 1
-        print a
-    end
-    return 0
-end
-
-func test_while()
-begin
-    var n, m
-
-    n := 4
-    m := 21
-
-    while n > 0 do
-    begin
-        n -= 1
-        if n = 2 then
-            continue
-
-        while m > 0 do
-        begin
-            m -= 1
-
-            if m = 10 then
-                continue
-
-            print n, m
-        end
-
-
-    end
-
-    return 0
-end

exercises/06/vslc/vsl_programs/ps6-codegen2/lists.vsl

@@ -1,35 +0,0 @@
-
-func my_func(a, b, c, d, e, f, g, h) begin
-    var i, j, k, l, m
-
-    i := a + b + d
-
-    print i, f
-
-    if i = f then begin
-        print "hmmm"
-    end
-
-    if 1 < 2 then begin
-        print "Whaa"
-    end
-    else begin
-        print "Whooo"
-    end
-
-
-
-    return i
-end
-
-func main() begin
-    var n, o, p, q, r, s, t, u, v, w
-    n := 5
-    n += my_func(1, 2, 3, 5, 8, 13, 21, 34)
-
-    if my_func(1, 2, 3, 5, 8, 13, 21, 34) > 3 then begin
-        print "True!"
-    end
-
-    return 0
-end

exercises/06/vslc/vsl_programs/ps6-codegen2/while_test.vsl

@@ -3,14 +3,9 @@
 
 func while_test ()
 begin
-    var a, b
+    var a
     a := 20
-    
-    b := test_while()
-    
     print a
-
-
     if a > 0 then print "foobar"
     while a > 0 do
     begin
@@ -26,32 +21,3 @@ begin
     end
     return 0
 end
-
-func test_while()
-begin
-    var n, m
-
-    n := 4
-    m := 21
-
-    while n > 0 do
-    begin
-        n -= 1
-        if n = 2 then
-            continue
-
-        while m > 0 do
-        begin
-            m -= 1
-
-            if m = 10 then
-                continue
-
-            print n, m
-        end
-
-
-    end
-
-    return 0
-end