Added more tests + refactored the project to remove the old signature…

… representation
FractalFir · Sep 12, 2024 · 50de7fc · 50de7fc
1 parent 186b498
commit 50de7fc
Show file tree

Hide file tree

Showing 45 changed files with 750 additions and 594 deletions.
diff --git a/cilly/src/asm.rs b/cilly/src/asm.rs
@@ -10,8 +10,8 @@ use crate::{
     call_site::CallSite,
     cil_root::CILRoot,
     method::{Method, MethodType},
-    v2::{ClassDef, Int},
-    FnSig, IString, Type,
+    v2::{ClassDef, FnSig, Int},
+    IString, Type,
 };
 
 #[derive(Clone, Copy, Serialize, Deserialize, Debug)]
@@ -104,14 +104,14 @@ impl Assembly {
             .entry(CallSite::new(
                 None,
                 ".tcctor".into(),
-                FnSig::new([], Type::Void),
+                FnSig::new(Box::new([]), Type::Void),
                 true,
             ))
             .or_insert_with(|| {
                 Method::new(
                     AccessModifer::Extern,
                     MethodType::Static,
-                    FnSig::new([], Type::Void),
+                    FnSig::new(Box::new([]), Type::Void),
                     ".tcctor",
                     vec![
                         (None, self.inner.nptr(Type::Int(Int::U8))),
@@ -164,7 +164,7 @@ impl Assembly {
         self.functions.get_mut(&CallSite::new(
             None,
             ".cctor".into(),
-            FnSig::new([], Type::Void),
+            FnSig::new(Box::new([]), Type::Void),
             true,
         ))
     }

diff --git a/cilly/src/bin/linker/main.rs b/cilly/src/bin/linker/main.rs
@@ -8,10 +8,9 @@ use cilly::{
     v2::{
         asm::{MissingMethodPatcher, ILASM_FLAVOUR},
         cilnode::MethodKind,
-        Assembly, BasicBlock, CILNode, CILRoot, ClassDef, ClassRef, Const, IlasmFlavour, Int,
-        MethodImpl, Type,
+        Assembly, BasicBlock, CILNode, CILRoot, ClassDef, ClassRef, Const, FnSig, IlasmFlavour,
+        Int, MethodImpl, Type,
     },
-    FnSig,
 };
 //use assembly::Assembly;
 use lazy_static::lazy_static;
@@ -267,7 +266,7 @@ fn main() {
                                             ))),
                                             ".ctor".into(),
                                             FnSig::new(
-                                                [
+                                                Box::new([
                                                     Type::ClassRef(asm.alloc_class_ref(
                                                         ClassRef::new(
                                                             rust_exception,
@@ -277,7 +276,7 @@ fn main() {
                                                         ),
                                                     )),
                                                     Type::Int(Int::USize),
-                                                ],
+                                                ]),
                                                 Type::Void,
                                             ),
                                             false,

diff --git a/cilly/src/call_site.rs b/cilly/src/call_site.rs
@@ -1,6 +1,6 @@
 use crate::{
-    v2::{Assembly, ClassRef, ClassRefIdx, Int},
-    FnSig, Type,
+    v2::{Assembly, ClassRef, ClassRefIdx, FnSig, Int},
+    Type,
 };
 use serde::{Deserialize, Serialize};
 
@@ -22,7 +22,7 @@ impl CallSite {
         Self::new_extern(
             ClassRef::marshal(asm),
             "StringToCoTaskMemUTF8".into(),
-            FnSig::new([Type::PlatformString], Type::Int(Int::ISize)),
+            FnSig::new(Box::new([Type::PlatformString]), Type::Int(Int::ISize)),
             true,
         )
     }
@@ -32,7 +32,7 @@ impl CallSite {
             ClassRef::native_mem(asm),
             "AlignedAlloc".into(),
             FnSig::new(
-                [Type::Int(Int::USize), Type::Int(Int::USize)],
+                Box::new([Type::Int(Int::USize), Type::Int(Int::USize)]),
                 asm.nptr(Type::Void),
             ),
             true,
@@ -43,7 +43,7 @@ impl CallSite {
         Self::new_extern(
             ClassRef::marshal(asm),
             "AllocHGlobal".into(),
-            FnSig::new([Type::Int(Int::I32)], Type::Int(Int::ISize)),
+            FnSig::new(Box::new([Type::Int(Int::I32)]), Type::Int(Int::ISize)),
             true,
         )
     }
@@ -53,11 +53,11 @@ impl CallSite {
             Some(ClassRef::native_mem(asm)),
             "AlignedRealloc".into(),
             FnSig::new(
-                [
+                Box::new([
                     asm.nptr(Type::Void),
                     Type::Int(Int::USize),
                     Type::Int(Int::USize),
-                ],
+                ]),
                 asm.nptr(Type::Void),
             ),
             true,

diff --git a/cilly/src/cil_iter.rs b/cilly/src/cil_iter.rs
@@ -542,8 +542,8 @@ impl<'a> IntoIterator for &'a CILRoot {
 fn iter() {
     use crate::{
         call_site::CallSite,
-        v2::{hashable::HashableF32, Float, Int},
-        FnSig, Type,
+        v2::{hashable::HashableF32, Float, FnSig, Int},
+        Type,
     };
     let node = CILNode::Add(
         Box::new(CILNode::Mul(
@@ -578,7 +578,10 @@ fn iter() {
         site: Box::new(CallSite::new(
             None,
             "bob".to_owned().into(),
-            FnSig::new([Type::Int(Int::I32), Type::Float(Float::F32)], Type::Void),
+            FnSig::new(
+                Box::new([Type::Int(Int::I32), Type::Float(Float::F32)]),
+                Type::Void,
+            ),
             true,
         )),
         args: [CILNode::LdcI32(-77), CILNode::LdcF32(HashableF32(3.119765))].into(),

diff --git a/cilly/src/cil_iter_mut.rs b/cilly/src/cil_iter_mut.rs
@@ -579,8 +579,8 @@ impl<'a, T: Iterator<Item = CILIterElemMut<'a>>> CILIterMutTrait<'a> for T {
 fn iter() {
     use crate::{
         call_site::CallSite,
-        v2::{hashable::HashableF32, Float, Int},
-        FnSig, Type,
+        v2::{hashable::HashableF32, Float, FnSig, Int},
+        Type,
     };
     let mut node = CILNode::Add(
         Box::new(CILNode::Mul(
@@ -615,7 +615,10 @@ fn iter() {
         site: Box::new(CallSite::new(
             None,
             "bob".into(),
-            FnSig::new([Type::Int(Int::I32), Type::Float(Float::F32)], Type::Void),
+            FnSig::new(
+                Box::new([Type::Int(Int::I32), Type::Float(Float::F32)]),
+                Type::Void,
+            ),
             true,
         )),
         args: [CILNode::LdcI32(-77), CILNode::LdcF32(HashableF32(3.119765))].into(),

diff --git a/cilly/src/cil_node.rs b/cilly/src/cil_node.rs
@@ -1,11 +1,10 @@
-use crate::v2::{Assembly, ClassRef, ClassRefIdx, Int, Type};
+use crate::v2::{Assembly, ClassRef, ClassRefIdx, FnSig, Int, Type};
 use crate::{
     call,
     call_site::CallSite,
     cil_iter::CILIterTrait,
     cil_root::CILRoot,
     field_desc::FieldDescriptor,
-    fn_sig::FnSig,
     static_field_desc::StaticFieldDescriptor,
     v2::hashable::{HashableF32, HashableF64},
     IString,
@@ -242,11 +241,11 @@ impl CILNode {
         let low = u128_low_u64(value);
         let high = (value >> 64) as u64;
         let ctor_sig = FnSig::new(
-            [
+            Box::new([
                 asm.nref(Type::Int(Int::U128)),
                 Type::Int(Int::U64),
                 Type::Int(Int::U64),
-            ],
+            ]),
             Type::Void,
         );
         CILNode::NewObj(Box::new(CallOpArgs {
@@ -270,11 +269,11 @@ impl CILNode {
         let low = u128_low_u64(value);
         let high = (value >> 64) as u64;
         let ctor_sig = FnSig::new(
-            [
+            Box::new([
                 asm.nref(Type::Int(Int::U128)),
                 Type::Int(Int::U64),
                 Type::Int(Int::U64),
-            ],
+            ]),
             Type::Void,
         );
         CILNode::NewObj(Box::new(CallOpArgs {
@@ -298,7 +297,7 @@ impl CILNode {
                 Some(ClassRef::gc_handle(asm)),
                 "Alloc".to_owned().into(),
                 FnSig::new(
-                    [Type::PlatformObject],
+                    Box::new([Type::PlatformObject]),
                     Type::ClassRef(ClassRef::gc_handle(asm))
                 ),
                 true
@@ -310,7 +309,7 @@ impl CILNode {
                 Some(ClassRef::gc_handle(asm)),
                 "op_Explicit".to_owned().into(),
                 FnSig::new(
-                    [Type::ClassRef(ClassRef::gc_handle(asm))],
+                    Box::new([Type::ClassRef(ClassRef::gc_handle(asm))]),
                     Type::Int(Int::ISize)
                 ),
                 true,
@@ -324,7 +323,7 @@ impl CILNode {
                 Some(ClassRef::gc_handle(asm)),
                 "FromIntPtr".to_owned().into(),
                 FnSig::new(
-                    [Type::Int(Int::ISize)],
+                    Box::new([Type::Int(Int::ISize)]),
                     Type::ClassRef(ClassRef::gc_handle(asm))
                 ),
                 true
@@ -341,7 +340,7 @@ impl CILNode {
             CallSite::new(
                 Some(ClassRef::gc_handle(asm)),
                 "get_Target".to_owned().into(),
-                FnSig::new([asm.nref(gc_handle_tpe)], Type::PlatformObject),
+                FnSig::new(Box::new([asm.nref(gc_handle_tpe)]), Type::PlatformObject),
                 false,
             ),
             [gc_handle]
@@ -355,7 +354,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_u128".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::U128), Type::Int(Int::U128), Type::Bool],
+                        Box::new([Type::Int(Int::U128), Type::Int(Int::U128), Type::Bool]),
                         Type::Int(Int::U128)
                     ),
                     true
@@ -366,7 +365,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_i128".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::I128), Type::Int(Int::I128), Type::Bool],
+                        Box::new([Type::Int(Int::I128), Type::Int(Int::I128), Type::Bool]),
                         Type::Int(Int::I128)
                     ),
                     true
@@ -377,7 +376,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_usize".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::USize), Type::Int(Int::USize), Type::Bool],
+                        Box::new([Type::Int(Int::USize), Type::Int(Int::USize), Type::Bool]),
                         Type::Int(Int::USize)
                     ),
                     true
@@ -388,7 +387,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_usize".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::USize), Type::Int(Int::USize), Type::Bool],
+                        Box::new([Type::Int(Int::USize), Type::Int(Int::USize), Type::Bool]),
                         Type::Int(Int::USize)
                     ),
                     true
@@ -404,7 +403,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_isize".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::ISize), Type::Int(Int::ISize), Type::Bool],
+                        Box::new([Type::Int(Int::ISize), Type::Int(Int::ISize), Type::Bool]),
                         Type::Int(Int::ISize)
                     ),
                     true
@@ -415,7 +414,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_u64".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::U64), Type::Int(Int::U64), Type::Bool],
+                        Box::new([Type::Int(Int::U64), Type::Int(Int::U64), Type::Bool]),
                         Type::Int(Int::U64)
                     ),
                     true
@@ -426,7 +425,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_i64".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::I64), Type::Int(Int::I64), Type::Bool],
+                        Box::new([Type::Int(Int::I64), Type::Int(Int::I64), Type::Bool]),
                         Type::Int(Int::I64)
                     ),
                     true
@@ -437,7 +436,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_u32".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::U32), Type::Int(Int::U32), Type::Bool],
+                        Box::new([Type::Int(Int::U32), Type::Int(Int::U32), Type::Bool]),
                         Type::Int(Int::U32)
                     ),
                     true
@@ -448,7 +447,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_i32".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::I32), Type::Int(Int::I32), Type::Bool],
+                        Box::new([Type::Int(Int::I32), Type::Int(Int::I32), Type::Bool]),
                         Type::Int(Int::I32)
                     ),
                     true
@@ -459,7 +458,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_u16".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::U16), Type::Int(Int::U16), Type::Bool],
+                        Box::new([Type::Int(Int::U16), Type::Int(Int::U16), Type::Bool]),
                         Type::Int(Int::U16)
                     ),
                     true
@@ -470,7 +469,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_i16".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::I16), Type::Int(Int::I16), Type::Bool],
+                        Box::new([Type::Int(Int::I16), Type::Int(Int::I16), Type::Bool]),
                         Type::Int(Int::I16)
                     ),
                     true
@@ -481,7 +480,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_u8".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::U8), Type::Int(Int::U8), Type::Bool],
+                        Box::new([Type::Int(Int::U8), Type::Int(Int::U8), Type::Bool]),
                         Type::Int(Int::U8)
                     ),
                     true
@@ -492,7 +491,7 @@ impl CILNode {
                 CallSite::builtin(
                     "select_i8".to_owned().into(),
                     FnSig::new(
-                        [Type::Int(Int::I8), Type::Int(Int::I8), Type::Bool],
+                        Box::new([Type::Int(Int::I8), Type::Int(Int::I8), Type::Bool]),
                         Type::Int(Int::I8)
                     ),
                     true