Added a run last test only flag (tests are getting too long now). Sto…

…pped non-main functions from printing their return value
chutasano · Apr 7, 2018 · f1ac8f6 · f1ac8f6
1 parent ad8b2b2
commit f1ac8f6
Show file tree

Hide file tree

Showing 6 changed files with 288 additions and 262 deletions.
diff --git a/main.cpp b/main.cpp
@@ -1,7 +1,16 @@
 #include "rep/r0.h"
 #include "test.h"
+#include <cstring>
 
-int main()
+int main(int argc, char* argv[])
 {
-    test_all();
+    bool last_test_only = false;
+    for (int i=argc; i>1; i--)
+    {
+        if (!strcmp("--last_test_only", argv[i-1]))
+        {
+            last_test_only = true;
+        }
+    }
+    test_all(last_test_only);
 }
diff --git a/rep/x0.cpp b/rep/x0.cpp
@@ -116,32 +116,36 @@ string IRet::to_asm()
     // this should be processed by the callee of the program
     // in automated tests
     stringstream ss;
-    ss << "MOVQ\t%rax, %rdi\n";
-    type ty = static_cast<type>(t);
-    switch (ty)
+    if (print)
     {
-        case TNUM:
-            ss << "    CALLQ\t_lang_print_num\n";
-            break;
-        case TBOOL:
-            ss << "    CALLQ\t_lang_print_bool\n";
-            break;
-        case TVOID:
-            ss << "    CALLQ\t_lang_print_void\n";
-            break;
-        default:
-            if (t > TVEC && t < TFUN)
-            {
-                ss << "    CALLQ\t_lang_print_vec\n";
+        ss << "MOVQ\t%rax, %rdi\n";
+        type ty = static_cast<type>(t);
+        switch (ty)
+        {
+            case TNUM:
+                ss << "    CALLQ\t_lang_print_num\n";
                 break;
-            }
-            else
-            {
-                cerr <<"WTF??? got unknown type: " << t << "\n";
-                exit(2);
-            }
+            case TBOOL:
+                ss << "    CALLQ\t_lang_print_bool\n";
+                break;
+            case TVOID:
+                ss << "    CALLQ\t_lang_print_void\n";
+                break;
+            default:
+                if (t > TVEC && t < TFUN)
+                {
+                    ss << "    CALLQ\t_lang_print_vec\n";
+                    break;
+                }
+                else
+                {
+                    cerr <<"WTF??? got unknown type: " << t << "\n";
+                    exit(2);
+                }
+        }
+        ss << "    ";
     }
-    ss << "    RETQ";
+    ss << "RETQ";
     return ss.str();
 }
 

diff --git a/rep/x0.h b/rep/x0.h
@@ -129,8 +129,9 @@ namespace x0
 
     struct IRet : I
     {
-        IRet(int ty) : t(ty) {  }
+        IRet(int ty, bool print) : t(ty), print(print) {  }
         int t;
+        bool print;
         std::string to_asm();
     };
 

diff --git a/rep/x0s.cpp b/rep/x0s.cpp
@@ -185,7 +185,8 @@ list<x0::I*> F::assign(bool is_default, int heap_size)
         total_offset = 8*(worst_stack - regs.size() + 1);
         ins.push_back(new x0::ISrcDst(SUBQ, new x0::Con(total_offset), new x0::Reg("rsp")));
     }
-    if (worst_rootstack >= regs.size())
+    if (worst_rootstack >= regs.size() && is_default) //FIXME, use highest worst_rootstack
+        // across all functions
     {
         ICall a("_lang_init_rootstack", { new Con((worst_rootstack - regs.size() + 1))}, new Reg("r12"));
         ins.splice(ins.end(), a.assign(vmap));
@@ -208,7 +209,14 @@ list<x0::I*> F::assign(bool is_default, int heap_size)
             }
             // can't use map to get type because simple programs may optimize
             // the ret part such that it's returning a non-variable (ie: constant)
-            ins.push_back(new x0::IRet(fun_type.at(this->t).back()));
+            if (is_default)
+            {
+                ins.push_back(new x0::IRet(fun_type.at(this->t).back(), true));
+            }
+            else
+            {
+                ins.push_back(new x0::IRet(fun_type.at(this->t).back(), false));
+            }
         }
         else
         {
@@ -481,7 +489,7 @@ list<x0::I*> ILabel::assign(const s2vmap &vmap)
 list<x0::I*> IRet::assign(const s2vmap &vmap)
 {
     // TODO fix
-    return { new x0::IRet(TBOOL) };
+    return { new x0::IRet(TBOOL, false) };
 }
 
 list<string> INoArg::get_vars()