Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v3' of https://github.com/aquynh/capstone into v3

This commit is contained in:
Nguyen Anh Quynh 2014-08-26 23:53:54 +08:00
parent 66ca55f3c4 5df81b4ab9
commit 8a429c25ff
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/AArch64/AArch64AddressingModes.h
View File

@ -130,6 +130,7 @@ static inline uint64_t AArch64_AM_decodeLogicalImmediate(uint64_t val, unsigned
unsigned N = (val >> 12) & 1; unsigned N = (val >> 12) & 1;
unsigned immr = (val >> 6) & 0x3f; unsigned immr = (val >> 6) & 0x3f;
unsigned imms = val & 0x3f; unsigned imms = val & 0x3f;
unsigned i;
// assert((regSize == 64 || N == 0) && "undefined logical immediate encoding"); // assert((regSize == 64 || N == 0) && "undefined logical immediate encoding");
int len = 31 - countLeadingZeros((N << 6) | (~imms & 0x3f)); int len = 31 - countLeadingZeros((N << 6) | (~imms & 0x3f));
@ -139,7 +140,7 @@ static inline uint64_t AArch64_AM_decodeLogicalImmediate(uint64_t val, unsigned
unsigned S = imms & (size - 1); unsigned S = imms & (size - 1);
// assert(S != size - 1 && "undefined logical immediate encoding"); // assert(S != size - 1 && "undefined logical immediate encoding");
uint64_t pattern = (1ULL << (S + 1)) - 1; uint64_t pattern = (1ULL << (S + 1)) - 1;
for (unsigned i = 0; i < R; ++i) for (i = 0; i < R; ++i)
pattern = ror(pattern, size); pattern = ror(pattern, size);
// Replicate the pattern to fill the regSize. // Replicate the pattern to fill the regSize.