diff options
| author | Mike Pall <mike> | 2016-05-06 12:09:23 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-05-06 12:09:23 +0200 |
| commit | 6a9973203c55daa4c1fcd611718bc5df09e4e5b5 (patch) | |
| tree | 7919ef5b219cbfae8dbe464c87b4eac2613a8984 | |
| parent | 221268b17d950d1cdfc36ee85b82c89c83a974fb (diff) | |
| parent | f05280e4156df2d13d87b1639157c63ed4e3b393 (diff) | |
| download | luajit-6a9973203c55daa4c1fcd611718bc5df09e4e5b5.tar.gz luajit-6a9973203c55daa4c1fcd611718bc5df09e4e5b5.tar.bz2 luajit-6a9973203c55daa4c1fcd611718bc5df09e4e5b5.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_asm_x86.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h index de47166e..66fb4403 100644 --- a/src/lj_asm_x86.h +++ b/src/lj_asm_x86.h | |||
| @@ -2680,9 +2680,9 @@ static uint32_t asm_x86_inslen(const uint8_t* p) | |||
| 2680 | case 4: result -= (prefixes & 2); /* fallthrough */ | 2680 | case 4: result -= (prefixes & 2); /* fallthrough */ |
| 2681 | case 5: return result + (x & 15); | 2681 | case 5: return result + (x & 15); |
| 2682 | case 6: /* Group 3. */ | 2682 | case 6: /* Group 3. */ |
| 2683 | if (p[1] & 0x38) return result + 2; | 2683 | if (p[1] & 0x38) x = 2; |
| 2684 | if ((prefixes & 2) && (x == 0x66)) return result + 4; | 2684 | else if ((prefixes & 2) && (x == 0x66)) x = 4; |
| 2685 | return result + (x & 15); | 2685 | goto mrm; |
| 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; |