refactor src/codegen

src/abi/polkadot.rs

@@ -22,8 +22,8 @@ use semver::Version;
 use solang_parser::pt;
 
 use crate::{
-    codegen::polkadot::SCRATCH_SIZE,
     codegen::revert::{SolidityError, ERROR_SELECTOR, PANIC_SELECTOR},
+    codegen::targets::polkadot::return_code::SCRATCH_SIZE,
     sema::{
         ast::{self, ArrayLength, EventDecl, Function},
         tags::render,

src/codegen/cfg.rs

@@ -8,6 +8,7 @@ use super::{
     vartable::{Vars, Vartable},
     vector_to_slice, Options,
 };
+use crate::codegen::interface::TargetCodegen;
 use crate::codegen::subexpression_elimination::common_sub_expression_elimination;
 use crate::codegen::{undefined_variable, Expression, LLVMName};
 use crate::sema::ast::{
@@ -1483,19 +1484,20 @@ fn is_there_virtual_function(
 
 /// Generate the CFG for a function. If function_no is None, generate the implicit default
 /// constructor
-pub fn generate_cfg(
+pub(crate) fn generate_cfg(
     contract_no: usize,
     function_no: Option<usize>,
     cfg_no: usize,
     all_cfgs: &mut Vec<ControlFlowGraph>,
     ns: &mut Namespace,
     opt: &Options,
+    target: &dyn TargetCodegen,
 ) {
     if is_there_virtual_function(ns, contract_no, function_no) {
         return;
     }
 
-    let mut cfg = function_cfg(contract_no, function_no, ns, opt);
+    let mut cfg = function_cfg(contract_no, function_no, ns, opt, target);
     let ast_fn = function_no
         .map(ASTFunction::SolidityFunction)
         .unwrap_or(ASTFunction::None);
@@ -1524,6 +1526,7 @@ pub fn generate_cfg(
                     chain_no,
                     ns,
                     opt,
+                    target,
                 );
                 optimize_and_check_cfg(&mut cfg, ns, ast_fn, opt);
             }
@@ -1609,6 +1612,7 @@ fn function_cfg(
     function_no: Option<usize>,
     ns: &mut Namespace,
     opt: &Options,
+    target: &dyn TargetCodegen,
 ) -> ControlFlowGraph {
     let mut vartab = match function_no {
         Some(function_no) => {
@@ -1727,8 +1731,16 @@ fn function_cfg(
                     .iter()
                     .enumerate()
                     .map(|(i, a)| {
-                        let expr =
-                            expression(a, &mut cfg, contract_no, Some(func), ns, &mut vartab, opt);
+                        let expr = expression(
+                            a,
+                            &mut cfg,
+                            contract_no,
+                            Some(func),
+                            ns,
+                            &mut vartab,
+                            opt,
+                            target,
+                        );
 
                         if let Some(id) = &func.symtable.arguments[i] {
                             let ty = expr.ty();
@@ -1806,6 +1818,7 @@ fn function_cfg(
             None,
             None,
             opt,
+            target,
         );
 
         if !stmt.reachable() {
@@ -1920,6 +1933,7 @@ fn generate_modifier_dispatch(
     chain_no: usize,
     ns: &mut Namespace,
     opt: &Options,
+    target: &dyn TargetCodegen,
 ) -> ControlFlowGraph {
     let (modifier_no, args) = resolve_modifier_call(
         &ns.functions[func_no].modifiers[chain_no],
@@ -1976,6 +1990,7 @@ fn generate_modifier_dispatch(
                 ns,
                 &mut vartab,
                 opt,
+                target,
             );
             cfg.add(
                 &mut vartab,
@@ -2033,6 +2048,7 @@ fn generate_modifier_dispatch(
             Some(&placeholder),
             Some(&return_instr),
             opt,
+            target,
         );
     }
 

src/codegen/constructor.rs

@@ -2,6 +2,7 @@
 
 use crate::codegen::cfg::{ControlFlowGraph, Instr};
 use crate::codegen::expression::{default_gas, expression};
+use crate::codegen::interface::TargetCodegen;
 use crate::codegen::vartable::Vartable;
 use crate::codegen::{Expression, Options};
 use crate::sema::{
@@ -12,10 +13,9 @@ use crate::Target;
 use num_bigint::{BigInt, Sign};
 use solang_parser::pt::Loc;
 
-use super::encoding::abi_encode;
-
 /// This function encodes the constructor arguments and place an instruction in the CFG to
 /// call the constructor of a contract.
+#[allow(clippy::too_many_arguments)]
 pub(super) fn call_constructor(
     loc: &Loc,
     contract_no: usize,
@@ -30,22 +30,23 @@ pub(super) fn call_constructor(
     vartab: &mut Vartable,
     cfg: &mut ControlFlowGraph,
     opt: &Options,
+    target: &dyn TargetCodegen,
 ) {
     let value = call_args
         .value
         .as_ref()
-        .map(|v| expression(v, cfg, callee_contract_no, func, ns, vartab, opt));
+        .map(|v| expression(v, cfg, callee_contract_no, func, ns, vartab, opt, target));
 
     let gas = if let Some(gas) = &call_args.gas {
-        expression(gas, cfg, callee_contract_no, func, ns, vartab, opt)
+        expression(gas, cfg, callee_contract_no, func, ns, vartab, opt, target)
     } else {
-        default_gas(ns)
+        default_gas(ns, target)
     };
 
     let salt = call_args
         .salt
         .as_ref()
-        .map(|e| expression(e, cfg, callee_contract_no, func, ns, vartab, opt));
+        .map(|e| expression(e, cfg, callee_contract_no, func, ns, vartab, opt, target));
     let address = if ns.target == Target::Solana {
         if let Some(literal_id) = &ns.contracts[contract_no].program_id {
             Some(Expression::NumberLiteral {
@@ -62,6 +63,7 @@ pub(super) fn call_constructor(
                 ns,
                 vartab,
                 opt,
+                target,
             );
             Some(address)
         }
@@ -71,14 +73,14 @@ pub(super) fn call_constructor(
     let seeds = call_args
         .seeds
         .as_ref()
-        .map(|e| expression(e, cfg, callee_contract_no, func, ns, vartab, opt));
+        .map(|e| expression(e, cfg, callee_contract_no, func, ns, vartab, opt, target));
     let accounts = call_args
         .accounts
-        .map(|expr| expression(expr, cfg, contract_no, func, ns, vartab, opt));
+        .map(|expr| expression(expr, cfg, contract_no, func, ns, vartab, opt, target));
 
     let mut constructor_args = constructor_args
         .iter()
-        .map(|e| expression(e, cfg, callee_contract_no, func, ns, vartab, opt))
+        .map(|e| expression(e, cfg, callee_contract_no, func, ns, vartab, opt, target))
         .collect::<Vec<Expression>>();
 
     let selector = match constructor_no {
@@ -99,7 +101,7 @@ pub(super) fn call_constructor(
 
     args.append(&mut constructor_args);
 
-    let (encoded_args, _) = abi_encode(loc, args, ns, vartab, cfg, false);
+    let (encoded_args, _) = target.abi_encode(loc, args, ns, vartab, cfg, false);
     cfg.add(
         vartab,
         Instr::Constructor {