Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11a7752e authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: remove math emulation code 



The last in-kernel user is gone so we can finally remove this code.

Reviewed-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 9c203239

arch/s390/include/asm/mathemu.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 *    IEEE floating point emulation.

 *

 *  S390 version

 *    Copyright IBM Corp. 1999

 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)

 */



#ifndef __MATHEMU__

#define __MATHEMU__



extern int math_emu_b3(__u8 *, struct pt_regs *);

extern int math_emu_ed(__u8 *, struct pt_regs *);

extern int math_emu_ldr(__u8 *);

extern int math_emu_ler(__u8 *);

extern int math_emu_std(__u8 *, struct pt_regs *);

extern int math_emu_ld(__u8 *, struct pt_regs *);

extern int math_emu_ste(__u8 *, struct pt_regs *);

extern int math_emu_le(__u8 *, struct pt_regs *);

extern int math_emu_lfpc(__u8 *, struct pt_regs *);

extern int math_emu_stfpc(__u8 *, struct pt_regs *);

extern int math_emu_srnm(__u8 *, struct pt_regs *);



#endif                                 /* __MATHEMU__                      */

arch/s390/include/asm/sfp-machine.h

deleted100644 → 0
+0 −142
Original line number Diff line number Diff line 
/* Machine-dependent software floating-point definitions.

   S/390 kernel version.

   Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.

   This file is part of the GNU C Library.

   Contributed by Richard Henderson (rth@cygnus.com),

		  Jakub Jelinek (jj@ultra.linux.cz),

		  David S. Miller (davem@redhat.com) and

		  Peter Maydell (pmaydell@chiark.greenend.org.uk).



   The GNU C Library is free software; you can redistribute it and/or

   modify it under the terms of the GNU Library General Public License as

   published by the Free Software Foundation; either version 2 of the

   License, or (at your option) any later version.



   The GNU C Library is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

   Library General Public License for more details.



   You should have received a copy of the GNU Library General Public

   License along with the GNU C Library; see the file COPYING.LIB.  If

   not, write to the Free Software Foundation, Inc.,

   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */



#ifndef _SFP_MACHINE_H

#define _SFP_MACHINE_H

   



#define _FP_W_TYPE_SIZE		32

#define _FP_W_TYPE		unsigned int

#define _FP_WS_TYPE		signed int

#define _FP_I_TYPE		int



#define _FP_MUL_MEAT_S(R,X,Y)					\

  _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm)

#define _FP_MUL_MEAT_D(R,X,Y)					\

  _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm)

#define _FP_MUL_MEAT_Q(R,X,Y)					\

  _FP_MUL_MEAT_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm)



#define _FP_DIV_MEAT_S(R,X,Y)	_FP_DIV_MEAT_1_udiv(S,R,X,Y)

#define _FP_DIV_MEAT_D(R,X,Y)	_FP_DIV_MEAT_2_udiv(D,R,X,Y)

#define _FP_DIV_MEAT_Q(R,X,Y)	_FP_DIV_MEAT_4_udiv(Q,R,X,Y)



#define _FP_NANFRAC_S		((_FP_QNANBIT_S << 1) - 1)

#define _FP_NANFRAC_D		((_FP_QNANBIT_D << 1) - 1), -1

#define _FP_NANFRAC_Q		((_FP_QNANBIT_Q << 1) - 1), -1, -1, -1

#define _FP_NANSIGN_S		0

#define _FP_NANSIGN_D		0

#define _FP_NANSIGN_Q		0



#define _FP_KEEPNANFRACP 1



/*

 * If one NaN is signaling and the other is not,

 * we choose that one, otherwise we choose X.

 */

#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP)                      \

  do {                                                          \

    if ((_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs)          \

        && !(_FP_FRAC_HIGH_RAW_##fs(Y) & _FP_QNANBIT_##fs))     \

      {                                                         \

        R##_s = Y##_s;                                          \

        _FP_FRAC_COPY_##wc(R,Y);                                \

      }                                                         \

    else                                                        \

      {                                                         \

        R##_s = X##_s;                                          \

        _FP_FRAC_COPY_##wc(R,X);                                \

      }                                                         \

    R##_c = FP_CLS_NAN;                                         \

  } while (0)



/* Some assembly to speed things up. */

#define __FP_FRAC_ADD_3(r2,r1,r0,x2,x1,x0,y2,y1,y0) ({		\

	unsigned int __r2 = (x2) + (y2);			\

	unsigned int __r1 = (x1);				\

	unsigned int __r0 = (x0);				\

	asm volatile(						\

		"	alr	%2,%3\n"			\

		"	brc	12,0f\n"			\

		"	lhi	0,1\n"				\

		"	alr	%1,0\n"				\

		"	brc	12,0f\n"			\

		"	alr	%0,0\n"				\

		"0:"						\

		: "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)	\

		: "d" (y0), "i" (1) : "cc", "0" );		\

	asm volatile(						\

		"	alr	%1,%2\n"			\

		"	brc	12,0f\n"			\

		"	ahi	%0,1\n"				\

		"0:"						\

		: "+&d" (__r2), "+&d" (__r1)			\

		: "d" (y1) : "cc");				\

	(r2) = __r2;						\

	(r1) = __r1;						\

	(r0) = __r0;						\

})



#define __FP_FRAC_SUB_3(r2,r1,r0,x2,x1,x0,y2,y1,y0) ({		\

	unsigned int __r2 = (x2) - (y2);			\

	unsigned int __r1 = (x1);				\

	unsigned int __r0 = (x0);				\

	asm volatile(						\

		"	slr   %2,%3\n"				\

		"	brc	3,0f\n"				\

		"	lhi	0,1\n"				\

		"	slr	%1,0\n"				\

		"	brc	3,0f\n"				\

		"	slr	%0,0\n"				\

		"0:"						\

		: "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)	\

		: "d" (y0) : "cc", "0");			\

	asm volatile(						\

		"	slr	%1,%2\n"			\

		"	brc	3,0f\n"				\

		"	ahi	%0,-1\n"			\

		"0:"						\

		: "+&d" (__r2), "+&d" (__r1)			\

		: "d" (y1) : "cc");				\

	(r2) = __r2;						\

	(r1) = __r1;						\

	(r0) = __r0;						\

})



#define __FP_FRAC_DEC_3(x2,x1,x0,y2,y1,y0) __FP_FRAC_SUB_3(x2,x1,x0,x2,x1,x0,y2,y1,y0)



/* Obtain the current rounding mode. */

#define FP_ROUNDMODE	mode



/* Exception flags. */

#define FP_EX_INVALID		0x800000

#define FP_EX_DIVZERO		0x400000

#define FP_EX_OVERFLOW		0x200000

#define FP_EX_UNDERFLOW		0x100000

#define FP_EX_INEXACT		0x080000



/* We write the results always */

#define FP_INHIBIT_RESULTS 0



#endif

arch/s390/include/asm/sfp-util.h

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/types.h>

#include <asm/byteorder.h>



#define add_ssaaaa(sh, sl, ah, al, bh, bl) ({		\

	unsigned int __sh = (ah);			\

	unsigned int __sl = (al);			\

	asm volatile(					\

		"	alr	%1,%3\n"		\

		"	brc	12,0f\n"		\

		"	ahi	%0,1\n"			\

		"0:	alr  %0,%2"			\

		: "+&d" (__sh), "+d" (__sl)		\

		: "d" (bh), "d" (bl) : "cc");		\

	(sh) = __sh;					\

	(sl) = __sl;					\

})



#define sub_ddmmss(sh, sl, ah, al, bh, bl) ({		\

	unsigned int __sh = (ah);			\

	unsigned int __sl = (al);			\

	asm volatile(					\

		"	slr	%1,%3\n"		\

		"	brc	3,0f\n"			\

		"	ahi	%0,-1\n"		\

		"0:	slr	%0,%2"			\

		: "+&d" (__sh), "+d" (__sl)		\

		: "d" (bh), "d" (bl) : "cc");		\

	(sh) = __sh;					\

	(sl) = __sl;					\

})



/* a umul b = a mul b + (a>=2<<31) ? b<<32:0 + (b>=2<<31) ? a<<32:0 */

#define umul_ppmm(wh, wl, u, v) ({			\

	unsigned int __wh = u;				\

	unsigned int __wl = v;				\

	asm volatile(					\

		"	ltr	1,%0\n"			\

		"	mr	0,%1\n"			\

		"	jnm	0f\n"				\

		"	alr	0,%1\n"			\

		"0:	ltr	%1,%1\n"			\

		"	jnm	1f\n"				\

		"	alr	0,%0\n"			\

		"1:	lr	%0,0\n"			\

		"	lr	%1,1\n"			\

		: "+d" (__wh), "+d" (__wl)		\

		: : "0", "1", "cc");			\

	wh = __wh;					\

	wl = __wl;					\

})



#define udiv_qrnnd(q, r, n1, n0, d)			\

  do { unsigned long __n;				\

       unsigned int __r, __d;				\

    __n = ((unsigned long)(n1) << 32) + n0;		\

    __d = (d);						\

    (q) = __n / __d;					\

    (r) = __n % __d;					\

  } while (0)



#define UDIV_NEEDS_NORMALIZATION 0



#define abort() BUG()



#define __BYTE_ORDER __BIG_ENDIAN

arch/s390/kernel/dis.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <asm/dis.h>

#include <asm/io.h>

#include <linux/atomic.h>

#include <asm/mathemu.h>

#include <asm/cpcmd.h>

#include <asm/lowcore.h>

#include <asm/debug.h>