mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/hal_memcpy' into 'master' 

fix(hal): Fix incorrect behavior of hal_memcpy

Closes IDFGH-11341

See merge request espressif/esp-idf!26801
pull/12525/head
Jiang Jiang Jian 2023-11-06 11:31:13 +08:00
rodzic 9489e8a984 b366dad79b
commit 25f729c758
1 zmienionych plików z 3 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
components/hal/platform_port/include/hal/misc.h
Wyświetl plik

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -66,11 +66,7 @@ extern "C" {
* @param len The number of bytes to be copied * @param len The number of bytes to be copied
* @return a pointer to destination * @return a pointer to destination
*/ */
__attribute__((always_inline)) static inline void *hal_memcpy(void *dst_mem, const void *src_mem, size_t len) #define hal_memcpy(dst_mem, src_mem, len) (__extension__({memcpy(dst_mem, src_mem, len);}))
{
asm("" : "+r"(dst_mem), "+r"(src_mem));
return memcpy(dst_mem, src_mem, len);
}
/** /**
* @brief Sets the first num bytes of the block of memory pointed by ptr to the specified value * @brief Sets the first num bytes of the block of memory pointed by ptr to the specified value
@ -82,11 +78,7 @@ __attribute__((always_inline)) static inline void *hal_memcpy(void *dst_mem, con
* @param len The number of bytes to be copied * @param len The number of bytes to be copied
* @return a pointer to the memory area * @return a pointer to the memory area
*/ */
__attribute__((always_inline)) static inline void *hal_memset(void *dst_mem, int value, size_t len) #define hal_memset(dst_mem, value, len) (__extension__({memset(dst_mem, value, len);}))
{
asm("" : "+r"(dst_mem));
return memset(dst_mem, value, len);
}
#ifdef __cplusplus #ifdef __cplusplus
} }