Unboxed type SHORT-FLOAT removed from the core.

parent 0e3b1c38
......@@ -235,10 +235,6 @@ ecl_alloc_object(cl_type t)
return MAKE_FIXNUM(0); /* Immediate fixnum */
case t_character:
return CODE_CHAR('\0'); /* Immediate character */
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return make_shortfloat(0.0); /* Immediate float */
#endif
default:;
}
......
......@@ -495,9 +495,6 @@ ecl_alloc_object(cl_type t)
return MAKE_FIXNUM(0); /* Immediate fixnum */
case t_character:
return CODE_CHAR(' '); /* Immediate character */
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
#endif
#ifdef ECL_LONG_FLOAT
case t_longfloat:
#endif
......
......@@ -77,10 +77,6 @@ ecl_to_fixnum(cl_object x)
/* case t_character: return (cl_fixnum)CHAR_CODE(x); */
case t_ratio:
return (cl_fixnum)ecl_to_double(x);
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return (cl_fixnum)ecl_short_float(x);
#endif
case t_singlefloat:
return (cl_fixnum)sf(x);
case t_doublefloat:
......@@ -103,10 +99,6 @@ ecl_to_unsigned_integer(cl_object x)
return fixnnint(x);
case t_ratio:
return (cl_index)ecl_to_double(x);
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return (cl_index)ecl_short_float(x);
#endif
case t_singlefloat:
return (cl_index)sf(x);
case t_doublefloat:
......@@ -131,10 +123,6 @@ ecl_to_float(cl_object x)
case t_bignum:
case t_ratio:
return ecl_to_double(x);
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return ecl_short_float(x);
#endif
case t_singlefloat:
return sf(x);
case t_doublefloat:
......
......@@ -1064,20 +1064,12 @@ fmt_exponential_float(format_stack fmt, bool colon, bool atsign)
} else if (y == @'single-float') {
t = t_singlefloat;
} else {
#ifdef ECL_SHORT_FLOAT
t = t_shortfloat;
#else
t = t_singlefloat;
#endif
}
if (type_of(x) == t)
exponentchar = 'E';
else if (type_of(x) == t_singlefloat)
exponentchar = 'F';
#ifdef ECL_SHORT_FLOAT
else if (type_of(x) == t_shortfloat)
exponentchar = 'S';
#endif
#ifdef ECL_LONG_FLOAT
else if (type_of(x) == t_longfloat)
exponentchar = 'L';
......
......@@ -153,9 +153,6 @@ BEGIN:
mark_next(x->ratio.den);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
#endif
case t_singlefloat:
case t_doublefloat:
#ifdef ECL_LONG_FLOAT
......
......@@ -54,12 +54,6 @@ _hash_eql(cl_hashkey h, cl_object x)
case t_ratio:
h = _hash_eql(h, x->ratio.num);
return _hash_eql(h, x->ratio.den);
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: {
float f = ecl_short_float(x);
return hash_string(h, (unsigned char*)&f, sizeof(f));
}
#endif
case t_singlefloat:
return hash_string(h, (unsigned char*)&sf(x), sizeof(sf(x)));
case t_doublefloat:
......@@ -127,12 +121,6 @@ _hash_equal(int depth, cl_hashkey h, cl_object x)
case t_random:
return _hash_equal(0, h, x->random.value);
#ifdef ECL_SIGNED_ZERO
# ifdef ECL_SHORT_FLOAT
case t_shortfloat: {
float f = ecl_short_float(x);
return hash_string(h, (unsigned char*)&f, sizeof(f));
}
# endif
case t_singlefloat: {
float f = sf(x);
if (f == 0.0) f = 0.0;
......@@ -198,16 +186,6 @@ _hash_equalp(int depth, cl_hashkey h, cl_object x)
return h;
case t_fixnum:
return hash_word(h, fix(x));
#ifdef HAVE_SHORT_FLOAT
case t_shortfloat: {
/* FIXME! We should be more precise here! */
return hash_word(h, (cl_index)sf(x));
union { float f; cl_index w; } x;
x.w = 0;
x.f = ecl_short_float(x);
return hash_word(h, x.w);
}
#endif
case t_singlefloat:
/* FIXME! We should be more precise here! */
return hash_word(h, (cl_index)sf(x));
......
......@@ -281,9 +281,6 @@ cl_class_of(cl_object x)
index = ECL_BUILTIN_INTEGER; break;
case t_ratio:
index = ECL_BUILTIN_RATIO; break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
#endif
case t_singlefloat:
case t_doublefloat:
#ifdef ECL_LONG_FLOAT
......
......@@ -161,9 +161,6 @@ static const char *feature_names[] = {
#ifdef ECL_LONG_FLOAT
"LONG-FLOAT",
#endif
#ifdef ECL_SHORT_FLOAT
"SHORT-FLOAT",
#endif
#ifdef ECL_RELATIVE_PACKAGE_NAMES
"RELATIVE-PACKAGE-NAMES",
#endif
......
This diff is collapsed.
......@@ -63,9 +63,6 @@ number_remainder(cl_object x, cl_object y, cl_object q)
ty = t_singlefloat;
}
switch (tx = type_of(x)) {
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
#endif
case t_singlefloat:
case t_doublefloat:
#ifdef ECL_LONG_FLOAT
......@@ -77,10 +74,6 @@ number_remainder(cl_object x, cl_object y, cl_object q)
case t_bignum:
case t_ratio:
switch (ty) {
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
x = make_shortfloat(ecl_to_double(x)); break;
#endif
case t_singlefloat:
x = ecl_make_singlefloat(ecl_to_double(x)); break;
case t_doublefloat:
......@@ -147,15 +140,6 @@ ecl_floor1(cl_object x)
v0 = ecl_floor2(x->ratio.num, x->ratio.den);
v1 = ecl_make_ratio(VALUES(1), x->ratio.den);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: {
float d = ecl_short_float(x);
float y = floorf(d);
v0 = float_to_integer(y);
v1 = make_shortfloat(d - y);
break;
}
#endif
case t_singlefloat: {
float d = sf(x);
float y = floorf(d);
......@@ -225,16 +209,6 @@ ecl_floor2(cl_object x, cl_object y)
v0 = ecl_floor2(ecl_times(x, y->ratio.den), y->ratio.num);
v1 = ecl_make_ratio(VALUES(1), y->ratio.den);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: { /* FIX / SF */
float n = ecl_short_float(y);
float p = fix(x) / n;
float q = floorf(p);
v0 = float_to_integer(q);
v1 = make_shortfloat((p - q)*n);
break;
}
#endif
case t_singlefloat: { /* FIX / SF */
float n = sf(y);
float p = fix(x) / n;
......@@ -281,16 +255,6 @@ ecl_floor2(cl_object x, cl_object y)
v0 = ecl_floor2(ecl_times(x, y->ratio.den), y->ratio.num);
v1 = ecl_make_ratio(VALUES(1), y->ratio.den);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: { /* BIG / SF */
float n = ecl_short_float(y);
float p = _ecl_big_to_double(x) / n;
float q = floorf(p);
v0 = float_to_integer(q);
v1 = make_shortfloat((p - q)*n);
break;
}
#endif
case t_singlefloat: { /* BIG / SF */
float n = sf(y);
float p = _ecl_big_to_double(x) / n;
......@@ -333,16 +297,6 @@ ecl_floor2(cl_object x, cl_object y)
v1 = ecl_divide(VALUES(1), x->ratio.den);
}
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: { /* SF / ANY */
float n = ecl_to_double(y);
float p = sf(x)/n;
float q = floorf(p);
v0 = float_to_integer(q);
v1 = make_shortfloat(p*n - q*n);
break;
}
#endif
case t_singlefloat: { /* SF / ANY */
float n = ecl_to_double(y);
float p = sf(x)/n;
......@@ -401,15 +355,6 @@ ecl_ceiling1(cl_object x)
v0 = ecl_ceiling2(x->ratio.num, x->ratio.den);
v1 = ecl_make_ratio(VALUES(1), x->ratio.den);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: {
float d = ecl_short_float(x);
float y = ceilf(d);
v0 = float_to_integer(y);
v1 = make_shortfloat(d - y);
break;
}
#endif
case t_singlefloat: {
float d = sf(x);
float y = ceilf(d);
......@@ -479,16 +424,6 @@ ecl_ceiling2(cl_object x, cl_object y)
v0 = ecl_ceiling2(ecl_times(x, y->ratio.den), y->ratio.num);
v1 = ecl_make_ratio(VALUES(1), y->ratio.den);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: { /* FIX / SF */
float n = ecl_short_float(y);
float p = fix(x)/n;
float q = ceilf(p);
v0 = float_to_integer(q);
v1 = ecl_make_singlefloat(p*n - q*n);
break;
}
#endif
case t_singlefloat: { /* FIX / SF */
float n = sf(y);
float p = fix(x)/n;
......@@ -535,16 +470,6 @@ ecl_ceiling2(cl_object x, cl_object y)
v0 = ecl_ceiling2(ecl_times(x, y->ratio.den), y->ratio.num);
v1 = ecl_make_ratio(VALUES(1), y->ratio.den);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: { /* BIG / SF */
float n = ecl_short_float(y);
float p = _ecl_big_to_double(x)/n;
float q = ceilf(p);
v0 = float_to_integer(q);
v1 = make_shortfloat(p*n - q*n);
break;
}
#endif
case t_singlefloat: { /* BIG / SF */
float n = sf(y);
float p = _ecl_big_to_double(x)/n;
......@@ -587,16 +512,6 @@ ecl_ceiling2(cl_object x, cl_object y)
v1 = ecl_divide(VALUES(1), x->ratio.den);
}
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: { /* SF / ANY */
float n = ecl_to_double(y);
float p = sf(x)/n;
float q = ceilf(p);
v0 = float_to_integer(q);
v1 = make_shortfloat(p*n - q*n);
break;
}
#endif
case t_singlefloat: { /* SF / ANY */
float n = ecl_to_double(y);
float p = sf(x)/n;
......@@ -653,15 +568,6 @@ ecl_truncate1(cl_object x)
v0 = ecl_truncate2(x->ratio.num, x->ratio.den);
v1 = ecl_make_ratio(VALUES(1), x->ratio.den);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: {
float d = ecl_short_float(x);
float y = d > 0? floorf(d) : ceilf(d);
v0 = float_to_integer(y);
v1 = make_shortfloat(d - y);
break;
}
#endif
case t_singlefloat: {
float d = sf(x);
float y = d > 0? floorf(d) : ceilf(d);
......@@ -765,11 +671,6 @@ ecl_round1(cl_object x)
v0 = ecl_round2(x->ratio.num, x->ratio.den);
v1 = ecl_make_ratio(VALUES(1), x->ratio.den);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
f = ecl_short_float(x);
goto FLOAT;
#endif
case t_singlefloat: {
float d = sf(x);
float q = round_double(d);
......@@ -874,11 +775,6 @@ cl_decode_float(cl_object x)
float f;
switch (tx) {
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
f = ecl_short_float(x);
goto FLOAT;
#endif
case t_singlefloat: {
f = sf(x);
FLOAT:
......@@ -936,11 +832,6 @@ cl_scale_float(cl_object x, cl_object y)
FEwrong_type_nth_arg(@[scale-float],2,y,@[fixnum]);
}
switch (type_of(x)) {
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
x = make_shortfloat(ldexpf(ecl_short_float(x), k));
break;
#endif
case t_singlefloat:
x = ecl_make_singlefloat(ldexpf(sf(x), k));
break;
......@@ -975,10 +866,6 @@ cl_float_radix(cl_object x)
y = cl_float(2, MAKE_FIXNUM(1), x);
}
switch (type_of(x)) {
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
negativep = signbit(ecl_short_float(x)); break;
#endif
case t_singlefloat:
negativep = signbit(sf(x)); break;
case t_doublefloat:
......@@ -991,13 +878,6 @@ cl_float_radix(cl_object x)
FEwrong_type_nth_arg(@[float-sign],1,x,@[float]);
}
switch (type_of(y)) {
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: {
float f = ecl_short_float(y);
if (signbit(f) != negativep) y = make_shortfloat(-f);
break;
}
#endif
case t_singlefloat: {
float f = sf(y);
if (signbit(f) != negativep) y = ecl_make_singlefloat(-f);
......@@ -1026,9 +906,6 @@ cl_float_digits(cl_object x)
{
const cl_env_ptr the_env = ecl_process_env();
switch (type_of(x)) {
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
#endif
case t_singlefloat:
x = MAKE_FIXNUM(FLT_MANT_DIG);
break;
......@@ -1052,23 +929,6 @@ cl_float_precision(cl_object x)
const cl_env_ptr the_env = ecl_process_env();
int precision;
switch (type_of(x)) {
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: {
float f = ecl_short_float(x);
if (f == 0.0) {
precision = 0;
} else {
int exp;
frexpf(f, &exp);
if (exp >= FLT_MIN_EXP) {
precision = FLT_MANT_DIG;
} else {
precision = FLT_MANT_DIG - (FLT_MIN_EXP - exp);
}
}
break;
}
#endif
case t_singlefloat: {
float f = sf(x);
if (f == 0.0) {
......@@ -1180,24 +1040,6 @@ cl_integer_decode_float(cl_object x)
}
break;
}
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: {
float d = ecl_short_float(x);
if (signbit(d)) {
s = -1;
d = -d;
}
if (d == 0.0) {
e = 0;
x = MAKE_FIXNUM(0);
} else {
d = frexpf(d, &e);
x = double_to_integer(ldexp(d, FLT_MANT_DIG));
e -= FLT_MANT_DIG;
}
break;
}
#endif
default:
FEwrong_type_nth_arg(@[integer-decode-float],1,x,@[float]);
}
......@@ -1217,9 +1059,6 @@ cl_realpart(cl_object x)
case t_fixnum:
case t_bignum:
case t_ratio:
#ifdef ECL_SHORT_FLOAT
case t_longfloat:
#endif
case t_singlefloat:
case t_doublefloat:
#ifdef ECL_LONG_FLOAT
......@@ -1244,14 +1083,6 @@ cl_imagpart(cl_object x)
case t_ratio:
x = MAKE_FIXNUM(0);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
if (signbit(ecl_short_float(x)))
x = make_shortfloat(-0.0);
else
x = make_shortfloat(0.0);
break;
#endif
case t_singlefloat:
if (signbit(sf(x)))
x = cl_core.singlefloat_minus_zero;
......
......@@ -103,10 +103,6 @@ ecl_number_equalp(cl_object x, cl_object y)
case t_bignum:
case t_ratio:
return 0;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return double_fix_compare(fix(x), ecl_short_float(y)) == 0;
#endif
case t_singlefloat:
return double_fix_compare(fix(x), sf(y)) == 0;
case t_doublefloat:
......@@ -128,9 +124,6 @@ ecl_number_equalp(cl_object x, cl_object y)
return _ecl_big_compare(x, y)==0;
case t_ratio:
return 0;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
#endif
case t_singlefloat:
case t_doublefloat:
#ifdef ECL_LONG_FLOAT
......@@ -151,9 +144,6 @@ ecl_number_equalp(cl_object x, cl_object y)
case t_ratio:
return (ecl_number_equalp(x->ratio.num, y->ratio.num) &&
ecl_number_equalp(x->ratio.den, y->ratio.den));
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
#endif
case t_singlefloat:
case t_doublefloat:
#ifdef ECL_LONG_FLOAT
......@@ -166,11 +156,6 @@ ecl_number_equalp(cl_object x, cl_object y)
default:
FEwrong_type_nth_arg(@[=], 2, y, @[number]);
}
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
dx = ecl_short_float(x);
goto FLOAT;
#endif
case t_singlefloat:
dx = sf(x);
goto FLOAT;
......@@ -184,10 +169,6 @@ ecl_number_equalp(cl_object x, cl_object y)
case t_ratio:
x = cl_rational(x);
goto BEGIN;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return dx == ecl_short_float(y);
#endif
case t_singlefloat:
return dx == sf(y);
case t_doublefloat:
......@@ -211,10 +192,6 @@ ecl_number_equalp(cl_object x, cl_object y)
case t_ratio:
x = cl_rational(x);
goto BEGIN;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return dx == ecl_short_float(y);
#endif
case t_singlefloat:
return dx == sf(y);
case t_doublefloat:
......@@ -239,9 +216,6 @@ ecl_number_equalp(cl_object x, cl_object y)
ecl_number_equalp(x->complex.imag, y->complex.imag));
case t_fixnum: case t_bignum: case t_ratio:
case t_singlefloat: case t_doublefloat:
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
#endif
#ifdef ECL_LONG_FLOAT
case t_longfloat:
#endif
......@@ -293,10 +267,6 @@ ecl_number_compare(cl_object x, cl_object y)
x = ecl_times(x, y->ratio.den);
y = y->ratio.num;
return(ecl_number_compare(x, y));
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return double_fix_compare(ix, ecl_short_float(y));
#endif
case t_singlefloat:
return double_fix_compare(ix, sf(y));
case t_doublefloat:
......@@ -318,9 +288,6 @@ ecl_number_compare(cl_object x, cl_object y)
x = ecl_times(x, y->ratio.den);
y = y->ratio.num;
return(ecl_number_compare(x, y));
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
#endif
case t_singlefloat:
case t_doublefloat:
#ifdef ECL_LONG_FLOAT
......@@ -343,9 +310,6 @@ ecl_number_compare(cl_object x, cl_object y)
y->ratio.den),
ecl_times(y->ratio.num,
x->ratio.den)));
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
#endif
case t_singlefloat:
case t_doublefloat:
#ifdef ECL_LONG_FLOAT
......@@ -356,11 +320,6 @@ ecl_number_compare(cl_object x, cl_object y)
default:
FEwrong_type_nth_arg(@[<], 2, y, @[real]);
}
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
dx = (double)(ecl_short_float(x));
goto DOUBLEFLOAT0;
#endif
case t_singlefloat:
dx = (double)(sf(x));
goto DOUBLEFLOAT0;
......@@ -406,11 +365,6 @@ ecl_number_compare(cl_object x, cl_object y)
case t_ratio:
x = cl_rational(x);
goto BEGIN;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
ldy = ecl_short_float(y);
break;
#endif
case t_singlefloat:
ldy = sf(y);
break;
......
......@@ -29,10 +29,6 @@ ecl_zerop(cl_object x)
case t_bignum:
case t_ratio:
return(0);
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return ecl_short_float(x) == 0.0;
#endif
case t_singlefloat:
return(sf(x) == 0.0);
......@@ -67,10 +63,6 @@ ecl_plusp(cl_object x)
/* INV: rat_den is always positive */
x = x->ratio.num;
goto RESTART;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return ecl_short_float(x) > 0.0;
#endif
case t_singlefloat:
return sf(x) > 0.0;
case t_doublefloat:
......@@ -100,10 +92,6 @@ ecl_minusp(cl_object x)
x = x->ratio.num;
goto RESTART;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return ecl_short_float(x) < 0;
#endif
case t_singlefloat:
return sf(x) < 0;
......@@ -190,10 +178,6 @@ bool
ecl_float_infinity_p(cl_object x)
{
switch (type_of(x)) {
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
return !isifinite(ecl_short_float(x));
#endif
case t_singlefloat:
return !isfinite(sf(x));
case t_doublefloat:
......
......@@ -186,12 +186,6 @@ rando(cl_object x, cl_object rs)
case t_bignum:
z = random_integer(x, rs->random.value);
break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
z = make_shortfloat(ecl_short_float(x) *
(float)generate_double(rs->random.value));
break;
#endif
case t_singlefloat:
z = ecl_make_singlefloat(sf(x) *
(float)generate_double(rs->random.value));
......
......@@ -128,10 +128,6 @@ ecl_exp(cl_object x)
case t_bignum:
case t_ratio:
output = ecl_make_singlefloat(expf(number_to_float(x))); break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
output = make_shortfloat(expf(ecl_short_float(x))); break;
#endif
case t_singlefloat:
output = ecl_make_singlefloat(expf(sf(x))); break;
case t_doublefloat:
......@@ -184,10 +180,6 @@ ecl_expt(cl_object x, cl_object y)
case t_bignum:
case t_ratio:
z = MAKE_FIXNUM(1); break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
z = make_shortfloat(1.0); break;
#endif
case t_singlefloat:
z = ecl_make_singlefloat(1.0); break;
case t_doublefloat:
......@@ -283,14 +275,6 @@ ecl_log1(cl_object x)
}
break;
}
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: {
float f = ecl_short_float(d);
if (f < 0) goto COMPLEX;
output = make_shortfloat(logf(ecl_short_float(x)));
break;
}
#endif
case t_singlefloat: {
float f = sf(x);
if (isnan(f)) goto ISNAN;
......@@ -351,15 +335,6 @@ ecl_log1p(cl_object x)
}
case t_bignum:
return ecl_log1(ecl_one_plus(x));
#ifdef ECL_SHORT_FLOAT
case t_shortfloat: {
float f = ecl_short_float(x);
if (isnan(f)) goto ISNAN;
if (f < -1) goto COMPLEX;
output = make_shortfloat(log1pf(ecl_short_float(x)));
break;
}
#endif
case t_singlefloat: {
float f = sf(x);
if (isnan(f)) goto ISNAN;
......@@ -432,10 +407,6 @@ ecl_sqrt(cl_object x)
case t_bignum:
case t_ratio:
z = ecl_make_singlefloat(sqrtf(number_to_float(x))); break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
z = make_shortfloat(sqrtf(ecl_short_float(x))); break;;
#endif
case t_singlefloat:
z = ecl_make_singlefloat(sqrtf(sf(x))); break;
case t_doublefloat:
......@@ -596,10 +567,6 @@ ecl_sin(cl_object x)
case t_bignum:
case t_ratio:
output = ecl_make_singlefloat(sinf(number_to_float(x))); break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
output = make_shortfloat(sinf(ecl_short_float(x))); break;
#endif
case t_singlefloat:
output = ecl_make_singlefloat(sinf(sf(x))); break;
case t_doublefloat:
......@@ -644,10 +611,6 @@ ecl_cos(cl_object x)
case t_bignum:
case t_ratio:
output = ecl_make_singlefloat(cosf(number_to_float(x))); break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
output = make_shortfloat(cosf(ecl_short_float(x))); break;
#endif
case t_singlefloat:
output = ecl_make_singlefloat(cosf(sf(x))); break;
case t_doublefloat:
......@@ -703,10 +666,6 @@ ecl_tan(cl_object x)
case t_bignum:
case t_ratio:
output = ecl_make_singlefloat(safe_tanf(number_to_float(x))); break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
output = make_shortfloat(safe_tanf(ecl_short_float(x))); break;
#endif
case t_singlefloat:
output = ecl_make_singlefloat(safe_tanf(sf(x))); break;
case t_doublefloat:
......@@ -744,10 +703,6 @@ ecl_sinh(cl_object x)
case t_bignum:
case t_ratio:
output = ecl_make_singlefloat(sinhf(number_to_float(x))); break;
#ifdef ECL_SHORT_FLOAT
case t_shortfloat:
output = make_shortfloat(sinhf(ecl_short_float(x))); break;
#endif
case t_singlefloat: