gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add partial support for building with MingW64 GCC 4.8-SEH.

Browse Source 
Error handling works, C++ interoperability generally works.
C++ destructors in libs compiled with G++ cause trouble (ok with MSVC).
This commit is contained in:
Mike Pall 2013-05-15 18:48:06 +02:00
parent 23aa02fb51
commit 1a5fd521b8
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@ -487,7 +487,8 @@ TARGET_DEP= $(LIB_VMDEF) $(LUAJIT_SO)
ifeq (Windows,$(TARGET_SYS)) ifeq (Windows,$(TARGET_SYS))
TARGET_DYNCC= $(STATIC_CC) TARGET_DYNCC= $(STATIC_CC)
LJVM_MODE= coffasm LJVM_MODE= peobj
LJVM_BOUT= $(LJVM_O)
LUAJIT_T= luajit.exe LUAJIT_T= luajit.exe
ifeq (cygwin,$(HOST_MSYS)) ifeq (cygwin,$(HOST_MSYS))
LUAJIT_SO= cyg$(TARGET_DLLNAME) LUAJIT_SO= cyg$(TARGET_DLLNAME)

4
src/lj_ccall.c
View File

@ -103,9 +103,9 @@
/* Windows/x64 argument registers are strictly positional (use ngpr). */ /* Windows/x64 argument registers are strictly positional (use ngpr). */
#define CCALL_HANDLE_REGARG \ #define CCALL_HANDLE_REGARG \
if (isfp) { \ if (isfp) { \
if (ngpr < 4) { dp = &cc->fpr[ngpr++]; nfpr = ngpr; goto done; } \ if (ngpr < maxgpr) { dp = &cc->fpr[ngpr++]; nfpr = ngpr; goto done; } \
} else { \ } else { \
if (ngpr < 4) { dp = &cc->gpr[ngpr++]; goto done; } \ if (ngpr < maxgpr) { dp = &cc->gpr[ngpr++]; goto done; } \
} }
#elif LJ_TARGET_X64 #elif LJ_TARGET_X64

4
src/lj_ccallback.c
View File

@ -286,9 +286,9 @@ void lj_ccallback_mcode_free(CTState *cts)
/* Windows/x64 argument registers are strictly positional (use ngpr). */ /* Windows/x64 argument registers are strictly positional (use ngpr). */
#define CALLBACK_HANDLE_REGARG \ #define CALLBACK_HANDLE_REGARG \
if (isfp) { \ if (isfp) { \
if (ngpr < 4) { sp = &cts->cb.fpr[ngpr++]; nfpr = ngpr; goto done; } \ if (ngpr < maxgpr) { sp = &cts->cb.fpr[ngpr++]; UNUSED(nfpr); goto done; } \
} else { \ } else { \
if (ngpr < 4) { sp = &cts->cb.gpr[ngpr++]; goto done; } \ if (ngpr < maxgpr) { sp = &cts->cb.gpr[ngpr++]; goto done; } \
} }
#elif LJ_TARGET_X64 #elif LJ_TARGET_X64

16
src/lj_err.c
View File

@ -385,12 +385,17 @@ typedef struct UndocumentedDispatcherContext {
ULONG Fill0; ULONG Fill0;
} UndocumentedDispatcherContext; } UndocumentedDispatcherContext;
#ifdef _MSC_VER
/* Another wild guess. */ /* Another wild guess. */
extern __DestructExceptionObject(EXCEPTION_RECORD *rec, int nothrow); extern void __DestructExceptionObject(EXCEPTION_RECORD *rec, int nothrow);
#ifdef MINGW_SDK_INIT
/* Workaround for broken MinGW64 declaration. */
VOID RtlUnwindEx_FIXED(PVOID,PVOID,PVOID,PVOID,PVOID,PVOID) asm("RtlUnwindEx");
#define RtlUnwindEx RtlUnwindEx_FIXED
#endif #endif
#define LJ_MSVC_EXCODE ((DWORD)0xe06d7363) #define LJ_MSVC_EXCODE ((DWORD)0xe06d7363)
#define LJ_GCC_EXCODE ((DWORD)0x20474343)
#define LJ_EXCODE ((DWORD)0xe24c4a00) #define LJ_EXCODE ((DWORD)0xe24c4a00)
#define LJ_EXCODE_MAKE(c) (LJ_EXCODE | (DWORD)(c)) #define LJ_EXCODE_MAKE(c) (LJ_EXCODE | (DWORD)(c))
@ -410,10 +415,9 @@ LJ_FUNCA EXCEPTION_DISPOSITION lj_err_unwind_win64(EXCEPTION_RECORD *rec,
} else { } else {
void *cf2 = err_unwind(L, cf, 0); void *cf2 = err_unwind(L, cf, 0);
if (cf2) { /* We catch it, so start unwinding the upper frames. */ if (cf2) { /* We catch it, so start unwinding the upper frames. */
if (rec->ExceptionCode == LJ_MSVC_EXCODE) { if (rec->ExceptionCode == LJ_MSVC_EXCODE ||
#ifdef _MSC_VER rec->ExceptionCode == LJ_GCC_EXCODE) {
__DestructExceptionObject(rec, 1); __DestructExceptionObject(rec, 1);
#endif
setstrV(L, L->top++, lj_err_str(L, LJ_ERR_ERRCPP)); setstrV(L, L->top++, lj_err_str(L, LJ_ERR_ERRCPP));
} else if (!LJ_EXCODE_CHECK(rec->ExceptionCode)) { } else if (!LJ_EXCODE_CHECK(rec->ExceptionCode)) {
/* Don't catch access violations etc. */ /* Don't catch access violations etc. */
@ -426,7 +430,7 @@ LJ_FUNCA EXCEPTION_DISPOSITION lj_err_unwind_win64(EXCEPTION_RECORD *rec,
RtlUnwindEx(cf, (void *)((cframe_unwind_ff(cf2) && errcode != LUA_YIELD) ? RtlUnwindEx(cf, (void *)((cframe_unwind_ff(cf2) && errcode != LUA_YIELD) ?
lj_vm_unwind_ff_eh : lj_vm_unwind_ff_eh :
lj_vm_unwind_c_eh), lj_vm_unwind_c_eh),
rec, (void *)errcode, ctx, dispatch->HistoryTable); rec, (void *)(uintptr_t)errcode, ctx, dispatch->HistoryTable);
/* RtlUnwindEx should never return. */ /* RtlUnwindEx should never return. */
} }
} }