aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMITSUNARI Shigeo <[email protected]>2019-12-20 06:09:10 +0900
committerMITSUNARI Shigeo <[email protected]>2019-12-20 06:09:10 +0900
commit0d54f1b182ae71f5981c64a7eafc34cb6a6e4a3d (patch)
tree1118794a74d0b56613873b97227da15e62939099
parent4da8fd4e6db8827b9cd66763a04e1cb26bcbc57c (diff)
downloadxbyak-0d54f1b182ae71f5981c64a7eafc34cb6a6e4a3d.tar.gz
xbyak-0d54f1b182ae71f5981c64a7eafc34cb6a6e4a3d.zip
fix for windowsv5.88
-rw-r--r--readme.md3
-rw-r--r--readme.txt1
-rw-r--r--xbyak/xbyak.h4
-rw-r--r--xbyak/xbyak_mnemonic.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/readme.md b/readme.md
index 5f5820d..f1d26d3 100644
--- a/readme.md
+++ b/readme.md
@@ -1,5 +1,5 @@
-# Xbyak 5.87 ; JIT assembler for x86(IA32), x64(AMD64, x86-64) by C++
+# Xbyak 5.88 ; JIT assembler for x86(IA32), x64(AMD64, x86-64) by C++
## Abstract
@@ -422,6 +422,7 @@ modified new BSD License
http://opensource.org/licenses/BSD-3-Clause
## History
+* 2019/Dec/20 ver 5.88 fix compile error on Windows
* 2019/Dec/19 ver 5.87 add setDefaultJmpNEAR(), which deals with `jmp` of an undefined label as T_NEAR if no type is specified.
* 2019/Dec/13 ver 5.86 [changed] revert to the behavior before v5.84 if -fno-operator-names is defined (and() is available)
* 2019/Dec/07 ver 5.85 append MAP_JIT flag to mmap for macOS mojave or later
diff --git a/readme.txt b/readme.txt
index f70f441..f5d4757 100644
--- a/readme.txt
+++ b/readme.txt
@@ -371,6 +371,7 @@ sample/{echo,hello}.bfは http://www.kmonos.net/alang/etc/brainfuck.php から
-----------------------------------------------------------------------------
◎履歴
+2019/12/20 ver 5.88 Windowsでのコンパイルエラー修正
2019/12/19 ver 5.87 未定義ラベルへのjmp命令のデフォルト挙動をT_NEARにするsetDefaultJmpNEAR()を追加
2019/12/13 ver 5.86 [変更] -fno-operator-namesが指定されたときは5.84以前の挙動に戻す
2019/12/07 ver 5.85 mmapにMAP_JITフラグを追加(macOS mojave以上)
diff --git a/xbyak/xbyak.h b/xbyak/xbyak.h
index a41503c..d339414 100644
--- a/xbyak/xbyak.h
+++ b/xbyak/xbyak.h
@@ -115,7 +115,7 @@ namespace Xbyak {
enum {
DEFAULT_MAX_CODE_SIZE = 4096,
- VERSION = 0x5870 /* 0xABCD = A.BC(D) */
+ VERSION = 0x5880 /* 0xABCD = A.BC(D) */
};
#ifndef MIE_INTEGER_TYPE_DEFINED
@@ -2317,7 +2317,7 @@ public:
void putL(const Label& label) { putL_inner(label); }
// set default type of `jmp` of undefined label to T_NEAR
- void setDefaultJmpNEAR(bool near) { isDefaultJmpNEAR_ = near; }
+ void setDefaultJmpNEAR(bool isNear) { isDefaultJmpNEAR_ = isNear; }
void jmp(const Operand& op) { opR_ModM(op, BIT, 4, 0xFF, NONE, NONE, true); }
void jmp(std::string label, LabelType type = T_AUTO) { opJmp(label, type, 0xEB, 0xE9, 0); }
void jmp(const char *label, LabelType type = T_AUTO) { jmp(std::string(label), type); }
diff --git a/xbyak/xbyak_mnemonic.h b/xbyak/xbyak_mnemonic.h
index ff1ee07..ba4d209 100644
--- a/xbyak/xbyak_mnemonic.h
+++ b/xbyak/xbyak_mnemonic.h
@@ -1,4 +1,4 @@
-const char *getVersionString() const { return "5.87"; }
+const char *getVersionString() const { return "5.88"; }
void adc(const Operand& op, uint32 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); }