diff --git a/lib/sdk/crt/except/cpp.c b/lib/sdk/crt/except/cpp.c index 445ce084691..718276fe5b3 100644 --- a/lib/sdk/crt/except/cpp.c +++ b/lib/sdk/crt/except/cpp.c @@ -63,6 +63,17 @@ typedef struct _rtti_object_locator #define THISCALL(func) __thiscall_ ## func #define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) + +#ifdef _MSC_VER +#pragma message ("DEFINE_THISCALL_WRAPPER broken") +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); +// __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ +// pop eax \ +// push ecx \ +// push eax \ +// jmp __ASM_NAME(#func) __ASM_STDCALL(args) ) +#else #define DEFINE_THISCALL_WRAPPER(func,args) \ extern void THISCALL(func)(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -70,6 +81,8 @@ typedef struct _rtti_object_locator "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ + #else /* __i386__ */ #define THISCALL(func) func diff --git a/lib/sdk/crt/except/cppexcept.c b/lib/sdk/crt/except/cppexcept.c index 02a74a952e9..5ff9e2b0f39 100644 --- a/lib/sdk/crt/except/cppexcept.c +++ b/lib/sdk/crt/except/cppexcept.c @@ -45,6 +45,9 @@ static inline void *call_ebp_func( void *func, void *ebp ) { void *ret; int dummy; +#ifdef _MSC_VER +#pragma message ("call_ebp_func is unimplemented for MSC") +#else __asm__ __volatile__ ("pushl %%ebx\n\t" "pushl %%ebp\n\t" "movl %4,%%ebp\n\t" @@ -53,6 +56,7 @@ static inline void *call_ebp_func( void *func, void *ebp ) "popl %%ebx" : "=a" (ret), "=S" (dummy), "=D" (dummy) : "0" (func), "1" (ebp) : "ecx", "edx", "memory" ); +#endif return ret; } @@ -60,6 +64,9 @@ static inline void *call_ebp_func( void *func, void *ebp ) static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); +#ifdef _MSC_VER +#pragma message ("call_copy_ctor is unimplemented for MSC") +#else if (has_vbase) /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ __asm__ __volatile__("pushl $1; pushl %2; call *%0" @@ -67,19 +74,28 @@ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vb else __asm__ __volatile__("pushl %2; call *%0" : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); +#endif } /* call the destructor of the exception object */ static inline void call_dtor( void *func, void *object ) { +#ifdef _MSC_VER +#pragma message ("call_dtor is unimplemented for MSC") +#else __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); +#endif } /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) { +#ifdef _MSC_VER +#pragma message ("continue_after_catch is unimplemented for MSC") +#else __asm__ __volatile__("movl -4(%0),%%esp; leal 12(%0),%%ebp; jmp *%1" : : "r" (frame), "a" (addr) ); +#endif for (;;) ; /* unreached */ } @@ -415,6 +431,14 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame */ extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); +#ifdef _MSC_VER +#pragma message ("__CxxFrameHandler is unimplemented for MSC") +DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, + PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ) +{ + return 0; +} +#else __ASM_GLOBAL_FUNC( __CxxFrameHandler, "pushl $0\n\t" /* nested_trylevel */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -434,7 +458,7 @@ __ASM_GLOBAL_FUNC( __CxxFrameHandler, "add $28,%esp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -28\n\t") "ret" ) - +#endif /********************************************************************* * __CxxLongjmpUnwind (MSVCRT.@) diff --git a/lib/sdk/crt/float/i386/logb.c b/lib/sdk/crt/float/i386/logb.c index 0c02c0e0f11..e4b61949fc4 100644 --- a/lib/sdk/crt/float/i386/logb.c +++ b/lib/sdk/crt/float/i386/logb.c @@ -30,7 +30,7 @@ double _logb (double __x) ("fxtract\n\t" : "=t" (__junk), "=u" (__val) : "0" (__x)); #else -#error REVIEW ME +#pragma message ("REVIEW ME") __asm fld [__x]; __asm fxtract; __asm fstp st(0); diff --git a/lib/sdk/crt/stdlib/rot.c b/lib/sdk/crt/stdlib/rot.c index 7502fb74fe2..d9655a263c6 100644 --- a/lib/sdk/crt/stdlib/rot.c +++ b/lib/sdk/crt/stdlib/rot.c @@ -10,6 +10,10 @@ #include +#ifdef _MSC_VER +#pragma function(_rotr, _rotl, _rotr, _lrotl, _lrotr) +#endif + unsigned int _rotr( unsigned int value, int shift ); /* * @implemented diff --git a/lib/sdk/crt/time/ctime.c b/lib/sdk/crt/time/ctime.c index b6d1bfb6cd1..3b93ba1ec4f 100644 --- a/lib/sdk/crt/time/ctime.c +++ b/lib/sdk/crt/time/ctime.c @@ -7,6 +7,7 @@ */ #define MINGW_HAS_SECURE_API 1 +#define RC_INVOKED 1 // to prevent inline functions #include #include #include "bitsfixup.h" diff --git a/lib/sdk/crt/time/futime.c b/lib/sdk/crt/time/futime.c index 99010f09f57..8e3ae8625be 100644 --- a/lib/sdk/crt/time/futime.c +++ b/lib/sdk/crt/time/futime.c @@ -6,6 +6,7 @@ * PROGRAMERS: Timo Kreuzer */ #include +#define RC_INVOKED 1 // to prevent inline functions #include #include #include "bitsfixup.h" diff --git a/lib/sdk/crt/time/utime.c b/lib/sdk/crt/time/utime.c index 130e5a400ba..d879d49d115 100644 --- a/lib/sdk/crt/time/utime.c +++ b/lib/sdk/crt/time/utime.c @@ -7,6 +7,7 @@ */ #include #include +#define RC_INVOKED 1 // to prevent inline functions #include #include "bitsfixup.h"