From f495be56b344bf79f45ce1bc55165ae6933e8246 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 28 Jan 2024 19:52:36 +0000 Subject: Name pointer types more consistently --- .../backends/llvm/codegen/PatioToLlvm.java | 18 +++++++------- .../compiler/backends/wasm/PatioToWasm.java | 28 +++++++++++----------- .../compiler/backends/wasm/WasmTarget.java | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/main/java/org/shedlang/compiler/backends') diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java b/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java index 7f7a8ba4..b77701e1 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java @@ -1016,10 +1016,10 @@ public class PatioToLlvm { case PatioDataLayoutByte patioDataLayoutByte -> throw new RuntimeException("offset not allowed for bytes"); - case PatioDataLayoutDataPointer patioDataLayoutdataPointer -> + case PatioDataLayoutDataPtr patioDataLayoutdataPtr -> throw new RuntimeException("offset not allowed for data ptrs"); - case PatioDataLayoutFunctionPointer patioDataLayoutFunctionPointer -> + case PatioDataLayoutFunctionPtr patioDataLayoutFunctionPtr -> throw new RuntimeException("offset not allowed for function ptrs"); case PatioDataLayoutInt patioDataLayoutInt -> @@ -1169,10 +1169,10 @@ public class PatioToLlvm { case PatioByteType patioByteType -> LlvmTypes.INT_8; - case PatioDataPointerType patioDataPointerType -> + case PatioDataPtrType patioDataPtrType -> LlvmTypes.pointer(LlvmTypes.VOID); - case PatioFunctionPointerType patioFunctionPointerType -> + case PatioFunctionPtrType patioFunctionPtrType -> LlvmTypes.pointer(LlvmTypes.VOID); case PatioIntType patioIntType -> @@ -1206,10 +1206,10 @@ public class PatioToLlvm { case PatioDataLayoutByte patioDataLayoutByte -> LlvmTypes.INT_8; - case PatioDataLayoutDataPointer patioDataLayoutDataPointer -> + case PatioDataLayoutDataPtr patioDataLayoutDataPtr -> LlvmTypes.pointer(LlvmTypes.VOID); - case PatioDataLayoutFunctionPointer patioDataLayoutFunctionPointer -> + case PatioDataLayoutFunctionPtr patioDataLayoutFunctionPtr -> LlvmTypes.pointer(LlvmTypes.VOID); case PatioDataLayoutInt patioDataLayoutInt -> @@ -1254,10 +1254,10 @@ public class PatioToLlvm { case PatioDataLayoutByte patioDataLayoutByte -> new LlvmOperandInt(0); - case PatioDataLayoutDataPointer patioDataLayoutDataPointer -> + case PatioDataLayoutDataPtr patioDataLayoutDataPtr -> new LlvmOperandNull(); - case PatioDataLayoutFunctionPointer patioDataLayoutFunctionPointer -> + case PatioDataLayoutFunctionPtr patioDataLayoutFunctionPtr -> new LlvmOperandNull(); case PatioDataLayoutInt patioDataLayoutInt -> @@ -1302,7 +1302,7 @@ public class PatioToLlvm { case PatioDataValueByte patioDataValueByte -> new LlvmOperandInt(patioDataValueByte.value()); - case PatioDataValueDataPointer patioDataValueDataPointer -> + case PatioDataValueDataPtr patioDataValueDataPtr -> new LlvmOperandNull(); case PatioDataValueInt patioDataValueInt -> diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java index 4070b25e..05dd71df 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java @@ -37,7 +37,7 @@ public class PatioToWasm { STACK_ALLOC_NAME, new WasmFuncType( List.of(target.sizeT()), - List.of(target.dataPointerType()) + List.of(target.dataPtrType()) ) ) )); @@ -585,7 +585,7 @@ public class PatioToWasm { } case PatioDataPtrValueNull patioDataPtrValueNull -> { - yield wasmIntConst(target.dataPointerType(), 0); + yield wasmIntConst(target.dataPtrType(), 0); } }; } @@ -621,11 +621,11 @@ public class PatioToWasm { case PatioDataLayoutByte patioDataLayoutByte -> 1; - case PatioDataLayoutDataPointer patioDataLayoutDataPointer -> - target.dataPointerType().sizeBytes(); + case PatioDataLayoutDataPtr patioDataLayoutDataPtr -> + target.dataPtrType().sizeBytes(); - case PatioDataLayoutFunctionPointer patioDataLayoutFunctionPointer -> - target.functionPointerType().sizeBytes(); + case PatioDataLayoutFunctionPtr patioDataLayoutFunctionPtr -> + target.functionPtrType().sizeBytes(); case PatioDataLayoutInt patioDataLayoutInt -> target.patioIntType().sizeBytes(); @@ -660,10 +660,10 @@ public class PatioToWasm { case PatioDataLayoutByte patioDataLayoutByte -> { throw new RuntimeException("offset not allowed for bytes"); } - case PatioDataLayoutDataPointer patioDataLayoutDataPointer -> { + case PatioDataLayoutDataPtr patioDataLayoutDataPtr -> { throw new RuntimeException("offset not allowed for data ptrs"); } - case PatioDataLayoutFunctionPointer patioDataLayoutFunctionPointer -> { + case PatioDataLayoutFunctionPtr patioDataLayoutFunctionPtr -> { throw new RuntimeException("offset not allowed for function ptrs"); } case PatioDataLayoutInt patioDataLayoutInt -> { @@ -725,8 +725,8 @@ public class PatioToWasm { case PatioDataValueByte patioDataValueByte -> { bytes.put(patioDataValueByte.value()); } - case PatioDataValueDataPointer patioDataValueDataPointer -> { - switch (patioDataValueDataPointer.value()) { + case PatioDataValueDataPtr patioDataValueDataPtr -> { + switch (patioDataValueDataPtr.value()) { case PatioDataPtrValueDataElement dataElement -> { throw new UnsupportedOperationException("TODO"); } @@ -800,10 +800,10 @@ public class PatioToWasm { WasmValueType.I32; case PatioByteType patioByteType -> WasmValueType.I32; - case PatioDataPointerType patioDataPointerType -> - target.dataPointerType(); - case PatioFunctionPointerType patioFunctionPointerType -> - target.functionPointerType(); + case PatioDataPtrType patioDataPtrType -> + target.dataPtrType(); + case PatioFunctionPtrType patioFunctionPtrType -> + target.functionPtrType(); case PatioIntType patioIntType -> target.patioIntType(); case PatioInt32Type patioInt32Type -> diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmTarget.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmTarget.java index 6ded336a..8f7d4e8c 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmTarget.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmTarget.java @@ -63,11 +63,11 @@ public enum WasmTarget { return sizeT; } - public WasmValueType dataPointerType() { + public WasmValueType dataPtrType() { return sizeT; } - public WasmValueType functionPointerType() { + public WasmValueType functionPtrType() { // TODO: there's a problem here: wasm64 uses 32-bit function pointers, // but C uses void* for all pointers, which will be 64-bit on wasm64. // We could either: -- cgit v1.2.3