Delegate to fptr helpers must be in IRAM

dok-net · dok-net · commit d855cbd3489f · 2021-06-28T12:48:37.000+02:00
diff --git a/cores/esp8266/Delegate.h b/cores/esp8266/Delegate.h
@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 namespace detail
 {
     template<typename R, typename... P>
-    static R vPtrToFunPtrExec(void* fn, P... args)
+    static R IRAM_ATTR vPtrToFunPtrExec(void* fn, P... args)
     {
         using target_type = R(P...);
         return reinterpret_cast<target_type*>(fn)(std::forward<P...>(args...));
@@ -296,7 +296,7 @@ namespace detail
             }
         }
 
-        static R vPtrToFunAPtrExec(void* self, P... args)
+        static R IRAM_ATTR vPtrToFunAPtrExec(void* self, P... args)
         {
             return static_cast<DelegatePImpl*>(self)->fnA(
                 static_cast<DelegatePImpl*>(self)->obj,
@@ -525,7 +525,7 @@ namespace detail
             }
         }
 
-        static R vPtrToFunAPtrExec(void* self, P... args)
+        static R IRAM_ATTR vPtrToFunAPtrExec(void* self, P... args)
         {
             return static_cast<DelegatePImpl*>(self)->fnA(
                 static_cast<DelegatePImpl*>(self)->obj,
@@ -1144,7 +1144,7 @@ namespace detail
             }
         }
 
-        static R vPtrToFunAPtrExec(void* self)
+        static R IRAM_ATTR vPtrToFunAPtrExec(void* self)
         {
             return static_cast<DelegateImpl*>(self)->fnA(
                 static_cast<DelegateImpl*>(self)->obj);
@@ -1372,7 +1372,7 @@ namespace detail
             }
         }
 
-        static R vPtrToFunAPtrExec(void* self)
+        static R IRAM_ATTR vPtrToFunAPtrExec(void* self)
         {
             return static_cast<DelegateImpl*>(self)->fnA(
                 static_cast<DelegateImpl*>(self)->obj);

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA`
`39`	`39`	`namespace detail`
`40`	`40`	`{`
`41`	`41`	`template<typename R, typename... P>`
`42`		`- static R vPtrToFunPtrExec(void* fn, P... args)`
	`42`	`+ static R IRAM_ATTR vPtrToFunPtrExec(void* fn, P... args)`
`43`	`43`	`{`
`44`	`44`	`using target_type = R(P...);`
`45`	`45`	`return reinterpret_cast<target_type*>(fn)(std::forward<P...>(args...));`
`@@ -296,7 +296,7 @@ namespace detail`
`296`	`296`	`}`
`297`	`297`	`}`
`298`	`298`
`299`		`- static R vPtrToFunAPtrExec(void* self, P... args)`
	`299`	`+ static R IRAM_ATTR vPtrToFunAPtrExec(void* self, P... args)`
`300`	`300`	`{`
`301`	`301`	`return static_cast<DelegatePImpl*>(self)->fnA(`
`302`	`302`	`static_cast<DelegatePImpl*>(self)->obj,`
`@@ -525,7 +525,7 @@ namespace detail`
`525`	`525`	`}`
`526`	`526`	`}`
`527`	`527`
`528`		`- static R vPtrToFunAPtrExec(void* self, P... args)`
	`528`	`+ static R IRAM_ATTR vPtrToFunAPtrExec(void* self, P... args)`
`529`	`529`	`{`
`530`	`530`	`return static_cast<DelegatePImpl*>(self)->fnA(`
`531`	`531`	`static_cast<DelegatePImpl*>(self)->obj,`
`@@ -1144,7 +1144,7 @@ namespace detail`
`1144`	`1144`	`}`
`1145`	`1145`	`}`
`1146`	`1146`
`1147`		`- static R vPtrToFunAPtrExec(void* self)`
	`1147`	`+ static R IRAM_ATTR vPtrToFunAPtrExec(void* self)`
`1148`	`1148`	`{`
`1149`	`1149`	`return static_cast<DelegateImpl*>(self)->fnA(`
`1150`	`1150`	`static_cast<DelegateImpl*>(self)->obj);`
`@@ -1372,7 +1372,7 @@ namespace detail`
`1372`	`1372`	`}`
`1373`	`1373`	`}`
`1374`	`1374`
`1375`		`- static R vPtrToFunAPtrExec(void* self)`
	`1375`	`+ static R IRAM_ATTR vPtrToFunAPtrExec(void* self)`
`1376`	`1376`	`{`
`1377`	`1377`	`return static_cast<DelegateImpl*>(self)->fnA(`
`1378`	`1378`	`static_cast<DelegateImpl*>(self)->obj);`