|
19 | 19 | #include <stdlib.h>
|
20 | 20 | #include <assert.h>
|
21 | 21 | #include <debug.h>
|
22 |
| -extern "C" { |
23 |
| -#include "ets_sys.h" |
24 |
| -#include "os_type.h" |
25 |
| -#include "osapi.h" |
26 |
| -#include "mem.h" |
27 |
| -} |
28 | 22 | #include <Arduino.h>
|
29 | 23 | #include <cxxabi.h>
|
30 | 24 |
|
31 | 25 | using __cxxabiv1::__guard;
|
32 | 26 |
|
33 |
| -void *operator new(size_t size) { |
34 |
| - size = ((size + 3) & ~((size_t)0x3)); |
35 |
| - return os_malloc(size); |
| 27 | +void *operator new(size_t size) |
| 28 | +{ |
| 29 | + return malloc(size); |
36 | 30 | }
|
37 | 31 |
|
38 |
| -void *operator new[](size_t size) { |
39 |
| - size = ((size + 3) & ~((size_t)0x3)); |
40 |
| - return os_malloc(size); |
| 32 | +void *operator new[](size_t size) |
| 33 | +{ |
| 34 | + return malloc(size); |
41 | 35 | }
|
42 | 36 |
|
43 |
| -void operator delete(void * ptr) { |
44 |
| - os_free(ptr); |
| 37 | +void operator delete(void * ptr) |
| 38 | +{ |
| 39 | + free(ptr); |
45 | 40 | }
|
46 | 41 |
|
47 |
| -void operator delete[](void * ptr) { |
48 |
| - os_free(ptr); |
| 42 | +void operator delete[](void * ptr) |
| 43 | +{ |
| 44 | + free(ptr); |
49 | 45 | }
|
50 | 46 |
|
51 | 47 | extern "C" void __cxa_pure_virtual(void) __attribute__ ((__noreturn__));
|
52 | 48 | extern "C" void __cxa_deleted_virtual(void) __attribute__ ((__noreturn__));
|
53 | 49 |
|
54 |
| -void __cxa_pure_virtual(void) { |
| 50 | +void __cxa_pure_virtual(void) |
| 51 | +{ |
55 | 52 | panic();
|
56 | 53 | }
|
57 | 54 |
|
58 |
| -void __cxa_deleted_virtual(void) { |
| 55 | +void __cxa_deleted_virtual(void) |
| 56 | +{ |
59 | 57 | panic();
|
60 | 58 | }
|
61 | 59 |
|
@@ -87,20 +85,25 @@ extern "C" void __cxa_guard_abort(__guard* pg)
|
87 | 85 | }
|
88 | 86 |
|
89 | 87 |
|
90 |
| -namespace std { |
91 |
| -void __throw_bad_function_call() { |
| 88 | +namespace std |
| 89 | +{ |
| 90 | +void __throw_bad_function_call() |
| 91 | +{ |
92 | 92 | panic();
|
93 | 93 | }
|
94 | 94 |
|
95 |
| -void __throw_length_error(char const*) { |
| 95 | +void __throw_length_error(char const*) |
| 96 | +{ |
96 | 97 | panic();
|
97 | 98 | }
|
98 | 99 |
|
99 |
| -void __throw_bad_alloc() { |
| 100 | +void __throw_bad_alloc() |
| 101 | +{ |
100 | 102 | panic();
|
101 | 103 | }
|
102 | 104 |
|
103 |
| -void __throw_logic_error(const char* str) { |
| 105 | +void __throw_logic_error(const char* str) |
| 106 | +{ |
104 | 107 | panic();
|
105 | 108 | }
|
106 | 109 | }
|
|
0 commit comments