Merge pull request #394 from Verdagon/master

Made scope tethers crash instead of using the undead cycle.
ValeLang · Dec 11, 2021 · 38fd362 · 38fd362
2 parents dae0bfd + ffca9bd
commit 38fd362
Show file tree

Hide file tree

Showing 23 changed files with 118 additions and 1,941 deletions.
diff --git a/Driver/src/build.vale b/Driver/src/build.vale
@@ -95,6 +95,12 @@ fn build_stuff(compiler_dir &Path, all_args &Array<imm, final, str>) {
           "Whether to output VPST.",
           "false",
           "Whether to output VPST, the code's parsed representation"),
+        Flag(
+          "--llvm_ir",
+          FLAG_BOOL(),
+          "Whether to output LLVM IR.",
+          "false",
+          "Whether to output LLVM IR."),
         Flag(
           "--reuse_vast",
           FLAG_BOOL(),

diff --git a/Driver/src/midas.vale b/Driver/src/midas.vale
@@ -24,11 +24,11 @@ Subprocess {
 
   command_line_args = List<str>();
   command_line_args!.add("--verify");
-  command_line_args!.add("--output-dir");
+  command_line_args!.add("--output_dir");
   command_line_args!.add(output_dir.str());
 
   if (not maybe_region_override.isEmpty()) {
-    command_line_args!.add("--region-override");
+    command_line_args!.add("--region_override");
     command_line_args!.add(maybe_region_override.get());
   }
   if (not maybe_cpu.isEmpty()) {
@@ -48,7 +48,7 @@ Subprocess {
     command_line_args!.add("--verify");
   }
   if (llvm_ir) {
-    command_line_args!.add("--llvm_ir");
+    command_line_args!.add("--llvmir");
   }
   if (print_mem_overhead) {
     command_line_args!.add("--print_mem_overhead");

diff --git a/Midas/src/builtins/genHeap.c b/Midas/src/builtins/genHeap.c
diff --git a/Midas/src/builtins/twinpages.c b/Midas/src/builtins/twinpages.c
diff --git a/Midas/src/c-compiler/externs.cpp b/Midas/src/c-compiler/externs.cpp
@@ -29,7 +29,7 @@ Externs::Externs(LLVMModuleRef mod, LLVMContextRef context) {
   memcpy = addExtern(mod, "memcpy", int8PtrLT, {int8PtrLT, int8PtrLT, int64LT});
   memset = addExtern(mod, "memset", voidLT, {int8PtrLT, int8LT, int64LT});
 
-  initTwinPages = addExtern(mod, "__vale_initTwinPages", int8PtrLT, {});
+//  initTwinPages = addExtern(mod, "__vale_initTwinPages", int8PtrLT, {});
 }
 
 bool hasEnding (std::string const &fullString, std::string const &ending) {

diff --git a/Midas/src/c-compiler/externs.h b/Midas/src/c-compiler/externs.h
@@ -16,7 +16,7 @@ class Externs {
   LLVMValueRef strncpy = nullptr;
   LLVMValueRef memcpy = nullptr;
 
-  LLVMValueRef initTwinPages = nullptr;
+//  LLVMValueRef initTwinPages = nullptr;
   LLVMValueRef censusContains = nullptr;
   LLVMValueRef censusAdd = nullptr;
   LLVMValueRef censusRemove = nullptr;

diff --git a/Midas/src/c-compiler/function/expressions/externs.cpp b/Midas/src/c-compiler/function/expressions/externs.cpp
@@ -172,6 +172,7 @@ Ref buildExternCall(
     auto result = LLVMBuildFAdd(builder, leftLE, rightLE, "add");
     return wrap(globalState->getRegion(globalState->metalCache->floatRef), globalState->metalCache->floatRef, result);
   } else if (prototype->name->name == "__vbi_panic") {
+    buildPrint(globalState, builder, "(panic)\n");
     // See MPESC for status codes
     auto exitCodeLE = makeConstIntExpr(functionState, builder, LLVMInt64TypeInContext(globalState->context), 1);
     LLVMBuildCall(builder, globalState->externs->exit, &exitCodeLE, 1, "");

diff --git a/Midas/src/c-compiler/globalstate.h b/Midas/src/c-compiler/globalstate.h
@@ -65,7 +65,7 @@ class GlobalState {
   LLVMTypeRef lgtTableStructLT, lgtEntryStructLT = nullptr; // contains generation and next free
   LLVMValueRef expandLgt = nullptr, checkLgti = nullptr, getNumLiveLgtEntries = nullptr;
 
-  LLVMValueRef genMalloc = nullptr, genFree = nullptr;
+//  LLVMValueRef genMalloc = nullptr, genFree = nullptr;
 
   LLVMTypeRef concreteHandleLT = nullptr; // 24 bytes, for SSA, RSA, and structs
   LLVMTypeRef interfaceHandleLT = nullptr; // 32 bytes, for interfaces. concreteHandleLT plus 8b itable ptr.