feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/__atomic_test_and_set' into 'release/v5.3'

Browse Source 
fix(newlib): fix __atomic_test_and_set to ensure atomicity

See merge request espressif/esp-idf!36707
This commit is contained in:
Alexey Gerenkov
2025-02-12 21:52:48 +08:00
parent f46d4f6c1c 88bbf875bd
commit 6fc456715f
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/newlib/platform_include/stdatomic.h Normal file
View File

@@ -0,0 +1,24 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#include_next "stdatomic.h"
#ifndef __clang__
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif
static inline bool __atomic_test_and_set(volatile void *ptr, int memorder)
{
return __atomic_exchange_1((bool *)ptr, true, memorder);
}
#ifdef __cplusplus
}
#endif
#endif

17
components/newlib/test_apps/newlib/main/test_stdatomic.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Unlicense OR CC0-1.0 * SPDX-License-Identifier: Unlicense OR CC0-1.0
*/ */
@@ -26,6 +26,19 @@ atomic_uint *g_atomic32;
atomic_ushort *g_atomic16; atomic_ushort *g_atomic16;
atomic_uchar *g_atomic8; atomic_uchar *g_atomic8;
TEST_CASE("stdatomic - test_atomic_flag", "[newlib_stdatomic]")
{
bool x8 = 0;
g_atomic8 = heap_caps_calloc(sizeof(*g_atomic8), 1, MALLOC_CAP_DEFAULT);
x8 = atomic_flag_test_and_set(g_atomic8);
TEST_ASSERT_EQUAL_HEX8(0x00, x8);
TEST_ASSERT_EQUAL_HEX8(0x01, *g_atomic8);
atomic_flag_clear(g_atomic8);
TEST_ASSERT_EQUAL_HEX8(0x00, *g_atomic8);
free(g_atomic8);
}
TEST_CASE("stdatomic - test_64bit_atomics", "[newlib_stdatomic]") TEST_CASE("stdatomic - test_64bit_atomics", "[newlib_stdatomic]")
{ {
unsigned long long x64 = 0; unsigned long long x64 = 0;
@@ -262,7 +275,7 @@ TEST_CASE("stdatomic - test_" #NAME, "[newlib_stdatomic]")
free(var_##NAME); \ free(var_##NAME); \
} }
// Note that the assert at the end is doing an excat bitwise comparison. // Note that the assert at the end is doing an exact bitwise comparison.
// This easily can fail due to rounding errors. However, there is currently // This easily can fail due to rounding errors. However, there is currently
// no corresponding Unity assert macro for long double. USE THIS WITH CARE! // no corresponding Unity assert macro for long double. USE THIS WITH CARE!
#define TEST_RACE_OPERATION_LONG_DOUBLE(NAME, LHSTYPE, PRE, POST, INIT, FINAL) \ #define TEST_RACE_OPERATION_LONG_DOUBLE(NAME, LHSTYPE, PRE, POST, INIT, FINAL) \