Skip to content

rp2040 pio: Fix absolute addressing of jmp and wrap #700

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
merged 2 commits into from
Oct 12, 2025
Merged

rp2040 pio: Fix absolute addressing of jmp and wrap #700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a72b51c
rp2040 pio: offset jmp and wrap behaviors when program is added
Kytezign Oct 3, 2025
4a61b22
fixed typo
Kytezign Oct 5, 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
13 changes: 9 additions & 4 deletions port/raspberrypi/rp2xxx/src/hal/pio/common.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,19 @@ pub fn PioImpl(EnumType: type, chip: Chip) type {
break offset;
} else error.NoSpace;
}
inline fn is_jmp(insn: u16) bool {
return (insn & 0xe000) == 0;
}

pub fn add_program_at_offset_unlocked(self: EnumType, program: Program, offset: u5) !void {
if (!self.can_add_program_at_offset(program, offset))
return error.NoSpace;

const instruction_memory = self.get_instruction_memory();
for (program.instructions, offset..) |insn, i|
instruction_memory[i] = insn;
for (program.instructions, offset..) |insn, i| {
// offset jump instructions since they are absolute
instruction_memory[i] = if (is_jmp(insn)) insn + offset else insn;
}

const program_mask = program.get_mask();
UsedInstructionSpace(chip).val[@intFromEnum(self)] |= program_mask << offset;
Expand Down Expand Up @@ -548,12 +553,12 @@ pub fn PioImpl(EnumType: type, chip: Chip) type {
.pin_mappings = options.pin_mappings,
.exec = .{
.wrap = if (program.wrap) |wrap|
wrap
wrap + offset // program.wrap is relative but actual wrap is absolute
else
offset + @as(u5, @intCast(program.instructions.len)),

.wrap_target = if (program.wrap_target) |wrap_target|
wrap_target
wrap_target + offset // program.wrap_target is relative but actual wrap is absolute
else
offset,

Expand Down
Loading