pr 30
This commit is contained in:
@@ -19,3 +19,8 @@ pub struct TypeId(pub u32);
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
#[serde(transparent)]
|
||||
pub struct ValueId(pub u32);
|
||||
|
||||
/// Unique identifier for a field within a HIP object.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
#[serde(transparent)]
|
||||
pub struct FieldId(pub u32);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
use super::ids::{ConstId, FunctionId, TypeId, ValueId};
|
||||
use super::ids::{ConstId, FieldId, FunctionId, TypeId, ValueId};
|
||||
|
||||
/// Instructions within a basic block.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
@@ -40,9 +40,9 @@ pub enum Instr {
|
||||
EndPeek,
|
||||
EndBorrow,
|
||||
EndMutate,
|
||||
/// Reads from heap at reference + offset. Pops reference, pushes value.
|
||||
LoadRef(u32),
|
||||
/// Writes to heap at reference + offset. Pops reference and value.
|
||||
StoreRef(u32),
|
||||
/// Reads from heap at gate + field. Pops gate, pushes value.
|
||||
GateLoadField(FieldId),
|
||||
/// Writes to heap at gate + field. Pops gate and value.
|
||||
GateStoreField(FieldId),
|
||||
Free,
|
||||
}
|
||||
|
||||
@@ -88,15 +88,15 @@ fn validate_function(func: &super::function::Function) -> Result<(), String> {
|
||||
None => return Err("EndMutate without matching BeginMutate".to_string()),
|
||||
}
|
||||
}
|
||||
Instr::LoadRef(_) => {
|
||||
Instr::GateLoadField(_) => {
|
||||
if current_stack.is_empty() {
|
||||
return Err("LoadRef outside of HIP operation".to_string());
|
||||
return Err("GateLoadField outside of HIP operation".to_string());
|
||||
}
|
||||
}
|
||||
Instr::StoreRef(_) => {
|
||||
Instr::GateStoreField(_) => {
|
||||
match current_stack.last() {
|
||||
Some(op) if op.kind == HipOpKind::Mutate => {},
|
||||
_ => return Err("StoreRef outside of BeginMutate".to_string()),
|
||||
_ => return Err("GateStoreField outside of BeginMutate".to_string()),
|
||||
}
|
||||
}
|
||||
Instr::Call(id, _) => {
|
||||
@@ -180,9 +180,9 @@ mod tests {
|
||||
id: 0,
|
||||
instrs: vec![
|
||||
Instr::BeginPeek { gate: ValueId(0) },
|
||||
Instr::LoadRef(0),
|
||||
Instr::GateLoadField(FieldId(0)),
|
||||
Instr::BeginMutate { gate: ValueId(1) },
|
||||
Instr::StoreRef(0),
|
||||
Instr::GateStoreField(FieldId(0)),
|
||||
Instr::EndMutate,
|
||||
Instr::EndPeek,
|
||||
],
|
||||
@@ -229,7 +229,7 @@ mod tests {
|
||||
id: 0,
|
||||
instrs: vec![
|
||||
Instr::BeginBorrow { gate: ValueId(0) },
|
||||
Instr::StoreRef(0),
|
||||
Instr::GateStoreField(FieldId(0)),
|
||||
Instr::EndBorrow,
|
||||
],
|
||||
terminator: Terminator::Return,
|
||||
@@ -237,7 +237,7 @@ mod tests {
|
||||
let prog = create_dummy_program(create_dummy_function(vec![block]));
|
||||
let res = validate_program(&prog);
|
||||
assert!(res.is_err());
|
||||
assert!(res.unwrap_err().contains("StoreRef outside of BeginMutate"));
|
||||
assert!(res.unwrap_err().contains("GateStoreField outside of BeginMutate"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -246,7 +246,7 @@ mod tests {
|
||||
id: 0,
|
||||
instrs: vec![
|
||||
Instr::BeginMutate { gate: ValueId(0) },
|
||||
Instr::StoreRef(0),
|
||||
Instr::GateStoreField(FieldId(0)),
|
||||
Instr::EndMutate,
|
||||
],
|
||||
terminator: Terminator::Return,
|
||||
@@ -260,14 +260,14 @@ mod tests {
|
||||
let block = Block {
|
||||
id: 0,
|
||||
instrs: vec![
|
||||
Instr::LoadRef(0),
|
||||
Instr::GateLoadField(FieldId(0)),
|
||||
],
|
||||
terminator: Terminator::Return,
|
||||
};
|
||||
let prog = create_dummy_program(create_dummy_function(vec![block]));
|
||||
let res = validate_program(&prog);
|
||||
assert!(res.is_err());
|
||||
assert!(res.unwrap_err().contains("LoadRef outside of HIP operation"));
|
||||
assert!(res.unwrap_err().contains("GateLoadField outside of HIP operation"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -282,7 +282,7 @@ mod tests {
|
||||
let block1 = Block {
|
||||
id: 1,
|
||||
instrs: vec![
|
||||
Instr::LoadRef(0),
|
||||
Instr::GateLoadField(FieldId(0)),
|
||||
Instr::EndPeek,
|
||||
],
|
||||
terminator: Terminator::Return,
|
||||
|
||||
Reference in New Issue
Block a user