diff options
| author | Mike Pall <mike> | 2016-04-18 13:41:41 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-04-18 13:41:41 +0200 |
| commit | 4c6498d24578e571ac381539063c4069aae694cc (patch) | |
| tree | 588563f80469b73063d755bccf4248b0ae20bccc | |
| parent | d13d4209808a050e4fbe7dcb43739983075789d5 (diff) | |
| parent | cc4f5d056ab93521451631f28501015f054d8976 (diff) | |
| download | luajit-4c6498d24578e571ac381539063c4069aae694cc.tar.gz luajit-4c6498d24578e571ac381539063c4069aae694cc.tar.bz2 luajit-4c6498d24578e571ac381539063c4069aae694cc.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_asm_x86.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h index f515d821..de47166e 100644 --- a/src/lj_asm_x86.h +++ b/src/lj_asm_x86.h | |||
| @@ -2685,17 +2685,17 @@ static uint32_t asm_x86_inslen(const uint8_t* p) | |||
| 2685 | return result + (x & 15); | 2685 | return result + (x & 15); |
| 2686 | case 7: /* VEX c4/c5. */ | 2686 | case 7: /* VEX c4/c5. */ |
| 2687 | if (LJ_32 && p[1] < 0xc0) { | 2687 | if (LJ_32 && p[1] < 0xc0) { |
| 2688 | x = 2; | 2688 | x = 2; |
| 2689 | goto mrm; | 2689 | goto mrm; |
| 2690 | } | 2690 | } |
| 2691 | if (x == 0x70) { | 2691 | if (x == 0x70) { |
| 2692 | x = *++p & 0x1f; | 2692 | x = *++p & 0x1f; |
| 2693 | result++; | 2693 | result++; |
| 2694 | if (x >= 2) { | 2694 | if (x >= 2) { |
| 2695 | p += 2; | 2695 | p += 2; |
| 2696 | result += 2; | 2696 | result += 2; |
| 2697 | goto mrm; | 2697 | goto mrm; |
| 2698 | } | 2698 | } |
| 2699 | } | 2699 | } |
| 2700 | p++; | 2700 | p++; |
| 2701 | result++; | 2701 | result++; |
| @@ -2712,8 +2712,8 @@ static uint32_t asm_x86_inslen(const uint8_t* p) | |||
| 2712 | case 3: return result; | 2712 | case 3: return result; |
| 2713 | } | 2713 | } |
| 2714 | if ((x & 7) == 4) { | 2714 | if ((x & 7) == 4) { |
| 2715 | result++; | 2715 | result++; |
| 2716 | if (x < 0x40 && (p[1] & 7) == 5) result += 4; | 2716 | if (x < 0x40 && (p[1] & 7) == 5) result += 4; |
| 2717 | } | 2717 | } |
| 2718 | return result; | 2718 | return result; |
| 2719 | } | 2719 | } |