wip

Author: xmnlab

.makim.yaml

@@ -1,7 +1,7 @@
 version: 1.0.0
 env:
   CFLAGS_EXTRA: "\
-    -fsanitize\
+    -fsanitize=address\
     "
   # use it for ASAN and LSAN
   SAN_OPTIONS_DEFAULT: "\
@@ -19,8 +19,9 @@ env:
     :print_legend=1\
     :detect_leaks=1\
     "
-  MESON_EXTRA: "-Db_coverage=true \
-    -Doptimization=0 \
+  MESON_EXTRA_DEBUG: "-Db_coverage=true \
+    --optimization=0 \
+    --debug \
     -Db_sanitize=address \
     "
 groups:
@@ -104,7 +105,7 @@ groups:
           - target: build.release
             args:
               build-type: "debug"
-              meson-extra: {{ env.MESON_EXTRA }}
+              meson-extra: {{ env.MESON_EXTRA_DEBUG }}
               clean: {{ args.clean }}
               asan-options: {{ env.SAN_OPTIONS_DEFAULT }}
               lsan-options: {{ env.SAN_OPTIONS_DEFAULT }}
@@ -120,7 +121,7 @@ groups:
           - target: build.release
             args:
               build-type: "debug"
-              meson-extra: {{ env.MESON_EXTRA }} -Ddev=enabled
+              meson-extra: {{ env.MESON_EXTRA_DEBUG }} -Ddev=enabled
               clean: {{ args.clean }}
               asan-options: {{ env.SAN_OPTIONS_DEFAULT }}
               lsan-options: {{ env.SAN_OPTIONS_DEFAULT }}
@@ -231,7 +232,7 @@ groups:
 
           if [[ "{{ args.debug  }}" == "True" ]]; then
             GDB="gdb --args"
-            DEBUG_FLAGS="-g"
+            DEBUG_FLAGS="-Og"
           fi
 
           TEST_DIR_PATH="./tests"
@@ -261,7 +262,7 @@ groups:
             print_header "${test_name}"
             OBJECT_FILE="${TMP_DIR}/${test_name}.o"
 
-            ${ARX} --output "${OBJECT_FILE}" --input "examples/${test_name}.arx"
+            ${ARX} --output "${OBJECT_FILE}" --input "examples/${test_name}.arx --build-lib"
 
             set -x
             clang++ \
@@ -381,4 +382,5 @@ groups:
           gdb \
             --args build/arx \
             --input `pwd`/examples/{{ args.test_name }}.arx \
+            --build-lib \
             --output "/tmp/{{ args.test_name }}" {{ args.meson_extra }}

src/codegen/arx-llvm.cpp

@@ -28,11 +28,19 @@ llvm::Type* ArxLLVM::VOID_TYPE;
 auto ArxLLVM::get_data_type(std::string type_name) -> llvm::Type* {
   if (type_name == "float") {
     return ArxLLVM::FLOAT_TYPE;
-  } else if (type_name == "void") {
-    return ArxLLVM::VOID_TYPE;
+  } else if (type_name == "double") {
+    return ArxLLVM::DOUBLE_TYPE;
+  } else if (type_name == "int8") {
+    return ArxLLVM::INT8_TYPE;
+  } else if (type_name == "int32") {
+    return ArxLLVM::INT32_TYPE;
   } else if (type_name == "char") {
     return ArxLLVM::INT8_TYPE;
+  } else if (type_name == "void") {
+    return ArxLLVM::VOID_TYPE;
   }
+
+  llvm::errs() << "[EE] type_name not valid.\n";
   return nullptr;
 }
 

src/codegen/ast-to-llvm-ir.cpp

@@ -45,13 +45,13 @@ extern std::string ARX_VERSION;
 auto ASTToLLVMIRVisitor::CreateFunctionType(unsigned NumArgs)
   -> llvm::DISubroutineType* {
   llvm::SmallVector<llvm::Metadata*, 8> EltTys;
-  llvm::DIType* DblTy = this->getDoubleTy();
+  llvm::DIType* di_double_type = this->getDoubleTy();
 
   // Add the result type.
-  EltTys.emplace_back(DblTy);
+  EltTys.emplace_back(di_double_type);
 
   for (unsigned i = 0, e = NumArgs; i != e; ++i) {
-    EltTys.emplace_back(DblTy);
+    EltTys.emplace_back(di_double_type);
   }
 
   return ArxLLVM::di_builder->createSubroutineType(
@@ -61,13 +61,23 @@ auto ASTToLLVMIRVisitor::CreateFunctionType(unsigned NumArgs)
 // DebugInfo
 
 auto ASTToLLVMIRVisitor::getDoubleTy() -> llvm::DIType* {
-  if (this->DblTy) {
-    return this->DblTy;
+  if (this->DI_DOUBLE_TYPE) {
+    return this->DI_DOUBLE_TYPE;
   }
 
-  DblTy = ArxLLVM::di_builder->createBasicType(
+  this->DI_DOUBLE_TYPE = ArxLLVM::di_builder->createBasicType(
     "double", 64, llvm::dwarf::DW_ATE_float);
-  return DblTy;
+  return this->DI_DOUBLE_TYPE;
+}
+
+auto ASTToLLVMIRVisitor::getFloatTy() -> llvm::DIType* {
+  if (this->DI_FLOAT_TYPE) {
+    return this->DI_FLOAT_TYPE;
+  }
+
+  this->DI_FLOAT_TYPE = ArxLLVM::di_builder->createBasicType(
+    "float", 32, llvm::dwarf::DW_ATE_float);
+  return this->DI_FLOAT_TYPE;
 }
 
 auto ASTToLLVMIRVisitor::emitLocation(ExprAST& ast) -> void {

src/codegen/ast-to-llvm-ir.h

@@ -38,7 +38,8 @@ class ASTToLLVMIRVisitor : public ASTToObjectVisitor {
  public:
   // DebugInfo
   llvm::DICompileUnit* TheCU;
-  llvm::DIType* DblTy;
+  llvm::DIType* DI_DOUBLE_TYPE;
+  llvm::DIType* DI_FLOAT_TYPE;
   std::vector<llvm::DIScope*> LexicalBlocks;
 
   llvm::ExitOnError ExitOnErr;
@@ -61,5 +62,6 @@ class ASTToLLVMIRVisitor : public ASTToObjectVisitor {
 
   // DebugInfo
   void emitLocation(ExprAST& AST);
+  llvm::DIType* getFloatTy();
   llvm::DIType* getDoubleTy();
 };

src/codegen/ast-to-object.cpp

@@ -100,7 +100,8 @@ auto ASTToObjectVisitor::getFunction(std::string name) -> void {
  */
 auto ASTToObjectVisitor::CreateEntryBlockAlloca(
   llvm::Function* fn, llvm::StringRef var_name) -> llvm::AllocaInst* {
-  llvm::IRBuilder<> tmp_builder(&fn->getEntryBlock(), fn->getEntryBlock().begin());
+  llvm::IRBuilder<> tmp_builder(
+    &fn->getEntryBlock(), fn->getEntryBlock().begin());
   return tmp_builder.CreateAlloca(ArxLLVM::FLOAT_TYPE, nullptr, var_name);
 }
 
@@ -421,7 +422,7 @@ auto ASTToObjectVisitor::visit(ForExprAST& expr) -> void {
   // Reload, increment, and restore the alloca.  This handles the case
   // where the body of the loop mutates the variable.
   llvm::Value* CurVar = ArxLLVM::ir_builder->CreateLoad(
-    ArxLLVM::DOUBLE_TYPE, alloca, expr.var_name.c_str());
+    ArxLLVM::FLOAT_TYPE, alloca, expr.var_name.c_str());
   llvm::Value* NextVar =
     ArxLLVM::ir_builder->CreateFAdd(CurVar, StepVal, "nextvar");
   ArxLLVM::ir_builder->CreateStore(NextVar, alloca);
@@ -525,7 +526,7 @@ auto ASTToObjectVisitor::visit(PrototypeAST& expr) -> void {
   for (auto& arg : expr.args) {
     arg_type = ArxLLVM::get_data_type(arg->type_name);
     if (arg_type != nullptr) {
-      args.push_back(arg_type);
+      args.emplace_back(arg_type);
     } else {
       llvm::errs() << "ARX::GEN-OBJECT[ERROR]: PrototypeAST: "
                    << "Argument data type " << arg->type_name

tests/integration/average.cpp

@@ -1,10 +1,10 @@
 #include <iostream>
 
 extern "C" {
-double average(double, double);
+float average(float, float);
 }
 
 int main() {
-  double avg_3_4 = average(3.0, 4.0);
+  float avg_3_4 = average(3.0, 4.0);
   std::cout << "average of 3.0 and 4.0: " << avg_3_4 << std::endl;
 }

tests/integration/constant.cpp

@@ -1,11 +1,11 @@
 #include <iostream>
 
 extern "C" {
-double get_constant(double);
+float get_constant(float);
 }
 
 int main() {
-  double value = get_constant(3.0);
+  float value = get_constant(3.0);
   printf("get_constant(3.0): %f\n", value);
 
   return 0;

tests/integration/fibonacci.cpp

@@ -2,10 +2,10 @@
 #include <iostream>
 
 extern "C" {
-double fib(double);
+float fib(float);
 }
 
 int main() {
-  double fib_10 = fib(10.);
+  float fib_10 = fib(10.);
   std::cout << "fib(40.): " << fib_10 << std::endl;
 }

tests/integration/print-star.cpp

@@ -2,10 +2,10 @@
 #include <iostream>
 
 extern "C" {
-double print_star(double);
+float print_star(float);
 }
 
-extern "C" auto putchard(double X) -> double {
+extern "C" auto putchard(float X) -> float {
   fputc(static_cast<char>(X), stderr);
   return 0;
 }

tests/integration/sum.cpp

@@ -2,10 +2,10 @@
 #include <iostream>
 
 extern "C" {
-double sum(double, double);
+float sum(float, float);
 }
 
 int main() {
-  double sum_3_4 = sum(3.0, 4.0);
+  float sum_3_4 = sum(3.0, 4.0);
   std::cout << "sum of 3.0 and 4.0: " << sum_3_4 << std::endl;
 }