eden-emu/xbyak
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix range test of mov(Operand, imm)

Browse source
This commit is contained in:
MITSUNARI Shigeo 2015-08-17 13:36:40 +09:00
parent 762f40ffc3
commit b0bf808647
2 changed files with 46 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

49
test/misc.cpp
View file

@ -32,19 +32,52 @@ CYBOZU_TEST_AUTO(compOperand)
CYBOZU_TEST_ASSERT(ptr[eax] != ptr[eax+3]); CYBOZU_TEST_ASSERT(ptr[eax] != ptr[eax+3]);
} }
#ifdef XBYAK64
CYBOZU_TEST_AUTO(mov_const) CYBOZU_TEST_AUTO(mov_const)
{ {
struct Code : Xbyak::CodeGenerator { struct Code : Xbyak::CodeGenerator {
Code() Code()
{ {
CYBOZU_TEST_NO_EXCEPTION(mov(qword[eax], 0x12345678)); const struct {
CYBOZU_TEST_NO_EXCEPTION(mov(qword[eax], 0x7fffffff)); uint64_t v;
CYBOZU_TEST_NO_EXCEPTION(mov(qword[eax], -1)); int bit;
CYBOZU_TEST_NO_EXCEPTION(mov(qword[eax], 0xffffffffffffffffull)); bool error;
CYBOZU_TEST_EXCEPTION(mov(qword[eax], 0x80000000), Xbyak::Error); } tbl[] = {
CYBOZU_TEST_EXCEPTION(mov(qword[eax], 0xffffffff), Xbyak::Error); { -1, 8, false },
{ 0x12, 8, false },
{ 0x80, 8, false },
{ 0xff, 8, false },
{ 0x100, 8, true },
{ 1, 16, false },
{ -1, 16, false },
{ 0x7fff, 16, false },
{ 0xffff, 16, false },
{ 0x10000, 16, true },
{ -1, 32, false },
{ 0x7fffffff, 32, false },
{ -0x7fffffff, 32, false },
{ 0xffffffff, 32, false },
{ 0x100000000ull, 32, true },
#ifdef XBYAK64
{ -1, 64, false },
{ 0x7fffffff, 64, false },
{ 0xffffffffffffffffull, 64, false },
{ 0x80000000, 64, true },
{ 0xffffffff, 64, true },
#endif
};
for (size_t i = 0; i < CYBOZU_NUM_OF_ARRAY(tbl); i++) {
const int bit = tbl[i].bit;
const uint64_t v = tbl[i].v;
const Xbyak::AddressFrame& af = bit == 8 ? byte : bit == 16 ? word : bit == 32 ? dword : qword;
if (tbl[i].error) {
CYBOZU_TEST_EXCEPTION(mov(af[eax], v), Xbyak::Error);
} else {
CYBOZU_TEST_NO_EXCEPTION(mov(af[eax], v));
}
}
} }
} code; } code;
} }
#endif

7
xbyak/xbyak.h
View file

@ -1859,14 +1859,17 @@ private:
public: public:
void mov(const Operand& op, size_t imm) void mov(const Operand& op, size_t imm)
{ {
verifyMemHasSize(op);
if (op.isREG()) { if (op.isREG()) {
const int size = mov_imm(static_cast<const Reg&>(op), imm); const int size = mov_imm(static_cast<const Reg&>(op), imm);
db(imm, size); db(imm, size);
} else if (op.isMEM()) { } else if (op.isMEM()) {
verifyMemHasSize(op);
opModM(static_cast<const Address&>(op), Reg(0, Operand::REG, op.getBit()), B11000110); opModM(static_cast<const Address&>(op), Reg(0, Operand::REG, op.getBit()), B11000110);
int size = op.getBit() / 8; int size = op.getBit() / 8;
if (size == 8) { if (size <= 4) {
sint64 s = sint64(imm) >> (size * 8);
if (s != 0 && s != -1) throw Error(ERR_IMM_IS_TOO_BIG);
} else {
if (!inner::IsInInt32(imm)) throw Error(ERR_IMM_IS_TOO_BIG); if (!inner::IsInInt32(imm)) throw Error(ERR_IMM_IS_TOO_BIG);
size = 4; size = 4;
} }