gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2015-05-04 06:37:24 +02:00
commit 4cec6a5706
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vm_x86.dasc
View File

@ -2350,8 +2350,8 @@ static void build_subroutines(BuildCtx *ctx)
| |
|.define TOBIT_BIAS, 0x59c00000 // 2^52 + 2^51 (float, not double!). |.define TOBIT_BIAS, 0x59c00000 // 2^52 + 2^51 (float, not double!).
| |
|.macro .ffunc_bit, name, kind |.macro .ffunc_bit, name, kind, fdef
| .ffunc_1 name | fdef name
|.if kind == 2 |.if kind == 2
| sseconst_tobit xmm1, RBa | sseconst_tobit xmm1, RBa
|.endif |.endif
@ -2378,6 +2378,10 @@ static void build_subroutines(BuildCtx *ctx)
|2: |2:
|.endmacro |.endmacro
| |
|.macro .ffunc_bit, name, kind
| .ffunc_bit name, kind, .ffunc_1
|.endmacro
|
|.ffunc_bit bit_tobit, 0 |.ffunc_bit bit_tobit, 0
| jmp ->fff_resbit | jmp ->fff_resbit
| |
@ -2431,7 +2435,7 @@ static void build_subroutines(BuildCtx *ctx)
| |
|.macro .ffunc_bit_sh, name, ins |.macro .ffunc_bit_sh, name, ins
|.if DUALNUM |.if DUALNUM
| .ffunc_bit name, 1 | .ffunc_bit name, 1, .ffunc_2
| // Note: no inline conversion from number for 2nd argument! | // Note: no inline conversion from number for 2nd argument!
| cmp dword [BASE+12], LJ_TISNUM; jne ->fff_fallback | cmp dword [BASE+12], LJ_TISNUM; jne ->fff_fallback
| mov RA, dword [BASE+8] | mov RA, dword [BASE+8]