aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-06-17 20:44:14 +0100
committerMichael Williamson <mike@zwobble.org>2023-06-17 20:44:14 +0100
commitfa32264f4807c40172f524b9a35d2e2019edc7c2 (patch)
treeeb04b926067f20e2e7c71e8a2260037c71251d63 /src
parent51f6b88390ce1c028fd1a3163f26620e6be16480 (diff)
Use opaque ptr in prttoint instructions
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java16
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/LlvmSizeOf.java1
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java4
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmPtrToInt.java2
-rw-r--r--src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java8
-rw-r--r--src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java3
-rw-r--r--src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java3
7 files changed, 18 insertions, 19 deletions
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 71d3cef1..2afcac4a 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java
@@ -1,8 +1,6 @@
package org.shedlang.compiler.backends.llvm;
-import org.shedlang.compiler.backends.llvm.ir.ast.LlvmFunctionDefinition;
-import org.shedlang.compiler.backends.llvm.ir.ast.LlvmModule;
-import org.shedlang.compiler.backends.llvm.ir.ast.LlvmParam;
+import org.shedlang.compiler.backends.llvm.ir.ast.*;
import org.shedlang.compiler.backends.llvm.ir.ast.instructions.*;
import org.shedlang.compiler.backends.llvm.ir.ast.operands.*;
import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypes;
@@ -20,7 +18,7 @@ public class LlvmCompiler {
List<Instruction> instructions,
TypeInfo typeInfo
) {
- var context = LlvmCompilerContext.fromTypeInfo(typeInfo);
+ var context = defaultContext(typeInfo);
for (var instruction : instructions) {
context = compileInstruction(instruction, context);
}
@@ -45,6 +43,15 @@ public class LlvmCompiler {
return new LlvmModule(topLevelEntities);
}
+ private static LlvmCompilerContext defaultContext(TypeInfo typeInfo) {
+ return LlvmCompilerContext.fromTypeInfo(typeInfo)
+ .addTopLevelEntity(new LlvmFunctionDeclaration(
+ "shed__runtime__alloc",
+ LlvmTypes.pointer(LlvmTypes.INT_8),
+ List.of(new LlvmParam(LlvmTypes.INT_64, "size"))
+ ));
+ }
+
public static LlvmCompilerContext compileInstruction(Instruction instruction, LlvmCompilerContext context) {
return switch (instruction) {
case CallInstruction call -> {
@@ -187,7 +194,6 @@ public class LlvmCompiler {
context = context.addInstruction(new LlvmPtrToInt(
closureValue,
- closureTypes.closurePointer(),
closurePointer,
LlvmCompilerTypes.VALUE_TYPE
));
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmSizeOf.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmSizeOf.java
index d26e8635..53d565f7 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmSizeOf.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmSizeOf.java
@@ -35,7 +35,6 @@ public class LlvmSizeOf {
.addInstruction(
new LlvmPtrToInt(
size,
- LlvmTypes.pointer(type),
sizePtr,
LlvmTypes.INT_64
)
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java
index 0b1ff62b..dd4e2cf1 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java
@@ -84,9 +84,7 @@ public class LlvmIrSerializer {
}
case LlvmPtrToInt ptrToInt -> {
serializeVariable(ptrToInt.target(), builder);
- builder.append(" = ptrtoint ");
- serializeType(ptrToInt.sourceType(), builder);
- builder.append(" ");
+ builder.append(" = ptrtoint ptr ");
serializeOperand(ptrToInt.value(), builder);
builder.append(" to ");
serializeType(ptrToInt.targetType(), builder);
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmPtrToInt.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmPtrToInt.java
index ca836d3c..784dcb9b 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmPtrToInt.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmPtrToInt.java
@@ -2,12 +2,10 @@ package org.shedlang.compiler.backends.llvm.ir.ast.instructions;
import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmOperand;
import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmVariable;
-import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypePointer;
import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypeScalar;
public record LlvmPtrToInt(
LlvmVariable target,
- LlvmTypePointer sourceType,
LlvmOperand value,
LlvmTypeScalar targetType
) implements LlvmInstruction {
diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java
index 95b6ed42..7604386c 100644
--- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java
@@ -57,11 +57,11 @@ public class LlvmCompilerDefineFunctionTests {
);
assertThat(instructions.toString(), equalTo("""
%size_ptr__0 = getelementptr {i64 ([0 x i64] *) *, [0 x i64]}, ptr null, i64 0
- %size__0 = ptrtoint {i64 ([0 x i64] *) *, [0 x i64]} * %size_ptr__0 to i64
+ %size__0 = ptrtoint ptr %size_ptr__0 to i64
%closurePointer__0 = call {i64 ([0 x i64] *) *, [0 x i64]} * @shed__runtime__alloc(i64 %size__0)
%closureFunctionPointerPointer__0 = getelementptr {i64 ([0 x i64] *) *, [0 x i64]}, ptr %closurePointer__0, i64 0, i32 0
store i64 ([0 x i64] *) * @shed__fun__f__0, i64 ([0 x i64] *) * * %closureFunctionPointerPointer__0
- %closureValue__0 = ptrtoint {i64 ([0 x i64] *) *, [0 x i64]} * %closurePointer__0 to i64"""));
+ %closureValue__0 = ptrtoint ptr %closurePointer__0 to i64"""));
assertThat(result.stack(), isSequence(
isLlvmVariableLocal("closureValue__0")
@@ -108,7 +108,7 @@ public class LlvmCompilerDefineFunctionTests {
);
assertThat(instructions.toString(), equalTo("""
%size_ptr__0 = getelementptr {i64 ([2 x i64] *) *, [2 x i64]}, ptr null, i64 0
- %size__0 = ptrtoint {i64 ([2 x i64] *) *, [2 x i64]} * %size_ptr__0 to i64
+ %size__0 = ptrtoint ptr %size_ptr__0 to i64
%closurePointer__0 = call {i64 ([2 x i64] *) *, [2 x i64]} * @shed__runtime__alloc(i64 %size__0)
%closureFunctionPointerPointer__0 = getelementptr {i64 ([2 x i64] *) *, [2 x i64]}, ptr %closurePointer__0, i64 0, i32 0
store i64 ([2 x i64] *) * @shed__fun__f__0, i64 ([2 x i64] *) * * %closureFunctionPointerPointer__0
@@ -116,7 +116,7 @@ public class LlvmCompilerDefineFunctionTests {
store i64 1, i64 * %closureEnvironmentPointer__0
%closureEnvironmentPointer__1 = getelementptr {i64 ([2 x i64] *) *, [2 x i64]}, ptr %closurePointer__0, i64 0, i32 1, i64 1
store i64 2, i64 * %closureEnvironmentPointer__1
- %closureValue__0 = ptrtoint {i64 ([2 x i64] *) *, [2 x i64]} * %closurePointer__0 to i64"""));
+ %closureValue__0 = ptrtoint ptr %closurePointer__0 to i64"""));
assertThat(result.stack(), isSequence(
isLlvmVariableLocal("closureValue__0")
diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java
index f6fc9216..b210c8d9 100644
--- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java
@@ -109,14 +109,13 @@ public class LlvmIrSerializerInstructionTests {
public void ptrToIntIsSerialized() {
var instruction = LlvmIr.ptrToInt(
LlvmIr.variableLocal("x"),
- LlvmTypes.pointer(LlvmTypes.INT_8),
LlvmIr.variableLocal("y"),
LlvmTypes.INT_64
);
var result = serializeToString(instruction, LlvmIrSerializer::serializeInstruction);
- assertThat(result, equalTo("%x = ptrtoint i8 * %y to i64"));
+ assertThat(result, equalTo("%x = ptrtoint ptr %y to i64"));
}
@Test
diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java
index 069b938e..414458fd 100644
--- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java
@@ -113,11 +113,10 @@ public class LlvmIr {
public static LlvmPtrToInt ptrToInt(
LlvmVariable target,
- LlvmTypePointer sourceType,
LlvmOperand value,
LlvmTypeScalar targetType
) {
- return new LlvmPtrToInt(target, sourceType, value, targetType);
+ return new LlvmPtrToInt(target, value, targetType);
}
public static LlvmReturn returnValue(LlvmType type, LlvmOperand value) {