lua-users home
lua-l archive

[Date Prev][Date Next][Thread Prev][Thread Next] [Date Index] [Thread Index]


I've attached a revised patch to fix LuaJIT-2.0.0-beta2 for OSX.

The zero-cost, automatic C++ exception catching now works on OSX,
too. In case anyone has applied the previous patch, it needs to be
backed out first (or start from the original beta2 sources).

--Mike
--- a/src/buildvm_x86.dasc
+++ b/src/buildvm_x86.dasc
@@ -3650,7 +3650,6 @@
 	".LEFDE1:\n\n", (int)ctx->codesz);
     break;
   case BUILD_machasm:
-    /* NYI: OSX ignores it. Something must be missing. */
     fprintf(ctx->fp, "\t.section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support\n");
     fprintf(ctx->fp,
 	"EH_frame1:\n"
@@ -3659,7 +3658,7 @@
 	"LSCIE1:\n"
 	"\t.long 0\n"
 	"\t.byte 0x1\n"
-	"\t.ascii \"zPR\"\n"
+	"\t.ascii \"zPR\\0\"\n"
 	"\t.byte 0x1\n"
 	"\t.byte 128-4\n"
 	"\t.byte 0x8\n"
--- a/src/buildvm_x86.h
+++ b/src/buildvm_x86.h
@@ -1681,7 +1681,6 @@
 	".LEFDE1:\n\n", (int)ctx->codesz);
     break;
   case BUILD_machasm:
-    /* NYI: OSX ignores it. Something must be missing. */
     fprintf(ctx->fp, "\t.section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support\n");
     fprintf(ctx->fp,
 	"EH_frame1:\n"
@@ -1690,7 +1689,7 @@
 	"LSCIE1:\n"
 	"\t.long 0\n"
 	"\t.byte 0x1\n"
-	"\t.ascii \"zPR\"\n"
+	"\t.ascii \"zPR\\0\"\n"
 	"\t.byte 0x1\n"
 	"\t.byte 128-4\n"
 	"\t.byte 0x8\n"