wip

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>

Author: xermicus

crates/llvm-context/src/polkavm/context/mod.rs

@@ -316,7 +316,8 @@ impl<'ctx> Context<'ctx> {
                 )
             })?;
 
-        let object = revive_linker::Linker::setup(true)?.link(buffer.as_slice(), None)?;
+        //let object = revive_linker::Linker::setup(true)?.link(buffer.as_slice(), None)?;
+        let object = buffer.as_slice().to_vec();
 
         self.debug_config.dump_object(contract_path, &object)?;
 

crates/llvm-context/src/polkavm/evm/call.rs

@@ -198,7 +198,7 @@ pub fn linker_symbol<'ctx>(
 ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
     context.declare_global(
         &path,
-        context.integer_type(revive_common::BYTE_LENGTH_ETH_ADDRESS),
+        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
         Default::default(),
     );
     context.build_load_address(context.get_global(path)?.into())

crates/llvm-context/src/polkavm/mod.rs

@@ -30,23 +30,24 @@ pub fn build(
     metadata_hash: Option<[u8; revive_common::BYTE_LENGTH_WORD]>,
     debug_config: &DebugConfig,
 ) -> anyhow::Result<Build> {
-    let program_blob = ProgramBlob::parse(bytecode.into())
-        .map_err(anyhow::Error::msg)
-        .with_context(|| format!("Failed to parse program blob for contract: {contract_path}"))?;
+    //let program_blob = ProgramBlob::parse(bytecode.into())
+    //    .map_err(anyhow::Error::msg)
+    //    .with_context(|| format!("Failed to parse program blob for contract: {contract_path}"))?;
 
-    let mut disassembler = Disassembler::new(&program_blob, DisassemblyFormat::Guest)
-        .map_err(anyhow::Error::msg)
-        .with_context(|| format!("Failed to create disassembler for contract: {contract_path}"))?;
-    disassembler.display_gas()?;
+    //let mut disassembler = Disassembler::new(&program_blob, DisassemblyFormat::Guest)
+    //    .map_err(anyhow::Error::msg)
+    //    .with_context(|| format!("Failed to create disassembler for contract: {contract_path}"))?;
+    //disassembler.display_gas()?;
 
-    let mut disassembled_code = Vec::new();
-    disassembler
-        .disassemble_into(&mut disassembled_code)
-        .with_context(|| format!("Failed to disassemble contract: {contract_path}"))?;
+    //let mut disassembled_code = Vec::new();
+    //disassembler
+    //    .disassemble_into(&mut disassembled_code)
+    //    .with_context(|| format!("Failed to disassemble contract: {contract_path}"))?;
 
-    let assembly_text = String::from_utf8(disassembled_code).with_context(|| {
-        format!("Failed to convert disassembled code to string for contract: {contract_path}")
-    })?;
+    //let assembly_text = String::from_utf8(disassembled_code).with_context(|| {
+    //    format!("Failed to convert disassembled code to string for contract: {contract_path}")
+    //})?;
+    let assembly_text = "";
 
     debug_config.dump_assembly(contract_path, &assembly_text)?;
 
@@ -79,8 +80,11 @@ pub fn link(
         Ok(value @ ObjectFormat::PVM) => Ok((bytecode, value)),
         Ok(ObjectFormat::ELF) => {
             let symbols = build_symbols(linker_symbols, factory_dependencies)?;
-            let bytecode_linked = revive_linker::Linker::setup(false)?
+            let mut bytecode_linked = revive_linker::Linker::setup(true)?
                 .link(bytecode.as_slice(), Some(symbols.as_slice()))?;
+            if let Ok(pvm) = revive_linker::polkavm_linker(&bytecode_linked, true) {
+                bytecode_linked = pvm;
+            }
             Ok((
                 MemoryBuffer::create_from_memory_range(&bytecode_linked, "bytecode_linked"),
                 ObjectFormat::try_from(bytecode_linked.as_slice())
@@ -102,6 +106,7 @@ pub fn build_symbols(
 
     for (name, value) in linker_symbols {
         let global_value = module.add_global(address_type, Default::default(), name);
+        global_value.set_linkage(inkwell::module::Linkage::External);
         global_value.set_initializer(
             &address_type
                 .const_int_from_string(
@@ -114,6 +119,7 @@ pub fn build_symbols(
 
     for (name, value) in factory_dependencies {
         let global_value = module.add_global(word_type, Default::default(), name);
+        global_value.set_linkage(inkwell::module::Linkage::External);
         global_value.set_initializer(
             &word_type
                 .const_int_from_string(

crates/resolc/src/lib.rs

@@ -226,6 +226,7 @@ pub fn standard_json<T: Compiler>(
     let detect_missing_libraries =
         solc_input.settings.detect_missing_libraries || detect_missing_libraries;
 
+    solc_input.extend_selection(SolcStandardJsonInputSettingsSelection::new_required());
     let mut solc_output = solc.standard_json(
         &mut solc_input,
         messages,

crates/resolc/src/process/mod.rs

@@ -26,12 +26,6 @@ pub trait Process {
 
         let source_location = SourceLocation::new(input.contract.identifier.path.to_owned());
 
-        initialize_llvm(
-            Target::PVM,
-            crate::DEFAULT_EXECUTABLE_NAME,
-            &input.llvm_arguments,
-        );
-
         let result = std::thread::Builder::new()
             .stack_size(64 * 1024 * 1024)
             .spawn(move || {

crates/resolc/src/resolc/main.rs

@@ -7,6 +7,7 @@ use std::{io::Write, path::PathBuf};
 
 use resolc::Process;
 use revive_common::MetadataHash;
+use revive_llvm_context::initialize_llvm;
 use revive_solc_json_interface::{
     SolcStandardJsonInputSettingsSelection, SolcStandardJsonOutput, SolcStandardJsonOutputError,
 };
@@ -90,6 +91,12 @@ fn main_inner(
         return Ok(());
     }
 
+    initialize_llvm(
+        revive_llvm_context::Target::PVM,
+        resolc::DEFAULT_EXECUTABLE_NAME,
+        &arguments.llvm_arguments,
+    );
+
     #[cfg(feature = "parallel")]
     rayon::ThreadPoolBuilder::new()
         .stack_size(RAYON_WORKER_STACK_SIZE)

crates/solc-json-interface/src/standard_json/input/mod.rs

@@ -138,4 +138,9 @@ impl Input {
             suppressed_warnings,
         })
     }
+
+    /// Extends the output selection with another one.
+    pub fn extend_selection(&mut self, selection: SolcStandardJsonInputSettingsSelection) {
+        self.settings.extend_selection(selection);
+    }
 }