Skip to content

Commit

Permalink
spectool: add test programs for load and store instructions (#139)
Browse files Browse the repository at this point in the history
  • Loading branch information
subotic authored Jul 15, 2024
1 parent e225c72 commit fffabd0
Show file tree
Hide file tree
Showing 44 changed files with 278 additions and 5 deletions.
22 changes: 17 additions & 5 deletions crates/polkavm-common/src/assembler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -589,8 +589,14 @@ pub fn assemble(code: &str) -> Result<Vec<u8>, 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),
});
}
Expand All @@ -607,8 +613,14 @@ pub fn assemble(code: &str) -> Result<Vec<u8>, 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),
});
}
Expand All @@ -634,7 +646,7 @@ pub fn assemble(code: &str) -> Result<Vec<u8>, 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) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pub @main:
pub @expected_exit:
jump [a0]
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pub @main:
a0 = @target
pub @expected_exit:
jump [a0 + 1]
trap
@target:
a1 = 0xdeadbeef
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
pub @main:
a0 = @target
a0 = a0 + 1
pub @expected_exit:
jump [a0]
trap
@target:
a1 = 0xdeadbeef
7 changes: 7 additions & 0 deletions tools/spectool/spec/src/inst_jump_indirect_with_offset_ok.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pub @main:
a0 = @target
a0 = a0 - 100
jump [a0 + 100]
trap
@target:
a1 = 0xdeadbeef
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pub @main:
a0 = @target
jump [a0]
trap
@target:
a1 = 0xdeadbeef
5 changes: 5 additions & 0 deletions tools/spectool/spec/src/inst_load_i16.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
%rw_data_size = 2
%rw_data = 81 82

pub @main:
a0 = i16 [0x20000]
5 changes: 5 additions & 0 deletions tools/spectool/spec/src/inst_load_i8.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
%rw_data_size = 1
%rw_data = 81

pub @main:
a0 = i8 [0x20000]
5 changes: 5 additions & 0 deletions tools/spectool/spec/src/inst_load_imm_and_jump.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pub @main:
a0 = 1234, jump @target
trap
@target:
a1 = 0xdeadbeef
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%rw_data_size = 4
%rw_data = 81 82 83 84
pre: a0 = 0x20000

pub @main:
a1 = i16 [a0 + 1]
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%rw_data_size = 4
%rw_data = 81 82 83 84
pre: a0 = 0x20000

pub @main:
a1 = i16 [a0]
6 changes: 6 additions & 0 deletions tools/spectool/spec/src/inst_load_indirect_i8_with_offset.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%rw_data_size = 4
%rw_data = 81 82 83 84
pre: a0 = 0x20000

pub @main:
a1 = i8 [a0 + 1]
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%rw_data_size = 4
%rw_data = 81 82 83 84
pre: a0 = 0x20000

pub @main:
a1 = i8 [a0]
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%rw_data_size = 4
%rw_data = 12 34 56 78
pre: a0 = 0x20000

pub @main:
a1 = u16 [a0 + 1]
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%rw_data_size = 4
%rw_data = 12 34 56 78
pre: a0 = 0x20000

pub @main:
a1 = u16 [a0]
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%rw_data_size = 5
%rw_data = 12 34 56 78 9A
pre: a0 = 0x20000

pub @main:
a1 = u32 [a0 + 1]
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%rw_data_size = 4
%rw_data = 12 34 56 78
pre: a0 = 0x20000

pub @main:
a1 = u32 [a0]
6 changes: 6 additions & 0 deletions tools/spectool/spec/src/inst_load_indirect_u8_with_offset.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%rw_data_size = 4
%rw_data = 12 34 56 78
pre: a0 = 0x20000

pub @main:
a1 = u8 [a0 + 1]
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%rw_data_size = 4
%rw_data = 12 34 56 78
pre: a0 = 0x20000

pub @main:
a1 = u8 [a0]
5 changes: 5 additions & 0 deletions tools/spectool/spec/src/inst_load_u16.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
%rw_data_size = 4
%rw_data = 12 34 56 78

pub @main:
a0 = u16 [0x20000]
5 changes: 5 additions & 0 deletions tools/spectool/spec/src/inst_load_u32.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
%rw_data_size = 4
%rw_data = 12 34 56 78

pub @main:
a0 = u32 [0x20000]
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pre: a0 = 0x20FFE

%rw_data_size = 2

pub @main:
pub @expected_exit:
u16 [a0 + 1] = 0x1234
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pre: a0 = 0x20EFE

%rw_data_size = 2

pub @main:
u16 [a0 + 256] = 0x1234
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pre: a0 = 0x20FFE

%rw_data_size = 2

pub @main:
u16 [a0] = 0x1234
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pre: a0 = 0x20FFC

%rw_data_size = 4

pub @main:
pub @expected_exit:
u32 [a0 + 1] = 0x12345678
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pre: a0 = 0x20EFC

%rw_data_size = 4

pub @main:
u32 [a0 + 256] = 0x12345678
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pre: a0 = 0x20FFC

%rw_data_size = 4

pub @main:
u32 [a0] = 0x12345678
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pre: a0 = 0x20FFF

%rw_data_size = 1

pub @main:
pub @expected_exit:
u8 [a0 + 1] = 0x12
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pre: a0 = 0x20EFF

%rw_data_size = 1

pub @main:
u8 [a0 + 256] = 0x12
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pre: a0 = 0x20FFF

%rw_data_size = 1

pub @main:
u8 [a0] = 0x12
4 changes: 4 additions & 0 deletions tools/spectool/spec/src/inst_store_imm_u16.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
%rw_data_size = 2

pub @main:
u16 [0x20000] = 0x1234
4 changes: 4 additions & 0 deletions tools/spectool/spec/src/inst_store_imm_u32.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
%rw_data_size = 4

pub @main:
u32 [0x20000] = 0x12345678
4 changes: 4 additions & 0 deletions tools/spectool/spec/src/inst_store_imm_u8.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
%rw_data_size = 1

pub @main:
u8 [0x20000] = 0x12
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
%rw_data_size = 0

pub @main:
pub @expected_exit:
u8 [0x20000] = 0x12
5 changes: 5 additions & 0 deletions tools/spectool/spec/src/inst_store_imm_u8_trap_read_only.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
%ro_data_size = 1

pub @main:
pub @expected_exit:
u8 [0x10000] = 0x12
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
pre: a0 = 0x20000
pre: a1 = 0x12345678

%rw_data_size = 1

pub @main:
pub @expected_exit:
u16 [a0 + 4097] = a1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pre: a0 = 0x20000
pre: a1 = 0x12345678

%rw_data_size = 1

pub @main:
u16 [a0 + 10] = a1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pre: a0 = 0x20000
pre: a1 = 0x12345678

%rw_data_size = 1

pub @main:
u16 [a0] = a1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
pre: a0 = 0x20000
pre: a1 = 0x12345678

%rw_data_size = 1

pub @main:
pub @expected_exit:
u32 [a0 + 4097] = a1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pre: a0 = 0x20000
pre: a1 = 0x12345678

%rw_data_size = 1

pub @main:
u32 [a0 + 10] = a1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pre: a0 = 0x20000
pre: a1 = 0x12345678

%rw_data_size = 1

pub @main:
u32 [a0] = a1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
pre: a0 = 0x20000
pre: a1 = 0x12345678

%rw_data_size = 1

pub @main:
pub @expected_exit:
u8 [a0 + 4097] = a1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pre: a0 = 0x20000
pre: a1 = 0x12345678

%rw_data_size = 1

pub @main:
u8 [a0 + 10] = a1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pre: a0 = 0x20000
pre: a1 = 0x12345678

%rw_data_size = 1

pub @main:
u8 [a0] = a1

0 comments on commit fffabd0

Please sign in to comment.