Skip to content
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

Fix: Replace attribute alias in CRC32 #1713

Merged
merged 2 commits into from
Jan 4, 2024
Merged

Fix: Replace attribute alias in CRC32 #1713

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
308d5b2
crc32: Replace attribute alias with a function wrapper and macros
ALTracer Jan 4, 2024
12c0da7
crc32: Move perf logging into the shim
ALTracer Jan 4, 2024
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
18 changes: 12 additions & 6 deletions src/crc32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static uint32_t crc32_calc(const uint32_t crc, const uint8_t data)
return (crc << 8U) ^ crc32_table[((crc >> 24U) ^ data) & 0xffU];
}

bool generic_crc32(target_s *const target, uint32_t *const result, const uint32_t base, const size_t len)
static bool generic_crc32(target_s *const target, uint32_t *const result, const uint32_t base, const size_t len)
dragonmux marked this conversation as resolved.
Show resolved Hide resolved
{
uint32_t crc = 0xffffffffU;
#if PC_HOSTED == 1
Expand Down Expand Up @@ -147,13 +147,11 @@ bool generic_crc32(target_s *const target, uint32_t *const result, const uint32_
return true;
}

__attribute__((alias("generic_crc32"))) bool bmd_crc32(
target_s *const target, uint32_t *const result, const uint32_t base, const size_t len);
#else
#include <libopencm3/stm32/crc.h>
#include "buffer_utils.h"

bool stm32_crc32(target_s *const target, uint32_t *const result, const uint32_t base, const size_t len)
static bool stm32_crc32(target_s *const target, uint32_t *const result, const uint32_t base, const size_t len)
{
uint8_t bytes[1024U]; /* ADIv5 MEM-AP AutoInc range */

Expand Down Expand Up @@ -212,7 +210,15 @@ bool stm32_crc32(target_s *const target, uint32_t *const result, const uint32_t
*result = crc;
return true;
}
#endif

__attribute__((alias("stm32_crc32"))) bool bmd_crc32(
target_s *const target, uint32_t *const result, const uint32_t base, const size_t len);
/* Shim to dispatch host-specific implementation (and keep the `__func__` meaningful) */
bool bmd_crc32(target_s *const target, uint32_t *const result, const uint32_t base, const size_t len)
{
#if !defined(STM32F0) && !defined(STM32F1) && !defined(STM32F2) && !defined(STM32F3) && !defined(STM32F4) && \
!defined(STM32F7) && !defined(STM32L0) && !defined(STM32L1) && !defined(STM32G0) && !defined(STM32G4)
return generic_crc32(target, result, base, len);
#else
return stm32_crc32(target, result, base, len);
#endif
}