diff --git a/crates/polkavm-common/src/assembler.rs b/crates/polkavm-common/src/assembler.rs index c19d7c01..b2dd60a3 100644 --- a/crates/polkavm-common/src/assembler.rs +++ b/crates/polkavm-common/src/assembler.rs @@ -589,8 +589,14 @@ pub fn assemble(code: &str) -> Result, String> { } else if let Some(rhs) = parse_imm(rhs) { let rhs = rhs as u32; emit_and_continue!(match kind { - StoreKind::U8 => Instruction::store_imm_u8(offset, rhs), - StoreKind::U16 => Instruction::store_imm_u16(offset, rhs), + StoreKind::U8 => match u8::try_from(rhs) { + Ok(_) => Instruction::store_imm_u8(offset, rhs), + Err(_) => return Err(format!("cannot parse line {nth_line}: immediate larger than u8")), + }, + StoreKind::U16 => match u16::try_from(rhs) { + Ok(_) => Instruction::store_imm_u16(offset, rhs), + Err(_) => return Err(format!("cannot parse line {nth_line}: immediate larger than u16")), + }, StoreKind::U32 => Instruction::store_imm_u32(offset, rhs), }); } @@ -607,8 +613,14 @@ pub fn assemble(code: &str) -> Result, String> { } else if let Some(rhs) = parse_imm(rhs) { let rhs = rhs as u32; emit_and_continue!(match kind { - StoreKind::U8 => Instruction::store_imm_indirect_u8(base, offset, rhs), - StoreKind::U16 => Instruction::store_imm_indirect_u16(base, offset, rhs), + StoreKind::U8 => match u8::try_from(rhs) { + Ok(_) => Instruction::store_imm_indirect_u8(base, offset, rhs), + Err(_) => return Err(format!("cannot parse line {nth_line}: immediate larger than u8")), + }, + StoreKind::U16 => match u16::try_from(rhs) { + Ok(_) => Instruction::store_imm_indirect_u16(base, offset, rhs), + Err(_) => return Err(format!("cannot parse line {nth_line}: immediate larger than u16")), + }, StoreKind::U32 => Instruction::store_imm_indirect_u32(base, offset, rhs), }); } @@ -634,7 +646,7 @@ pub fn assemble(code: &str) -> Result, String> { jump_table.push(target_index); code.push(Instruction::load_imm( dst.into(), - target_index * crate::abi::VM_CODE_ADDRESS_ALIGNMENT, + (jump_table.len() as u32) * crate::abi::VM_CODE_ADDRESS_ALIGNMENT, )); } MaybeInstruction::LoadImmAndJump(dst, value, label) => { diff --git a/tools/spectool/spec/src/inst_jump_indirect_invalid_djump_to_zero_nok.txt b/tools/spectool/spec/src/inst_jump_indirect_invalid_djump_to_zero_nok.txt new file mode 100644 index 00000000..db6c198b --- /dev/null +++ b/tools/spectool/spec/src/inst_jump_indirect_invalid_djump_to_zero_nok.txt @@ -0,0 +1,3 @@ +pub @main: +pub @expected_exit: + jump [a0] diff --git a/tools/spectool/spec/src/inst_jump_indirect_misaligned_djump_with_offset_nok.txt b/tools/spectool/spec/src/inst_jump_indirect_misaligned_djump_with_offset_nok.txt new file mode 100644 index 00000000..c4b25b27 --- /dev/null +++ b/tools/spectool/spec/src/inst_jump_indirect_misaligned_djump_with_offset_nok.txt @@ -0,0 +1,7 @@ +pub @main: + a0 = @target +pub @expected_exit: + jump [a0 + 1] + trap +@target: + a1 = 0xdeadbeef diff --git a/tools/spectool/spec/src/inst_jump_indirect_misaligned_djump_without_offset_nok.txt b/tools/spectool/spec/src/inst_jump_indirect_misaligned_djump_without_offset_nok.txt new file mode 100644 index 00000000..a6b80ece --- /dev/null +++ b/tools/spectool/spec/src/inst_jump_indirect_misaligned_djump_without_offset_nok.txt @@ -0,0 +1,8 @@ +pub @main: + a0 = @target + a0 = a0 + 1 +pub @expected_exit: + jump [a0] + trap +@target: + a1 = 0xdeadbeef diff --git a/tools/spectool/spec/src/inst_jump_indirect_with_offset_ok.txt b/tools/spectool/spec/src/inst_jump_indirect_with_offset_ok.txt new file mode 100644 index 00000000..5ec48981 --- /dev/null +++ b/tools/spectool/spec/src/inst_jump_indirect_with_offset_ok.txt @@ -0,0 +1,7 @@ +pub @main: + a0 = @target + a0 = a0 - 100 + jump [a0 + 100] + trap +@target: + a1 = 0xdeadbeef diff --git a/tools/spectool/spec/src/inst_jump_indirect_without_offset_ok.txt b/tools/spectool/spec/src/inst_jump_indirect_without_offset_ok.txt new file mode 100644 index 00000000..030bd48f --- /dev/null +++ b/tools/spectool/spec/src/inst_jump_indirect_without_offset_ok.txt @@ -0,0 +1,6 @@ +pub @main: + a0 = @target + jump [a0] + trap +@target: + a1 = 0xdeadbeef diff --git a/tools/spectool/spec/src/inst_load_i16.txt b/tools/spectool/spec/src/inst_load_i16.txt new file mode 100644 index 00000000..6fb6b461 --- /dev/null +++ b/tools/spectool/spec/src/inst_load_i16.txt @@ -0,0 +1,5 @@ +%rw_data_size = 2 +%rw_data = 81 82 + +pub @main: + a0 = i16 [0x20000] diff --git a/tools/spectool/spec/src/inst_load_i8.txt b/tools/spectool/spec/src/inst_load_i8.txt new file mode 100644 index 00000000..f7261dc7 --- /dev/null +++ b/tools/spectool/spec/src/inst_load_i8.txt @@ -0,0 +1,5 @@ +%rw_data_size = 1 +%rw_data = 81 + +pub @main: + a0 = i8 [0x20000] diff --git a/tools/spectool/spec/src/inst_load_imm_and_jump.txt b/tools/spectool/spec/src/inst_load_imm_and_jump.txt new file mode 100644 index 00000000..c0bb5ad8 --- /dev/null +++ b/tools/spectool/spec/src/inst_load_imm_and_jump.txt @@ -0,0 +1,5 @@ +pub @main: + a0 = 1234, jump @target + trap +@target: + a1 = 0xdeadbeef diff --git a/tools/spectool/spec/src/inst_load_indirect_i16_with_offset.txt b/tools/spectool/spec/src/inst_load_indirect_i16_with_offset.txt new file mode 100644 index 00000000..aa5b071c --- /dev/null +++ b/tools/spectool/spec/src/inst_load_indirect_i16_with_offset.txt @@ -0,0 +1,6 @@ +%rw_data_size = 4 +%rw_data = 81 82 83 84 +pre: a0 = 0x20000 + +pub @main: + a1 = i16 [a0 + 1] diff --git a/tools/spectool/spec/src/inst_load_indirect_i16_without_offset.txt b/tools/spectool/spec/src/inst_load_indirect_i16_without_offset.txt new file mode 100644 index 00000000..d9b07508 --- /dev/null +++ b/tools/spectool/spec/src/inst_load_indirect_i16_without_offset.txt @@ -0,0 +1,6 @@ +%rw_data_size = 4 +%rw_data = 81 82 83 84 +pre: a0 = 0x20000 + +pub @main: + a1 = i16 [a0] diff --git a/tools/spectool/spec/src/inst_load_indirect_i8_with_offset.txt b/tools/spectool/spec/src/inst_load_indirect_i8_with_offset.txt new file mode 100644 index 00000000..f0ef8015 --- /dev/null +++ b/tools/spectool/spec/src/inst_load_indirect_i8_with_offset.txt @@ -0,0 +1,6 @@ +%rw_data_size = 4 +%rw_data = 81 82 83 84 +pre: a0 = 0x20000 + +pub @main: + a1 = i8 [a0 + 1] diff --git a/tools/spectool/spec/src/inst_load_indirect_i8_without_offset.txt b/tools/spectool/spec/src/inst_load_indirect_i8_without_offset.txt new file mode 100644 index 00000000..4c421aa1 --- /dev/null +++ b/tools/spectool/spec/src/inst_load_indirect_i8_without_offset.txt @@ -0,0 +1,6 @@ +%rw_data_size = 4 +%rw_data = 81 82 83 84 +pre: a0 = 0x20000 + +pub @main: + a1 = i8 [a0] diff --git a/tools/spectool/spec/src/inst_load_indirect_u16_with_offset.txt b/tools/spectool/spec/src/inst_load_indirect_u16_with_offset.txt new file mode 100644 index 00000000..1425725c --- /dev/null +++ b/tools/spectool/spec/src/inst_load_indirect_u16_with_offset.txt @@ -0,0 +1,6 @@ +%rw_data_size = 4 +%rw_data = 12 34 56 78 +pre: a0 = 0x20000 + +pub @main: + a1 = u16 [a0 + 1] diff --git a/tools/spectool/spec/src/inst_load_indirect_u16_without_offset.txt b/tools/spectool/spec/src/inst_load_indirect_u16_without_offset.txt new file mode 100644 index 00000000..3e87ba34 --- /dev/null +++ b/tools/spectool/spec/src/inst_load_indirect_u16_without_offset.txt @@ -0,0 +1,6 @@ +%rw_data_size = 4 +%rw_data = 12 34 56 78 +pre: a0 = 0x20000 + +pub @main: + a1 = u16 [a0] diff --git a/tools/spectool/spec/src/inst_load_indirect_u32_with_offset.txt b/tools/spectool/spec/src/inst_load_indirect_u32_with_offset.txt new file mode 100644 index 00000000..57ed015c --- /dev/null +++ b/tools/spectool/spec/src/inst_load_indirect_u32_with_offset.txt @@ -0,0 +1,6 @@ +%rw_data_size = 5 +%rw_data = 12 34 56 78 9A +pre: a0 = 0x20000 + +pub @main: + a1 = u32 [a0 + 1] diff --git a/tools/spectool/spec/src/inst_load_indirect_u32_without_offset.txt b/tools/spectool/spec/src/inst_load_indirect_u32_without_offset.txt new file mode 100644 index 00000000..ed83c33e --- /dev/null +++ b/tools/spectool/spec/src/inst_load_indirect_u32_without_offset.txt @@ -0,0 +1,6 @@ +%rw_data_size = 4 +%rw_data = 12 34 56 78 +pre: a0 = 0x20000 + +pub @main: + a1 = u32 [a0] diff --git a/tools/spectool/spec/src/inst_load_indirect_u8_with_offset.txt b/tools/spectool/spec/src/inst_load_indirect_u8_with_offset.txt new file mode 100644 index 00000000..a08834bc --- /dev/null +++ b/tools/spectool/spec/src/inst_load_indirect_u8_with_offset.txt @@ -0,0 +1,6 @@ +%rw_data_size = 4 +%rw_data = 12 34 56 78 +pre: a0 = 0x20000 + +pub @main: + a1 = u8 [a0 + 1] diff --git a/tools/spectool/spec/src/inst_load_indirect_u8_without_offset.txt b/tools/spectool/spec/src/inst_load_indirect_u8_without_offset.txt new file mode 100644 index 00000000..13e4777c --- /dev/null +++ b/tools/spectool/spec/src/inst_load_indirect_u8_without_offset.txt @@ -0,0 +1,6 @@ +%rw_data_size = 4 +%rw_data = 12 34 56 78 +pre: a0 = 0x20000 + +pub @main: + a1 = u8 [a0] diff --git a/tools/spectool/spec/src/inst_load_u16.txt b/tools/spectool/spec/src/inst_load_u16.txt new file mode 100644 index 00000000..bb5a27b0 --- /dev/null +++ b/tools/spectool/spec/src/inst_load_u16.txt @@ -0,0 +1,5 @@ +%rw_data_size = 4 +%rw_data = 12 34 56 78 + +pub @main: + a0 = u16 [0x20000] diff --git a/tools/spectool/spec/src/inst_load_u32.txt b/tools/spectool/spec/src/inst_load_u32.txt new file mode 100644 index 00000000..61658d89 --- /dev/null +++ b/tools/spectool/spec/src/inst_load_u32.txt @@ -0,0 +1,5 @@ +%rw_data_size = 4 +%rw_data = 12 34 56 78 + +pub @main: + a0 = u32 [0x20000] diff --git a/tools/spectool/spec/src/inst_store_imm_indirect_u16_with_offset_nok.txt b/tools/spectool/spec/src/inst_store_imm_indirect_u16_with_offset_nok.txt new file mode 100644 index 00000000..81060c97 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_indirect_u16_with_offset_nok.txt @@ -0,0 +1,7 @@ +pre: a0 = 0x20FFE + +%rw_data_size = 2 + +pub @main: +pub @expected_exit: + u16 [a0 + 1] = 0x1234 diff --git a/tools/spectool/spec/src/inst_store_imm_indirect_u16_with_offset_ok.txt b/tools/spectool/spec/src/inst_store_imm_indirect_u16_with_offset_ok.txt new file mode 100644 index 00000000..07d786c6 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_indirect_u16_with_offset_ok.txt @@ -0,0 +1,6 @@ +pre: a0 = 0x20EFE + +%rw_data_size = 2 + +pub @main: + u16 [a0 + 256] = 0x1234 diff --git a/tools/spectool/spec/src/inst_store_imm_indirect_u16_without_offset_ok.txt b/tools/spectool/spec/src/inst_store_imm_indirect_u16_without_offset_ok.txt new file mode 100644 index 00000000..b18d7a89 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_indirect_u16_without_offset_ok.txt @@ -0,0 +1,6 @@ +pre: a0 = 0x20FFE + +%rw_data_size = 2 + +pub @main: + u16 [a0] = 0x1234 diff --git a/tools/spectool/spec/src/inst_store_imm_indirect_u32_with_offset_nok.txt b/tools/spectool/spec/src/inst_store_imm_indirect_u32_with_offset_nok.txt new file mode 100644 index 00000000..b9976f67 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_indirect_u32_with_offset_nok.txt @@ -0,0 +1,7 @@ +pre: a0 = 0x20FFC + +%rw_data_size = 4 + +pub @main: +pub @expected_exit: + u32 [a0 + 1] = 0x12345678 diff --git a/tools/spectool/spec/src/inst_store_imm_indirect_u32_with_offset_ok.txt b/tools/spectool/spec/src/inst_store_imm_indirect_u32_with_offset_ok.txt new file mode 100644 index 00000000..1ce78927 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_indirect_u32_with_offset_ok.txt @@ -0,0 +1,6 @@ +pre: a0 = 0x20EFC + +%rw_data_size = 4 + +pub @main: + u32 [a0 + 256] = 0x12345678 diff --git a/tools/spectool/spec/src/inst_store_imm_indirect_u32_without_offset_ok.txt b/tools/spectool/spec/src/inst_store_imm_indirect_u32_without_offset_ok.txt new file mode 100644 index 00000000..0c96c26a --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_indirect_u32_without_offset_ok.txt @@ -0,0 +1,6 @@ +pre: a0 = 0x20FFC + +%rw_data_size = 4 + +pub @main: + u32 [a0] = 0x12345678 diff --git a/tools/spectool/spec/src/inst_store_imm_indirect_u8_with_offset_nok.txt b/tools/spectool/spec/src/inst_store_imm_indirect_u8_with_offset_nok.txt new file mode 100644 index 00000000..4f46aff8 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_indirect_u8_with_offset_nok.txt @@ -0,0 +1,7 @@ +pre: a0 = 0x20FFF + +%rw_data_size = 1 + +pub @main: +pub @expected_exit: + u8 [a0 + 1] = 0x12 diff --git a/tools/spectool/spec/src/inst_store_imm_indirect_u8_with_offset_ok.txt b/tools/spectool/spec/src/inst_store_imm_indirect_u8_with_offset_ok.txt new file mode 100644 index 00000000..675f451e --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_indirect_u8_with_offset_ok.txt @@ -0,0 +1,6 @@ +pre: a0 = 0x20EFF + +%rw_data_size = 1 + +pub @main: + u8 [a0 + 256] = 0x12 diff --git a/tools/spectool/spec/src/inst_store_imm_indirect_u8_without_offset_ok.txt b/tools/spectool/spec/src/inst_store_imm_indirect_u8_without_offset_ok.txt new file mode 100644 index 00000000..06a1b963 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_indirect_u8_without_offset_ok.txt @@ -0,0 +1,6 @@ +pre: a0 = 0x20FFF + +%rw_data_size = 1 + +pub @main: + u8 [a0] = 0x12 diff --git a/tools/spectool/spec/src/inst_store_imm_u16.txt b/tools/spectool/spec/src/inst_store_imm_u16.txt new file mode 100644 index 00000000..3a06fb07 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_u16.txt @@ -0,0 +1,4 @@ +%rw_data_size = 2 + +pub @main: + u16 [0x20000] = 0x1234 diff --git a/tools/spectool/spec/src/inst_store_imm_u32.txt b/tools/spectool/spec/src/inst_store_imm_u32.txt new file mode 100644 index 00000000..a52a0c4c --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_u32.txt @@ -0,0 +1,4 @@ +%rw_data_size = 4 + +pub @main: + u32 [0x20000] = 0x12345678 diff --git a/tools/spectool/spec/src/inst_store_imm_u8.txt b/tools/spectool/spec/src/inst_store_imm_u8.txt new file mode 100644 index 00000000..7ca3ab48 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_u8.txt @@ -0,0 +1,4 @@ +%rw_data_size = 1 + +pub @main: + u8 [0x20000] = 0x12 diff --git a/tools/spectool/spec/src/inst_store_imm_u8_trap_inaccessible.txt b/tools/spectool/spec/src/inst_store_imm_u8_trap_inaccessible.txt new file mode 100644 index 00000000..e9add398 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_u8_trap_inaccessible.txt @@ -0,0 +1,5 @@ +%rw_data_size = 0 + +pub @main: +pub @expected_exit: + u8 [0x20000] = 0x12 diff --git a/tools/spectool/spec/src/inst_store_imm_u8_trap_read_only.txt b/tools/spectool/spec/src/inst_store_imm_u8_trap_read_only.txt new file mode 100644 index 00000000..7020f4fc --- /dev/null +++ b/tools/spectool/spec/src/inst_store_imm_u8_trap_read_only.txt @@ -0,0 +1,5 @@ +%ro_data_size = 1 + +pub @main: +pub @expected_exit: + u8 [0x10000] = 0x12 diff --git a/tools/spectool/spec/src/inst_store_indirect_u16_with_offset_nok.txt b/tools/spectool/spec/src/inst_store_indirect_u16_with_offset_nok.txt new file mode 100644 index 00000000..6b2a3d29 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_indirect_u16_with_offset_nok.txt @@ -0,0 +1,8 @@ +pre: a0 = 0x20000 +pre: a1 = 0x12345678 + +%rw_data_size = 1 + +pub @main: +pub @expected_exit: + u16 [a0 + 4097] = a1 diff --git a/tools/spectool/spec/src/inst_store_indirect_u16_with_offset_ok.txt b/tools/spectool/spec/src/inst_store_indirect_u16_with_offset_ok.txt new file mode 100644 index 00000000..1b9e41aa --- /dev/null +++ b/tools/spectool/spec/src/inst_store_indirect_u16_with_offset_ok.txt @@ -0,0 +1,7 @@ +pre: a0 = 0x20000 +pre: a1 = 0x12345678 + +%rw_data_size = 1 + +pub @main: + u16 [a0 + 10] = a1 diff --git a/tools/spectool/spec/src/inst_store_indirect_u16_without_offset_ok.txt b/tools/spectool/spec/src/inst_store_indirect_u16_without_offset_ok.txt new file mode 100644 index 00000000..1e205856 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_indirect_u16_without_offset_ok.txt @@ -0,0 +1,7 @@ +pre: a0 = 0x20000 +pre: a1 = 0x12345678 + +%rw_data_size = 1 + +pub @main: + u16 [a0] = a1 diff --git a/tools/spectool/spec/src/inst_store_indirect_u32_with_offset_nok.txt b/tools/spectool/spec/src/inst_store_indirect_u32_with_offset_nok.txt new file mode 100644 index 00000000..4b067e19 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_indirect_u32_with_offset_nok.txt @@ -0,0 +1,8 @@ +pre: a0 = 0x20000 +pre: a1 = 0x12345678 + +%rw_data_size = 1 + +pub @main: +pub @expected_exit: + u32 [a0 + 4097] = a1 diff --git a/tools/spectool/spec/src/inst_store_indirect_u32_with_offset_ok.txt b/tools/spectool/spec/src/inst_store_indirect_u32_with_offset_ok.txt new file mode 100644 index 00000000..914bee46 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_indirect_u32_with_offset_ok.txt @@ -0,0 +1,7 @@ +pre: a0 = 0x20000 +pre: a1 = 0x12345678 + +%rw_data_size = 1 + +pub @main: + u32 [a0 + 10] = a1 diff --git a/tools/spectool/spec/src/inst_store_indirect_u32_without_offset_ok.txt b/tools/spectool/spec/src/inst_store_indirect_u32_without_offset_ok.txt new file mode 100644 index 00000000..3f7964cf --- /dev/null +++ b/tools/spectool/spec/src/inst_store_indirect_u32_without_offset_ok.txt @@ -0,0 +1,7 @@ +pre: a0 = 0x20000 +pre: a1 = 0x12345678 + +%rw_data_size = 1 + +pub @main: + u32 [a0] = a1 diff --git a/tools/spectool/spec/src/inst_store_indirect_u8_with_offset_nok.txt b/tools/spectool/spec/src/inst_store_indirect_u8_with_offset_nok.txt new file mode 100644 index 00000000..f80697a5 --- /dev/null +++ b/tools/spectool/spec/src/inst_store_indirect_u8_with_offset_nok.txt @@ -0,0 +1,8 @@ +pre: a0 = 0x20000 +pre: a1 = 0x12345678 + +%rw_data_size = 1 + +pub @main: +pub @expected_exit: + u8 [a0 + 4097] = a1 diff --git a/tools/spectool/spec/src/inst_store_indirect_u8_with_offset_ok.txt b/tools/spectool/spec/src/inst_store_indirect_u8_with_offset_ok.txt new file mode 100644 index 00000000..04b4baab --- /dev/null +++ b/tools/spectool/spec/src/inst_store_indirect_u8_with_offset_ok.txt @@ -0,0 +1,7 @@ +pre: a0 = 0x20000 +pre: a1 = 0x12345678 + +%rw_data_size = 1 + +pub @main: + u8 [a0 + 10] = a1 diff --git a/tools/spectool/spec/src/inst_store_indirect_u8_without_offset_ok.txt b/tools/spectool/spec/src/inst_store_indirect_u8_without_offset_ok.txt new file mode 100644 index 00000000..69bd39da --- /dev/null +++ b/tools/spectool/spec/src/inst_store_indirect_u8_without_offset_ok.txt @@ -0,0 +1,7 @@ +pre: a0 = 0x20000 +pre: a1 = 0x12345678 + +%rw_data_size = 1 + +pub @main: + u8 [a0] = a1