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

Commit f741a1aa authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

[ARM] 3049/1: More optimized libgcc functions 



Patch from Nicolas Pitre

This patch gets rid of the last C implementations of needed libgcc
functions for the kernel, replacing them with optimized assembly
versions.

Those functions are:

__ashldi3
__ashrdi3
__lshrdi3
__muldi3
__ucmpdi2

The first 3 were lifted from gcc, the other two were written from scratch.

Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cb7610d0

arch/arm/lib/ashldi3.S

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/* Copyright 1995, 1996, 1998, 1999, 2000, 2003, 2004, 2005

   Free Software Foundation, Inc.



This file is free software; you can redistribute it and/or modify it

under the terms of the GNU General Public License as published by the

Free Software Foundation; either version 2, or (at your option) any

later version.



In addition to the permissions in the GNU General Public License, the

Free Software Foundation gives you unlimited permission to link the

compiled version of this file into combinations with other programs,

and to distribute those combinations without any restriction coming

from the use of this file.  (The General Public License restrictions

do apply in other respects; for example, they cover modification of

the file, and distribution when not linked into a combine

executable.)



This file 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

General Public License for more details.



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

along with this program; see the file COPYING.  If not, write to

the Free Software Foundation, 51 Franklin Street, Fifth Floor,

Boston, MA 02110-1301, USA.  */





#include <linux/linkage.h>



#ifdef __ARMEB__

#define al r1

#define ah r0

#else

#define al r0

#define ah r1

#endif



ENTRY(__ashldi3)



	subs	r3, r2, #32

	rsb	ip, r2, #32

	movmi	ah, ah, lsl r2

	movpl	ah, al, lsl r3

	orrmi	ah, ah, al, lsr ip

	mov	al, al, lsl r2

	mov	pc, lr

arch/arm/lib/ashldi3.c

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/* More subroutines needed by GCC output code on some machines.  */

/* Compile this one with gcc.  */

/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.



This file is part of GNU CC.



GNU CC is free software; you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation; either version 2, or (at your option)

any later version.



GNU CC 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 General Public License for more details.



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

along with GNU CC; see the file COPYING.  If not, write to

the Free Software Foundation, 59 Temple Place - Suite 330,

Boston, MA 02111-1307, USA.  */



/* As a special exception, if you link this library with other files,

   some of which are compiled with GCC, to produce an executable,

   this library does not by itself cause the resulting executable

   to be covered by the GNU General Public License.

   This exception does not however invalidate any other reasons why

   the executable file might be covered by the GNU General Public License.

 */

/* support functions required by the kernel. based on code from gcc-2.95.3 */

/* I Molton	29/07/01 */



#include "gcclib.h"



s64 __ashldi3(s64 u, int b)

{

	DIunion w;

	int bm;

	DIunion uu;



	if (b == 0)

		return u;



	uu.ll = u;



	bm = (sizeof(s32) * BITS_PER_UNIT) - b;

	if (bm <= 0) {

		w.s.low = 0;

		w.s.high = (u32) uu.s.low << -bm;

	} else {

		u32 carries = (u32) uu.s.low >> bm;

		w.s.low = (u32) uu.s.low << b;

		w.s.high = ((u32) uu.s.high << b) | carries;

	}



	return w.ll;

}

arch/arm/lib/ashrdi3.S

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/* Copyright 1995, 1996, 1998, 1999, 2000, 2003, 2004, 2005

   Free Software Foundation, Inc.



This file is free software; you can redistribute it and/or modify it

under the terms of the GNU General Public License as published by the

Free Software Foundation; either version 2, or (at your option) any

later version.



In addition to the permissions in the GNU General Public License, the

Free Software Foundation gives you unlimited permission to link the

compiled version of this file into combinations with other programs,

and to distribute those combinations without any restriction coming

from the use of this file.  (The General Public License restrictions

do apply in other respects; for example, they cover modification of

the file, and distribution when not linked into a combine

executable.)



This file 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

General Public License for more details.



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

along with this program; see the file COPYING.  If not, write to

the Free Software Foundation, 51 Franklin Street, Fifth Floor,

Boston, MA 02110-1301, USA.  */





#include <linux/linkage.h>



#ifdef __ARMEB__

#define al r1

#define ah r0

#else

#define al r0

#define ah r1

#endif



ENTRY(__ashrdi3)



	subs	r3, r2, #32

	rsb	ip, r2, #32

	movmi	al, al, lsr r2

	movpl	al, ah, asr r3

	orrmi	al, al, ah, lsl ip

	mov	ah, ah, asr r2

	mov	pc, lr

arch/arm/lib/ashrdi3.c

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
/* More subroutines needed by GCC output code on some machines.  */

/* Compile this one with gcc.  */

/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.



This file is part of GNU CC.



GNU CC is free software; you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation; either version 2, or (at your option)

any later version.



GNU CC 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 General Public License for more details.



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

along with GNU CC; see the file COPYING.  If not, write to

the Free Software Foundation, 59 Temple Place - Suite 330,

Boston, MA 02111-1307, USA.  */



/* As a special exception, if you link this library with other files,

   some of which are compiled with GCC, to produce an executable,

   this library does not by itself cause the resulting executable

   to be covered by the GNU General Public License.

   This exception does not however invalidate any other reasons why

   the executable file might be covered by the GNU General Public License.

 */

/* support functions required by the kernel. based on code from gcc-2.95.3 */

/* I Molton     29/07/01 */



#include "gcclib.h"



s64 __ashrdi3(s64 u, int b)

{

	DIunion w;

	int bm;

	DIunion uu;



	if (b == 0)

		return u;



	uu.ll = u;



	bm = (sizeof(s32) * BITS_PER_UNIT) - b;

	if (bm <= 0) {

		/* w.s.high = 1..1 or 0..0 */

		w.s.high = uu.s.high >> (sizeof(s32) * BITS_PER_UNIT - 1);

		w.s.low = uu.s.high >> -bm;

	} else {

		u32 carries = (u32) uu.s.high << bm;

		w.s.high = uu.s.high >> b;

		w.s.low = ((u32) uu.s.low >> b) | carries;

	}



	return w.ll;

}

arch/arm/lib/gcclib.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/* gcclib.h -- definitions for various functions 'borrowed' from gcc-2.95.3 */

/* I Molton     29/07/01 */



#include <linux/types.h>



#define BITS_PER_UNIT	8

#define SI_TYPE_SIZE	(sizeof(s32) * BITS_PER_UNIT)



#ifdef __ARMEB__

struct DIstruct {

	s32 high, low;

};

#else

struct DIstruct {

	s32 low, high;

};

#endif



typedef union {

	struct DIstruct s;

	s64 ll;

} DIunion;