Merge branch 'dev'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da1765a..8045d6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6...3.0.2)
-project(xbyak LANGUAGES CXX VERSION 6.04)
+project(xbyak LANGUAGES CXX VERSION 6.041)
file(GLOB headers xbyak/*.h)
diff --git a/doc/changelog.md b/doc/changelog.md
index c329558..c586e1d 100644
--- a/doc/changelog.md
+++ b/doc/changelog.md
@@ -1,5 +1,6 @@
# History
+* 2022/Apr/22 ver 6.041 consider Android and mingw
* 2022/Apr/05 ver 6.04 add tpause, umonitor, umwait
* 2022/Mar/08 ver 6.03 MmapAllocator supports memfd with user-defined strings.
* 2022/Jan/28 ver 6.02 strict check the range of 32-bit dispacement
diff --git a/gen/Makefile b/gen/Makefile
index 9442f0d..ae7605e 100644
--- a/gen/Makefile
+++ b/gen/Makefile
@@ -1,7 +1,7 @@
TARGET=../xbyak/xbyak_mnemonic.h
BIN=sortline gen_code gen_avx512
CFLAGS=-I../ -O2 -DXBYAK_NO_OP_NAMES -Wall -Wextra -Wno-missing-field-initializers $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
-all: $(TARGET) ../CMakeLists.txt ../meson.build
+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
@@ -29,5 +29,11 @@
../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)
diff --git a/meson.build b/meson.build
index 653c1ff..065f2fa 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@
project(
'xbyak',
'cpp',
- version: '6.04',
+ version: '6.041',
license: 'BSD-3-Clause',
default_options: 'b_ndebug=if-release'
)
diff --git a/readme.md b/readme.md
index 93befb1..1e64d05 100644
--- a/readme.md
+++ b/readme.md
@@ -1,5 +1,5 @@
-# Xbyak 6.04 [![Badge Build]][Build Status]
+# Xbyak 6.041 [![Badge Build]][Build Status]
*A C++ JIT assembler for x86 (IA32), x64 (AMD64, x86-64)*
diff --git a/readme.txt b/readme.txt
index 1a6db9a..3c3c9b6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
- C++用x86(IA-32), x64(AMD64, x86-64) JITアセンブラ Xbyak 6.04
+ C++用x86(IA-32), x64(AMD64, x86-64) JITアセンブラ Xbyak 6.041
-----------------------------------------------------------------------------
◎概要
diff --git a/xbyak/xbyak.h b/xbyak/xbyak.h
index 9bc12e5..071d730 100644
--- a/xbyak/xbyak.h
+++ b/xbyak/xbyak.h
@@ -144,7 +144,7 @@
enum {
DEFAULT_MAX_CODE_SIZE = 4096,
- VERSION = 0x6040 /* 0xABCD = A.BC(D) */
+ VERSION = 0x6041 /* 0xABCD = A.BC(D) */
};
#ifndef MIE_INTEGER_TYPE_DEFINED
diff --git a/xbyak/xbyak_mnemonic.h b/xbyak/xbyak_mnemonic.h
index 8ded218..24b8c3f 100644
--- a/xbyak/xbyak_mnemonic.h
+++ b/xbyak/xbyak_mnemonic.h
@@ -1,4 +1,4 @@
-const char *getVersionString() const { return "6.04"; }
+const char *getVersionString() const { return "6.041"; }
void adc(const Operand& op, uint32_t imm) { opRM_I(op, imm, 0x10, 2); }
void adc(const Operand& op1, const Operand& op2) { opRM_RM(op1, op2, 0x10); }
void adcx(const Reg32e& reg, const Operand& op) { opGen(reg, op, 0xF6, 0x66, isREG32_REG32orMEM, NONE, 0x38); }
