Skip to content

Move Instruction enum to its own file #6693

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

Merged
youknowone merged 9 commits into from
Jan 11, 2026
Merged

Move Instruction enum to its own file #6693

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c23b891
Move `Instruction` to its own file
ShaharNaveh Jan 10, 2026
8ac2d00
Fix codegen and frame.rs
ShaharNaveh Jan 10, 2026
437fe30
Adjust script
ShaharNaveh Jan 10, 2026
d2d3aa0
Remove comment
ShaharNaveh Jan 10, 2026
9e8f46c
Merge remote-tracking branch 'upstream/main' into bytecode-cleanup
ShaharNaveh Jan 10, 2026
25c3348
Fix
ShaharNaveh Jan 10, 2026
0813614
Trigger CI
ShaharNaveh Jan 10, 2026
2bcf71f
Merge remote-tracking branch 'upstream/main' into bytecode-cleanup
ShaharNaveh Jan 10, 2026
9b00a69
Trigger CI
ShaharNaveh Jan 10, 2026
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
Fix
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Jan 10, 2026
commit 25c3348687b9d8351d5e05fe601aa962a8c83d87
36 changes: 30 additions & 6 deletions crates/compiler-core/src/bytecode/instruction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ pub enum Instruction {
LoadFastLoadFast {
arg: Arg<u32>,
} = 88, // Placeholder
LoadFromDictOrDeref(Arg<NameIdx>) = 89, // Placeholder
LoadFromDictOrDeref(Arg<NameIdx>) = 89,
LoadFromDictOrGlobals(Arg<NameIdx>) = 90, // Placeholder
LoadGlobal(Arg<NameIdx>) = 91,
LoadName(Arg<NameIdx>) = 92,
Expand Down Expand Up @@ -272,7 +272,6 @@ pub enum Instruction {
target: Arg<Label>,
} = 130,
JumpIfNotExcMatch(Arg<Label>) = 131,
LoadClassDeref(Arg<NameIdx>) = 132,
SetExcInfo = 134,
Subscript = 135,
// ===== Pseudo Opcodes (252+) ======
Expand Down Expand Up @@ -337,7 +336,6 @@ impl TryFrom<u8> for Instruction {
target: Arg::marker(),
}),
u8::from(Self::JumpIfNotExcMatch(Arg::marker())),
u8::from(Self::LoadClassDeref(Arg::marker())),
u8::from(Self::SetExcInfo),
u8::from(Self::Subscript),
];
Expand Down Expand Up @@ -428,7 +426,6 @@ impl Instruction {
Self::LoadName(_) => 1,
Self::LoadGlobal(_) => 1,
Self::LoadDeref(_) => 1,
Self::LoadClassDeref(_) => 1,
Self::StoreFast(_) => -1,
Self::StoreName(_) => -1,
Self::StoreGlobal(_) => -1,
Expand All @@ -438,6 +435,7 @@ impl Instruction {
Self::DeleteName(_) => 0,
Self::DeleteGlobal(_) => 0,
Self::DeleteDeref(_) => 0,
Self::LoadFromDictOrDeref(_) => 1,
Self::LoadClosure(_) => 1,
Self::Subscript => -1,
Self::StoreSubscr => -3,
Expand Down Expand Up @@ -590,7 +588,33 @@ impl Instruction {
Self::UnaryNot => 0,
Self::GetYieldFromIter => 0,
Self::PushNull => 1, // Push NULL for call protocol
_ => 0,
Self::Cache => 0,
Self::BinarySlice => 0,
Self::BinaryOpInplaceAddUnicode => 0,
Self::EndFor => 0,
Self::ExitInitCheck => 0,
Self::InterpreterExit => 0,
Self::LoadAssertionError => 0,
Self::LoadLocals => 0,
Self::ReturnGenerator => 0,
Self::StoreSlice => 0,
Self::DictMerge { .. } => 0,
Self::BuildConstKeyMap { .. } => 0,
Self::CopyFreeVars { .. } => 0,
Self::EnterExecutor => 0,
Self::JumpBackwardNoInterrupt { .. } => 0,
Self::JumpBackward { .. } => 0,
Self::JumpForward { .. } => 0,
Self::ListExtend { .. } => 0,
Self::LoadFastCheck(_) => 0,
Self::LoadFastLoadFast { .. } => 0,
Self::LoadFromDictOrGlobals(_) => 0,
Self::SetUpdate { .. } => 0,
Self::MakeCell(_) => 0,
Self::LoadSuperAttr { .. } => 0,
Self::StoreFastStoreFast { .. } => 0,
Self::PopJumpIfNone { .. } => 0,
Self::PopJumpIfNotNone { .. } => 0,
}
}

Expand Down Expand Up @@ -736,7 +760,7 @@ impl Instruction {
}
Self::LoadAttrMethod { idx } => w!(LOAD_ATTR_METHOD, name = idx),
Self::LoadBuildClass => w!(LOAD_BUILD_CLASS),
Self::LoadClassDeref(idx) => w!(LOAD_CLASSDEREF, cell_name = idx),
Self::LoadFromDictOrDeref(i) => w!(LOAD_FROM_DICT_OR_DEREF, cell_name = i),
Self::LoadClosure(i) => w!(LOAD_CLOSURE, cell_name = i),
Self::LoadConst { idx } => fmt_const("LOAD_CONST", arg, f, idx),
Self::LoadDeref(idx) => w!(LOAD_DEREF, cell_name = idx),
Expand Down
Loading