Skip to content

Sort Instruction variants + Ensure each holds a singular oparg type #6312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ShaharNaveh wants to merge 16 commits into from
Closed

Sort Instruction variants + Ensure each holds a singular oparg type #6312

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
423fc3d
Sort `Instruction` enum. Variants hold 1 element
ShaharNaveh Nov 29, 2025
ef456a7
Fix `fmt_dis`
ShaharNaveh Nov 29, 2025
e2a1dfa
Fix `stack_effect`
ShaharNaveh Nov 29, 2025
0eed077
Fix `label_arg`
ShaharNaveh Nov 29, 2025
e844cef
Fix codegen compile
ShaharNaveh Nov 29, 2025
7659663
Fix `execute_instruction`
ShaharNaveh Nov 29, 2025
73b5b88
Sort `execute_instruction` match arms
ShaharNaveh Nov 29, 2025
f59c99f
Clippy
ShaharNaveh Nov 29, 2025
6d52107
Fix jit `add_instruction`
ShaharNaveh Nov 29, 2025
d5abcdb
Sort match arms
ShaharNaveh Nov 29, 2025
3a01e05
Missed one
ShaharNaveh Nov 29, 2025
845cdd9
fix Jit's `process_instruction`
ShaharNaveh Nov 29, 2025
f35d028
Sort arms
ShaharNaveh Nov 29, 2025
6579723
Fix docs
ShaharNaveh Nov 29, 2025
7beb732
Merge remote-tracking branch 'upstream/main' into sort-inst
ShaharNaveh Nov 29, 2025
85b17af
Add comments
ShaharNaveh Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Sort arms
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Nov 29, 2025
commit f35d02810e6a1c406fad00624fcc700d4f421471
44 changes: 22 additions & 22 deletions crates/jit/tests/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,6 @@ impl StackMachine {
names: &[String],
) -> ControlFlow<()> {
match instruction {
Instruction::LoadConst(idx) => {
let idx = idx.get(arg);
self.stack.push(constants[idx as usize].clone().into())
}
Instruction::LoadNameAny(idx) => self
.stack
.push(StackValue::String(names[idx.get(arg) as usize].clone())),
Instruction::StoreLocal(idx) => {
let idx = idx.get(arg);
self.locals
.insert(names[idx as usize].clone(), self.stack.pop().unwrap());
}
Instruction::StoreAttr(_) => {
// Do nothing except throw away the stack values
self.stack.pop().unwrap();
self.stack.pop().unwrap();
}
Instruction::BuildMap(size) => {
let mut map = HashMap::new();
for _ in 0..size.get(arg) {
Expand All @@ -122,6 +105,14 @@ impl StackMachine {
}
self.stack.push(StackValue::Map(map));
}
Instruction::ExtendedArg => {}
Instruction::LoadConst(idx) => {
let idx = idx.get(arg);
self.stack.push(constants[idx as usize].clone().into())
}
Instruction::LoadNameAny(idx) => self
.stack
.push(StackValue::String(names[idx.get(arg) as usize].clone())),
Instruction::MakeFunction => {
let code = if let Some(StackValue::Code(code)) = self.stack.pop() {
code
Expand All @@ -134,6 +125,12 @@ impl StackMachine {
annotations: HashMap::new(), // empty annotations, will be set later if needed
}));
}
Instruction::ReturnConst(idx) => {
let idx = idx.get(arg);
self.stack.push(constants[idx as usize].clone().into());
return ControlFlow::Break(());
}
Instruction::ReturnValue => return ControlFlow::Break(()),
Instruction::SetFunctionAttribute(attr) => {
// Stack: [..., attr_value, func] -> [..., func]
let func = if let Some(StackValue::Function(func)) = self.stack.pop() {
Expand Down Expand Up @@ -164,13 +161,16 @@ impl StackMachine {
self.stack.push(StackValue::Function(func));
}
}
Instruction::ReturnConst(idx) => {
Instruction::StoreAttr(_) => {
// Do nothing except throw away the stack values
self.stack.pop().unwrap();
self.stack.pop().unwrap();
}
Instruction::StoreLocal(idx) => {
let idx = idx.get(arg);
self.stack.push(constants[idx as usize].clone().into());
return ControlFlow::Break(());
self.locals
.insert(names[idx as usize].clone(), self.stack.pop().unwrap());
}
Instruction::ReturnValue => return ControlFlow::Break(()),
Instruction::ExtendedArg => {}
_ => unimplemented!(
"instruction {:?} isn't yet supported in py_function!",
instruction
Expand Down
Loading