From 61a330314d75c4a6c023e64f521aa9f920375c9e Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 18 Jun 2023 18:45:38 +0100 Subject: Store whether namespace has been initialized --- .../backends/llvm/LlvmCompilerNamespaces.java | 31 +++++++++++++++++++--- .../backends/llvm/ir/ast/types/LlvmTypes.java | 1 + 2 files changed, 28 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerNamespaces.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerNamespaces.java index fef63530..266672d0 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerNamespaces.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerNamespaces.java @@ -56,6 +56,10 @@ public class LlvmCompilerNamespaces { return "shed__namespaceInit__" + namespaceNameToLlvmIdentifier(namespaceName); } + private static String globalNameNamespaceIsInited(NamespaceName namespaceName) { + return "shed__namespaceIsInited__" + namespaceNameToLlvmIdentifier(namespaceName); + } + private static String namespaceNameToLlvmIdentifier(NamespaceName namespaceName) { return String.join("_", namespaceName.parts()); } @@ -93,6 +97,11 @@ public class LlvmCompilerNamespaces { NamespaceName namespaceName, LlvmCompilerContext context ) { + context = context.addInstruction(new LlvmStore( + LlvmTypes.INT_1, + new LlvmOperandInt(1), + new LlvmVariableGlobal(globalNameNamespaceIsInited(namespaceName)) + )); context = context.addTerminatorInstruction(new LlvmReturnVoid()); var basicBlocks = context.basicBlocks(); var namespaceInitFunction = new LlvmFunctionDefinition( @@ -125,7 +134,8 @@ public class LlvmCompilerNamespaces { ); return context - .addTopLevelEntity(defineGlobal( + .addTopLevelEntity(defineNamespaceIsInited(namespaceName)) + .addTopLevelEntity(defineNamespaceValue( namespaceName, context.typeInfo().namespaceTypeInfo(namespaceName) )) @@ -133,7 +143,20 @@ public class LlvmCompilerNamespaces { .addTopLevelEntity(namespaceImportFunction); } - private static LlvmGlobalDefinition defineGlobal( + private static LlvmGlobalDefinition defineNamespaceIsInited( + NamespaceName namespaceName + ) { + return new LlvmGlobalDefinition( + globalNameNamespaceIsInited(namespaceName), + LlvmTypes.INT_1, + Optional.of(new LlvmOperandInt(0)), + false, + true, + true + ); + } + + private static LlvmGlobalDefinition defineNamespaceValue( NamespaceName namespaceName, NamespaceTypeInfo namespaceTypeInfo ) { @@ -149,8 +172,8 @@ public class LlvmCompilerNamespaces { .toList() )), false, - false, - false + true, + true ); } diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/types/LlvmTypes.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/types/LlvmTypes.java index 90a8b1ee..87006069 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/types/LlvmTypes.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/types/LlvmTypes.java @@ -7,6 +7,7 @@ public class LlvmTypes { private LlvmTypes() { } + public static final LlvmTypeScalar INT_1 = new LlvmTypeScalar("i1"); public static final LlvmTypeScalar INT_8 = new LlvmTypeScalar("i8"); public static final LlvmTypeScalar INT_32 = new LlvmTypeScalar("i32"); public static final LlvmTypeScalar INT_64 = new LlvmTypeScalar("i64"); -- cgit v1.2.3