Implement AOT compilation for components

Cargo.toml

@@ -37,6 +37,7 @@ libc = "0.2.60"
 humantime = "2.0.0"
 once_cell = { workspace = true }
 listenfd = "1.0.0"
+wat = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 rustix = { workspace = true, features = ["mm", "param"] }
@@ -90,7 +91,7 @@ members = [
   "examples/wasi/wasm",
   "examples/tokio/wasm",
   "fuzz",
-  "winch", 
+  "winch",
   "winch/codegen"
 ]
 exclude = [

cranelift/codegen/src/isa/aarch64/mod.rs

@@ -184,7 +184,7 @@ impl TargetIsa for AArch64Backend {
         Some(inst::unwind::systemv::create_cie())
     }
 
-    fn text_section_builder(&self, num_funcs: u32) -> Box<dyn TextSectionBuilder> {
+    fn text_section_builder(&self, num_funcs: usize) -> Box<dyn TextSectionBuilder> {
         Box::new(MachTextSectionBuilder::<inst::Inst>::new(num_funcs))
     }
 

cranelift/codegen/src/isa/mod.rs

@@ -285,7 +285,7 @@ pub trait TargetIsa: fmt::Display + Send + Sync {
     /// The `num_labeled_funcs` argument here is the number of functions which
     /// will be "labeled" or might have calls between them, typically the number
     /// of defined functions in the object file.
-    fn text_section_builder(&self, num_labeled_funcs: u32) -> Box<dyn TextSectionBuilder>;
+    fn text_section_builder(&self, num_labeled_funcs: usize) -> Box<dyn TextSectionBuilder>;
 
     /// The function alignment required by this ISA.
     fn function_alignment(&self) -> u32;

cranelift/codegen/src/isa/riscv64/mod.rs

@@ -152,7 +152,7 @@ impl TargetIsa for Riscv64Backend {
         Some(inst::unwind::systemv::create_cie())
     }
 
-    fn text_section_builder(&self, num_funcs: u32) -> Box<dyn TextSectionBuilder> {
+    fn text_section_builder(&self, num_funcs: usize) -> Box<dyn TextSectionBuilder> {
         Box::new(MachTextSectionBuilder::<inst::Inst>::new(num_funcs))
     }
 

cranelift/codegen/src/isa/s390x/mod.rs

@@ -167,7 +167,7 @@ impl TargetIsa for S390xBackend {
         inst::unwind::systemv::map_reg(reg).map(|reg| reg.0)
     }
 
-    fn text_section_builder(&self, num_funcs: u32) -> Box<dyn TextSectionBuilder> {
+    fn text_section_builder(&self, num_funcs: usize) -> Box<dyn TextSectionBuilder> {
         Box::new(MachTextSectionBuilder::<inst::Inst>::new(num_funcs))
     }
 

cranelift/codegen/src/isa/x64/mod.rs

@@ -156,7 +156,7 @@ impl TargetIsa for X64Backend {
         inst::unwind::systemv::map_reg(reg).map(|reg| reg.0)
     }
 
-    fn text_section_builder(&self, num_funcs: u32) -> Box<dyn TextSectionBuilder> {
+    fn text_section_builder(&self, num_funcs: usize) -> Box<dyn TextSectionBuilder> {
         Box::new(MachTextSectionBuilder::<inst::Inst>::new(num_funcs))
     }
 

cranelift/codegen/src/machinst/buffer.rs

@@ -1612,9 +1612,9 @@ pub struct MachTextSectionBuilder<I: VCodeInst> {
 }
 
 impl<I: VCodeInst> MachTextSectionBuilder<I> {
-    pub fn new(num_funcs: u32) -> MachTextSectionBuilder<I> {
+    pub fn new(num_funcs: usize) -> MachTextSectionBuilder<I> {
         let mut buf = MachBuffer::new();
-        buf.reserve_labels_for_blocks(num_funcs as usize);
+        buf.reserve_labels_for_blocks(num_funcs);
         MachTextSectionBuilder {
             buf,
             next_func: 0,
@@ -1624,7 +1624,7 @@ impl<I: VCodeInst> MachTextSectionBuilder<I> {
 }
 
 impl<I: VCodeInst> TextSectionBuilder for MachTextSectionBuilder<I> {
-    fn append(&mut self, named: bool, func: &[u8], align: u32) -> u64 {
+    fn append(&mut self, labeled: bool, func: &[u8], align: u32) -> u64 {
         // Conditionally emit an island if it's necessary to resolve jumps
         // between functions which are too far away.
         let size = func.len() as u32;
@@ -1634,7 +1634,7 @@ impl<I: VCodeInst> TextSectionBuilder for MachTextSectionBuilder<I> {
 
         self.buf.align_to(align);
         let pos = self.buf.cur_offset();
-        if named {
+        if labeled {
             self.buf
                 .bind_label(MachLabel::from_block(BlockIndex::new(self.next_func)));
             self.next_func += 1;
@@ -1643,8 +1643,8 @@ impl<I: VCodeInst> TextSectionBuilder for MachTextSectionBuilder<I> {
         u64::from(pos)
     }
 
-    fn resolve_reloc(&mut self, offset: u64, reloc: Reloc, addend: Addend, target: u32) -> bool {
-        let label = MachLabel::from_block(BlockIndex::new(target as usize));
+    fn resolve_reloc(&mut self, offset: u64, reloc: Reloc, addend: Addend, target: usize) -> bool {
+        let label = MachLabel::from_block(BlockIndex::new(target));
         let offset = u32::try_from(offset).unwrap();
         match I::LabelUse::from_reloc(reloc, addend) {
             Some(label_use) => {

cranelift/codegen/src/machinst/mod.rs

@@ -397,8 +397,10 @@ impl CompiledCode {
 pub trait TextSectionBuilder {
     /// Appends `data` to the text section with the `align` specified.
     ///
-    /// If `labeled` is `true` then the offset of the final data is used to
-    /// resolve relocations in `resolve_reloc` in the future.
+    /// If `labeled` is `true` then this also binds the appended data to the
+    /// `n`th label for how many times this has been called with `labeled:
+    /// true`. The label target can be passed as the `target` argument to
+    /// `resolve_reloc`.
     ///
     /// This function returns the offset at which the data was placed in the
     /// text section.
@@ -418,7 +420,7 @@ pub trait TextSectionBuilder {
     /// If this builder does not know how to handle `reloc` then this function
     /// will return `false`. Otherwise this function will return `true` and this
     /// relocation will be resolved in the final bytes returned by `finish`.
-    fn resolve_reloc(&mut self, offset: u64, reloc: Reloc, addend: Addend, target: u32) -> bool;
+    fn resolve_reloc(&mut self, offset: u64, reloc: Reloc, addend: Addend, target: usize) -> bool;
 
     /// A debug-only option which is used to for
     fn force_veneers(&mut self);