Skip to content

Commit

Permalink
Implement static initialization guards (#500)
Browse files Browse the repository at this point in the history
  • Loading branch information
igrr committed Feb 5, 2016
1 parent b5684b4 commit 6fc1417
Showing 1 changed file with 31 additions and 0 deletions.
31 changes: 31 additions & 0 deletions cores/esp8266/abi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ extern "C" {
#include "osapi.h"
#include "mem.h"
}
#include <Arduino.h>
#include <cxxabi.h>

using __cxxabiv1::__guard;

void *operator new(size_t size) {
size = ((size + 3) & ~((size_t)0x3));
Expand Down Expand Up @@ -56,6 +59,34 @@ void __cxa_deleted_virtual(void) {
panic();
}

typedef struct {
uint8_t guard;
uint8_t ps;
} guard_t;

extern "C" int __cxa_guard_acquire(__guard* pg)
{
uint8_t ps = xt_rsil(15);
if (reinterpret_cast<guard_t*>(pg)->guard) {
xt_wsr_ps(ps);
return 0;
}
reinterpret_cast<guard_t*>(pg)->ps = ps;
return 1;
}

extern "C" void __cxa_guard_release(__guard* pg)
{
reinterpret_cast<guard_t*>(pg)->guard = 1;
xt_wsr_ps(reinterpret_cast<guard_t*>(pg)->ps);
}

extern "C" void __cxa_guard_abort(__guard* pg)
{
xt_wsr_ps(reinterpret_cast<guard_t*>(pg)->ps);
}


namespace std {
void __throw_bad_function_call() {
panic();
Expand Down

0 comments on commit 6fc1417

Please sign in to comment.