wip update old code for new insts

Author: sbillig

crates/codegen/Cargo.toml

@@ -22,6 +22,11 @@ sonatina-ir = { path = "../ir", version = "0.0.3-alpha" }
 sonatina-triple = { path = "../triple", version = "0.0.3-alpha" }
 sonatina-macros = { path = "../macros", version = "0.0.3-alpha" }
 bit-set = "0.8.0"
+indexmap = "2.6.0"
+if_chain = "1.0.2"
 
 [dev-dependencies]
+dir-test = "0.4.0"
+hex = "0.4.3"
+insta = "1.41.1"
 sonatina-parser = { path = "../parser", version = "0.0.3-alpha" }

crates/codegen/src/isa/evm/mod.rs

@@ -0,0 +1,161 @@
+#[derive(Debug, Default, Clone, Copy)]
+#[repr(u8)]
+pub enum OpCode {
+    STOP = 0x00,
+    ADD = 0x01,
+    MUL = 0x02,
+    SUB = 0x03,
+    DIV = 0x04,
+    SDIV = 0x05,
+    MOD = 0x06,
+    SMOD = 0x07,
+    ADDMOD = 0x08,
+    MULMOD = 0x09,
+    EXP = 0x0A,
+    SIGNEXTEND = 0x0B,
+    // 0C-0F unused
+    LT = 0x10,
+    GT = 0x11,
+    SLT = 0x12,
+    SGT = 0x13,
+    EQ = 0x14,
+    ISZERO = 0x15,
+    AND = 0x16,
+    OR = 0x17,
+    XOR = 0x18,
+    NOT = 0x19,
+    BYTE = 0x1A,
+    SHL = 0x1B,
+    SHR = 0x1C,
+    SAR = 0x1D,
+    // 1E-1F unused
+    KECCAK256 = 0x20,
+    // 21-2F unused
+    ADDRESS = 0x30,
+    BALANCE = 0x31,
+    ORIGIN = 0x32,
+    CALLER = 0x33,
+    CALLVALUE = 0x34,
+    CALLDATALOAD = 0x35,
+    CALLDATASIZE = 0x36,
+    CALLDATACOPY = 0x37,
+    CODESIZE = 0x38,
+    CODECOPY = 0x39,
+    GASPRICE = 0x3A,
+    EXTCODESIZE = 0x3B,
+    EXTCODECOPY = 0x3C,
+    RETURNDATASIZE = 0x3D,
+    RETURNDATACOPY = 0x3E,
+    EXTCODEHASH = 0x3F,
+    BLOCKHASH = 0x40,
+    COINBASE = 0x41,
+    TIMESTAMP = 0x42,
+    NUMBER = 0x43,
+    PREVRANDAO = 0x44,
+    GASLIMIT = 0x45,
+    CHAINID = 0x46,
+    SELFBALANCE = 0x47,
+    BASEFEE = 0x48,
+    BLOBHASH = 0x49,
+    BLOBBASEFEE = 0x4A,
+    // 4B-4F unused
+    POP = 0x50,
+    MLOAD = 0x51,
+    MSTORE = 0x52,
+    MSTORE8 = 0x53,
+    SLOAD = 0x54,
+    SSTORE = 0x55,
+    JUMP = 0x56,
+    JUMPI = 0x57,
+    PC = 0x58,
+    MSIZE = 0x59,
+    GAS = 0x5A,
+    JUMPDEST = 0x5B,
+    TLOAD = 0x5C,
+    TSTORE = 0x5D,
+    MCOPY = 0x5E,
+    PUSH0 = 0x5F,
+    PUSH1 = 0x60,
+    PUSH2 = 0x61,
+    PUSH3 = 0x62,
+    PUSH4 = 0x63,
+    PUSH5 = 0x64,
+    PUSH6 = 0x65,
+    PUSH7 = 0x66,
+    PUSH8 = 0x67,
+    PUSH9 = 0x68,
+    PUSH10 = 0x69,
+    PUSH11 = 0x6A,
+    PUSH12 = 0x6B,
+    PUSH13 = 0x6C,
+    PUSH14 = 0x6D,
+    PUSH15 = 0x6E,
+    PUSH16 = 0x6F,
+    PUSH17 = 0x70,
+    PUSH18 = 0x71,
+    PUSH19 = 0x72,
+    PUSH20 = 0x73,
+    PUSH21 = 0x74,
+    PUSH22 = 0x75,
+    PUSH23 = 0x76,
+    PUSH24 = 0x77,
+    PUSH25 = 0x78,
+    PUSH26 = 0x79,
+    PUSH27 = 0x7A,
+    PUSH28 = 0x7B,
+    PUSH29 = 0x7C,
+    PUSH30 = 0x7D,
+    PUSH31 = 0x7E,
+    PUSH32 = 0x7F,
+    DUP1 = 0x80,
+    DUP2 = 0x81,
+    DUP3 = 0x82,
+    DUP4 = 0x83,
+    DUP5 = 0x84,
+    DUP6 = 0x85,
+    DUP7 = 0x86,
+    DUP8 = 0x87,
+    DUP9 = 0x88,
+    DUP10 = 0x89,
+    DUP11 = 0x8A,
+    DUP12 = 0x8B,
+    DUP13 = 0x8C,
+    DUP14 = 0x8D,
+    DUP15 = 0x8E,
+    DUP16 = 0x8F,
+    SWAP1 = 0x90,
+    SWAP2 = 0x91,
+    SWAP3 = 0x92,
+    SWAP4 = 0x93,
+    SWAP5 = 0x94,
+    SWAP6 = 0x95,
+    SWAP7 = 0x96,
+    SWAP8 = 0x97,
+    SWAP9 = 0x98,
+    SWAP10 = 0x99,
+    SWAP11 = 0x9A,
+    SWAP12 = 0x9B,
+    SWAP13 = 0x9C,
+    SWAP14 = 0x9D,
+    SWAP15 = 0x9E,
+    SWAP16 = 0x9F,
+    LOG0 = 0xA0,
+    LOG1 = 0xA1,
+    LOG2 = 0xA2,
+    LOG3 = 0xA3,
+    LOG4 = 0xA4,
+    // A5-EF unused
+    CREATE = 0xF0,
+    CALL = 0xF1,
+    CALLCODE = 0xF2,
+    RETURN = 0xF3,
+    DELEGATECALL = 0xF4,
+    CREATE2 = 0xF5,
+    // F6-F9 unused
+    STATICCALL = 0xFA,
+    // FB-FC unused
+    REVERT = 0xFD,
+    #[default]
+    INVALID = 0xFE,
+    SELFDESTRUCT = 0xFF,
+}

crates/codegen/src/isa/evm/opcode.rs

@@ -0,0 +1 @@
+pub mod evm;

crates/codegen/src/isa/mod.rs

@@ -5,7 +5,10 @@
 mod bitset;
 pub mod critical_edge;
 pub mod domtree;
+pub mod isa;
 pub mod liveness;
 pub mod loop_analysis;
+pub mod machinst;
 pub mod optim;
 pub mod post_domtree;
+pub mod stackalloc;

crates/codegen/src/lib.rs

@@ -154,7 +154,7 @@ pub fn value_uses_in_block_matching_predicate(
 fn for_each_use(func: &Function, block: BlockId, mut f: impl FnMut(ValueId, Option<BlockId>)) {
     for inst in func.layout.iter_inst(block) {
         if let Some(phi) = func.dfg.cast_phi(inst) {
-            for (val, block) in phi.iter_args() {
+            for (val, block) in phi.args().iter() {
                 f(*val, Some(*block))
             }
         } else {