embecosm · CohenArthur · Jun 12, 2024 · Mar 20, 2024 · Mar 20, 2024 · Apr 18, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler/plc_ast/src/ast.rs b/compiler/plc_ast/src/ast.rs
@@ -600,7 +600,6 @@ pub enum AstStatement {
     DefaultValue(DefaultValue),
     // Literals
     Literal(AstLiteral),
-    CastStatement(CastStatement),
     MultipliedStatement(MultipliedStatement),
     // Expressions
     ReferenceExpr(ReferenceExpr),
@@ -735,9 +734,6 @@ impl Debug for AstNode {
             }
             AstStatement::ContinueStatement(..) => f.debug_struct("ContinueStatement").finish(),
             AstStatement::ExitStatement(..) => f.debug_struct("ExitStatement").finish(),
-            AstStatement::CastStatement(CastStatement { target, type_name }) => {
-                f.debug_struct("CastStatement").field("type_name", type_name).field("target", target).finish()
-            }
             AstStatement::ReferenceExpr(ReferenceExpr { access, base }) => {
                 f.debug_struct("ReferenceExpr").field("kind", access).field("base", base).finish()
             }

diff --git a/compiler/plc_ast/src/lib.rs b/compiler/plc_ast/src/lib.rs
@@ -7,3 +7,4 @@ pub mod control_statements;
 pub mod literals;
 mod pre_processor;
 pub mod provider;
+pub mod visitor;
diff --git a/compiler/plc_ast/src/visitor.rs b/compiler/plc_ast/src/visitor.rs
diff --git a/...r/src/tests/snapshots/plc_driver__tests__external_files__external_file_function_call.snap b/...r/src/tests/snapshots/plc_driver__tests__external_files__external_file_function_call.snap
@@ -5,7 +5,7 @@ expression: "results.join(\"\\n\")"
 ; ModuleID = 'main.st'
 source_filename = "main.st"
 
-define i16 @main() section "fn-main:i16" {
+define i16 @main() section "fn-$RUSTY$main:i16" {
 entry:
   %main = alloca i16, align 2
   store i16 0, i16* %main, align 2
@@ -14,9 +14,9 @@ entry:
   ret i16 %main_ret
 }
 
-declare i16 @external() section "fn-external:i16"
+declare i16 @external() section "fn-$RUSTY$external:i16"
 
 ; ModuleID = 'external.st'
 source_filename = "external.st"
 
-declare i16 @external() section "fn-external:i16"
+declare i16 @external() section "fn-$RUSTY$external:i16"
diff --git a/...iver/src/tests/snapshots/plc_driver__tests__external_files__external_file_global_var.snap b/...iver/src/tests/snapshots/plc_driver__tests__external_files__external_file_global_var.snap
@@ -5,10 +5,10 @@ expression: "results.join(\"\\n\")"
 ; ModuleID = 'main.st'
 source_filename = "main.st"
 
-@x = external global i16
-@y = external global i16
+@x = external global i16, section "var-$RUSTY$x:i16"
+@y = external global i16, section "var-$RUSTY$y:i16"
 
-define i16 @main() section "fn-main:i16" {
+define i16 @main() section "fn-$RUSTY$main:i16" {
 entry:
   %main = alloca i16, align 2
   store i16 0, i16* %main, align 2
@@ -19,12 +19,12 @@ entry:
   ret i16 %main_ret
 }
 
-declare i16 @external() section "fn-external:i16"
+declare i16 @external() section "fn-$RUSTY$external:i16"
 
 ; ModuleID = 'external.st'
 source_filename = "external.st"
 
-@x = external global i16
-@y = external global i16
+@x = external global i16, section "var-$RUSTY$x:i16"
+@y = external global i16, section "var-$RUSTY$y:i16"
 
-declare i16 @external() section "fn-external:i16"
+declare i16 @external() section "fn-$RUSTY$external:i16"
diff --git a/...lc_driver__tests__multi_files__multiple_files_in_different_locations_with_debug_info.snap b/...lc_driver__tests__multi_files__multiple_files_in_different_locations_with_debug_info.snap
@@ -7,9 +7,9 @@ source_filename = "app/file1.st"
 
 %mainProg = type {}
 
-@mainProg_instance = external global %mainProg, !dbg !0
+@mainProg_instance = external global %mainProg, section "var-$RUSTY$mainProg_instance:r0", !dbg !0
 
-define i16 @main() section "fn-main:i16" !dbg !10 {
+define i16 @main() section "fn-$RUSTY$main:i16" !dbg !10 {
 entry:
   %main = alloca i16, align 2, !dbg !14
   call void @llvm.dbg.declare(metadata i16* %main, metadata !15, metadata !DIExpression()), !dbg !17
@@ -19,7 +19,7 @@ entry:
   ret i16 %main_ret, !dbg !14
 }
 
-declare !dbg !18 void @mainProg(%mainProg*) section "fn-mainProg:v"
+declare !dbg !18 void @mainProg(%mainProg*) section "fn-$RUSTY$mainProg:v"
 
 ; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
 declare void @llvm.dbg.declare(metadata, metadata, metadata) #0
@@ -54,9 +54,9 @@ source_filename = "lib/file2.st"
 
 %mainProg = type {}
 
-@mainProg_instance = global %mainProg zeroinitializer, !dbg !0
+@mainProg_instance = global %mainProg zeroinitializer, section "var-$RUSTY$mainProg_instance:r0", !dbg !0
 
-define void @mainProg(%mainProg* %0) section "fn-mainProg:v" !dbg !10 {
+define void @mainProg(%mainProg* %0) section "fn-$RUSTY$mainProg:v" !dbg !10 {
 entry:
   call void @llvm.dbg.declare(metadata %mainProg* %0, metadata !13, metadata !DIExpression()), !dbg !14
   ret void, !dbg !14

diff --git a/...r/src/tests/snapshots/plc_driver__tests__multi_files__multiple_files_with_debug_info.snap b/...r/src/tests/snapshots/plc_driver__tests__multi_files__multiple_files_with_debug_info.snap
@@ -7,9 +7,9 @@ source_filename = "file1.st"
 
 %mainProg = type {}
 
-@mainProg_instance = external global %mainProg, !dbg !0
+@mainProg_instance = external global %mainProg, section "var-$RUSTY$mainProg_instance:r0", !dbg !0
 
-define i16 @main() section "fn-main:i16" !dbg !10 {
+define i16 @main() section "fn-$RUSTY$main:i16" !dbg !10 {
 entry:
   %main = alloca i16, align 2, !dbg !14
   call void @llvm.dbg.declare(metadata i16* %main, metadata !15, metadata !DIExpression()), !dbg !17
@@ -19,7 +19,7 @@ entry:
   ret i16 %main_ret, !dbg !14
 }
 
-declare !dbg !18 void @mainProg(%mainProg*) section "fn-mainProg:v"
+declare !dbg !18 void @mainProg(%mainProg*) section "fn-$RUSTY$mainProg:v"
 
 ; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
 declare void @llvm.dbg.declare(metadata, metadata, metadata) #0
@@ -54,9 +54,9 @@ source_filename = "file2.st"
 
 %mainProg = type {}
 
-@mainProg_instance = global %mainProg zeroinitializer, !dbg !0
+@mainProg_instance = global %mainProg zeroinitializer, section "var-$RUSTY$mainProg_instance:r0", !dbg !0
 
-define void @mainProg(%mainProg* %0) section "fn-mainProg:v" !dbg !10 {
+define void @mainProg(%mainProg* %0) section "fn-$RUSTY$mainProg:v" !dbg !10 {
 entry:
   call void @llvm.dbg.declare(metadata %mainProg* %0, metadata !13, metadata !DIExpression()), !dbg !14
   ret void, !dbg !14

diff --git a/.../src/tests/snapshots/plc_driver__tests__multi_files__multiple_source_files_generated.snap b/.../src/tests/snapshots/plc_driver__tests__multi_files__multiple_source_files_generated.snap
@@ -7,9 +7,9 @@ source_filename = "external_file1.st"
 
 %mainProg = type {}
 
-@mainProg_instance = external global %mainProg
+@mainProg_instance = external global %mainProg, section "var-$RUSTY$mainProg_instance:r0"
 
-define i16 @main() section "fn-main:i16" {
+define i16 @main() section "fn-$RUSTY$main:i16" {
 entry:
   %main = alloca i16, align 2
   store i16 0, i16* %main, align 2
@@ -18,16 +18,16 @@ entry:
   ret i16 %main_ret
 }
 
-declare void @mainProg(%mainProg*) section "fn-mainProg:v"
+declare void @mainProg(%mainProg*) section "fn-$RUSTY$mainProg:v"
 
 ; ModuleID = 'external_file2.st'
 source_filename = "external_file2.st"
 
 %mainProg = type {}
 
-@mainProg_instance = global %mainProg zeroinitializer
+@mainProg_instance = global %mainProg zeroinitializer, section "var-$RUSTY$mainProg_instance:r0"
 
-define void @mainProg(%mainProg* %0) section "fn-mainProg:v" {
+define void @mainProg(%mainProg* %0) section "fn-$RUSTY$mainProg:v" {
 entry:
   ret void
 }
diff --git a/compiler/section_mangler/Cargo.toml b/compiler/section_mangler/Cargo.toml
@@ -4,3 +4,4 @@ version = "0.0.1"
 edition = "2021"
 
 [dependencies]
+nom = "7.1"
diff --git a/compiler/section_mangler/src/lib.rs b/compiler/section_mangler/src/lib.rs
@@ -44,20 +44,25 @@
 
 use std::fmt;
 
+mod parser;
+
 /// The main builder type of this crate. Use it to create mangling contexts, in
 /// order to encode and decode binary type information.
 // TODO: Add example code for using this builder
+#[derive(Debug, PartialEq, Clone)]
 pub enum SectionMangler {
     Function(FunctionMangler),
     Variable(VariableMangler),
 }
 
+#[derive(Debug, PartialEq, Clone)]
 pub struct FunctionMangler {
     name: String,
     parameters: Vec<FunctionArgument>,
     return_type: Option<Type>,
 }
 
+#[derive(Debug, PartialEq, Clone)]
 pub struct VariableMangler {
     name: String,
     ty: Type,
@@ -72,6 +77,13 @@ impl SectionMangler {
         SectionMangler::Variable(VariableMangler { name: name.into(), ty })
     }
 
+    pub fn name(&self) -> &str {
+        match self {
+            SectionMangler::Function(FunctionMangler { name, .. })
+            | SectionMangler::Variable(VariableMangler { name, .. }) => name,
+        }
+    }
+
     pub fn with_parameter(self, param: FunctionArgument) -> SectionMangler {
         match self {
             SectionMangler::Function(f) => {
@@ -84,9 +96,11 @@ impl SectionMangler {
         }
     }
 
-    pub fn with_return_type(self, return_type: Option<Type>) -> SectionMangler {
+    pub fn with_return_type(self, return_type: Type) -> SectionMangler {
         match self {
-            SectionMangler::Function(f) => SectionMangler::Function(FunctionMangler { return_type, ..f }),
+            SectionMangler::Function(f) => {
+                SectionMangler::Function(FunctionMangler { return_type: Some(return_type), ..f })
+            }
             SectionMangler::Variable(_) => unreachable!("global variables do not have a return type."),
         }
     }
@@ -111,6 +125,7 @@ impl SectionMangler {
 // NOTE: This is called `variable_linkage` in the `MemberInfo` struct.
 
 /// We have to encode this because if it changes, the function needs to be reloaded - this is an ABI breakage
+#[derive(Debug, PartialEq, Clone)]
 pub enum FunctionArgument {
     ByValue(Type),
     ByRef(Type),
@@ -127,6 +142,7 @@ impl fmt::Display for FunctionArgument {
 }
 
 // TODO: Do we have to encode this? Does that affect ABI? Probably
+#[derive(Debug, PartialEq, Clone)]
 pub enum StringEncoding {
     // TODO: Should we encode this differently? this could cause problems compared to encoding unsigned types
     /// Encoded as `8u`
@@ -146,6 +162,7 @@ impl fmt::Display for StringEncoding {
 
 // This maps directly to the [`DataTypeInformation`] enum in RuSTy - we simply remove some fields and add the ability to encode/decode serialize/deserialize
 // TODO: Do we have to handle Generic?
+#[derive(Debug, PartialEq, Clone)]
 pub enum Type {
     /// Encoded as `v`
     Void,
@@ -158,7 +175,9 @@ pub enum Type {
         semantic_size: Option<u32>,
     },
     /// Encoded as `f<size>`
-    Float { size: u32 },
+    Float {
+        size: u32,
+    },
     /// Encoded as `s<encoding><size>`
     String {
         size: usize, // FIXME: Is that okay? will all the constant expressions be folded at that point? Can we have TypeSize::Undetermined still?
@@ -170,23 +189,12 @@ pub enum Type {
         // TODO: Is changing the `auto_deref` mode an ABI break?
         // auto_deref: bool,
     },
-
-    // --- UNIMPLEMENTED
-
-    // FIXME: Do we need any info here? How are structs codegened?
     Struct {
-        // name: TypeId,
-        // members: Vec<VariableIndexEntry>,
-        // source: StructSource,
+        members: Vec<Type>,
     },
-
-    // FIXME: Same here
     Enum {
-        // name: TypeId,
-        // referenced_type: TypeId,
-        // // TODO: Would it make sense to store `VariableIndexEntry`s similar to how the `Struct` variant does?
-        // //       This would allow us to pattern match in the index `find_member` method
-        // elements: Vec<String>,
+        referenced_type: Box<Type>,
+        elements: usize,
     },
     Array {
         inner: Box<Type>,
@@ -224,27 +232,36 @@ impl fmt::Display for Type {
             Type::Float { size } => write!(f, "f{size}"),
             Type::String { size, encoding } => write!(f, "s{encoding}{size}",),
             Type::Pointer { inner } => write!(f, "p{}", inner),
+            Type::Struct { members } => {
+                write!(
+                    f,
+                    "r{}{}",
+                    members.len(),
+                    members.iter().fold(String::new(), |acc, m| format!("{acc}{m}"))
+                )
+            }
+            Type::Enum { referenced_type, elements } => write!(f, "e{elements}{referenced_type}"),
+            Type::Array { inner } => write!(f, "a{inner}"),
             // -- Unimplemented
-            Type::Struct {} => todo!(),
-            Type::Enum {} => todo!(),
-            Type::Array { .. } => todo!(),
             Type::SubRange {} => todo!(),
             Type::Alias {} => todo!(),
             Type::Generic {} => todo!(),
         }
     }
 }
 
+pub const PREFIX: &str = "$RUSTY$";
+
 // TODO: How to encode variadics?
 fn mangle_function(FunctionMangler { name, parameters, return_type }: FunctionMangler) -> String {
     let mangled = parameters
         .into_iter()
         /* FIXME: Is that correct? */
         .fold(return_type.unwrap_or(Type::Void).to_string(), |mangled, arg| format!("{mangled}[{arg}]"));
 
-    format!("{name}:{mangled}")
+    format!("{PREFIX}{name}:{mangled}")
 }
 
 fn mangle_variable(VariableMangler { name, ty }: VariableMangler) -> String {
-    format!("{name}:{ty}")
+    format!("{PREFIX}{name}:{ty}")
 }