OpenVMSettings type
#30
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pacheco
requested review from
Copilot and
lvella
and removed request for
Copilot
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
lvella
requested changes
Aug 6, 2025
integration/src/womir_translation.rs
Outdated
Comment on lines
245
to
275
| fn allocate_loop_frame_slots( | ||
| &self, | ||
| need_ret_info: bool, | ||
| saved_fps: BTreeSet<u32>, | ||
| ) -> (RegisterGenerator<'a, Self>, LoopFrameLayout) { | ||
| let mut rgen = RegisterGenerator::new(); | ||
|
|
||
| let ret_info = need_ret_info.then(|| { | ||
| // Allocate the return PC and frame pointer for the loop. | ||
| let ret_pc = rgen.allocate_words(Self::words_per_ptr()); | ||
| let ret_fp = rgen.allocate_words(Self::words_per_ptr()); | ||
| ReturnInfo { ret_pc, ret_fp } | ||
| }); | ||
|
|
||
| // Allocate the slots for the saved frame pointers. | ||
| let saved_fps = saved_fps | ||
| .into_iter() | ||
| .map(|depth| { | ||
| let outer_fp = rgen.allocate_words(Self::words_per_ptr()); | ||
| (depth, outer_fp) | ||
| }) | ||
| .collect(); | ||
|
|
||
| ( | ||
| rgen, | ||
| LoopFrameLayout { | ||
| saved_fps, | ||
| ret_info, | ||
| }, | ||
| ) | ||
| } |
There was a problem hiding this comment.
This is a matter for another PR, in womir, but I think this function should have a default implementation. It was created for PetraVM, that I think would require a different layout...
Comment on lines
356
to
397
| fn emit_jump_into_loop( | ||
| &self, | ||
| _g: &mut womir::loader::flattening::Generators<'a, '_, Self>, | ||
| loop_label: String, | ||
| loop_frame_ptr: std::ops::Range<u32>, | ||
| ret_info_to_copy: Option<womir::loader::flattening::settings::ReturnInfosToCopy>, | ||
| saved_curr_fp_ptr: Option<std::ops::Range<u32>>, | ||
| ) -> Vec<Self::Directive> { | ||
| let mut directives = if let Some(to_copy) = ret_info_to_copy { | ||
| assert_eq!(Self::words_per_ptr(), 1); | ||
| vec![ | ||
| Directive::Instruction(ib::copy_into_frame( | ||
| to_copy.dest.ret_pc.start as usize, | ||
| to_copy.src.ret_pc.start as usize, | ||
| loop_frame_ptr.start as usize, | ||
| )), | ||
| Directive::Instruction(ib::copy_into_frame( | ||
| to_copy.dest.ret_fp.start as usize, | ||
| to_copy.src.ret_fp.start as usize, | ||
| loop_frame_ptr.start as usize, | ||
| )), | ||
| ] | ||
| } else { | ||
| Vec::new() | ||
| }; | ||
|
|
||
| let jump = if let Some(saved_caller_fp) = saved_curr_fp_ptr { | ||
| Directive::JaafSave { | ||
| target: loop_label, | ||
| new_frame_ptr: loop_frame_ptr.start, | ||
| saved_caller_fp: saved_caller_fp.start, | ||
| } | ||
| } else { | ||
| Directive::Jaaf { | ||
| target: loop_label, | ||
| new_frame_ptr: loop_frame_ptr.start, | ||
| } | ||
| }; | ||
|
|
||
| directives.push(jump); | ||
| directives | ||
| } |
There was a problem hiding this comment.
Similar situation to allocate_loop_frame_slots: implementing this at this level should not be needed, and can be improved in womir.
lvella
approved these changes
Aug 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use OpenVM specific settings instead of the generic one, so we're able to do "one to many" translation of directives