rewrote confusing code; removed unnecessary assembly

Author: wgibbs-rs

CMakeLists.txt

@@ -58,7 +58,6 @@ file(
     "src/ast.c"
     "src/binary.cpp"
     "src/llvm_ir.cpp"
-    "src/optimize.cpp"
 )
 
 # Remove raw lexer and parser source files if they're listed by GLOB

examples/addition.b

@@ -22,7 +22,6 @@
 
 main () {
    auto a;
-   a = !a;
 }
 
 

src/ast.c

@@ -192,6 +192,7 @@ static void print_node(ASTNode* node, int depth) {
 
 
 void print_ast() {
-    for (int i = 0; i < ast_length; i++) print_node(generated_ast[i], 0);
+    for (int i = 0; i < ast_length; i++) 
+        print_node(generated_ast[i], 0);
     printf("\n");
 }

src/binary.cpp

@@ -40,12 +40,18 @@
 #include <llvm/Support/FileSystem.h>
 #include <llvm/IR/LegacyPassManager.h>
 
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/StandardInstrumentations.h"
+#include "llvm/Analysis/AliasAnalysis.h"
+#include "llvm/Transforms/Scalar.h"
+#include "llvm/Transforms/Utils.h"
 
 #include <llvm/TargetParser/Host.h>
 
+// Optimize TheModule with the provided optimization flags (-O3, -Os, etc)
+void optimize();
 
 extern "C" void initialize_llvm() {
-
    TheContext = std::make_unique<llvm::LLVMContext>();
    Builder = std::unique_ptr<llvm::IRBuilder<>>(new llvm::IRBuilder<>(*TheContext));
    TheModule = std::make_unique<llvm::Module>(ctx.inputFile, *TheContext);
@@ -62,11 +68,9 @@ extern "C" void initialize_llvm() {
    LLVMInitializeAArch64TargetMC();
    LLVMInitializeAArch64AsmParser();
    LLVMInitializeAArch64AsmPrinter();
-   
 }
 
 extern "C" void export_asm() {
-
    optimize(); // Apply any optimizations (will return if -O0)
 
    std::string targetTriple = llvm::sys::getDefaultTargetTriple();
@@ -100,10 +104,8 @@ extern "C" void export_asm() {
 
    // Set file type: object file (.o)
 #if defined(__APPLE__)
-    // macOS (old API)
     llvm::CodeGenFileType fileType = llvm::CodeGenFileType::AssemblyFile;
 #else
-    // Linux, Windows (new API)
     llvm::CodeGenFileType fileType = llvm::CGFT_AssemblyFile;
 #endif
 
@@ -114,14 +116,10 @@ extern "C" void export_asm() {
 
    pass.run(*TheModule);
    dest.flush();
-
-   llvm::outs() << "Wrote " << ctx.outputFilename << "\n";
-
 }
 
 
 extern "C" void export_ir() {
-
    optimize(); // Apply any optimizations (will return if -O0)
 
    std::error_code EC;
@@ -135,7 +133,6 @@ extern "C" void export_ir() {
 
 
 extern "C" void generate_binary() {
-
    optimize(); // Apply any optimizations (will return if -O0)
 
    std::string targetTriple = llvm::sys::getDefaultTargetTriple();
@@ -181,10 +178,40 @@ extern "C" void generate_binary() {
 
    pass.run(*TheModule);
    dest.flush();
-
-   llvm::outs() << "Wrote " << ctx.outputFilename << "\n";
 }
 
 
-
-
+void optimize() {
+   if (!ctx.optimization) return;
+
+   // Create analysis managers
+   llvm::LoopAnalysisManager LAM;
+   llvm::FunctionAnalysisManager FAM;
+   llvm::CGSCCAnalysisManager CGAM;
+   llvm::ModuleAnalysisManager MAM;
+
+   // Create pass builder
+   llvm::PassBuilder PB;
+
+   // Register analysis passes
+   PB.registerModuleAnalyses(MAM);
+   PB.registerCGSCCAnalyses(CGAM);
+   PB.registerFunctionAnalyses(FAM);
+   PB.registerLoopAnalyses(LAM);
+   PB.crossRegisterProxies(LAM, FAM, CGAM, MAM);
+
+   llvm::ModulePassManager MPM;
+   // Create optimization pipeline
+   if (ctx.optimization == 1)       // Mild optimization 
+      MPM = PB.buildPerModuleDefaultPipeline(llvm::OptimizationLevel::O1);
+   else if (ctx.optimization == 2)  // Moderate optimization
+      MPM = PB.buildPerModuleDefaultPipeline(llvm::OptimizationLevel::O2);
+   else if (ctx.optimization == 3)  // Aggressive optimization
+      MPM = PB.buildPerModuleDefaultPipeline(llvm::OptimizationLevel::O3);
+   else if (ctx.optimization == 4)  // Optimize for size
+      MPM = PB.buildPerModuleDefaultPipeline(llvm::OptimizationLevel::Os);
+   else if (ctx.optimization == 5)  // Aggressively optimize for size
+      MPM = PB.buildPerModuleDefaultPipeline(llvm::OptimizationLevel::Oz);
+
+   MPM.run(*TheModule, MAM);
+}

src/context.h

@@ -26,30 +26,20 @@
 extern "C" {
 #endif
 
-
 #include <stdbool.h>
 
-
 // Compiler options and state
 typedef struct CompilerContext {
    bool emitAssembly;
    bool emitLLVM;
-
    char* outputFilename;
-
    char* inputFile;
-
    char* sourceText;
-    
    int optimization;
-
 } CompilerContext;
 
-
-// Declare a global or external context variable, so other files can use it
 extern CompilerContext ctx;
 
-
 #ifdef __cplusplus
 }
 #endif

src/error.c

@@ -24,6 +24,9 @@
 #include <stdlib.h>
 #include "error.h"
 
+#if defined(__GNUC__) || defined(__clang__)
+__attribute__((cold))
+#endif
 void error(const char *text, ...) {
    va_list args;
    va_start(args, text);
@@ -34,16 +37,14 @@ void error(const char *text, ...) {
 }
 
 #if defined(__GNUC__) || defined(__clang__)
-__attribute__((noreturn))
+__attribute__((noreturn, cold))
 #endif
 void fatal_error(const char *text, ...) {
    va_list args;
    va_start(args, text);
    printf("bcc: " RED "error: " RESET);
    vprintf(text, args);
-   printf("\n");
    va_end(args);
-
-   printf("bcc: " RED "error: " RESET "compilation failed\n");
+   printf("\nbcc: " RED "error: " RESET "compilation failed\n");
    exit(1);
 }

src/error.h

@@ -22,21 +22,15 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include <stdarg.h>
-#include <stdio.h>
-
 #define RED "\033[1;31m"
 #define RESET "\033[0m"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/** Alert an error in the console; does not quit the program. */
-extern void error(const char *text, ...);
-
-/** Alert an error in the console and quit the program. */
-extern void fatal_error(const char *text, ...);
+void error(const char *text, ...);
+void fatal_error(const char *text, ...);
 
 #ifdef __cplusplus
 }

src/llvm.h

@@ -22,19 +22,13 @@
 #ifndef LLVM_WRAPPER_H
 #define LLVM_WRAPPER_H
 
-
-
 #ifdef __cplusplus
-
-
 #include <llvm/IR/LLVMContext.h>
 #include <llvm/IR/Module.h>
 #include <llvm/IR/IRBuilder.h>
 #include <llvm/IR/Value.h>
 #include <map>
 
-
-
 extern std::unique_ptr<llvm::LLVMContext> TheContext;
 extern std::unique_ptr<llvm::IRBuilder<>> Builder;
 extern std::unique_ptr<llvm::Module> TheModule;
@@ -44,11 +38,8 @@ extern "C" {
 #endif
 
 void generate_llvm_ir();
-
 void initialize_llvm();
-
 void optimize();
-
 void generate_binary();
 void export_ir();
 void export_asm();

src/llvm_ir.cpp

@@ -21,10 +21,6 @@
 
 /// This file is used to create intermediate representation code for LLVM.
 
-#include "llvm.h"
-#include "ast.h"
-#include "error.h"
-
 #include <llvm/IR/LLVMContext.h>
 #include <llvm/IR/Module.h>
 #include <llvm/IR/IRBuilder.h>
@@ -36,31 +32,29 @@
 #include <cstring>
 #include <iostream>
 
+#include "llvm.h"
+#include "ast.h"
+#include "error.h"
+
 std::unique_ptr<llvm::LLVMContext> TheContext;
 std::unique_ptr<llvm::IRBuilder<>> Builder;
 std::unique_ptr<llvm::Module> TheModule;
 
-
 std::map<std::string, llvm::Value *> NamedValues;
 std::map<std::string, llvm::Value *> ExtrnValues;
 
-
-
 std::map<std::string, llvm::Function *> FunctionValues;
 std::map<std::string, llvm::BasicBlock *> BasicBlockValues;
 
-
 static llvm::Value *LogErrorV(const char *Str) {
   llvm::errs() << "error: " << Str << "\n";
   return nullptr;
 }
 
-
 static inline llvm::Value* value_of(llvm::Value* alloca) {
    return Builder->CreateLoad(llvm::Type::getInt64Ty(*TheContext), alloca, "load");
 }
 
-
 /** 
  * Stores whether a function being processed includes a return statement at the end.
  * If not, return(0); is added.
@@ -120,7 +114,6 @@ static llvm::Value* add_expression(ASTNode* node) {
          }
       case ASTNode::_FUNCTION_CALL:
          break;
-
       case ASTNode::_NOT:
          {
             llvm::Value* not_value = Builder->CreateICmpEQ(
@@ -163,10 +156,8 @@ static llvm::Value* add_expression(ASTNode* node) {
    }
 
    return nullptr;
-
 }
 
-
 static void add_statement(ASTNode* node) {
 
    switch (node->type) {