espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/force_u32_macro_cpp_typeof' into 'master'

Browse Source 
HAL: Fix Force U32 macros for C++ typeof()

Closes IDF-3862

See merge request espressif/esp-idf!15066
This commit is contained in:
morris
2021-09-07 16:08:44 +00:00
parent dc71fa895d 14fe6dcaaf
commit fbc81c3d44
1 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
components/hal/platform_port/include/hal/misc.h
View File

@@ -19,20 +19,41 @@
/** @cond */ //Doxy command to hide preprocessor definitions from docs */ /** @cond */ //Doxy command to hide preprocessor definitions from docs */
// In case the compiler optimise a 32bit instruction (e.g. s32i) into 8/16bit instruction with size optimization enabled /**
// which is not allowed on s2 and later chips (s2, s3, c3, h2) * @brief Macro to force a 32-bit read, modify, then write on a peripheral register
// use these wrappers for manually read-modify-write with l32i and s32i *
* Due to a GCC bug, the compiler may still try to optimize read/writes to peripheral register fields by using 8/16 bit
// modify register as uint32_t * access, even if they are marked volatile (i.e., -fstrict-volatile-bitfields has no effect).
#define HAL_FORCE_MODIFY_U32_REG_FIELD(base_reg, field, val) \ *
* For ESP chips, the peripheral bus only allows 32-bit read/writes. The following macro works around the compiler issue
* by forcing a 32-bit read/modify/write.
*
* @note This macro should only be called on register fields of xxx_struct.h type headers, as it depends on the presence
* of a 'val' field of the register union.
* @note Current implementation reads into a uint32_t instead of copy base_reg direclty to temp_reg. The reason being
* that C++ does not create a copy constructor for volatile structs.
*/
#define HAL_FORCE_MODIFY_U32_REG_FIELD(base_reg, reg_field, field_val) \
{ \ { \
typeof(base_reg) temp_reg = (base_reg); \ uint32_t temp_val = base_reg.val; \
temp_reg.field = (val); \ typeof(base_reg) temp_reg; \
(base_reg) = temp_reg; \ temp_reg.val = temp_val; \
temp_reg.reg_field = (field_val); \
(base_reg).val = temp_reg.val; \
} }
// read register as uint32_t /**
#define HAL_FORCE_READ_U32_REG_FIELD(base_reg, field) \ * @brief Macro to force a 32-bit read on a peripheral register
( ((typeof(base_reg))((base_reg).val)).field ) *
* @note This macro should only be called on register fields of xxx_struct.h type headers. See description above for
* more details.
* @note Current implementation reads into a uint32_t. See description above for more details.
*/
#define HAL_FORCE_READ_U32_REG_FIELD(base_reg, reg_field) ({ \
uint32_t temp_val = base_reg.val; \
typeof(base_reg) temp_reg; \
temp_reg.val = temp_val; \
temp_reg.reg_field; \
})
/** @endcond */ /** @endcond */