mirror/pico-sdk
1
0
Fork 0
mirror of https://github.com/raspberrypi/pico-sdk.git synced 2026-03-14 21:19:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use 'constexpr' when including pio header files from a C++ compiler (#2651)

Browse source 
* Use 'constexpr' when including pio header files from a C++ compiler

In particular this allows compile-time checks to be performed on the
contents of pio_program structs via 'static_assert'.

This could be used (for example) to confirm that multiple PIO programs
fit in a single PIO module and abort compilation if not.

Fixes #2650

* Use feature test macro to check for 'constexpr' support

* Rename modifier PIO_CONST to __pio_const

---------

Co-authored-by: Graham Sanderson <graham.sanderson@gmail.com>
This commit is contained in:
Richard Hulme 2026-03-02 21:12:14 +01:00 • committed by GitHub
parent 33c01e9531
commit 5a2cbf93a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/pioasm/c_sdk_output.cpp
View file

@ -79,6 +79,13 @@ struct c_sdk_output : public output_format {
fprintf(out, "#endif\n");
fprintf(out, "\n");
fprintf(out, "#ifdef __cpp_constexpr\n");
fprintf(out, "#define __pio_const constexpr\n");
fprintf(out, "#else\n");
fprintf(out, "#define __pio_const const\n");
fprintf(out, "#endif\n");
fprintf(out, "\n");
output_symbols(out, "", source.global_symbols);
for (const auto &program : source.programs) {
@ -93,7 +100,7 @@ struct c_sdk_output : public output_format {
output_symbols(out, prefix, program.symbols);
fprintf(out, "static const uint16_t %sprogram_instructions[] = {\n", prefix.c_str());
fprintf(out, "static __pio_const uint16_t %sprogram_instructions[] = {\n", prefix.c_str());
for (int i = 0; i < (int)program.instructions.size(); i++) {
const auto &inst = program.instructions[i];
if (i == program.wrap_target) {
@ -109,7 +116,7 @@ struct c_sdk_output : public output_format {
fprintf(out, "\n");
fprintf(out, "#if !PICO_NO_HARDWARE\n");
fprintf(out, "static const struct pio_program %sprogram = {\n", prefix.c_str());
fprintf(out, "static __pio_const struct pio_program %sprogram = {\n", prefix.c_str());
fprintf(out, " .instructions = %sprogram_instructions,\n", prefix.c_str());
fprintf(out, " .length = %d,\n", (int) program.instructions.size());
fprintf(out, " .origin = %d,\n", program.origin.get());