Skip to content

WIP: Update ARM Toolchain and libopencm #373

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

Open
rpls wants to merge 6 commits into
base: master
Choose a base branch
from
Open

WIP: Update ARM Toolchain and libopencm #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c3979b9
Update to latest GNU ARM toolchain
rpls Jan 9, 2025
058dd11
Update libopencm3
rpls Jan 9, 2025
2f57153
Bump pqclean
rpls May 29, 2025
85905f7
Include snova fix
rpls Jul 3, 2025
6c474be
Add missing symbol type for assembly functions
rpls Jul 8, 2025
d7bfc6a
Update workflows for 14.3-rel1
rpls Nov 4, 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
4 changes: 2 additions & 2 deletions .github/workflows/cw308t-stm32f3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
with:
submodules: recursive
- name: Install Toolchain
uses: carlosperate/arm-none-eabi-gcc-action@v1.8.0
uses: carlosperate/arm-none-eabi-gcc-action@v1.11.0
with:
release: 13.2.Rel1
release: 14.3.Rel1
- name: Build All (cw308t-stm32f3)
run: make PLATFORM=cw308t-stm32f3 -j2
4 changes: 2 additions & 2 deletions .github/workflows/cw308t-stm32f415.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
with:
submodules: recursive
- name: Install Toolchain
uses: carlosperate/arm-none-eabi-gcc-action@v1.8.0
uses: carlosperate/arm-none-eabi-gcc-action@v1.11.0
with:
release: 13.2.Rel1
release: 14.3.Rel1
- name: Build All (cw308t-stm32f415)
run: make PLATFORM=cw308t-stm32f415 -j2
4 changes: 2 additions & 2 deletions .github/workflows/mps2-an386.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
with:
submodules: recursive
- name: Install Toolchain
uses: carlosperate/arm-none-eabi-gcc-action@v1.8.0
uses: carlosperate/arm-none-eabi-gcc-action@v1.11.0
with:
release: 13.2.Rel1
release: 14.3.Rel1
- name: Build All (mps2-an386)
run: make PLATFORM=mps2-an386 -j2
4 changes: 2 additions & 2 deletions .github/workflows/nucleo-l476rg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
with:
submodules: recursive
- name: Install Toolchain
uses: carlosperate/arm-none-eabi-gcc-action@v1.8.0
uses: carlosperate/arm-none-eabi-gcc-action@v1.11.0
with:
release: 13.2.Rel1
release: 14.3.Rel1
- name: Build All (nucleo-l476rg)
run: make PLATFORM=nucleo-l476rg -j2
4 changes: 2 additions & 2 deletions .github/workflows/nucleo-l4r5zi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
with:
submodules: recursive
- name: Install Toolchain
uses: carlosperate/arm-none-eabi-gcc-action@v1.8.0
uses: carlosperate/arm-none-eabi-gcc-action@v1.11.0
with:
release: 13.2.Rel1
release: 14.3.Rel1
- name: Build All (nucleo-l4r5zi)
run: make PLATFORM=nucleo-l4r5zi -j2
4 changes: 2 additions & 2 deletions .github/workflows/stm32f4discovery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
with:
submodules: recursive
- name: Install Toolchain
uses: carlosperate/arm-none-eabi-gcc-action@v1.8.0
uses: carlosperate/arm-none-eabi-gcc-action@v1.11.0
with:
release: 13.2.Rel1
release: 14.3.Rel1
- name: Build All (stm32f4discovery)
run: make PLATFORM=stm32f4discovery -j2
4 changes: 4 additions & 0 deletions common/keccakf1600.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,7 @@
@
.align 8
.global KeccakF1600_Initialize
.type KeccakF1600_Initialize, %function
KeccakF1600_Initialize:
bx lr

Expand All @@ -882,6 +883,7 @@ KeccakF1600_Initialize:
@
.align 8
.global KeccakF1600_StateXORBytes
.type KeccakF1600_StateXORBytes, %function
KeccakF1600_StateXORBytes:
cbz r3, KeccakF1600_StateXORBytes_Exit1
push {r4 - r8, lr} @ then
Expand Down Expand Up @@ -985,6 +987,7 @@ __KeccakF1600_StateXORBytesInLane_Loop:
@
.align 8
.global KeccakF1600_StateExtractBytes
.type KeccakF1600_StateExtractBytes, %function
KeccakF1600_StateExtractBytes:
cbz r3, KeccakF1600_StateExtractBytes_Exit1 @ .if length != 0
push {r4 - r8, lr} @ then
Expand Down Expand Up @@ -1118,6 +1121,7 @@ KeccakF1600_StatePermute_RoundConstantsWithTerminator:
@
.align 8
.global KeccakF1600_StatePermute
.type KeccakF1600_StatePermute, %function
KeccakF1600_StatePermute:
adr r1, KeccakF1600_StatePermute_RoundConstantsWithTerminator
push { r4 - r12, lr }
Expand Down
4 changes: 2 additions & 2 deletions common/mps2/startup_MPS2.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

.section .vector_table,"a",%progbits
.align 2
.globl __isr_vector
.global __isr_vector
__isr_vector:
.long __StackTop /* Top of Stack */
.long Reset_Handler /* Reset Handler */
Expand Down Expand Up @@ -85,7 +85,7 @@ __isr_vector:
.thumb
.thumb_func
.align 2
.globl Reset_Handler
.global Reset_Handler
.type Reset_Handler, %function
Reset_Handler:
/*
Expand Down
1 change: 1 addition & 0 deletions crypto_kem/bikel1/m4f/cshift.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

// void cshift_asm(uint32_t *array, int s)
.global cshift_asm
.type cshift_asm, %function
cshift_asm:
ptr_a .req r0
s .req r1
Expand Down
22 changes: 22 additions & 0 deletions crypto_kem/bikel1/m4f/gfv_tower_asm.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

//void gf4v_mul_2_asm( sto_t *c, const sto_t *a )
.global gf4v_mul_2_asm
.type gf4v_mul_2_asm, %function
gf4v_mul_2_asm:
ldr r3, [r1] //load a0
ldr r2, [r1, #4] //load a1
Expand All @@ -55,6 +56,7 @@ gf4v_mul_2_asm:

//void gf4v_mul_asm( sto_t *c, const sto_t *a , const sto_t *b)
.global gf4v_mul_asm
.type gf4v_mul_asm, %function
gf4v_mul_asm:
push {r4-r5}
ptr_c .req r0
Expand Down Expand Up @@ -98,6 +100,7 @@ b_1 .req r12

//void gf4v_mulscalar_asm( sto_t *c, const sto_t *a , uint8_t b)
.global gf4v_mulscalar_asm
.type gf4v_mulscalar_asm, %function
gf4v_mulscalar_asm:
push {r4-r5}
ptr_c .req r0
Expand Down Expand Up @@ -179,6 +182,7 @@ buf1 .req r12
//void gf16v_mul_asm( sto_t *c, const sto_t *a , const sto_t *b )
// does not preserve pointers, uses all registers
.global gf16v_mul_asm
.type gf16v_mul_asm, %function
gf16v_mul_asm:
push {r4-r11, lr}
ptr_c .req r0
Expand Down Expand Up @@ -234,6 +238,7 @@ buf0 .req r14
// void gf16v_mulscalar_asm( sto_t *c, const sto_t *a , uint8_t b )
// preserves pointers, uses all registers
.global gf16v_mulscalar_asm
.type gf16v_mulscalar_asm, %function
gf16v_mulscalar_asm:
push {r4-r11, lr}
ptr_c .req r0
Expand Down Expand Up @@ -276,6 +281,7 @@ buf2 .req r14
//void gf16v_mul_0x4_asm( sto_t *c, const sto_t *a )
//does not preserve pointer a, uses only caller-saved registers
.global gf16v_mul_0x4_asm
.type gf16v_mul_0x4_asm, %function
gf16v_mul_0x4_asm:
ptr_c .req r0
ptr_a .req r1
Expand Down Expand Up @@ -306,6 +312,7 @@ c_3 .req r12
//void gf16v_mul_0x5_asm( sto_t *c, const sto_t *a )
//does not preserve pointer a, uses only caller-saved registers
.global gf16v_mul_0x5_asm
.type gf16v_mul_0x5_asm, %function
gf16v_mul_0x5_asm:
ptr_c .req r0
ptr_a .req r1
Expand Down Expand Up @@ -336,6 +343,7 @@ c_3 .req r12
//void gf16v_mul_8_asm( sto_t *c, const sto_t *a )
//does not preserve pointer a, uses only caller-saved registers
.global gf16v_mul_8_asm
.type gf16v_mul_8_asm, %function
gf16v_mul_8_asm:
ptr_c .req r0
ptr_a .req r1
Expand Down Expand Up @@ -590,20 +598,23 @@ buf2 .req r14

//void void gf256v_mul_asm( sto_t *c, const sto_t *a , const sto_t *b )
.global gf256v_mul_asm
.type gf256v_mul_asm, %function
gf256v_mul_asm:
push {r4-r11, lr}
m_gf256v_mul
pop {r4-r11, pc}

//void gf256v_mulscalar_asm( sto_t *c, const sto_t *a , uint8_t b )
.global gf256v_mulscalar_asm
.type gf256v_mulscalar_asm, %function
gf256v_mulscalar_asm:
push {r4-r11, lr}
m_gf256v_mulscalar_asm
pop {r4-r11, pc}

//void gf256v_mul_0x80_asm( sto_t *c, const sto_t *a)
.global gf256v_mul_0x80_asm
.type gf256v_mul_0x80_asm, %function
gf256v_mul_0x80_asm:
push {r4, r5, r10, r11, lr}
ptr_c .req r0
Expand Down Expand Up @@ -732,13 +743,15 @@ c_7 .req r14

//void gf216v_mul( sto_t *c, const sto_t *a , const sto_t *b )
.global gf216v_mul_asm
.type gf216v_mul_asm, %function
gf216v_mul_asm:
push {r4-r11, lr}
m_gf216v_mul
pop {r4-r11, pc}

//void void gf216v_mul_0x8000_asm( sto_t *c, const sto_t *a )
.global gf216v_mul_0x8000_asm
.type gf216v_mul_0x8000_asm, %function
gf216v_mul_0x8000_asm:
push {r4-r11, lr}
m_gf216v_mul_0x8000
Expand Down Expand Up @@ -920,6 +933,7 @@ buf3 .req r14

//void gf232v_mul( sto_t *c, const sto_t *a , const sto_t *b )
.global gf232v_mul_asm
.type gf232v_mul_asm, %function
gf232v_mul_asm:
push {r4-r11, lr}
vpush {s16-s19}
Expand All @@ -930,6 +944,7 @@ gf232v_mul_asm:

//void void gf232v_mul_0x2_asm( sto_t *c, const sto_t *a )
.global gf232v_mul_0x2_asm
.type gf232v_mul_0x2_asm, %function
gf232v_mul_0x2_asm:
push {r4, r5, r10, r11, lr}
ptr_c .req r0
Expand Down Expand Up @@ -964,6 +979,7 @@ c_7 .req r14

// void gf232v_mul_0x5_asm( sto_t *c, const sto_t *a )
.global gf232v_mul_0x5_asm
.type gf232v_mul_0x5_asm, %function
gf232v_mul_0x5_asm:
push {r4, r5, r10, r11, lr}
ptr_c .req r0
Expand Down Expand Up @@ -998,6 +1014,7 @@ c_7 .req r14

// void gf232v_mul_gf16_asm( sto_t *c, const sto_t *a , const sto_t *b_gf16 )
.global gf232v_mul_gf16_asm
.type gf232v_mul_gf16_asm, %function
gf232v_mul_gf16_asm:
push {r4-r11, lr}
ptr_c .req r0
Expand Down Expand Up @@ -1125,6 +1142,7 @@ buf0 .req r14

// void gf232v_mul_gf256_asm( sto_t *c, const sto_t *a , const sto_t *b_gf256 )
.global gf232v_mul_gf256_asm
.type gf232v_mul_gf256_asm, %function
gf232v_mul_gf256_asm:
push {r4-r11, lr}
push {r1, r2}
Expand All @@ -1145,6 +1163,7 @@ gf232v_mul_gf256_asm:

// void gf232v_mul_gf216_asm( sto_t *c, const sto_t *a , const sto_t *b_gf216 )
.global gf232v_mul_gf216_asm
.type gf232v_mul_gf216_asm, %function
gf232v_mul_gf216_asm:
push {r4-r11, lr}
push {r0, r1, r2}
Expand All @@ -1157,6 +1176,7 @@ gf232v_mul_gf216_asm:

// void gf232v_mulscalar_gf16_asm( sto_t *c, const sto_t *a , uint8_t b )
.global gf232v_mulscalar_gf16_asm
.type gf232v_mulscalar_gf16_asm, %function
gf232v_mulscalar_gf16_asm:
push {r4-r11, lr}
ptr_c .req r0
Expand Down Expand Up @@ -1239,6 +1259,7 @@ buf2 .req r14

// void gf232v_mulscalar_gf256_asm( sto_t *c, const sto_t *a , uint8_t b )
.global gf232v_mulscalar_gf256_asm
.type gf232v_mulscalar_gf256_asm, %function
gf232v_mulscalar_gf256_asm:
push {r4-r11, lr}
vmov s5, r2
Expand All @@ -1259,6 +1280,7 @@ gf232v_mulscalar_gf256_asm:

// void gf232v_mulscalar_asm( sto_t *c, const sto_t *a , uint32_t _b );
.global gf232v_mulscalar_asm
.type gf232v_mulscalar_asm, %function
gf232v_mulscalar_asm:
push {r4-r11, lr}
vpush {s16-s19}
Expand Down
1 change: 1 addition & 0 deletions crypto_kem/bikel3/m4f/cshift.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

// void cshift_asm(uint32_t *array, int s)
.global cshift_asm
.type cshift_asm, %function
cshift_asm:
ptr_a .req r0
s .req r1
Expand Down
Loading
Loading