build fix

externals/xbyak/Makefile

@@ -0,0 +1,24 @@
+PREFIX?=/usr/local
+INSTALL_DIR=$(PREFIX)/include/xbyak
+
+all:
+	$(MAKE) -C sample
+
+clean:
+	$(MAKE) -C sample clean
+
+install:
+	mkdir -p $(INSTALL_DIR)
+	cp -pR xbyak/*.h $(INSTALL_DIR)
+
+uninstall:
+	rm -i $(INSTALL_DIR)/*.h
+	rmdir $(INSTALL_DIR)
+
+update:
+	$(MAKE) -C gen
+
+test:
+	$(MAKE) -C test test
+
+.PHONY: test update

externals/xbyak/gen/Makefile

@@ -0,0 +1,39 @@
+TARGET=../xbyak/xbyak_mnemonic.h
+BIN=sortline gen_code gen_avx512
+CFLAGS=-I../ -O2 -Wall -Wextra -Wno-missing-field-initializers $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
+all: $(TARGET) ../CMakeLists.txt ../meson.build ../readme.md ../readme.txt
+sortline: sortline.cpp
+	$(CXX) $(CFLAGS) $< -o $@
+gen_code: gen_code.cpp ../xbyak/xbyak.h avx_type.hpp
+	$(CXX) $(CFLAGS) $< -o $@
+gen_avx512: gen_avx512.cpp ../xbyak/xbyak.h avx_type.hpp
+	$(CXX) $(CFLAGS) $< -o $@
+
+$(TARGET): $(BIN)
+	./gen_code | ./sortline > $@
+	echo "#ifdef XBYAK_ENABLE_OMITTED_OPERAND" >> $@
+	./gen_code omit | ./sortline >> $@
+	echo "#endif" >>$@
+	./gen_code fixed >> $@
+	echo "#ifndef XBYAK_DISABLE_AVX512" >> $@
+	./gen_avx512 | ./sortline >> $@
+	echo "#ifdef XBYAK64" >> $@
+	./gen_avx512 64 | ./sortline >> $@
+	echo "#endif" >> $@
+	echo "#endif" >> $@
+
+VER=$(shell head -n 1 ../xbyak/xbyak_mnemonic.h|grep -o "[0-9.]*")
+../CMakeLists.txt: $(TARGET)
+	sed -i -e 's/CXX VERSION [0-9.]*/CXX VERSION $(VER)/' $@
+
+../meson.build: $(TARGET)
+	sed -i -e "s/version: '[0-9.]*',/version: '$(VER)',/" $@
+
+../readme.md: $(TARGET)
+	sed -l 2 -i -e "s/# Xbyak [0-9.]*/# Xbyak $(VER)/" $@
+
+../readme.txt: $(TARGET)
+	sed -l 2 -i -e "s/Xbyak [0-9.]*/Xbyak $(VER)/" $@
+
+clean:
+	$(RM) $(BIN) $(TARGET)

externals/xbyak/sample/Makefile

@@ -0,0 +1,128 @@
+XBYAK_INC=../xbyak/xbyak.h
+CXX?=g++
+
+BOOST_EXIST=$(shell echo "#include <boost/spirit/core.hpp>" | $(CXX) -x c++ -c - 2>/dev/null && echo 1)
+UNAME_M=$(shell uname -m)
+
+ONLY_64BIT=0
+ifeq ($(shell uname -s),Darwin)
+	ONLY_64BIT=1
+	OS=mac
+	ifeq ($(UNAME_M),x86_64)
+		BIT=64
+	endif
+	ifeq ($(UNAME_M),i386)
+		BIT=32
+	endif
+	ifeq ($(shell sw_vers -productVersion | cut -c1-4 | sed 's/\.//'),105)
+		ifeq ($(shell sysctl -n hw.cpu64bit_capable),1)
+			BIT=64
+		endif
+	endif
+else
+	BIT=32
+	ifeq ($(UNAME_M),x86_64)
+		BIT=64
+	endif
+	ifeq ($(UNAME_M),amd64)
+		BIT=64
+	endif
+endif
+
+ifeq ($(BIT),64)
+TARGET += test64 bf64 memfunc64 test_util64 jmp_table64
+ifeq ($(BOOST_EXIST),1)
+TARGET += calc64 #calc2_64
+endif
+endif
+
+ifneq ($(OS),mac)
+TARGET += static_buf64
+TARGET += memfd
+endif
+
+
+ifneq ($(ONLY_64BIT),1)
+	TARGET += test quantize bf toyvm test_util memfunc static_buf jmp_table
+ifeq ($(BOOST_EXIST),1)
+	TARGET += calc #calc2
+endif
+endif
+
+all: $(TARGET)
+
+CFLAGS_WARN=-Wall -Wextra -Wformat=2 -Wcast-qual -Wcast-align -Wwrite-strings -Wfloat-equal -Wpointer-arith #-pedantic
+
+CFLAGS=-g -O2 -fomit-frame-pointer -Wall -I../ $(CFLAGS_WARN) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+test:
+	$(CXX) $(CFLAGS) test0.cpp -o $@ -m32
+
+quantize:
+	$(CXX) $(CFLAGS) quantize.cpp -o $@ -m32
+
+calc:
+	$(CXX) $(CFLAGS) calc.cpp -o $@ -m32
+calc64:
+	$(CXX) $(CFLAGS) calc.cpp -o $@ -m64
+calc2:
+	$(CXX) $(CFLAGS) calc2.cpp -o $@ -m32
+calc2_64:
+	$(CXX) $(CFLAGS) calc2.cpp -o $@ -m64
+
+bf:
+	$(CXX) $(CFLAGS) bf.cpp -o $@ -m32
+bf64:
+	$(CXX) $(CFLAGS) bf.cpp -o $@ -m64
+
+memfunc:
+	$(CXX) $(CFLAGS) memfunc.cpp -o $@ -m32
+memfunc64:
+	$(CXX) $(CFLAGS) memfunc.cpp -o $@ -m64
+
+toyvm:
+	$(CXX) $(CFLAGS) toyvm.cpp -o $@ -m32
+
+test64:
+	$(CXX) $(CFLAGS) test0.cpp -o $@ -m64
+test_util:
+	$(CXX) $(CFLAGS) test_util.cpp -o $@ -m32
+test_util64:
+	$(CXX) $(CFLAGS) test_util.cpp -o $@ -m64
+static_buf:
+	$(CXX) $(CFLAGS) static_buf.cpp -o $@ -m32
+static_buf64:
+	$(CXX) $(CFLAGS) static_buf.cpp -o $@ -m64
+jmp_table:
+	$(CXX) $(CFLAGS) jmp_table.cpp -o $@ -m32
+jmp_table64:
+	$(CXX) $(CFLAGS) jmp_table.cpp -o $@ -m64
+memfd:
+	$(CXX) $(CFLAGS) memfd.cpp -o $@ -m64
+profiler: profiler.cpp ../xbyak/xbyak_util.h
+	$(CXX) $(CFLAGS) profiler.cpp -o $@
+profiler-vtune: profiler.cpp ../xbyak/xbyak_util.h
+	$(CXX) $(CFLAGS) profiler.cpp -o $@ -DXBYAK_USE_VTUNE -I /opt/intel/vtune_amplifier/include/ -L /opt/intel/vtune_amplifier/lib64 -ljitprofiling -ldl
+
+clean:
+	rm -rf $(TARGET) profiler profiler-vtune
+
+test : test0.cpp $(XBYAK_INC)
+test64: test0.cpp $(XBYAK_INC)
+quantize : quantize.cpp $(XBYAK_INC)
+calc : calc.cpp $(XBYAK_INC)
+calc64 : calc.cpp $(XBYAK_INC)
+calc2 : calc2.cpp $(XBYAK_INC)
+calc2_64 : calc2.cpp $(XBYAK_INC)
+bf : bf.cpp $(XBYAK_INC)
+bf64 : bf.cpp $(XBYAK_INC)
+memfunc : memfunc.cpp $(XBYAK_INC)
+memfunc64 : memfunc.cpp $(XBYAK_INC)
+toyvm : toyvm.cpp $(XBYAK_INC)
+static_buf: static_buf.cpp $(XBYAK_INC)
+static_buf64: static_buf.cpp $(XBYAK_INC)
+test_util : test_util.cpp $(XBYAK_INC) ../xbyak/xbyak_util.h
+test_util2 : test_util.cpp $(XBYAK_INC) ../xbyak/xbyak_util.h
+jmp_table: jmp_table.cpp $(XBYAK_INC)
+jmp_table64: jmp_table.cpp $(XBYAK_INC)
+memfd: memfd.cpp $(XBYAK_INC)

externals/xbyak/test/Makefile

@@ -0,0 +1,114 @@
+TARGET = make_nm normalize_prefix bad_address misc cvt_test cvt_test32 noexception misc32 detect_x32
+XBYAK_INC=../xbyak/xbyak.h
+UNAME_S=$(shell uname -s)
+ifeq ($(shell ./detect_x32),x32)
+X32?=1
+endif
+BIT=32
+ifeq ($(shell uname -m),x86_64)
+BIT=64
+endif
+ONLY_64BIT=0
+ifeq ($(UNAME_S),Darwin)
+  # 32-bit binary is not supported
+  ONLY_64BIT=1
+endif
+ifeq ($(ONLY_64BIT),0)
+  TARGET += jmp address
+endif
+
+ifeq ($(BIT),64)
+	TARGET += jmp64 address64
+endif
+
+all: $(TARGET)
+
+CFLAGS_WARN=-Wall -Wextra -Wformat=2 -Wcast-qual -Wwrite-strings -Wfloat-equal -Wpointer-arith
+
+CFLAGS=-O2 -Wall -I../ -I./ $(CFLAGS_WARN) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) #-std=c++0x
+make_nm:
+	$(CXX) $(CFLAGS) make_nm.cpp -o $@
+normalize_prefix: normalize_prefix.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) normalize_prefix.cpp -o $@
+test_mmx: test_mmx.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) test_mmx.cpp -o $@ -lpthread
+jmp: jmp.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) jmp.cpp -o $@ -m32
+jmp64: jmp.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) jmp.cpp -o $@ -m64
+address: address.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) address.cpp -o $@ -m32
+address64: address.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) address.cpp -o $@ -m64
+bad_address: bad_address.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) bad_address.cpp -o $@
+misc: misc.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) misc.cpp -o $@
+misc32: misc.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) misc.cpp -o $@ -DXBYAK32
+cvt_test: cvt_test.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) $< -o $@
+cvt_test32: cvt_test.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) $< -o $@ -DXBYAK32
+noexception: noexception.cpp ../xbyak/xbyak.h
+	$(CXX) $(CFLAGS) $< -o $@ -fno-exceptions
+
+test_nm: normalize_prefix $(TARGET)
+	$(MAKE) -C ../gen
+ifneq ($(ONLY_64BIT),1)
+	CXX=$(CXX) ./test_nm.sh
+	CXX=$(CXX) ./test_nm.sh noexcept
+	CXX=$(CXX) ./test_nm.sh Y
+	CXX=$(CXX) ./test_nm.sh avx512
+	CXX=$(CXX) ./test_address.sh
+	./jmp
+	./cvt_test32
+endif
+	./bad_address
+	./misc
+	./misc32
+	./cvt_test
+ifeq ($(BIT),64)
+	CXX=$(CXX) ./test_address.sh 64
+ifneq ($(X32),1)
+	CXX=$(CXX) ./test_nm.sh 64
+	CXX=$(CXX) ./test_nm.sh Y64
+endif
+	./jmp64
+endif
+
+test_avx: normalize_prefix
+ifneq ($(ONLY_64BIT),0)
+	CXX=$(CXX) ./test_avx.sh
+	CXX=$(CXX) ./test_avx.sh Y
+endif
+ifeq ($(BIT),64)
+	CXX=$(CXX) ./test_avx.sh 64
+ifneq ($(X32),1)
+	CXX=$(CXX) ./test_avx.sh Y64
+endif
+endif
+
+test_avx512: normalize_prefix
+ifneq ($(ONLY_64BIT),0)
+	CXX=$(CXX) ./test_avx512.sh
+endif
+ifeq ($(BIT),64)
+	CXX=$(CXX) ./test_avx512.sh 64
+endif
+
+detect_x32: detect_x32.c
+	$(CC) $< -o $@
+
+test: detect_x32
+	$(MAKE) test_nm
+	$(MAKE) test_avx
+	$(MAKE) test_avx512
+
+clean:
+	$(RM) a.asm *.lst *.obj *.o $(TARGET) lib_run nm.cpp nm_frame make_512
+
+lib_run: lib_test.cpp lib_run.cpp lib.h
+	$(CXX) $(CFLAGS) lib_run.cpp lib_test.cpp -o lib_run
+make_nm: make_nm.cpp $(XBYAK_INC)
+