pezkuwichain/revive
1
0
Fork 0
mirror of https://github.com/pezkuwichain/revive.git synced 2026-05-01 02:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: use PolkaVM disassembler (#6)

Browse Source 
Integrate the PolkaVM disassembler to fix `--asm` output

Co-authored-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
This commit is contained in:
Chris
2024-05-03 06:31:24 -04:00
committed by GitHub
parent c547a9ef78
commit a75fc55133
28 changed files with 261 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/solidity/src/evmla/ethereal_ir/entry_link.rs
+1 -4
View File
@@ -23,10 +23,7 @@ impl<D> revive_llvm_context::PolkaVMWriteLLVM<D> for EntryLink
where
D: revive_llvm_context::PolkaVMDependency + Clone,
{
fn into_llvm(
self,
context: &mut revive_llvm_context::PolkaVMContext<D>,
) -> anyhow::Result<()> {
fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
let target = context
.get_function(EtherealIR::DEFAULT_ENTRY_FUNCTION_NAME)
.expect("Always exists")
crates/solidity/src/evmla/ethereal_ir/function/block/element/mod.rs
+3 -8
View File
@@ -1168,8 +1168,7 @@ where
.map(Some)
}
InstructionName::NUMBER => {
revive_llvm_context::polkavm_evm_contract_context::block_number(context)
.map(Some)
revive_llvm_context::polkavm_evm_contract_context::block_number(context).map(Some)
}
InstructionName::BLOCKHASH => {
let arguments = self.pop_arguments_llvm(context);
@@ -1244,9 +1243,7 @@ where
.to_llvm()
.into_pointer_value();
context.build_store(
revive_llvm_context::PolkaVMPointer::new_stack_field(
context, pointer,
),
revive_llvm_context::PolkaVMPointer::new_stack_field(context, pointer),
value,
)?;
}
@@ -1297,9 +1294,7 @@ where
assert_eq!(arguments.len(), 1);
context.build_store(pointer, arguments.remove(0))?;
}
revive_llvm_context::PolkaVMFunctionReturn::Compound {
pointer, ..
} => {
revive_llvm_context::PolkaVMFunctionReturn::Compound { pointer, .. } => {
for (index, argument) in arguments.into_iter().enumerate() {
let element_pointer = context.build_gep(
pointer,
crates/solidity/src/evmla/ethereal_ir/function/block/mod.rs
+1 -4
View File
@@ -117,10 +117,7 @@ impl<D> revive_llvm_context::PolkaVMWriteLLVM<D> for Block
where
D: revive_llvm_context::PolkaVMDependency + Clone,
{
fn into_llvm(
self,
context: &mut revive_llvm_context::PolkaVMContext<D>,
) -> anyhow::Result<()> {
fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
context.set_code_type(self.key.code_type);
for element in self.elements.into_iter() {
crates/solidity/src/evmla/ethereal_ir/function/mod.rs
+20 -31
View File
@@ -252,12 +252,10 @@ impl Function {
destination.to_owned() - num::BigUint::from(1u64 << 32),
)
}
Element::Tag(destination) => {
revive_llvm_context::PolkaVMFunctionBlockKey::new(
code_type,
destination.to_owned(),
)
}
Element::Tag(destination) => revive_llvm_context::PolkaVMFunctionBlockKey::new(
code_type,
destination.to_owned(),
),
Element::ReturnAddress(output_size) => {
block_element.instruction =
Instruction::recursive_return(1 + output_size, instruction);
@@ -316,12 +314,10 @@ impl Function {
destination.to_owned() - num::BigUint::from(1u64 << 32),
)
}
Element::Tag(destination) => {
revive_llvm_context::PolkaVMFunctionBlockKey::new(
code_type,
destination.to_owned(),
)
}
Element::Tag(destination) => revive_llvm_context::PolkaVMFunctionBlockKey::new(
code_type,
destination.to_owned(),
),
element => {
return Err(anyhow::anyhow!(
"The {} instruction expected a tag or return address, found {}",
@@ -346,8 +342,7 @@ impl Function {
..
} => {
let tag: num::BigUint = tag.parse().expect("Always valid");
let block_key =
revive_llvm_context::PolkaVMFunctionBlockKey::new(code_type, tag);
let block_key = revive_llvm_context::PolkaVMFunctionBlockKey::new(code_type, tag);
queue_element.predecessor = Some((queue_element.block_key.clone(), instance));
queue_element.block_key = block_key.clone();
@@ -1014,21 +1009,16 @@ impl Function {
block_stack: &mut Stack,
block_element: &mut BlockElement,
version: &semver::Version,
) -> anyhow::Result<(
revive_llvm_context::PolkaVMFunctionBlockKey,
Vec<Element>,
)> {
) -> anyhow::Result<(revive_llvm_context::PolkaVMFunctionBlockKey, Vec<Element>)> {
let return_address_offset = block_stack.elements.len() - 2 - recursive_function.input_size;
let input_arguments_offset = return_address_offset + 1;
let callee_tag_offset = input_arguments_offset + recursive_function.input_size;
let return_address = match block_stack.elements[return_address_offset] {
Element::Tag(ref return_address) => {
revive_llvm_context::PolkaVMFunctionBlockKey::new(
block_key.code_type,
return_address.to_owned(),
)
}
Element::Tag(ref return_address) => revive_llvm_context::PolkaVMFunctionBlockKey::new(
block_key.code_type,
return_address.to_owned(),
),
ref element => anyhow::bail!("Expected the function return address, found {}", element),
};
let mut stack = Stack::with_capacity(1 + recursive_function.input_size);
@@ -1177,17 +1167,16 @@ where
output_size,
Some(inkwell::module::Linkage::Private),
)?;
function.borrow_mut().set_evmla_data(
revive_llvm_context::PolkaVMFunctionEVMLAData::new(self.stack_size),
);
function
.borrow_mut()
.set_evmla_data(revive_llvm_context::PolkaVMFunctionEVMLAData::new(
self.stack_size,
));
Ok(())
}
fn into_llvm(
self,
context: &mut revive_llvm_context::PolkaVMContext<D>,
) -> anyhow::Result<()> {
fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
context.set_current_function(self.name.as_str())?;
for (key, blocks) in self.blocks.iter() {
crates/solidity/src/evmla/ethereal_ir/mod.rs
+2 -8
View File
@@ -81,10 +81,7 @@ impl EtherealIR {
&instructions[offset..],
)?;
blocks.insert(
revive_llvm_context::PolkaVMFunctionBlockKey::new(
code_type,
block.key.tag.clone(),
),
revive_llvm_context::PolkaVMFunctionBlockKey::new(code_type, block.key.tag.clone()),
block,
);
offset += size;
@@ -111,10 +108,7 @@ where
Ok(())
}
fn into_llvm(
self,
context: &mut revive_llvm_context::PolkaVMContext<D>,
) -> anyhow::Result<()> {
fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
context.evmla_mut().stack = vec![];
self.entry_function.into_llvm(context)?;