mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-01 03:34:32 +02:00
toolchain: C++ exception workaround
* disable C++ exception FDE sorting (saves RAM) Closes IDF-1128
This commit is contained in:
committed by
Anton Maklakov
parent
c7ba54ed73
commit
89523af91f
@@ -44,16 +44,17 @@ TEST_CASE("can use std::vector", "[cxx]")
|
|||||||
TEST_ASSERT_EQUAL(51, std::accumulate(std::begin(v), std::end(v), 0));
|
TEST_ASSERT_EQUAL(51, std::accumulate(std::begin(v), std::end(v), 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Note: When first exception (in system) is thrown this test produces memory leaks report (~500 bytes):
|
/* Note: When first exception (in system) is thrown this test produces memory leaks report (~300 bytes):
|
||||||
- 392 bytes (can vary) as libunwind allocates memory to keep stack frames info to handle exceptions.
|
- 392 bytes (can vary) as libunwind allocates memory to keep stack frames info to handle exceptions.
|
||||||
This info is kept until global destructors are called by __do_global_dtors_aux()
|
This info is kept until global destructors are called by __do_global_dtors_aux()
|
||||||
- 8 bytes are allocated by __cxa_get_globals() to keep __cxa_eh_globals
|
- 8 bytes are allocated by __cxa_get_globals() to keep __cxa_eh_globals
|
||||||
- 16 bytes are allocated by pthread_setspecific() which is called by __cxa_get_globals() to init TLS var for __cxa_eh_globals
|
- 16 bytes are allocated by pthread_setspecific() which is called by __cxa_get_globals() to init TLS var for __cxa_eh_globals
|
||||||
- 88 bytes are allocated by pthread_setspecific() to init internal lock
|
- 88 bytes are allocated by pthread_setspecific() to init internal lock
|
||||||
|
- some more memory...
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS
|
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS
|
||||||
|
|
||||||
TEST_CASE("c++ exceptions work", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ exceptions work", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
int thrown_value;
|
int thrown_value;
|
||||||
try {
|
try {
|
||||||
@@ -65,7 +66,7 @@ TEST_CASE("c++ exceptions work", "[cxx] [exceptions] [leaks=800]")
|
|||||||
printf("OK?\n");
|
printf("OK?\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("c++ bool exception", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ bool exception", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
bool thrown_value = false;
|
bool thrown_value = false;
|
||||||
try {
|
try {
|
||||||
@@ -77,7 +78,7 @@ TEST_CASE("c++ bool exception", "[cxx] [exceptions] [leaks=800]")
|
|||||||
printf("OK?\n");
|
printf("OK?\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("c++ void exception", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ void exception", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
void* thrown_value = 0;
|
void* thrown_value = 0;
|
||||||
try {
|
try {
|
||||||
@@ -89,7 +90,7 @@ TEST_CASE("c++ void exception", "[cxx] [exceptions] [leaks=800]")
|
|||||||
printf("OK?\n");
|
printf("OK?\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("c++ uint64_t exception", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ uint64_t exception", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
uint64_t thrown_value = 0;
|
uint64_t thrown_value = 0;
|
||||||
try {
|
try {
|
||||||
@@ -101,7 +102,7 @@ TEST_CASE("c++ uint64_t exception", "[cxx] [exceptions] [leaks=800]")
|
|||||||
printf("OK?\n");
|
printf("OK?\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("c++ char exception", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ char exception", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
char thrown_value = '0';
|
char thrown_value = '0';
|
||||||
try {
|
try {
|
||||||
@@ -113,7 +114,7 @@ TEST_CASE("c++ char exception", "[cxx] [exceptions] [leaks=800]")
|
|||||||
printf("OK?\n");
|
printf("OK?\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("c++ wchar exception", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ wchar exception", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
wchar_t thrown_value = 0;
|
wchar_t thrown_value = 0;
|
||||||
try {
|
try {
|
||||||
@@ -125,7 +126,7 @@ TEST_CASE("c++ wchar exception", "[cxx] [exceptions] [leaks=800]")
|
|||||||
printf("OK?\n");
|
printf("OK?\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("c++ float exception", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ float exception", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
float thrown_value = 0;
|
float thrown_value = 0;
|
||||||
try {
|
try {
|
||||||
@@ -137,7 +138,7 @@ TEST_CASE("c++ float exception", "[cxx] [exceptions] [leaks=800]")
|
|||||||
printf("OK?\n");
|
printf("OK?\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("c++ double exception", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ double exception", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
double thrown_value = 0;
|
double thrown_value = 0;
|
||||||
try {
|
try {
|
||||||
@@ -149,7 +150,7 @@ TEST_CASE("c++ double exception", "[cxx] [exceptions] [leaks=800]")
|
|||||||
printf("OK?\n");
|
printf("OK?\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("c++ const char* exception", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ const char* exception", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
const char *thrown_value = 0;
|
const char *thrown_value = 0;
|
||||||
try {
|
try {
|
||||||
@@ -167,7 +168,7 @@ public:
|
|||||||
NonExcTypeThrowee(int value) : value(value) { }
|
NonExcTypeThrowee(int value) : value(value) { }
|
||||||
};
|
};
|
||||||
|
|
||||||
TEST_CASE("c++ any class exception", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ any class exception", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
int thrown_value = 0;
|
int thrown_value = 0;
|
||||||
try {
|
try {
|
||||||
@@ -185,7 +186,7 @@ public:
|
|||||||
ExcTypeThrowee(int value) : value(value) { }
|
ExcTypeThrowee(int value) : value(value) { }
|
||||||
};
|
};
|
||||||
|
|
||||||
TEST_CASE("c++ std::exception child", "[cxx] [exceptions] [leaks=800]")
|
TEST_CASE("c++ std::exception child", "[cxx] [exceptions] [leaks=300]")
|
||||||
{
|
{
|
||||||
int thrown_value = 0;
|
int thrown_value = 0;
|
||||||
try {
|
try {
|
||||||
@@ -197,7 +198,7 @@ TEST_CASE("c++ std::exception child", "[cxx] [exceptions] [leaks=800]")
|
|||||||
printf("OK?\n");
|
printf("OK?\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("c++ exceptions emergency pool", "[cxx] [exceptions] [ignore]")
|
TEST_CASE("c++ exceptions emergency pool", "[cxx] [exceptions] [ignore] [leaks=300]")
|
||||||
{
|
{
|
||||||
void **p, **pprev = NULL;
|
void **p, **pprev = NULL;
|
||||||
int thrown_value = 0;
|
int thrown_value = 0;
|
||||||
|
@@ -112,6 +112,11 @@ struct object { long placeholder[ 10 ]; };
|
|||||||
void __register_frame_info (const void *begin, struct object *ob);
|
void __register_frame_info (const void *begin, struct object *ob);
|
||||||
extern char __eh_frame[];
|
extern char __eh_frame[];
|
||||||
|
|
||||||
|
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS
|
||||||
|
// workaround for C++ exception large memory allocation
|
||||||
|
void _Unwind_SetEnableExceptionFdeSorting(unsigned char enable);
|
||||||
|
#endif // CONFIG_COMPILER_CXX_EXCEPTIONS
|
||||||
|
|
||||||
//If CONFIG_SPIRAM_IGNORE_NOTFOUND is set and external RAM is not found or errors out on testing, this is set to false.
|
//If CONFIG_SPIRAM_IGNORE_NOTFOUND is set and external RAM is not found or errors out on testing, this is set to false.
|
||||||
static bool s_spiram_okay=true;
|
static bool s_spiram_okay=true;
|
||||||
|
|
||||||
@@ -386,6 +391,12 @@ void start_cpu0_default(void)
|
|||||||
assert(err == ESP_OK && "Failed to init pthread module!");
|
assert(err == ESP_OK && "Failed to init pthread module!");
|
||||||
|
|
||||||
do_global_ctors();
|
do_global_ctors();
|
||||||
|
|
||||||
|
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS
|
||||||
|
ESP_EARLY_LOGD(TAG, "Setting C++ exception workarounds.");
|
||||||
|
_Unwind_SetEnableExceptionFdeSorting(0);
|
||||||
|
#endif // CONFIG_COMPILER_CXX_EXCEPTIONS
|
||||||
|
|
||||||
#if CONFIG_ESP_INT_WDT
|
#if CONFIG_ESP_INT_WDT
|
||||||
esp_int_wdt_init();
|
esp_int_wdt_init();
|
||||||
//Initialize the interrupt watch dog for CPU0.
|
//Initialize the interrupt watch dog for CPU0.
|
||||||
|
@@ -97,6 +97,11 @@ struct object { long placeholder[ 10 ]; };
|
|||||||
void __register_frame_info (const void *begin, struct object *ob);
|
void __register_frame_info (const void *begin, struct object *ob);
|
||||||
extern char __eh_frame[];
|
extern char __eh_frame[];
|
||||||
|
|
||||||
|
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS
|
||||||
|
// workaround for C++ exception large memory allocation
|
||||||
|
void _Unwind_SetEnableExceptionFdeSorting(unsigned char enable);
|
||||||
|
#endif // CONFIG_COMPILER_CXX_EXCEPTIONS
|
||||||
|
|
||||||
//If CONFIG_SPIRAM_IGNORE_NOTFOUND is set and external RAM is not found or errors out on testing, this is set to false.
|
//If CONFIG_SPIRAM_IGNORE_NOTFOUND is set and external RAM is not found or errors out on testing, this is set to false.
|
||||||
static bool s_spiram_okay=true;
|
static bool s_spiram_okay=true;
|
||||||
|
|
||||||
@@ -311,6 +316,12 @@ void start_cpu0_default(void)
|
|||||||
assert(err == ESP_OK && "Failed to init pthread module!");
|
assert(err == ESP_OK && "Failed to init pthread module!");
|
||||||
|
|
||||||
do_global_ctors();
|
do_global_ctors();
|
||||||
|
|
||||||
|
#ifdef CONFIG_COMPILER_CXX_EXCEPTIONS
|
||||||
|
ESP_EARLY_LOGD(TAG, "Setting C++ exception workarounds.");
|
||||||
|
_Unwind_SetEnableExceptionFdeSorting(0);
|
||||||
|
#endif // CONFIG_COMPILER_CXX_EXCEPTIONS
|
||||||
|
|
||||||
#if CONFIG_ESP_INT_WDT
|
#if CONFIG_ESP_INT_WDT
|
||||||
esp_int_wdt_init();
|
esp_int_wdt_init();
|
||||||
//Initialize the interrupt watch dog
|
//Initialize the interrupt watch dog
|
||||||
|
Reference in New Issue
Block a user