Skip to content

Commit

Permalink
change clang-format to version 11
Browse files Browse the repository at this point in the history
  • Loading branch information
kawakami-k committed Oct 31, 2023
1 parent 0d3f126 commit 7f6b296
Show file tree
Hide file tree
Showing 28 changed files with 3,698 additions and 3,427 deletions.
3,317 changes: 1,787 additions & 1,530 deletions translator/include/xbyak_translator_aarch64/xbyak.h

Large diffs are not rendered by default.

3,676 changes: 1,843 additions & 1,833 deletions translator/include/xbyak_translator_aarch64/xbyak_mnemonic.h

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions translator/include/xbyak_translator_aarch64/xbyak_translator.h
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ unsigned int xt_push_zreg(xt_a64fx_operands_struct_t *a64) {
xa_->sub(xa_->sp, xa_->sp, NUM_BYTES_Z_REG);
xa_->mov(X_TMP_0, xa_->sp);
xa_->str(xa::ZReg(i), xa::ptr(X_TMP_0));
#else //#ifdef XT_AARCH64_STACK_REG
#else //#ifdef XT_AARCH64_STACK_REG
xa_->sub(X_TRANSLATOR_STACK, X_TRANSLATOR_STACK, NUM_BYTES_Z_REG);
xa_->str(xa::ZReg(i), xa::ptr(X_TRANSLATOR_STACK));
#endif //#ifdef XT_AARCH64_STACK_REG
Expand Down Expand Up @@ -364,7 +364,7 @@ unsigned int xt_push_zreg(xt_a64fx_operands_structV3_t *a64) {
xa_->mov(X_TMP_0, xa_->sp);

xa_->str(xa::ZReg(i), xa::ptr(X_TMP_0));
#else //#ifdef XT_AARCH64_STACK_REG
#else //#ifdef XT_AARCH64_STACK_REG
xa_->sub(X_TRANSLATOR_STACK, X_TRANSLATOR_STACK, NUM_BYTES_Z_REG);
xa_->str(xa::ZReg(i), xa::ptr(X_TRANSLATOR_STACK));
#endif //#ifdef XT_AARCH64_STACK_REG
Expand Down Expand Up @@ -397,7 +397,7 @@ unsigned int xt_push_preg(xt_a64fx_operands_struct_t *a64) {
xa_->sub(xa_->sp, xa_->sp, NUM_BYTES_PRED_REG);
xa_->mov(X_TMP_0, xa_->sp);
xa_->str(xa::PReg(i), xa::ptr(X_TMP_0));
#else //#ifdef XT_AARCH64_STACK_REG
#else //#ifdef XT_AARCH64_STACK_REG
xa_->sub(X_TRANSLATOR_STACK, X_TRANSLATOR_STACK, NUM_BYTES_PRED_REG);
xa_->str(xa::PReg(i), xa::ptr(X_TRANSLATOR_STACK));
#endif //#ifdef XT_AARCH64_STACK_REG
Expand Down Expand Up @@ -441,7 +441,7 @@ unsigned int xt_push_preg(xt_a64fx_operands_structV3_t *a64) {
xa_->sub(xa_->sp, xa_->sp, NUM_BYTES_PRED_REG);
xa_->mov(X_TMP_0, xa_->sp);
xa_->str(xa::PReg(i), xa::ptr(X_TMP_0));
#else //#ifdef XT_AARCH64_STACK_REG
#else //#ifdef XT_AARCH64_STACK_REG
xa_->sub(X_TRANSLATOR_STACK, X_TRANSLATOR_STACK, NUM_BYTES_PRED_REG);
xa_->str(xa::PReg(i), xa::ptr(X_TRANSLATOR_STACK));
#endif //#ifdef XT_AARCH64_STACK_REG
Expand Down Expand Up @@ -472,7 +472,7 @@ void xt_pop_zreg() {
xa_->mov(X_TMP_0, xa_->sp);
xa_->ldr(xa::ZReg(i), xa::ptr(X_TMP_0));
xa_->add(xa_->sp, xa_->sp, NUM_BYTES_Z_REG);
#else //#ifdef XT_AARCH64_STACK_REG
#else //#ifdef XT_AARCH64_STACK_REG
xa_->ldr(xa::ZReg(i), xa::ptr(X_TRANSLATOR_STACK));
xa_->add(X_TRANSLATOR_STACK, X_TRANSLATOR_STACK, NUM_BYTES_Z_REG);
#endif //#ifdef XT_AARCH64_STACK_REG
Expand Down Expand Up @@ -501,7 +501,7 @@ void xt_pop_preg() {
xa_->mov(X_TMP_0, xa_->sp);
xa_->ldr(xa::PReg(i), xa::ptr(X_TMP_0));
xa_->add(xa_->sp, xa_->sp, NUM_BYTES_PRED_REG);
#else //#ifdef XT_AARCH64_STACK_REG
#else //#ifdef XT_AARCH64_STACK_REG
xa_->ldr(xa::PReg(i), xa::ptr(X_TRANSLATOR_STACK));
xa_->add(X_TRANSLATOR_STACK, X_TRANSLATOR_STACK, NUM_BYTES_PRED_REG);
#endif //#ifdef XT_AARCH64_STACK_REG
Expand Down Expand Up @@ -1219,7 +1219,7 @@ void decodeAndTransToAArch64(xt_cmp_x86_64_t cmp_mode, const Label &label) {
break;
}
}
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
void decodeAndTransToAArch64() {}
#endif //#ifdef XBYAK_TRANSLATE_AARCH64

Expand Down
12 changes: 8 additions & 4 deletions translator/src/xbyak_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ void Xbyak::CodeGenerator::vex(const Reg &reg, const Reg &base,
db(0xC5);
db((r ? 0 : 0x80) | vvvv);
} else {
uint32 mmmm =
(type & T_0F) ? 1 : (type & T_0F38) ? 2 : (type & T_0F3A) ? 3 : 0;
uint32 mmmm = (type & T_0F) ? 1
: (type & T_0F38) ? 2
: (type & T_0F3A) ? 3
: 0;
db(0xC4);
db((r ? 0 : 0x80) | (x ? 0 : 0x40) | (b ? 0 : 0x20) | mmmm);
db((w << 7) | vvvv);
Expand Down Expand Up @@ -197,8 +199,10 @@ void Xbyak::CodeGenerator::opFpuMem(const Address &addr, uint8 m16, uint8 m32,
uint8 m64, uint8 ext, uint8 m64ext) {
if (addr.is64bitDisp())
throw Error(ERR_CANT_USE_64BIT_DISP);
uint8 code =
addr.isBit(16) ? m16 : addr.isBit(32) ? m32 : addr.isBit(64) ? m64 : 0;
uint8 code = addr.isBit(16) ? m16
: addr.isBit(32) ? m32
: addr.isBit(64) ? m64
: 0;
if (!code)
throw Error(ERR_BAD_MEM_SIZE);
if (m64ext && addr.isBit(64))
Expand Down
2 changes: 1 addition & 1 deletion translator/tests/pattern/jb/jb000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TestPtnGenerator : public TestGenerator {
L(label_vec[n]);
#ifdef XBYAK_TRANSLATE_AARCH64
xa_->lsl(x0, x0, 1);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
shl(rax, 1);
#endif //#ifdef XBYAK_TRANSLATE_AARCH64
n++;
Expand Down
2 changes: 1 addition & 1 deletion translator/tests/pattern/jbe/jbe000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TestPtnGenerator : public TestGenerator {
L(label_vec[n]);
#ifdef XBYAK_TRANSLATE_AARCH64
xa_->lsl(x0, x0, 1);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
shl(rax, 1);
#endif //#ifdef XBYAK_TRANSLATE_AARCH64
n++;
Expand Down
2 changes: 1 addition & 1 deletion translator/tests/pattern/je/je000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TestPtnGenerator : public TestGenerator {
L(label_vec[n]);
#ifdef XBYAK_TRANSLATE_AARCH64
xa_->lsl(x0, x0, 1);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
shl(rax, 1);
#endif //#ifdef XBYAK_TRANSLATE_AARCH64
n++;
Expand Down
2 changes: 1 addition & 1 deletion translator/tests/pattern/jg/jg000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TestPtnGenerator : public TestGenerator {
L(label_vec[n]);
#ifdef XBYAK_TRANSLATE_AARCH64
xa_->lsl(x0, x0, 1);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
shl(rax, 1);
#endif //#ifdef XBYAK_TRANSLATE_AARCH64
n++;
Expand Down
2 changes: 1 addition & 1 deletion translator/tests/pattern/jge/jge000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TestPtnGenerator : public TestGenerator {
L(label_vec[n]);
#ifdef XBYAK_TRANSLATE_AARCH64
xa_->lsl(x0, x0, 1);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
shl(rax, 1);
#endif //#ifdef XBYAK_TRANSLATE_AARCH64
n++;
Expand Down
2 changes: 1 addition & 1 deletion translator/tests/pattern/jl/jl000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TestPtnGenerator : public TestGenerator {
L(label_vec[n]);
#ifdef XBYAK_TRANSLATE_AARCH64
xa_->lsl(x0, x0, 1);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
shl(rax, 1);
#endif //#ifdef XBYAK_TRANSLATE_AARCH64
n++;
Expand Down
2 changes: 1 addition & 1 deletion translator/tests/pattern/jle/jle000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TestPtnGenerator : public TestGenerator {
L(label_vec[n]);
#ifdef XBYAK_TRANSLATE_AARCH64
xa_->lsl(x0, x0, 1);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
shl(rax, 1);
#endif //#ifdef XBYAK_TRANSLATE_AARCH64
n++;
Expand Down
2 changes: 1 addition & 1 deletion translator/tests/pattern/jne/jne000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TestPtnGenerator : public TestGenerator {
L(label_vec[n]);
#ifdef XBYAK_TRANSLATE_AARCH64
xa_->lsl(x0, x0, 1);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
shl(rax, 1);
#endif //#ifdef XBYAK_TRANSLATE_AARCH64
n++;
Expand Down
2 changes: 1 addition & 1 deletion translator/tests/pattern/jnz/jnz000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TestPtnGenerator : public TestGenerator {
L(label_vec[n]);
#ifdef XBYAK_TRANSLATE_AARCH64
xa_->lsl(x0, x0, 1);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
shl(rax, 1);
#endif //#ifdef XBYAK_TRANSLATE_AARCH64
n++;
Expand Down
2 changes: 1 addition & 1 deletion translator/tests/pattern/jz/jz000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TestPtnGenerator : public TestGenerator {
L(label_vec[n]);
#ifdef XBYAK_TRANSLATE_AARCH64
xa_->lsl(x0, x0, 1);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
shl(rax, 1);
#endif //#ifdef XBYAK_TRANSLATE_AARCH64
n++;
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/ktestq/ktestq000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -132,7 +132,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 4);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/test/test000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -142,7 +142,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 8);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/test/test001.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -147,7 +147,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 8);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/test/test002.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -146,7 +146,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 8);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/test/test002_1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -146,7 +146,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 8);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/test/test003.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -146,7 +146,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 8);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/test/test003_1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -146,7 +146,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 8);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/test/test004.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -144,7 +144,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 8);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/vtestps/vtestps000.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -172,7 +172,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 4);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/vtestps/vtestps001.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -172,7 +172,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 4);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/vtestps/vtestps002.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -175,7 +175,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 4);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
4 changes: 2 additions & 2 deletions translator/tests/pattern/vtestps/vtestps003.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class TestPtnGenerator : public TestGenerator {
xa_->mov_imm(x_cf, 1 << 0);
Reg64 r_addr{rdx};
Reg64 r_tmpAddr{rcx};
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
Reg64 r_of{rdi};
Reg64 r_sf{rsi};
Reg64 r_zf{rbp};
Expand Down Expand Up @@ -175,7 +175,7 @@ class TestPtnGenerator : public TestGenerator {

xa_->str(x_dummyFlag, Xbyak_aarch64::ptr(x_tmpAddr));
xa_->add(x_tmpAddr, x_tmpAddr, 4);
#else //#ifdef XBYAK_TRANSLATE_AARCH64
#else //#ifdef XBYAK_TRANSLATE_AARCH64
pushf(); // eflags is stored on statck.
pop(r_tmpFlag); // eflags is read from stack.
and_(r_tmpFlag, r_flagMask);
Expand Down
Loading

0 comments on commit 7f6b296

Please sign in to comment.