diff options
| author | MITSUNARI Shigeo <[email protected]> | 2022-08-02 16:29:53 +0900 |
|---|---|---|
| committer | MITSUNARI Shigeo <[email protected]> | 2022-08-02 16:29:53 +0900 |
| commit | 6fadefd040320c614f453f0391f14eb20ac1aa7e (patch) | |
| tree | b2f3bcd6381a572fbcd843c7e2800445de3a12ff | |
| parent | 88f2f771f179a3d856ecd0b07a20598bd06ba21d (diff) | |
| parent | fc1c18a9d62c2e169447b00d12f148fb23755ea4 (diff) | |
| download | xbyak-6.61.1.tar.gz xbyak-6.61.1.zip | |
Merge branch 'dev'v6.61.1
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | doc/changelog.md | 1 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | readme.md | 2 | ||||
| -rw-r--r-- | readme.txt | 3 | ||||
| -rw-r--r-- | xbyak/xbyak.h | 4 | ||||
| -rw-r--r-- | xbyak/xbyak_mnemonic.h | 2 |
7 files changed, 9 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 835bec7..14b90fc 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.61) +project(xbyak LANGUAGES CXX VERSION 6.61.1) file(GLOB headers xbyak/*.h) diff --git a/doc/changelog.md b/doc/changelog.md index 93d23d9..f59117b 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,5 +1,6 @@ # History +* 2022/Aug/02 ver 6.61.1 noexcept is supported by Visual Studio 2015 or later * 2022/Jul/29 ver 6.61 fix exception of movzx eax, ah in 64-bit mode * 2022/Jun/16 ver 6.60.2 fix detection of GFNI, VAES, and VPCLMULQDQ * 2022/Jun/15 ver 6.60.1 fix link error of Xbyak::util::Cpu on Visual Studio with /O0 option diff --git a/meson.build b/meson.build index 73282e1..02c18f3 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project( 'xbyak', 'cpp', - version: '6.61', + version: '6.61.1', license: 'BSD-3-Clause', default_options: 'b_ndebug=if-release' ) @@ -1,5 +1,5 @@ -# Xbyak 6.61 [![Badge Build]][Build Status] +# Xbyak 6.61.1 [![Badge Build]][Build Status] *A C++ JIT assembler for x86 (IA32), x64 (AMD64, x86-64)* @@ -1,5 +1,5 @@ - C++用x86(IA-32), x64(AMD64, x86-64) JITアセンブラ Xbyak 6.61
+ C++用x86(IA-32), x64(AMD64, x86-64) JITアセンブラ Xbyak 6.61.1
-----------------------------------------------------------------------------
◎概要
@@ -400,6 +400,7 @@ sample/{echo,hello}.bfは http://www.kmonos.net/alang/etc/brainfuck.php から -----------------------------------------------------------------------------
◎履歴
+2022/08/02 ver 6.61.1 noexceptはVisual Studio 2015以降対応
2022/07/29 ver 6.61 movzx eax, ahがエラーになるのを修正
2022/06/16 ver 6.60.2 GFNI, VAES, VPCLMULQDQの判定修正
2022/06/15 ver 6.60.1 Visual Studio /O0でXbyak::util::Cpuがリンクエラーになるのに対応
diff --git a/xbyak/xbyak.h b/xbyak/xbyak.h index eecea61..00fe411 100644 --- a/xbyak/xbyak.h +++ b/xbyak/xbyak.h @@ -118,7 +118,7 @@ #endif #endif -#if (__cplusplus >= 201103) || (defined(_MSC_VER) && _MSC_VER >= 1800) +#if (__cplusplus >= 201103) || (defined(_MSC_VER) && _MSC_VER >= 1900) #undef XBYAK_TLS #define XBYAK_TLS thread_local #define XBYAK_VARIADIC_TEMPLATE @@ -148,7 +148,7 @@ namespace Xbyak { enum { DEFAULT_MAX_CODE_SIZE = 4096, - VERSION = 0x6610 /* 0xABCD = A.BC(.D) */ + VERSION = 0x6611 /* 0xABCD = A.BC(.D) */ }; #ifndef MIE_INTEGER_TYPE_DEFINED diff --git a/xbyak/xbyak_mnemonic.h b/xbyak/xbyak_mnemonic.h index 5871557..41efe8f 100644 --- a/xbyak/xbyak_mnemonic.h +++ b/xbyak/xbyak_mnemonic.h @@ -1,4 +1,4 @@ -const char *getVersionString() const { return "6.61"; } +const char *getVersionString() const { return "6.61.1"; } 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); } |