Skip to content

Bytecode enum named oparg #7294

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 26 commits into from
Mar 3, 2026
Merged

Bytecode enum named oparg #7294

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
59a8471
Align real opcodes
ShaharNaveh Mar 1, 2026
5c99d26
Align pseudoes
ShaharNaveh Mar 1, 2026
511bc2e
fix fmt_dis
ShaharNaveh Mar 1, 2026
6b9966b
Compiler compiles
ShaharNaveh Mar 1, 2026
ac64b1a
Fix some of ir
ShaharNaveh Mar 1, 2026
927daa1
Fix some of compile.rs
ShaharNaveh Mar 1, 2026
8845094
codegen compiles
ShaharNaveh Mar 1, 2026
bf1dcfa
VM compiles
ShaharNaveh Mar 2, 2026
6983124
Merge remote-tracking branch 'upstream/main' into bytecode-enum-named…
ShaharNaveh Mar 2, 2026
18b0dfa
Fix compiler-core
ShaharNaveh Mar 2, 2026
96dd420
fix merge
ShaharNaveh Mar 2, 2026
ede9094
fix more merge
ShaharNaveh Mar 2, 2026
0bf36db
fix stdlib
ShaharNaveh Mar 2, 2026
aad0560
Fix some jit
ShaharNaveh Mar 2, 2026
8af88fe
Fix more jit
ShaharNaveh Mar 2, 2026
358d466
Fix some jit tests
ShaharNaveh Mar 2, 2026
cf22b78
More jit fixes
ShaharNaveh Mar 2, 2026
64a3ef8
Make sure no instruction is emitted using `Foo(val)`
ShaharNaveh Mar 2, 2026
de0a702
Add comment
ShaharNaveh Mar 2, 2026
faf47b3
Merge remote-tracking branch 'upstream/main' into bytecode-enum-named…
ShaharNaveh Mar 2, 2026
ffe71f9
Fix typo
ShaharNaveh Mar 2, 2026
a828ab1
Add `consti` to known words
ShaharNaveh Mar 2, 2026
04b7c4a
Merge remote-tracking branch 'upstream/main' into bytecode-enum-named…
ShaharNaveh Mar 3, 2026
f9e5530
Merge remote-tracking branch 'upstream/main' into bytecode-enum-named…
ShaharNaveh Mar 3, 2026
7865718
Fix more
ShaharNaveh Mar 3, 2026
0ae8b08
Fix bad merge
ShaharNaveh Mar 3, 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 more
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Mar 3, 2026
commit 7865718eff3de5a93a51c4590f99b584ef1c0ed2
102 changes: 68 additions & 34 deletions crates/vm/src/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2655,7 +2655,7 @@ impl ExecutingFrame<'_> {
.write_cache_u16(cache_base, counter - 1);
}
} else {
self.specialize_store_attr(vm, idx.get(arg), instr_idx, cache_base);
self.specialize_store_attr(vm, namei.get(arg), instr_idx, cache_base);
}
self.store_attr(vm, namei.get(arg))
}
Expand Down Expand Up @@ -2903,7 +2903,7 @@ impl ExecutingFrame<'_> {
self.code.instructions.replace_op(
instr_idx,
Instruction::Send {
target: Arg::marker(),
delta: Arg::marker(),
},
);
self.code
Expand Down Expand Up @@ -3154,9 +3154,12 @@ impl ExecutingFrame<'_> {
}
// Deoptimize
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -3185,9 +3188,12 @@ impl ExecutingFrame<'_> {
return Ok(None);
}
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -3230,9 +3236,12 @@ impl ExecutingFrame<'_> {
return Ok(None);
}
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -3263,9 +3272,12 @@ impl ExecutingFrame<'_> {
return Ok(None);
}
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -3296,9 +3308,12 @@ impl ExecutingFrame<'_> {
// Slot is None → AttributeError (fall through to slow path)
}
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -3328,9 +3343,12 @@ impl ExecutingFrame<'_> {
}
}
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { idx: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand All @@ -3356,9 +3374,12 @@ impl ExecutingFrame<'_> {
}
// Deoptimize
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::StoreAttr { idx: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::StoreAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand All @@ -3385,9 +3406,12 @@ impl ExecutingFrame<'_> {
// Deoptimize
let attr_idx = u32::from(arg);
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::StoreAttr { idx: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::StoreAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -4344,7 +4368,9 @@ impl ExecutingFrame<'_> {
unsafe {
self.code.instructions.replace_op(
self.lasti() as usize - 1,
Instruction::LoadSuperAttr { arg: Arg::marker() },
Instruction::LoadSuperAttr {
namei: Arg::marker(),
},
);
let cache_base = self.lasti() as usize;
self.code
Expand Down Expand Up @@ -4422,7 +4448,9 @@ impl ExecutingFrame<'_> {
unsafe {
self.code.instructions.replace_op(
self.lasti() as usize - 1,
Instruction::LoadSuperAttr { arg: Arg::marker() },
Instruction::LoadSuperAttr {
namei: Arg::marker(),
},
);
let cache_base = self.lasti() as usize;
self.code
Expand Down Expand Up @@ -7021,9 +7049,12 @@ impl ExecutingFrame<'_> {
let instr_idx = self.lasti() as usize - 1;
let cache_base = instr_idx + 1;
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::CompareOp { op: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::CompareOp {
opname: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -7221,9 +7252,12 @@ impl ExecutingFrame<'_> {
let instr_idx = self.lasti() as usize - 1;
let cache_base = instr_idx + 1;
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadGlobal(Arg::marker()));
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadGlobal {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down