RP2xxx: Fix overflow when PIO programs contain 32 instructions (#599)

piotrfila · web-flow · commit 9663eaf422fb · 2025-06-17T17:24:12.000-07:00
diff --git a/port/raspberrypi/rp2xxx/src/hal/pio/assembler/encoder.zig b/port/raspberrypi/rp2xxx/src/hal/pio/assembler/encoder.zig
@@ -486,30 +486,33 @@ pub fn Encoder(comptime chip: Chip, comptime options: Options) type {
 
         fn encode_instruction_body(self: *Self, program: *BoundedProgram, diags: *?Diagnostics) !void {
             // first scan through body for labels
-            var instr_index: u5 = program.origin orelse 0;
+            var instr_index: ?u5 = program.origin orelse 0;
             for (self.tokens[self.index..]) |token| {
                 switch (token.data) {
                     .label => |label| try program.labels.append(.{
                         .name = label.name,
                         .public = label.public,
-                        .index = instr_index,
+                        .index = instr_index.?,
                     }),
-                    .instruction, .word => instr_index += 1,
+                    .instruction, .word => {
+                        const result, const ov = @addWithOverflow(instr_index.?, 1);
+                        instr_index = if (ov != 0) null else result;
+                    },
                     .wrap_target => {
                         if (program.wrap_target != null) {
                             diags.* = Diagnostics.init(token.index, "wrap_target already set for this program", .{});
                             return error.WrapTargetAlreadySet;
                         }
 
-                        program.wrap_target = instr_index;
+                        program.wrap_target = instr_index.?;
                     },
                     .wrap => {
                         if (program.wrap != null) {
                             diags.* = Diagnostics.init(token.index, "wrap already set for this program", .{});
                             return error.WrapAlreadySet;
                         }
 
-                        program.wrap = instr_index - 1;
+                        program.wrap = if (instr_index) |idx| idx - 1 else 31;
                     },
                     .program => break,
                     else => unreachable, // invalid
