From 8a0add6981fef214b910a5fce4f79561b85e3d0d Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 14 Jun 2023 19:09:14 +0100 Subject: Compile zero-arg calls --- .../compiler/backends/llvm/LlvmCompiler.java | 20 ++++++++++-- .../backends/llvm/LlvmCompilerContext.java | 21 +++++++++++- .../llvm/LlvmCompilerLocalVariableSpace.java | 3 +- .../backends/llvm/LlvmCompilerCallTests.java | 38 ++++++++++++++++++++++ 4 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java index 8aabbd5b..0cd282cf 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java @@ -1,5 +1,6 @@ package org.shedlang.compiler.backends.llvm; +import org.shedlang.compiler.backends.llvm.ir.ast.instructions.LlvmCall; import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmOperandInt; import org.shedlang.compiler.stackir.instructions.*; import org.shedlang.compiler.types.NamespaceName; @@ -13,8 +14,23 @@ public class LlvmCompiler { public static LlvmCompilerContext compileInstruction(Instruction instruction, LlvmCompilerContext context) { return switch (instruction) { - case CallInstruction callInstruction -> { - throw new UnsupportedOperationException("TODO"); + case CallInstruction call -> { + var receiverResult = context.pop(); + var receiver = receiverResult.value(); + context = receiverResult.context(); + + var temporaryResult = context.generateVariableLocal( + LlvmCompilerLocalVariableSpace.TEMPORARY + ); + var temporary = temporaryResult.value(); + context = temporaryResult.context(); + + yield context.addInstruction(new LlvmCall( + temporary, + LlvmCompilerTypes.VALUE_TYPE, + receiver, + List.of() + )).push(temporary); } case DefineFunctionInstruction defineFunctionInstruction -> { throw new UnsupportedOperationException("TODO"); diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerContext.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerContext.java index c72bed0a..f6f4c9c6 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerContext.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerContext.java @@ -10,6 +10,7 @@ import org.shedlang.compiler.typechecker.TypeInfo; import org.shedlang.compiler.util.POrderedMap; import java.util.Collection; +import java.util.Optional; public record LlvmCompilerContext( TypeInfo typeInfo, @@ -116,13 +117,31 @@ public record LlvmCompilerContext( return topLevelEntitiesByName.values(); } + public LlvmCompilerResult generateVariableLocal( + LlvmCompilerLocalVariableSpace space + ) { + return generateVariableLocal(space, Optional.empty()); + } + public LlvmCompilerResult generateVariableLocal( LlvmCompilerLocalVariableSpace space, String name ) { + return generateVariableLocal(space, Optional.of(name)); + } + + private LlvmCompilerResult generateVariableLocal( + LlvmCompilerLocalVariableSpace space, + Optional name + ) { + var prefix = space.toString(); + if (name.isPresent()) { + prefix += "__" + name.get(); + } + var index = 0; while (true) { - var fullName = space + "__" + name + "__" + index; + var fullName = prefix + "__" + index; if (localVariableNames.contains(fullName)) { index++; } else { diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerLocalVariableSpace.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerLocalVariableSpace.java index a7bb515a..756e139b 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerLocalVariableSpace.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerLocalVariableSpace.java @@ -1,7 +1,8 @@ package org.shedlang.compiler.backends.llvm; public enum LlvmCompilerLocalVariableSpace { - FIELD_POINTER("fieldPointer"); + FIELD_POINTER("fieldPointer"), + TEMPORARY("tmp"); private final String name; diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java new file mode 100644 index 00000000..45af4ac3 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java @@ -0,0 +1,38 @@ +package org.shedlang.compiler.backends.llvm; + +import org.junit.jupiter.api.Test; +import org.shedlang.compiler.backends.llvm.ir.ast.LlvmIr; +import org.shedlang.compiler.backends.llvm.ir.ast.instructions.LlvmCall; +import org.shedlang.compiler.stackir.instructions.Instructions; + +import java.util.List; + +import static org.shedlang.compiler.backends.llvm.ir.ast.LlvmIrMatchers.isLlvmVariableLocal; +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.*; + +public class LlvmCompilerCallTests { + @Test + public void canCallFunctionWithNoArgs() { + var instruction = Instructions.call(0, List.of()); + var context = LlvmCompilerContext.EMPTY + .push(LlvmIr.variableLocal("x")) + .push(LlvmIr.variableLocal("f")); + + var result = LlvmCompiler.compileInstruction(instruction, context); + + assertThat(result.instructions(), isSequence( + instanceOf( + LlvmCall.class, + has("target", x -> x.target(), isLlvmVariableLocal("tmp__0")), + has("returnType", x -> x.returnType(), equalTo(LlvmCompilerTypes.VALUE_TYPE)), + has("functionPointer", x -> x.functionPointer(), isLlvmVariableLocal("f")), + has("args", x -> x.args(), isSequence()) + ) + )); + assertThat(result.stack(), isSequence( + isLlvmVariableLocal("tmp__0"), + isLlvmVariableLocal("x") + )); + } +} -- cgit v1.2.3