mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-13 07:10:20 +02:00
fixes to sparc floating point
2004-11-09 Paolo Bonzini <bonzini@gnu.org> * lightning/sparc/fp.h: Fix fp-to-integer conversions. * lightning/ppc/testfp.c: Test fp-to-integer conversions of integer numbers. * lightning/ppc/testfp.ok: Adjust for the above. git-archimport-id: bonzini@gnu.org--2004b/lightning--stable--1.2--patch-8
This commit is contained in:
Paolo Bonzini
parent
32abbe4919
commit
7101c65e25
4 changed files with 99 additions and 29 deletions
|
|
@ -1,3 +1,10 @@
|
||||||
|
2004-11-09 Paolo Bonzini <bonzini@gnu.org>
|
||||||
|
|
||||||
|
* lightning/sparc/fp.h: Fix fp-to-integer conversions.
|
||||||
|
* lightning/ppc/testfp.c: Test fp-to-integer conversions
|
||||||
|
of integer numbers.
|
||||||
|
* lightning/ppc/testfp.ok: Adjust for the above.
|
||||||
|
|
||||||
2004-11-08 Paolo Bonzini <bonzini@gnu.org>
|
2004-11-08 Paolo Bonzini <bonzini@gnu.org>
|
||||||
|
|
||||||
* lightning/ppc/testfp.c: Always flush code before
|
* lightning/ppc/testfp.c: Always flush code before
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,8 @@
|
||||||
#ifndef __lightning_asm_fp_h
|
#ifndef __lightning_asm_fp_h
|
||||||
#define __lightning_asm_fp_h
|
#define __lightning_asm_fp_h
|
||||||
|
|
||||||
|
#include <float.h>
|
||||||
|
|
||||||
#define JIT_FPR_NUM 6
|
#define JIT_FPR_NUM 6
|
||||||
#define JIT_FPR(i) (30-(i)*2)
|
#define JIT_FPR(i) (30-(i)*2)
|
||||||
#define JIT_FPTMP 18
|
#define JIT_FPTMP 18
|
||||||
|
|
@ -88,37 +90,90 @@
|
||||||
#define jit_stxr_f(d1, d2, rs) STFrx((rs), (d1), (d2))
|
#define jit_stxr_f(d1, d2, rs) STFrx((rs), (d1), (d2))
|
||||||
#define jit_stxr_d(d1, d2, rs) STDFrx((rs), (d1), (d2))
|
#define jit_stxr_d(d1, d2, rs) STDFrx((rs), (d1), (d2))
|
||||||
|
|
||||||
#define jit_do_round(mode, rd, freg, macro) ( \
|
#define jit_truncr_f_i(rd, rs) ( \
|
||||||
_1(_jit.x.pc + 3), \
|
_1(_jit.x.pc + 3), \
|
||||||
SETHIir(_HI(mode << 29), JIT_BIG), \
|
FSTOIrr((rs), JIT_FPTMP), \
|
||||||
NOP(), \
|
NOP(), \
|
||||||
STFSRm(_Ro(7), 8), /* store fsr */ \
|
STFrm(JIT_FPTMP, _Ro(7), 8), \
|
||||||
LDmr(_Ro(7), 8, rd), \
|
LDmr(_Ro(7), 8, (rd)))
|
||||||
XORrrr(rd, JIT_BIG, JIT_BIG), /* adjust mode */ \
|
|
||||||
STrm(JIT_BIG, _Ro(7), 8), \
|
|
||||||
LDFSRm(_Ro(7), 8), /* load fsr */ \
|
|
||||||
macro, /* truncate */ \
|
|
||||||
STrm(rd, _Ro(7), 8), /* load old fsr */ \
|
|
||||||
LDFSRm(_Ro(7), 8), \
|
|
||||||
STFrm(JIT_FPTMP, _Ro(7), 8), /* store truncated value */ \
|
|
||||||
LDmr(_Ro(7), 8, rd)) /* load it into rd */
|
|
||||||
|
|
||||||
#define jit_do_round_no_fsr(macro1, macro2) ( \
|
#define jit_truncr_d_i(rd, rs) ( \
|
||||||
_1(_jit.x.pc + 3), \
|
_1(_jit.x.pc + 3), \
|
||||||
macro1, \
|
FDTOIrr((rs), JIT_FPTMP), \
|
||||||
NOP(), \
|
NOP(), \
|
||||||
macro2)
|
STFrm(JIT_FPTMP, _Ro(7), 8), \
|
||||||
|
LDmr(_Ro(7), 8, (rd)))
|
||||||
|
|
||||||
#define jit_extr_i_d(rd, rs) jit_do_round_no_fsr (NOP(), (STrm((rs), _Ro(7), 8), LDFmr(_Ro(7), 8, (rd)), FITODrr((rd), (rd))))
|
#define jit_extr_i_d(rd, rs) (_1 (_jit.x.pc + 3), NOP(), NOP(), STrm((rs), _Ro(7), 8), LDFmr(_Ro(7), 8, (rd)), FITODrr((rd), (rd)))
|
||||||
#define jit_extr_i_f(rd, rs) jit_do_round_no_fsr (NOP(), (STrm((rs), _Ro(7), 8), LDFmr(_Ro(7), 8, (rd)), FITOSrr((rd), (rd))))
|
#define jit_extr_i_f(rd, rs) (_1 (_jit.x.pc + 3), NOP(), NOP(), STrm((rs), _Ro(7), 8), LDFmr(_Ro(7), 8, (rd)), FITOSrr((rd), (rd)))
|
||||||
#define jit_roundr_d_i(rd, rs) jit_do_round_no_fsr (FDTOIrr((rs), JIT_FPTMP), (STFrm(JIT_FPTMP, _Ro(7), 8), LDmr(_Ro(7), 8, (rd))))
|
|
||||||
#define jit_roundr_f_i(rd, rs) jit_do_round_no_fsr (FSTOIrr((rs), JIT_FPTMP), (STFrm(JIT_FPTMP, _Ro(7), 8), LDmr(_Ro(7), 8, (rd))))
|
#define jit_do_round_f(rd, rs, fixup, mode) do { \
|
||||||
#define jit_floorr_d_i(rd, rs) jit_do_round(3, (rd), (rs), FDTOIrr((rs), JIT_FPTMP))
|
jit_movi_f (JIT_FPTMP, fixup); \
|
||||||
#define jit_ceilr_d_i(rd, rs) jit_do_round(2, (rd), (rs), FDTOIrr((rs), JIT_FPTMP))
|
_1(_jit.x.pc + 4); \
|
||||||
#define jit_truncr_d_i(rd, rs) jit_do_round(1, (rd), (rs), FDTOIrr((rs), JIT_FPTMP))
|
SETHIir(_HI(mode << 29), JIT_BIG); \
|
||||||
#define jit_floorr_f_i(rd, rs) jit_do_round(3, (rd), (rs), FSTOIrr((rs), JIT_FPTMP))
|
NOP(); \
|
||||||
#define jit_ceilr_f_i(rd, rs) jit_do_round(2, (rd), (rs), FSTOIrr((rs), JIT_FPTMP))
|
NOP(); \
|
||||||
#define jit_truncr_f_i(rd, rs) jit_do_round(1, (rd), (rs), FSTOIrr((rs), JIT_FPTMP))
|
STFSRm(_Ro(7), 8); /* store fsr */ \
|
||||||
|
LDmr(_Ro(7), 8, rd); \
|
||||||
|
XORrrr(rd, JIT_BIG, JIT_BIG); /* adjust mode */ \
|
||||||
|
STrm(JIT_BIG, _Ro(7), 12); \
|
||||||
|
LDFSRm(_Ro(7), 12); /* load fsr */ \
|
||||||
|
FADDSrrr ((rs), JIT_FPTMP, JIT_FPTMP); \
|
||||||
|
LDFSRm(_Ro(7), 8); \
|
||||||
|
FSTOIrr(JIT_FPTMP, JIT_FPTMP); \
|
||||||
|
STFrm(JIT_FPTMP, _Ro(7), 8); \
|
||||||
|
LDmr(_Ro(7), 8, (rd)); \
|
||||||
|
ADDCCrrr ((rd), (rd), 0); \
|
||||||
|
SUBXrrr ((rd), 0, (rd)); \
|
||||||
|
} while (0);
|
||||||
|
|
||||||
|
#define jit_do_round_d(rd, rs, fixup, mode) do { \
|
||||||
|
jit_movi_d (JIT_FPTMP, fixup); \
|
||||||
|
_1(_jit.x.pc + 4); \
|
||||||
|
SETHIir(_HI(mode << 29), JIT_BIG); \
|
||||||
|
NOP(); \
|
||||||
|
NOP(); \
|
||||||
|
STFSRm(_Ro(7), 8); /* store fsr */ \
|
||||||
|
LDmr(_Ro(7), 8, rd); \
|
||||||
|
XORrrr(rd, JIT_BIG, JIT_BIG); /* adjust mode */ \
|
||||||
|
STrm(JIT_BIG, _Ro(7), 12); \
|
||||||
|
LDFSRm(_Ro(7), 12); /* load fsr */ \
|
||||||
|
FADDDrrr ((rs), JIT_FPTMP, JIT_FPTMP); \
|
||||||
|
LDFSRm(_Ro(7), 8); \
|
||||||
|
FDTOIrr(JIT_FPTMP, JIT_FPTMP); \
|
||||||
|
STFrm(JIT_FPTMP, _Ro(7), 8); \
|
||||||
|
LDmr(_Ro(7), 8, (rd)); \
|
||||||
|
ADDCCrrr ((rd), (rd), 0); \
|
||||||
|
SUBXrrr ((rd), 0, (rd)); \
|
||||||
|
} while (0);
|
||||||
|
|
||||||
|
#define jit_roundr_f_i(rd, rs) do { \
|
||||||
|
jit_movi_f (JIT_FPTMP, 0.5); \
|
||||||
|
FADDSrrr ((rs), JIT_FPTMP, JIT_FPTMP); \
|
||||||
|
jit_truncr_f_i ((rd), JIT_FPTMP); \
|
||||||
|
ADDCCrrr ((rd), (rd), 0); \
|
||||||
|
SUBXrrr ((rd), 0, (rd)); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define jit_roundr_d_i(rd, rs) do { \
|
||||||
|
jit_movi_d (JIT_FPTMP, 0.5); \
|
||||||
|
FADDDrrr ((rs), JIT_FPTMP, JIT_FPTMP); \
|
||||||
|
jit_truncr_d_i ((rd), JIT_FPTMP); \
|
||||||
|
ADDCCrrr ((rd), (rd), 0); \
|
||||||
|
SUBXrrr ((rd), 0, (rd)); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define jit_ceilr_f_i(rd, rs) \
|
||||||
|
jit_do_round_f ((rd), (rs), 1.0f - FLT_EPSILON, 3)
|
||||||
|
|
||||||
|
#define jit_ceilr_d_i(rd, rs) \
|
||||||
|
jit_do_round_d ((rd), (rs), 1.0 - DBL_EPSILON, 3)
|
||||||
|
|
||||||
|
#define jit_floorr_f_i(rd, rs) \
|
||||||
|
jit_do_round_f ((rd), (rs), FLT_EPSILON, 2)
|
||||||
|
|
||||||
|
#define jit_floorr_d_i(rd, rs) \
|
||||||
|
jit_do_round_d ((rd), (rs), DBL_EPSILON, 2)
|
||||||
|
|
||||||
#define jit_ltr_d(d, s1, s2) (FCMPDrr ((s1), (s2)), FBLi(_jit.x.pc + 3), MOVir (1, (d)), MOVir (0, (d)))
|
#define jit_ltr_d(d, s1, s2) (FCMPDrr ((s1), (s2)), FBLi(_jit.x.pc + 3), MOVir (1, (d)), MOVir (0, (d)))
|
||||||
#define jit_ltr_f(d, s1, s2) (FCMPSrr ((s1), (s2)), FBLi(_jit.x.pc + 3), MOVir (1, (d)), MOVir (0, (d)))
|
#define jit_ltr_f(d, s1, s2) (FCMPSrr ((s1), (s2)), FBLi(_jit.x.pc + 3), MOVir (1, (d)), MOVir (0, (d)))
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,7 @@ main()
|
||||||
#endif
|
#endif
|
||||||
#ifndef LIGHTNING_CROSS
|
#ifndef LIGHTNING_CROSS
|
||||||
int_test("trunc", code, -2.6, -2.4, 0, 2.4, 2.6);
|
int_test("trunc", code, -2.6, -2.4, 0, 2.4, 2.6);
|
||||||
|
int_test("trunc", code, -3, -2, 0, 2, 3);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
jit_set_ip(codeBuffer);
|
jit_set_ip(codeBuffer);
|
||||||
|
|
@ -122,6 +123,7 @@ main()
|
||||||
#endif
|
#endif
|
||||||
#ifndef LIGHTNING_CROSS
|
#ifndef LIGHTNING_CROSS
|
||||||
int_test("ceil", code, -2.6, -2.4, 0, 2.4, 2.6);
|
int_test("ceil", code, -2.6, -2.4, 0, 2.4, 2.6);
|
||||||
|
int_test("ceil", code, -3, -2, 0, 2, 3);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
jit_set_ip(codeBuffer);
|
jit_set_ip(codeBuffer);
|
||||||
|
|
@ -136,6 +138,7 @@ main()
|
||||||
#endif
|
#endif
|
||||||
#ifndef LIGHTNING_CROSS
|
#ifndef LIGHTNING_CROSS
|
||||||
int_test("floor", code, -2.6, -2.4, 0, 2.4, 2.6);
|
int_test("floor", code, -2.6, -2.4, 0, 2.4, 2.6);
|
||||||
|
int_test("floor", code, -3, -2, 0, 2, 3);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
jit_set_ip(codeBuffer);
|
jit_set_ip(codeBuffer);
|
||||||
|
|
@ -150,6 +153,7 @@ main()
|
||||||
#endif
|
#endif
|
||||||
#ifndef LIGHTNING_CROSS
|
#ifndef LIGHTNING_CROSS
|
||||||
int_test("round", code, -2.6, -2.4, 0, 2.4, 2.6);
|
int_test("round", code, -2.6, -2.4, 0, 2.4, 2.6);
|
||||||
|
int_test("round", code, -3, -2, 0, 2, 3);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if 0 && defined JIT_TRANSCENDENTAL
|
#if 0 && defined JIT_TRANSCENDENTAL
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,10 @@
|
||||||
compare -1 -1 0 1 1
|
compare -1 -1 0 1 1
|
||||||
nans 0 2 2 1 2
|
nans 0 2 2 1 2
|
||||||
trunc -2 -2 0 2 2
|
trunc -2 -2 0 2 2
|
||||||
|
trunc -3 -2 0 2 3
|
||||||
ceil -2 -2 0 3 3
|
ceil -2 -2 0 3 3
|
||||||
|
ceil -3 -2 0 2 3
|
||||||
floor -3 -3 0 2 2
|
floor -3 -3 0 2 2
|
||||||
|
floor -3 -2 0 2 3
|
||||||
|
round -3 -2 0 2 3
|
||||||
round -3 -2 0 2 3
|
round -3 -2 0 2 3
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue