RPCSX/xbyak
1
0
Fork 0
mirror of https://github.com/RPCSX/xbyak.git synced 2024-11-30 14:50:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix error of jmp.cpp

Browse Source
This commit is contained in:
MITSUNARI Shigeo 2016-11-21 10:56:47 +09:00
parent a691458e47
commit 2443f568e9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/jmp.cpp
View File

@ -444,7 +444,7 @@ size_t getValue(const uint8* p)
{
size_t v = 0;
for (size_t i = 0; i < sizeof(size_t); i++) {
v |= p[i] << (i * 8);
v |= size_t(p[i]) << (i * 8);
}
return v;
}
@ -1057,6 +1057,7 @@ CYBOZU_TEST_AUTO(rip_addr_with_fixed_buf)
mov(eax, 123);
mov(ptr[rip + x0], eax);
mov(dword[rip + x1], 456);
mov(byte[rip + 1 + x1 + 3], 99);
ret();
}
} code;
@ -1064,5 +1065,6 @@ CYBOZU_TEST_AUTO(rip_addr_with_fixed_buf)
code.getCode<void (*)()>()();
CYBOZU_TEST_EQUAL(*x0, 123);
CYBOZU_TEST_EQUAL(*x1, 456);
CYBOZU_TEST_EQUAL(buf[8], 99);
}
#endif

4
xbyak/xbyak.h
View File

@ -599,8 +599,8 @@ struct RegRip {
return RegRip(r.disp_, &label);
}
friend const RegRip operator+(const RegRip& r, const void *addr) {
if (r.disp_ || r.label_ || r.isAddr_) throw Error(ERR_BAD_ADDRESSING);
return RegRip((sint64)addr, 0, true);
if (r.label_ || r.isAddr_) throw Error(ERR_BAD_ADDRESSING);
return RegRip(r.disp_ + (sint64)addr, 0, true);
}
};
#endif