diff options
| author | MITSUNARI Shigeo <[email protected]> | 2023-12-27 11:48:00 +0900 |
|---|---|---|
| committer | MITSUNARI Shigeo <[email protected]> | 2023-12-27 11:48:00 +0900 |
| commit | 2e93baa6a63c34cd7775eae25de32d71ff46e226 (patch) | |
| tree | 73dd2c31a2e6b173bab0a2d85b6fded316f5fbed /gen | |
| parent | 5c95842bebbd005e0fbfe48692ae066361b18a7b (diff) | |
| parent | e1864642cb5a64ff034077ec45df0aa62ae61ecc (diff) | |
| download | xbyak-2e93baa6a63c34cd7775eae25de32d71ff46e226.tar.gz xbyak-2e93baa6a63c34cd7775eae25de32d71ff46e226.zip | |
Merge branch 'dev'
Diffstat (limited to 'gen')
| -rw-r--r-- | gen/avx_type.hpp | 2 | ||||
| -rw-r--r-- | gen/avx_type_def.h | 5 | ||||
| -rw-r--r-- | gen/gen_code.cpp | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/gen/avx_type.hpp b/gen/avx_type.hpp index 5ec0229..6fa11f4 100644 --- a/gen/avx_type.hpp +++ b/gen/avx_type.hpp @@ -64,10 +64,8 @@ std::string type2String(uint64_t type) if (type & T_MEM_EVEX) str += "|T_MEM_EVEX"; if (type & T_NF) str += "|T_NF"; if (type & T_CODE1_IF1) str += "|T_CODE1_IF1"; - if (type & T_MAP3) str += "|T_MAP3"; if (type & T_ND1) str += "|T_ND1"; if (type & T_ZU) str += "|T_ZU"; - if (type & T_MAP1) str += "|T_MAP1"; if (str[0] == '|') str = str.substr(1); return str; diff --git a/gen/avx_type_def.h b/gen/avx_type_def.h index 81052c4..51bc9c2 100644 --- a/gen/avx_type_def.h +++ b/gen/avx_type_def.h @@ -43,13 +43,10 @@ static const uint64_t T_MAP6 = T_FP16 | T_0F38; static const uint64_t T_NF = 1ull << 32; // T_nf static const uint64_t T_CODE1_IF1 = 1ull << 33; // code|=1 if !r.isBit(8) - static const uint64_t T_MAP3 = 1ull << 34; // rorx only + static const uint64_t T_ND1 = 1ull << 35; // ND=1 static const uint64_t T_ZU = 1ull << 36; // ND=ZU static const uint64_t T_F2 = 1ull << 37; // pp = 3 - static const uint64_t T_MAP1 = 1ull << 38; // kmov // T_66 = 1, T_F3 = 2, T_F2 = 3 static inline uint32_t getPP(uint64_t type) { return (type & T_66) ? 1 : (type & T_F3) ? 2 : (type & T_F2) ? 3 : 0; } - static inline uint32_t getMMM(uint64_t type) { return (type & T_0F) ? 1 : (type & T_0F38) ? 2 : (type & T_0F3A) ? 3 : 0; } - // @@@end of avx_type_def.h diff --git a/gen/gen_code.cpp b/gen/gen_code.cpp index 13b9ab6..84e5804 100644 --- a/gen/gen_code.cpp +++ b/gen/gen_code.cpp @@ -1831,7 +1831,7 @@ void put() const Tbl& p = tbl[i]; printf("void %s(const Reg32e& r1, const Operand& op, const Reg32e& r2) { opRRO(r1, r2, op, %s, 0x%x); }\n", p.name, type2String(p.type).c_str(), p.code); } - puts("void rorx(const Reg32e& r, const Operand& op, uint8_t imm) { opRRO(r, Reg32e(0, r.getBit()), op, T_0F3A|T_F2|T_APX|T_MAP3, 0xF0, imm); }"); + puts("void rorx(const Reg32e& r, const Operand& op, uint8_t imm) { opRRO(r, Reg32e(0, r.getBit()), op, T_0F3A|T_F2|T_APX, 0xF0, imm); }"); } // gpr(reg, r/m) { |