diff options
| author | Mike Pall <mike> | 2014-03-27 11:39:15 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-03-27 11:39:15 +0100 |
| commit | 3500c35e23c89fe728d6aa1404cf1324483caddc (patch) | |
| tree | f4f7d6c897ecfe849e0691d8734440ad32a24461 | |
| parent | ce477ffbfa15a50f7c3a0dd3fc071f06b6fe8d11 (diff) | |
| parent | c03be1210c5334e58958d95ea0412c20c3eb0128 (diff) | |
| download | luajit-3500c35e23c89fe728d6aa1404cf1324483caddc.tar.gz luajit-3500c35e23c89fe728d6aa1404cf1324483caddc.tar.bz2 luajit-3500c35e23c89fe728d6aa1404cf1324483caddc.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/vm_x86.dasc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc index bbe341ff..a0c7cc60 100644 --- a/src/vm_x86.dasc +++ b/src/vm_x86.dasc | |||
| @@ -2152,7 +2152,7 @@ static void build_subroutines(BuildCtx *ctx) | |||
| 2152 | | xorps xmm4, xmm4; jmp <1 // Return +-Inf and +-0. | 2152 | | xorps xmm4, xmm4; jmp <1 // Return +-Inf and +-0. |
| 2153 | | | 2153 | | |
| 2154 | |.ffunc_nnr math_fmod | 2154 | |.ffunc_nnr math_fmod |
| 2155 | |1: ; fprem; fnstsw ax; sahf; jp <1 | 2155 | |1: ; fprem; fnstsw ax; and ax, 0x400; jnz <1 |
| 2156 | | fpop1 | 2156 | | fpop1 |
| 2157 | | jmp ->fff_resn | 2157 | | jmp ->fff_resn |
| 2158 | | | 2158 | | |