move faerie-related code from table to output

Author: Pat Hickey

lucetc/src/output.rs

@@ -1,7 +1,7 @@
 use crate::error::Error;
 use crate::name::Name;
 use crate::stack_probe;
-use crate::table::{link_tables, TABLE_SYM};
+use crate::table::{TABLE_SYM, TABLE_REF_SIZE};
 use crate::traps::{translate_trapcode, trap_sym_for_func};
 use byteorder::{LittleEndian, WriteBytesExt};
 use cranelift_codegen::{ir, isa, binemit::TrapSink};
@@ -90,7 +90,7 @@ impl ObjectFile {
 
         obj.write_trap_tables(&trap_manifest)?;
         obj.write_function_manifest(function_manifest.as_slice())?;
-        link_tables(table_manifest.as_slice(), &mut obj.artifact)?;
+        obj.link_tables(table_manifest.as_slice())?;
 
         // And now write out the actual structure tying together all the data in this module.
         write_module(
@@ -251,6 +251,18 @@ impl ObjectFile {
         Ok(())
     }
 
+    fn link_tables(&mut self, tables: &[Name]) -> Result<(), Error> {
+        for (idx, table) in tables.iter().enumerate() {
+            self.artifact.link(Link {
+                from: TABLE_SYM,
+                to: table.symbol(),
+                at: (TABLE_REF_SIZE * idx) as u64,
+            })
+                .map_err(|source| Error::Failure(source, "Table error".to_owned()))?;
+        }
+        Ok(())
+    }
+
     pub fn write<P: AsRef<Path>>(&self, path: P) -> Result<(), Error> {
         let _ = path.as_ref().file_name().ok_or(|| {
             let message = format!("Path must be filename {:?}", path.as_ref());

lucetc/src/table.rs

@@ -7,7 +7,6 @@ use byteorder::{LittleEndian, WriteBytesExt};
 use cranelift_codegen::entity::EntityRef;
 use cranelift_module::{Backend as ClifBackend, DataContext, Module as ClifModule};
 use cranelift_wasm::{TableElementType, TableIndex};
-use faerie::{Artifact, Link};
 use std::io::Cursor;
 
 /// This symbol will be used to reference the `tables` field in `Module` - a sequence of tables.
@@ -51,18 +50,6 @@ fn table_elements(decl: &TableDecl<'_>) -> Result<Vec<Elem>, Error> {
     Ok(elems)
 }
 
-pub fn link_tables(tables: &[Name], obj: &mut Artifact) -> Result<(), Error> {
-    for (idx, table) in tables.iter().enumerate() {
-        obj.link(Link {
-            from: TABLE_SYM,
-            to: table.symbol(),
-            at: (TABLE_REF_SIZE * idx) as u64,
-        })
-        .map_err(|source| Error::Failure(source, "Table error".to_owned()))?;
-    }
-    Ok(())
-}
-
 pub fn write_table_data<B: ClifBackend>(
     clif_module: &mut ClifModule<B>,
     decls: &ModuleDecls<'_>,