Skip to content

Hook to luajit mm (https://github.com/cloudflare/luajit-mm). #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Hook to luajit mm (https://github.com/cloudflare/luajit-mm). #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,13 @@ LJLIB_O= lib_base.o lib_math.o lib_bit.o lib_string.o lib_table.o \
lib_io.o lib_os.o lib_package.o lib_debug.o lib_jit.o lib_ffi.o
LJLIB_C= $(LJLIB_O:.o=.c)

ifeq (x64,$(TARGET_LJARCH))
ifneq (, $(LJMM_DIR))
CCOPT += -DUSE_LJMM
LJMM_O := $(LJMM_DIR)/ljmm-combined.o
endif
endif

LJCORE_O= lj_gc.o lj_err.o lj_char.o lj_bc.o lj_obj.o \
lj_str.o lj_tab.o lj_func.o lj_udata.o lj_meta.o lj_debug.o \
lj_state.o lj_dispatch.o lj_vmevent.o lj_vmmath.o lj_strscan.o \
Expand All @@ -463,7 +470,7 @@ LJCORE_O= lj_gc.o lj_err.o lj_char.o lj_bc.o lj_obj.o \
lj_ctype.o lj_cdata.o lj_cconv.o lj_ccall.o lj_ccallback.o \
lj_carith.o lj_clib.o lj_cparse.o \
lj_lib.o lj_alloc.o lib_aux.o \
$(LJLIB_O) lib_init.o
$(LJLIB_O) $(LJMM_O) lib_init.o

LJVMCORE_O= $(LJVM_O) $(LJCORE_O)
LJVMCORE_DYNO= $(LJVMCORE_O:.o=_dyn.o)
Expand Down Expand Up @@ -568,6 +575,16 @@ E= @echo

default all: $(TARGET_T)

ifeq (x64,$(TARGET_LJARCH))
ifneq (, $(LJMM_DIR))
$(LJMM_DIR)/ljmm-combined.o :
$(MAKE) CC=$(CC) OPT_FLAGS="$(CCOPT)" -C $(LJMM_DIR)

$(TARGET_T) : $(LJMM_DIR)/ljmm-combined.o

endif
endif

amalg:
@grep "^[+|]" ljamalg.c
$(MAKE) all "LJCORE_O=ljamalg.o"
Expand Down
9 changes: 9 additions & 0 deletions src/lj_alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,15 @@ static LJ_AINLINE int CALL_MUNMAP(void *ptr, size_t size)
#include <errno.h>
#include <sys/mman.h>

#ifdef USE_LJMM
void *ljmm_mmap(void *addr, size_t length, int prot, int flags, int fd, off_t);
int ljmm_munmap(void *addr, size_t length);
void *ljmm_mremap(void *old_address, size_t old_size, size_t new_size, int flags, ...);
#define mmap ljmm_mmap
#define munmp ljmm_munmap
#define mremap ljmm_mremap
#endif

#define MMAP_PROT (PROT_READ|PROT_WRITE)
#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
#define MAP_ANONYMOUS MAP_ANON
Expand Down