feat(runtime): implement shared transactional memcard with async saves
Intrepid/Prometeu/Runtime/pipeline/pr-master This commit looks good
Intrepid/Prometeu/Runtime/pipeline/pr-master This commit looks good
This commit is contained in:
@@ -65,6 +65,7 @@ pub enum LifecycleRole {
|
||||
None = 0,
|
||||
BeforePause = 1,
|
||||
BeforeResume = 2,
|
||||
MemcardBoot = 3,
|
||||
}
|
||||
impl TryFrom<u8> for LifecycleRole {
|
||||
type Error = E;
|
||||
@@ -73,6 +74,7 @@ impl TryFrom<u8> for LifecycleRole {
|
||||
0 => Ok(Self::None),
|
||||
1 => Ok(Self::BeforePause),
|
||||
2 => Ok(Self::BeforeResume),
|
||||
3 => Ok(Self::MemcardBoot),
|
||||
_ => Err(E::new(C::InvalidRegistry, R::LifecycleRole)),
|
||||
}
|
||||
}
|
||||
@@ -254,7 +256,7 @@ pub struct FunctionLayout {
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Registry {
|
||||
lifecycle_hooks: [Option<FunctionId>; 2],
|
||||
lifecycle_hooks: [Option<FunctionId>; 3],
|
||||
declarations: RegistryDeclarations,
|
||||
layouts: Vec<TypeLayout>,
|
||||
functions: Vec<FunctionLayout>,
|
||||
@@ -267,6 +269,7 @@ impl Registry {
|
||||
LifecycleRole::None => None,
|
||||
LifecycleRole::BeforePause => self.lifecycle_hooks[0],
|
||||
LifecycleRole::BeforeResume => self.lifecycle_hooks[1],
|
||||
LifecycleRole::MemcardBoot => self.lifecycle_hooks[2],
|
||||
}
|
||||
}
|
||||
pub fn declarations(&self) -> &RegistryDeclarations {
|
||||
@@ -376,16 +379,25 @@ impl Registry {
|
||||
});
|
||||
}
|
||||
}
|
||||
let mut lifecycle_hooks = [None; 2];
|
||||
let mut lifecycle_hooks = [None; 3];
|
||||
let mut functions = b.vector(d.functions.len(), Q::RegistryBytes)?;
|
||||
let mut ranges = b.vector(d.functions.len(), Q::TemporaryBytes)?;
|
||||
for (i, f) in d.functions.iter().enumerate() {
|
||||
b.work(1)?;
|
||||
if f.lifecycle_role != LifecycleRole::None {
|
||||
let invalid = i == 0
|
||||
|| !f.signature.parameters.is_empty()
|
||||
|| !f.signature.results.is_empty()
|
||||
|| !f.captures.is_empty();
|
||||
let signature_valid = if f.lifecycle_role == LifecycleRole::MemcardBoot {
|
||||
f.signature.parameters.len() == 1
|
||||
&& f.signature.results.len() == 1
|
||||
&& d.types
|
||||
.get(f.signature.parameters[0].type_id.0 as usize)
|
||||
.is_some_and(|t| t.kind == TypeKind::Builtin(BuiltinId::INT64))
|
||||
&& d.types
|
||||
.get(f.signature.results[0].0 as usize)
|
||||
.is_some_and(|t| t.kind == TypeKind::Builtin(BuiltinId::INT32))
|
||||
} else {
|
||||
f.signature.parameters.is_empty() && f.signature.results.is_empty()
|
||||
};
|
||||
let invalid = i == 0 || !signature_valid || !f.captures.is_empty();
|
||||
if invalid {
|
||||
return Err(E::new(C::InvalidEntrypoint, R::LifecycleSignature)
|
||||
.in_section(1)
|
||||
|
||||
@@ -1128,3 +1128,35 @@ fn lifecycle_roles_resolve_and_roundtrip_with_strict_validation() {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn memcard_role_has_its_own_signature_and_does_not_reinterpret_function_id() {
|
||||
let declarations = RegistryDeclarations {
|
||||
types: vec![builtin(BuiltinId::INT64), builtin(BuiltinId::INT32)],
|
||||
functions: vec![
|
||||
FunctionDecl { code_len: 2, ..Default::default() },
|
||||
FunctionDecl { code_offset: 2, code_len: 2, ..Default::default() },
|
||||
FunctionDecl {
|
||||
lifecycle_role: LifecycleRole::MemcardBoot,
|
||||
signature: Signature { parameters: vec![named(0)], results: vec![TypeId(1)] },
|
||||
code_offset: 4,
|
||||
code_len: 2,
|
||||
..Default::default()
|
||||
},
|
||||
],
|
||||
..Default::default()
|
||||
};
|
||||
let registry = resolve(declarations.clone()).unwrap();
|
||||
assert_eq!(registry.lifecycle_hook(LifecycleRole::MemcardBoot), Some(FunctionId(2)));
|
||||
assert_eq!(LifecycleRole::try_from(3), Ok(LifecycleRole::MemcardBoot));
|
||||
for case in 0..4 {
|
||||
let mut invalid = declarations.clone();
|
||||
match case {
|
||||
0 => invalid.functions[2].signature.parameters[0].type_id = TypeId(1),
|
||||
1 => invalid.functions[2].signature.results = vec![TypeId(0)],
|
||||
2 => invalid.functions[2].captures = vec![TypeId(0)],
|
||||
_ => invalid.functions[2].lifecycle_role = LifecycleRole::BeforePause,
|
||||
}
|
||||
assert_eq!(resolve(invalid).unwrap_err().reason, LoadReason::LifecycleSignature);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user