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

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2014-01-20 16:59:04 +01:00
commit bcd27038fc
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -292,7 +292,9 @@ ifeq (Darwin,$(TARGET_SYS))
endif endif
TARGET_STRIP+= -x TARGET_STRIP+= -x
TARGET_AR+= 2>/dev/null TARGET_AR+= 2>/dev/null
ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1))
TARGET_XCFLAGS+= -fno-stack-protector TARGET_XCFLAGS+= -fno-stack-protector
endif
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
TARGET_DYNXLDOPTS= TARGET_DYNXLDOPTS=
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)

2
src/lib_string.c
View File

@ -65,7 +65,7 @@ LJLIB_ASM(string_byte) LJLIB_REC(string_range 0)
LJLIB_ASM(string_char) LJLIB_REC(.) LJLIB_ASM(string_char) LJLIB_REC(.)
{ {
int i, nargs = (int)(L->top - L->base); int i, nargs = (int)(L->top - L->base);
char *buf = lj_buf_tmp(L, (size_t)nargs); char *buf = lj_buf_tmp(L, (MSize)nargs);
for (i = 1; i <= nargs; i++) { for (i = 1; i <= nargs; i++) {
int32_t k = lj_lib_checkint(L, i); int32_t k = lj_lib_checkint(L, i);
if (!checku8(k)) if (!checku8(k))

2
src/lj_cconv.h
View File

@ -29,7 +29,7 @@ static LJ_AINLINE uint32_t cconv_idx(CTInfo info)
uint32_t idx = ((info >> 26) & 15u); /* Dispatch bits. */ uint32_t idx = ((info >> 26) & 15u); /* Dispatch bits. */
lua_assert(ctype_type(info) <= CT_MAYCONVERT); lua_assert(ctype_type(info) <= CT_MAYCONVERT);
#if LJ_64 #if LJ_64
idx = ((U64x(f436fff5,fff7f021) >> 4*idx) & 15u); idx = ((uint32_t)(U64x(f436fff5,fff7f021) >> 4*idx) & 15u);
#else #else
idx = (((idx < 8 ? 0xfff7f021u : 0xf436fff5) >> 4*(idx & 7u)) & 15u); idx = (((idx < 8 ? 0xfff7f021u : 0xf436fff5) >> 4*(idx & 7u)) & 15u);
#endif #endif

2
src/lj_record.c
View File

@ -2305,7 +2305,7 @@ static const BCIns *rec_setup_root(jit_State *J)
case BC_RET0: case BC_RET0:
case BC_RET1: case BC_RET1:
/* No bytecode range check for down-recursive root traces. */ /* No bytecode range check for down-recursive root traces. */
J->maxslot = ra + bc_d(ins); J->maxslot = ra + bc_d(ins) - 1;
break; break;
case BC_FUNCF: case BC_FUNCF:
/* No bytecode range check for root traces started by a hot call. */ /* No bytecode range check for root traces started by a hot call. */