Merge 1cefa13 into 406702a

FuelLabs · May 3, 2024 · 520aae7 · 520aae7
2 parents 406702a + 1cefa13
commit 520aae7
Show file tree

Hide file tree

Showing 53 changed files with 2,430 additions and 1,642 deletions.
diff --git a/sway-ast/src/intrinsics.rs b/sway-ast/src/intrinsics.rs
@@ -3,10 +3,10 @@ use std::fmt;
 #[derive(Eq, PartialEq, Debug, Clone, Hash)]
 pub enum Intrinsic {
     IsReferenceType,
-    IsStrArray,
     SizeOfType,
     SizeOfVal,
     SizeOfStr,
+    IsStrArray,
     AssertIsStrArray,
     ToStrArray,
     Eq,
@@ -36,8 +36,11 @@ pub enum Intrinsic {
     Smo,
     Not,
     JmpMem,
-    ContractCall, // __contract_call(params, coins, asset_id, gas)
-    ContractRet,  // __contract_ret(ptr, len)
+    ContractCall,           // __contract_call(params, coins, asset_id, gas)
+    ContractRet,            // __contract_ret(ptr, len)
+    EncodeBufferEmpty,      // let buffer: (raw_ptr, u64, u64) = __encode_buffer_empty()
+    EncodeBufferAppend, // let buffer: (raw_ptr, u64, u64) = __encode_buffer_append(buffer, primitive data type)
+    EncodeBufferAsRawSlice, // let slice: raw_slice = __encode_buffer_as_raw_slice(buffer)
 }
 
 impl fmt::Display for Intrinsic {
@@ -79,6 +82,9 @@ impl fmt::Display for Intrinsic {
             Intrinsic::JmpMem => "jmp_mem",
             Intrinsic::ContractCall => "contract_call",
             Intrinsic::ContractRet => "contract_ret",
+            Intrinsic::EncodeBufferEmpty => "encode_buffer_empty",
+            Intrinsic::EncodeBufferAppend => "encode_buffer_append",
+            Intrinsic::EncodeBufferAsRawSlice => "encode_buffer_as_raw_slice",
         };
         write!(f, "{s}")
     }
@@ -124,6 +130,9 @@ impl Intrinsic {
             "__jmp_mem" => JmpMem,
             "__contract_call" => ContractCall,
             "__contract_ret" => ContractRet,
+            "__encode_buffer_empty" => EncodeBufferEmpty,
+            "__encode_buffer_append" => EncodeBufferAppend,
+            "__encode_buffer_as_raw_slice" => EncodeBufferAsRawSlice,
             _ => return None,
         })
     }

diff --git a/sway-core/src/asm_generation/fuel/data_section.rs b/sway-core/src/asm_generation/fuel/data_section.rs
@@ -22,6 +22,7 @@ pub enum Datum {
     Byte(u8),
     Word(u64),
     ByteArray(Vec<u8>),
+    Slice(Vec<u8>),
     Collection(Vec<Entry>),
 }
 
@@ -54,6 +55,19 @@ impl Entry {
         }
     }
 
+    pub(crate) fn new_slice(
+        bytes: Vec<u8>,
+        name: Option<String>,
+        padding: Option<Padding>,
+    ) -> Entry {
+        dbg!(&name, &bytes);
+        Entry {
+            padding: padding.unwrap_or(Padding::default_for_byte_array(&bytes)),
+            value: Datum::Slice(bytes),
+            name,
+        }
+    }
+
     pub(crate) fn new_collection(
         elements: Vec<Entry>,
         name: Option<String>,
@@ -124,9 +138,10 @@ impl Entry {
                 name,
                 padding,
             ),
+            ConstantValue::RawUntypedSlice(bytes) => Entry::new_slice(bytes.clone(), name, padding),
             ConstantValue::Reference(_) => {
                 todo!("Constant references are currently not supported.")
-            } // TODO-IG: Implement.
+            }
         }
     }
 
@@ -143,6 +158,13 @@ impl Entry {
                 .copied()
                 .take((bs.len() + 7) & 0xfffffff8_usize)
                 .collect(),
+            Datum::Slice(bs) if bs.len() % 8 == 0 => bs.clone(),
+            Datum::Slice(bs) => bs
+                .iter()
+                .chain([0; 8].iter())
+                .copied()
+                .take((bs.len() + 7) & 0xfffffff8_usize)
+                .collect(),
             Datum::Collection(els) => els.iter().flat_map(|el| el.to_bytes()).collect(),
         };
 
@@ -309,6 +331,19 @@ impl fmt::Display for DataSection {
                     }
                     format!(".bytes[{}] {hex_str} {chr_str}", bs.len())
                 }
+                Datum::Slice(bs) => {
+                    let mut hex_str = String::new();
+                    let mut chr_str = String::new();
+                    for b in bs {
+                        hex_str.push_str(format!("{b:02x} ").as_str());
+                        chr_str.push(if *b == b' ' || b.is_ascii_graphic() {
+                            *b as char
+                        } else {
+                            '.'
+                        });
+                    }
+                    format!(".slice[{}] {hex_str} {chr_str}", bs.len())
+                }
                 Datum::Collection(els) => format!(
                     ".collection {{ {} }}",
                     els.iter()

diff --git a/sway-core/src/asm_generation/fuel/fuel_asm_builder.rs b/sway-core/src/asm_generation/fuel/fuel_asm_builder.rs
@@ -1716,6 +1716,7 @@ impl<'ir, 'eng> FuelAsmBuilder<'ir, 'eng> {
         stored_val: &Value,
     ) -> Result<(), CompileError> {
         let owning_span = self.md_mgr.val_to_span(self.context, *instr_val);
+
         if stored_val
             .get_type(self.context)
             .map_or(true, |ty| !self.is_copy_type(&ty))

diff --git a/sway-core/src/asm_generation/miden_vm/miden_vm_asm_builder.rs b/sway-core/src/asm_generation/miden_vm/miden_vm_asm_builder.rs
@@ -660,6 +660,7 @@ impl<'ir, 'eng> MidenVMAsmBuilder<'ir, 'eng> {
             Array(_) => todo!(),
             Struct(_) => todo!(),
             Reference(_) => todo!(),
+            RawUntypedSlice(_) => todo!(),
         }
     }
 }