Merge pull request #10 from geky/master

Added improved FuncPtr type

hal/api/FunctionPointer.h

@@ -21,38 +21,566 @@
 
 namespace mbed {
 
-/* If we had variaditic templates, this wouldn't be a problem, but until C++11 is enabled, we are stuck with multiple classes... */
+// Reusable FuncPtr class based on template specialization
+template <typename F>
+class FuncPtr;
 
 /** A class for storing and calling a pointer to a static or member function
  */
-template <typename R, typename A1>
+template <typename R, typename A1, typename A2, typename A3, typename A4>
-class FunctionPointerArg1{
+class FuncPtr<R(A1, A2, A3, A4)> {
 public:
-    /** Create a FunctionPointer, attaching a static function
+    /** Create a FuncPtr, attaching a static function
      *
      *  @param function The static function to attach (default is none)
      */
-    FunctionPointerArg1(R (*function)(A1) = 0) {
+    FuncPtr(R (*function)(A1, A2, A3, A4) = 0) {
         attach(function);
     }
 
-    /** Create a FunctionPointer, attaching a member function
+    /** Create a FuncPtr, attaching a static function with bound pointer
+     *
+     *  @param object Pointer to object to bind to function
+     *  @param function The static function to attach
+     */
+    template<typename T>
+    FuncPtr(T *object, R (*function)(T*, A1, A2, A3, A4)) {
+        attach(object, function);
+    }
+
+    /** Create a FuncPtr, attaching a member function
      *
      *  @param object The object pointer to invoke the member function on (i.e. the this pointer)
      *  @param function The address of the member function to attach
      */
     template<typename T>
-    FunctionPointerArg1(T *object, R (T::*member)(A1)) {
+    FuncPtr(T *object, R (T::*member)(A1, A2, A3, A4)) {
         attach(object, member);
     }
 
+    /** Create a FuncPtr, attaching a function object
+     *
+     *  @param object Pointer to a function object to attach
+     */
+    template<typename T>
+    FuncPtr(T *object) {
+        attach(object, &T::operator());
+    }
+
+    /** Create a FuncPtr from another FuncPtr
+     *
+     *  @param func The func to attach
+     */
+    FuncPtr(const FuncPtr<R(A1, A2, A3, A4)> &func) {
+        attach(func);
+    }
+
+    /** Attach a static function
+     *
+     *  @param function The static function to attach (default is none)
+     */
+    void attach(R (*function)(A1, A2, A3, A4)) {
+        _object = 0;
+        memcpy(&_function, &function, sizeof function);
+        _thunk = &FuncPtr::staticthunk;
+    }
+
+    /** Attach a static function with bound pointer
+     *
+     *  @param object Pointer to object to bind to function
+     *  @param function The static function to attach
+     */
+    template <typename T>
+    void attach(T *object, R (*function)(T*, A1, A2, A3, A4)) {
+        _object = static_cast<void*>(object);
+        memcpy(&_function, &function, sizeof function);
+        _thunk = &FuncPtr::boundthunk<T>;
+    }
+
+    /** Attach a member function
+     *
+     *  @param object The object pointer to invoke the member function on (i.e. the this pointer)
+     *  @param function The address of the member function to attach
+     */
+    template<typename T>
+    void attach(T *object, R (T::*method)(A1, A2, A3, A4)) {
+        _object = static_cast<void*>(object);
+        memcpy(&_function, &method, sizeof method);
+        _thunk = &FuncPtr::methodthunk<T>;
+    }
+
+    /** Attach a function object
+     *
+     *  @param object Pointer to a function object to attach
+     */
+    template<typename T>
+    void attach(T *object) {
+        attach(object, &T::operator());
+    }
+
+    /** Attach a FuncPtr
+     *
+     *  @param func The func to attach
+     */
+    void attach(const FuncPtr<R(A1, A2, A3, A4)> &func) {
+        _object = func._object;
+        memcpy(&_function, &func._function, sizeof _function);
+        _thunk = func._thunk;
+    }
+
+    /** Call the attached static or member function
+     */
+    R call(A1 a1, A2 a2, A3 a3, A4 a4) {
+        return _thunk(_object, _function, a1, a2, a3, a4);
+    }
+
+    /** Get registered static function
+     */
+    R (*get_function(A1, A2, A3, A4))() {
+        return reinterpret_cast<R (*)(A1, A2, A3, A4)>(_object ? 0 : _function);
+    }
+
+#ifdef MBED_OPERATORS
+    R operator ()(A1 a1, A2 a2, A3 a3, A4 a4) {
+        return call(a1, a2, a3, a4);
+    }
+    operator bool(void) const {
+        return static_cast<bool>(_function);
+    }
+#endif
+private:
+    // Static thunks for various function types
+    static R staticthunk(void*, void *func, A1 a1, A2 a2, A3 a3, A4 a4) {
+        R (*f)(A1, A2, A3, A4) = *reinterpret_cast<R (**)(A1, A2, A3, A4)>(func);
+        return f(a1, a2, a3, a4);
+    }
+
+    template<typename T>
+    static R boundthunk(void *object, void *func, A1 a1, A2 a2, A3 a3, A4 a4) {
+        T *o = static_cast<T*>(object);
+        R (*f)(T*, A1, A2, A3, A4) = *reinterpret_cast<R (**)(T*, A1, A2, A3, A4)>(func);
+        return f(o, a1);
+    }
+
+    template<typename T>
+    static R methodthunk(void *object, void *member, A1 a1, A2 a2, A3 a3, A4 a4) {
+        T* o = static_cast<T*>(object);
+        R (T::*m)(A1, A2, A3, A4) = *reinterpret_cast<R (T::**)(A1, A2, A3, A4)>(member);
+        return (o->*m)(a1, a2, a3, a4);
+    }
+
+    // Forward declaration of an unknown class
+    // this kind of declaration is authorized by the standard (see 8.3.3/2 of C++ 03 standard).  
+    // As a result, the compiler will allocate for UnknownFunctionMember_t the biggest size 
+    // and biggest alignment possible for member function. 
+    // This type can be used inside unions, it will help to provide the storage 
+    // with the proper size and alignment guarantees 
+    class UnknownClass;
+
+    // object this pointer
+    void *_object;
+
+    // aligned raw member function pointer storage - converted back by registered thunk
+    char _function[sizeof(void (UnknownClass::*)())];
+
+    // registered function to convert back and call _m.member on _object
+    R (*_thunk)(void*, void*, A1, A2, A3, A4); 
+};
+
+/** A class for storing and calling a pointer to a static or member function
+ */
+template <typename R, typename A1, typename A2, typename A3>
+class FuncPtr<R(A1, A2, A3)> {
+public:
+    /** Create a FuncPtr, attaching a static function
+     *
+     *  @param function The static function to attach (default is none)
+     */
+    FuncPtr(R (*function)(A1, A2, A3) = 0) {
+        attach(function);
+    }
+
+    /** Create a FuncPtr, attaching a static function with bound pointer
+     *
+     *  @param object Pointer to object to bind to function
+     *  @param function The static function to attach
+     */
+    template<typename T>
+    FuncPtr(T *object, R (*function)(T*, A1, A2, A3)) {
+        attach(object, function);
+    }
+
+    /** Create a FuncPtr, attaching a member function
+     *
+     *  @param object The object pointer to invoke the member function on (i.e. the this pointer)
+     *  @param function The address of the member function to attach
+     */
+    template<typename T>
+    FuncPtr(T *object, R (T::*member)(A1, A2, A3)) {
+        attach(object, member);
+    }
+
+    /** Create a FuncPtr, attaching a function object
+     *
+     *  @param object Pointer to a function object to attach
+     */
+    template<typename T>
+    FuncPtr(T *object) {
+        attach(object, &T::operator());
+    }
+
+    /** Create a FuncPtr from another FuncPtr
+     *
+     *  @param func The func to attach
+     */
+    FuncPtr(const FuncPtr<R(A1, A2, A3)> &func) {
+        attach(func);
+    }
+
+    /** Attach a static function
+     *
+     *  @param function The static function to attach (default is none)
+     */
+    void attach(R (*function)(A1, A2, A3)) {
+        _object = 0;
+        memcpy(&_function, &function, sizeof function);
+        _thunk = &FuncPtr::staticthunk;
+    }
+
+    /** Attach a static function with bound pointer
+     *
+     *  @param object Pointer to object to bind to function
+     *  @param function The static function to attach
+     */
+    template <typename T>
+    void attach(T *object, R (*function)(T*, A1, A2, A3)) {
+        _object = static_cast<void*>(object);
+        memcpy(&_function, &function, sizeof function);
+        _thunk = &FuncPtr::boundthunk<T>;
+    }
+
+    /** Attach a member function
+     *
+     *  @param object The object pointer to invoke the member function on (i.e. the this pointer)
+     *  @param function The address of the member function to attach
+     */
+    template<typename T>
+    void attach(T *object, R (T::*method)(A1, A2, A3)) {
+        _object = static_cast<void*>(object);
+        memcpy(&_function, &method, sizeof method);
+        _thunk = &FuncPtr::methodthunk<T>;
+    }
+
+    /** Attach a function object
+     *
+     *  @param object Pointer to a function object to attach
+     */
+    template<typename T>
+    void attach(T *object) {
+        attach(object, &T::operator());
+    }
+
+    /** Attach a FuncPtr
+     *
+     *  @param func The func to attach
+     */
+    void attach(const FuncPtr<R(A1, A2, A3)> &func) {
+        _object = func._object;
+        memcpy(&_function, &func._function, sizeof _function);
+        _thunk = func._thunk;
+    }
+
+    /** Call the attached static or member function
+     */
+    R call(A1 a1, A2 a2, A3 a3) {
+        return _thunk(_object, _function, a1, a2, a3);
+    }
+
+    /** Get registered static function
+     */
+    R (*get_function(A1, A2, A3))() {
+        return reinterpret_cast<R (*)(A1, A2, A3)>(_object ? 0 : _function);
+    }
+
+#ifdef MBED_OPERATORS
+    R operator ()(A1 a1, A2 a2, A3 a3) {
+        return call(a1, a2, a3);
+    }
+    operator bool(void) const {
+        return static_cast<bool>(_function);
+    }
+#endif
+private:
+    // Static thunks for various function types
+    static R staticthunk(void*, void *func, A1 a1, A2 a2, A3 a3) {
+        R (*f)(A1, A2, A3) = *reinterpret_cast<R (**)(A1, A2, A3)>(func);
+        return f(a1, a2, a3);
+    }
+
+    template<typename T>
+    static R boundthunk(void *object, void *func, A1 a1, A2 a2, A3 a3) {
+        T *o = static_cast<T*>(object);
+        R (*f)(T*, A1, A2, A3) = *reinterpret_cast<R (**)(T*, A1, A2, A3)>(func);
+        return f(o, a1);
+    }
+
+    template<typename T>
+    static R methodthunk(void *object, void *member, A1 a1, A2 a2, A3 a3) {
+        T* o = static_cast<T*>(object);
+        R (T::*m)(A1, A2, A3) = *reinterpret_cast<R (T::**)(A1, A2, A3)>(member);
+        return (o->*m)(a1, a2, a3);
+    }
+
+    // Forward declaration of an unknown class
+    // this kind of declaration is authorized by the standard (see 8.3.3/2 of C++ 03 standard).  
+    // As a result, the compiler will allocate for UnknownFunctionMember_t the biggest size 
+    // and biggest alignment possible for member function. 
+    // This type can be used inside unions, it will help to provide the storage 
+    // with the proper size and alignment guarantees 
+    class UnknownClass;
+
+    // object this pointer
+    void *_object;
+
+    // aligned raw member function pointer storage - converted back by registered thunk
+    char _function[sizeof(void (UnknownClass::*)())];
+
+    // registered function to convert back and call _m.member on _object
+    R (*_thunk)(void*, void*, A1, A2, A3); 
+};
+
+/** A class for storing and calling a pointer to a static or member function
+ */
+template <typename R, typename A1, typename A2>
+class FuncPtr<R(A1, A2)> {
+public:
+    /** Create a FuncPtr, attaching a static function
+     *
+     *  @param function The static function to attach (default is none)
+     */
+    FuncPtr(R (*function)(A1, A2) = 0) {
+        attach(function);
+    }
+
+    /** Create a FuncPtr, attaching a static function with bound pointer
+     *
+     *  @param object Pointer to object to bind to function
+     *  @param function The static function to attach
+     */
+    template<typename T>
+    FuncPtr(T *object, R (*function)(T*, A1, A2)) {
+        attach(object, function);
+    }
+
+    /** Create a FuncPtr, attaching a member function
+     *
+     *  @param object The object pointer to invoke the member function on (i.e. the this pointer)
+     *  @param function The address of the member function to attach
+     */
+    template<typename T>
+    FuncPtr(T *object, R (T::*member)(A1, A2)) {
+        attach(object, member);
+    }
+
+    /** Create a FuncPtr, attaching a function object
+     *
+     *  @param object Pointer to a function object to attach
+     */
+    template<typename T>
+    FuncPtr(T *object) {
+        attach(object, &T::operator());
+    }
+
+    /** Create a FuncPtr from another FuncPtr
+     *
+     *  @param func The func to attach
+     */
+    FuncPtr(const FuncPtr<R(A1, A2)> &func) {
+        attach(func);
+    }
+
+    /** Attach a static function
+     *
+     *  @param function The static function to attach (default is none)
+     */
+    void attach(R (*function)(A1, A2)) {
+        _object = 0;
+        memcpy(&_function, &function, sizeof function);
+        _thunk = &FuncPtr::staticthunk;
+    }
+
+    /** Attach a static function with bound pointer
+     *
+     *  @param object Pointer to object to bind to function
+     *  @param function The static function to attach
+     */
+    template <typename T>
+    void attach(T *object, R (*function)(T*, A1, A2)) {
+        _object = static_cast<void*>(object);
+        memcpy(&_function, &function, sizeof function);
+        _thunk = &FuncPtr::boundthunk<T>;
+    }
+
+    /** Attach a member function
+     *
+     *  @param object The object pointer to invoke the member function on (i.e. the this pointer)
+     *  @param function The address of the member function to attach
+     */
+    template<typename T>
+    void attach(T *object, R (T::*method)(A1, A2)) {
+        _object = static_cast<void*>(object);
+        memcpy(&_function, &method, sizeof method);
+        _thunk = &FuncPtr::methodthunk<T>;
+    }
+
+    /** Attach a function object
+     *
+     *  @param object Pointer to a function object to attach
+     */
+    template<typename T>
+    void attach(T *object) {
+        attach(object, &T::operator());
+    }
+
+    /** Attach a FuncPtr
+     *
+     *  @param func The func to attach
+     */
+    void attach(const FuncPtr<R(A1, A2)> &func) {
+        _object = func._object;
+        memcpy(&_function, &func._function, sizeof _function);
+        _thunk = func._thunk;
+    }
+
+    /** Call the attached static or member function
+     */
+    R call(A1 a1, A2 a2) {
+        return _thunk(_object, _function, a1, a2);
+    }
+
+    /** Get registered static function
+     */
+    R (*get_function(A1, A2))() {
+        return reinterpret_cast<R (*)(A1, A2)>(_object ? 0 : _function);
+    }
+
+#ifdef MBED_OPERATORS
+    R operator ()(A1 a1, A2 a2) {
+        return call(a1, a2);
+    }
+    operator bool(void) const {
+        return static_cast<bool>(_function);
+    }
+#endif
+private:
+    // Static thunks for various function types
+    static R staticthunk(void*, void *func, A1 a1, A2 a2) {
+        R (*f)(A1, A2) = *reinterpret_cast<R (**)(A1, A2)>(func);
+        return f(a1, a2);
+    }
+
+    template<typename T>
+    static R boundthunk(void *object, void *func, A1 a1, A2 a2) {
+        T *o = static_cast<T*>(object);
+        R (*f)(T*, A1, A2) = *reinterpret_cast<R (**)(T*, A1, A2)>(func);
+        return f(o, a1);
+    }
+
+    template<typename T>
+    static R methodthunk(void *object, void *member, A1 a1, A2 a2) {
+        T* o = static_cast<T*>(object);
+        R (T::*m)(A1, A2) = *reinterpret_cast<R (T::**)(A1, A2)>(member);
+        return (o->*m)(a1, a2);
+    }
+
+    // Forward declaration of an unknown class
+    // this kind of declaration is authorized by the standard (see 8.3.3/2 of C++ 03 standard).  
+    // As a result, the compiler will allocate for UnknownFunctionMember_t the biggest size 
+    // and biggest alignment possible for member function. 
+    // This type can be used inside unions, it will help to provide the storage 
+    // with the proper size and alignment guarantees 
+    class UnknownClass;
+
+    // object this pointer
+    void *_object;
+
+    // aligned raw member function pointer storage - converted back by registered thunk
+    char _function[sizeof(void (UnknownClass::*)())];
+
+    // registered function to convert back and call _m.member on _object
+    R (*_thunk)(void*, void*, A1, A2); 
+};
+
+/** A class for storing and calling a pointer to a static or member function
+ */
+template <typename R, typename A1>
+class FuncPtr<R(A1)> {
+public:
+    /** Create a FuncPtr, attaching a static function
+     *
+     *  @param function The static function to attach (default is none)
+     */
+    FuncPtr(R (*function)(A1) = 0) {
+        attach(function);
+    }
+
+    /** Create a FuncPtr, attaching a static function with bound pointer
+     *
+     *  @param object Pointer to object to bind to function
+     *  @param function The static function to attach
+     */
+    template<typename T>
+    FuncPtr(T *object, R (*function)(T*, A1)) {
+        attach(object, function);
+    }
+
+    /** Create a FuncPtr, attaching a member function
+     *
+     *  @param object The object pointer to invoke the member function on (i.e. the this pointer)
+     *  @param function The address of the member function to attach
+     */
+    template<typename T>
+    FuncPtr(T *object, R (T::*member)(A1)) {
+        attach(object, member);
+    }
+
+    /** Create a FuncPtr, attaching a function object
+     *
+     *  @param object Pointer to a function object to attach
+     */
+    template<typename T>
+    FuncPtr(T *object) {
+        attach(object, &T::operator());
+    }
+
+    /** Create a FuncPtr from another FuncPtr
+     *
+     *  @param func The func to attach
+     */
+    FuncPtr(const FuncPtr<R(A1)> &func) {
+        attach(func);
+    }
+
     /** Attach a static function
      *
      *  @param function The static function to attach (default is none)
      */
     void attach(R (*function)(A1)) {
-        _p.function = function;
+        _object = 0;
-        _membercaller = 0;
+        memcpy(&_function, &function, sizeof function);
+        _thunk = &FuncPtr::staticthunk;
+    }
+
+    /** Attach a static function with bound pointer
+     *
+     *  @param object Pointer to object to bind to function
+     *  @param function The static function to attach
+     */
+    template <typename T>
+    void attach(T *object, R (*function)(T*, A1)) {
+        _object = static_cast<void*>(object);
+        memcpy(&_function, &function, sizeof function);
+        _thunk = &FuncPtr::boundthunk<T>;
     }
 
     /** Attach a member function
@@ -61,141 +589,258 @@ public:
      *  @param function The address of the member function to attach
      */
     template<typename T>
-    void attach(T *object, R (T::*member)(A1)) {
+    void attach(T *object, R (T::*method)(A1)) {
-        _p.object = static_cast<void*>(object);
+        _object = static_cast<void*>(object);
-        *reinterpret_cast<R (T::**)(A1)>(_member) = member;
+        memcpy(&_function, &method, sizeof method);
-        _membercaller = &FunctionPointerArg1::membercaller<T>;
+        _thunk = &FuncPtr::methodthunk<T>;
+    }
+
+    /** Attach a function object
+     *
+     *  @param object Pointer to a function object to attach
+     */
+    template<typename T>
+    void attach(T *object) {
+        attach(object, &T::operator());
+    }
+
+    /** Attach a FuncPtr
+     *
+     *  @param func The func to attach
+     */
+    void attach(const FuncPtr<R(A1)> &func) {
+        _object = func._object;
+        memcpy(&_function, &func._function, sizeof _function);
+        _thunk = func._thunk;
     }
 
     /** Call the attached static or member function
      */
-    R call(A1 a) {
+    R call(A1 a1) {
-        if (_membercaller == 0 && _p.function) {
+        return _thunk(_object, _function, a1);
-           return _p.function(a);
-        } else if (_membercaller && _p.object) {
-           return _membercaller(_p.object, _member, a);
-        }
-        return (R)0;
     }
 
     /** Get registered static function
      */
-    R(*get_function(A1))() {
+    R (*get_function(A1))() {
-        return _membercaller ? (R(*)(A1))0 : (R(*)(A1))_p.function;
+        return reinterpret_cast<R (*)(A1)>(_object ? 0 : _function);
     }
 
 #ifdef MBED_OPERATORS
-    R operator ()(A1 a) {
+    R operator ()(A1 a1) {
-        return call(a);
+        return call(a1);
     }
     operator bool(void) const {
-        return (_membercaller != NULL ? _p.object : (void*)_p.function) != NULL;
+        return static_cast<bool>(_function);
     }
 #endif
 private:
-    template<typename T>
+    // Static thunks for various function types
-    static R membercaller(void *object, uintptr_t *member, A1 a) {
+    static R staticthunk(void*, void *func, A1 a1) {
-        T* o = static_cast<T*>(object);
+        R (*f)(A1) = *reinterpret_cast<R (**)(A1)>(func);
-        R (T::**m)(A1) = reinterpret_cast<R (T::**)(A1)>(member);
+        return f(a1);
-        return (o->**m)(a);
     }
 
-    union {
+    template<typename T>
-        R (*function)(A1); // static function pointer
+    static R boundthunk(void *object, void *func, A1 a1) {
-        void *object;      // object this pointer
+        T *o = static_cast<T*>(object);
-    } _p;
+        R (*f)(T*, A1) = *reinterpret_cast<R (**)(T*, A1)>(func);
-    uintptr_t _member[4]; // aligned raw member function pointer storage - converted back by registered _membercaller
+        return f(o, a1);
-    R (*_membercaller)(void*, uintptr_t*, A1); // registered membercaller function to convert back and call _m.member on _object
+    }
+
+    template<typename T>
+    static R methodthunk(void *object, void *member, A1 a1) {
+        T* o = static_cast<T*>(object);
+        R (T::*m)(A1) = *reinterpret_cast<R (T::**)(A1)>(member);
+        return (o->*m)(a1);
+    }
+
+    // Forward declaration of an unknown class
+    // this kind of declaration is authorized by the standard (see 8.3.3/2 of C++ 03 standard).  
+    // As a result, the compiler will allocate for UnknownFunctionMember_t the biggest size 
+    // and biggest alignment possible for member function. 
+    // This type can be used inside unions, it will help to provide the storage 
+    // with the proper size and alignment guarantees 
+    class UnknownClass;
+
+    // object this pointer
+    void *_object;
+
+    // aligned raw member function pointer storage - converted back by registered thunk
+    char _function[sizeof(void (UnknownClass::*)())];
+
+    // registered function to convert back and call _m.member on _object
+    R (*_thunk)(void*, void*, A1); 
 };
 
-/** A class for storing and calling a pointer to a static or member function (R ()(void))
+/** A class for storing and calling a pointer to a static or member function
  */
 template <typename R>
-class FunctionPointerArg1<R, void>{
+class FuncPtr<R()> {
 public:
-    /** Create a FunctionPointer, attaching a static function
+    /** Create a FuncPtr, attaching a static function
      *
      *  @param function The static function to attach (default is none)
      */
-    FunctionPointerArg1(R (*function)(void) = 0) {
+    FuncPtr(R (*function)() = 0) {
         attach(function);
     }
 
-    /** Create a FunctionPointer, attaching a member function
+    /** Create a FuncPtr, attaching a static function with bound pointer
      *
-     *  @param object The object pointer to invoke the member function on (i.e. the this pointer)
+     *  @param object Pointer to object to bind to function
-     *  @param function The address of the void member function to attach
+     *  @param function The static function to attach
      */
     template<typename T>
-    FunctionPointerArg1(T *object, R (T::*member)(void)) {
+    FuncPtr(T *object, R (*function)(T*)) {
+        attach(object, function);
+    }
+
+    /** Create a FuncPtr, attaching a member function
+     *
+     *  @param object The object pointer to invoke the member function on (i.e. the this pointer)
+     *  @param function The address of the member function to attach
+     */
+    template<typename T>
+    FuncPtr(T *object, R (T::*member)()) {
         attach(object, member);
     }
 
+    /** Create a FuncPtr, attaching a function object
+     *
+     *  @param object Pointer to a function object to attach
+     */
+    template<typename T>
+    FuncPtr(T *object) {
+        attach(object, &T::operator());
+    }
+
+    /** Create a FuncPtr from another FuncPtr
+     *
+     *  @param func The func to attach
+     */
+    FuncPtr(const FuncPtr<R()> &func) {
+        attach(func);
+    }
+
     /** Attach a static function
      *
-     *  @param function The void static function to attach (default is none)
+     *  @param function The static function to attach (default is none)
      */
-    void attach(R (*function)(void)) {
+    void attach(R (*function)()) {
-        _p.function = function;
+        _object = 0;
-        _membercaller = 0;
+        memcpy(&_function, &function, sizeof function);
+        _thunk = &FuncPtr::staticthunk;
+    }
+
+    /** Attach a static function with bound pointer
+     *
+     *  @param object Pointer to object to bind to function
+     *  @param function The static function to attach
+     */
+    template <typename T>
+    void attach(T *object, R (*function)(T*)) {
+        _object = static_cast<void*>(object);
+        memcpy(&_function, &function, sizeof function);
+        _thunk = &FuncPtr::boundthunk<T>;
     }
 
     /** Attach a member function
      *
      *  @param object The object pointer to invoke the member function on (i.e. the this pointer)
-     *  @param function The address of the void member function to attach
+     *  @param function The address of the member function to attach
      */
     template<typename T>
-    void attach(T *object, R (T::*member)(void)) {
+    void attach(T *object, R (T::*method)()) {
-        _p.object = static_cast<void*>(object);
+        _object = static_cast<void*>(object);
-        *reinterpret_cast<R (T::**)(void)>(_member) = member;
+        memcpy(&_function, &method, sizeof method);
-        _membercaller = &FunctionPointerArg1::membercaller<T>;
+        _thunk = &FuncPtr::methodthunk<T>;
+    }
+
+    /** Attach a function object
+     *
+     *  @param object Pointer to a function object to attach
+     */
+    template<typename T>
+    void attach(T *object) {
+        attach(object, &T::operator());
+    }
+
+    /** Attach a FuncPtr
+     *
+     *  @param func The func to attach
+     */
+    void attach(const FuncPtr<R()> &func) {
+        _object = func._object;
+        memcpy(&_function, &func._function, sizeof _function);
+        _thunk = func._thunk;
     }
 
     /** Call the attached static or member function
      */
-    R call(){
+    R call() {
-        if (_membercaller == 0 && _p.function) {
+        return _thunk(_object, _function);
-            return _p.function();
-        } else if (_membercaller && _p.object) {
-            return _membercaller(_p.object, _member);
-        }
-        return (R)0;
     }
 
     /** Get registered static function
      */
-    R(*get_function())() {
+    R (*get_function())() {
-        return _membercaller ? (R(*)())0 : (R(*)())_p.function;
+        return reinterpret_cast<R (*)()>(_object ? 0 : _function);
     }
 
 #ifdef MBED_OPERATORS
-    R operator ()(void) {
+    R operator ()() {
         return call();
     }
     operator bool(void) const {
-        return (_membercaller != NULL ? _p.object : (void*)_p.function) != NULL;
+        return static_cast<bool>(_function);
     }
 #endif
-
 private:
-    template<typename T>
+    // Static thunks for various function types
-    static R membercaller(void *object, uintptr_t *member) {
+    static R staticthunk(void*, void *func) {
-        T* o = static_cast<T*>(object);
+        R (*f)() = *reinterpret_cast<R (**)()>(func);
-        R (T::**m)(void) = reinterpret_cast<R (T::**)(void)>(member);
+        return f();
-        return (o->**m)();
     }
 
+    template<typename T>
+    static R boundthunk(void *object, void *func) {
+        T *o = static_cast<T*>(object);
+        R (*f)(T*) = *reinterpret_cast<R (**)(T*)>(func);
+        return f(o);
+    }
+
+    template<typename T>
+    static R methodthunk(void *object, void *member) {
+        T* o = static_cast<T*>(object);
+        R (T::*m)() = *reinterpret_cast<R (T::**)()>(member);
+        return (o->*m)();
+    }
+
+    // Forward declaration of an unknown class
+    // this kind of declaration is authorized by the standard (see 8.3.3/2 of C++ 03 standard).  
+    // As a result, the compiler will allocate for UnknownFunctionMember_t the biggest size 
+    // and biggest alignment possible for member function. 
+    // This type can be used inside unions, it will help to provide the storage 
+    // with the proper size and alignment guarantees 
+    class UnknownClass;
+
+    // object this pointer
+    void *_object;
+
+    // aligned raw member function pointer storage - converted back by registered thunk
     union {
-        R (*function)(void); // static function pointer
+        char _function[sizeof(void (UnknownClass::*)())];
-        void *object;        // object this pointer
+        void (UnknownClass::*_unknownMethod)();
-    } _p;
+    };
-    uintptr_t _member[4]; // aligned raw member function pointer storage - converted back by registered _membercaller
+
-    R (*_membercaller)(void*, uintptr_t*); // registered membercaller function to convert back and call _m.member on _object
+    // registered function to convert back and call _m.member on _object
+    R (*_thunk)(void*, void*); 
 };
 
-typedef FunctionPointerArg1<void, void> FunctionPointer;
+// Overloads for backwards compatibility
-typedef FunctionPointerArg1<void, int> event_callback_t;
+typedef FuncPtr<void()> FunctionPointer;
+typedef FuncPtr<void(int)> event_callback_t;
 
 } // namespace mbed