git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
asm-parisc
/
assembly.h
diff --git
a/include/asm-parisc/assembly.h
b/include/asm-parisc/assembly.h
index
5ba8c5c
..
b421d4b
100644
(file)
--- a/
include/asm-parisc/assembly.h
+++ b/
include/asm-parisc/assembly.h
@@
-24,7
+24,6
@@
#ifdef __LP64__
#define LDREG ldd
#define STREG std
#ifdef __LP64__
#define LDREG ldd
#define STREG std
-#define LDREGX ldd,s
#define LDREGM ldd,mb
#define STREGM std,ma
#define RP_OFFSET 16
#define LDREGM ldd,mb
#define STREGM std,ma
#define RP_OFFSET 16
@@
-32,19
+31,12
@@
#else
#define LDREG ldw
#define STREG stw
#else
#define LDREG ldw
#define STREG stw
-#define LDREGX ldwx,s
#define LDREGM ldwm
#define STREGM stwm
#define RP_OFFSET 20
#define FRAME_SIZE 64
#endif
#define LDREGM ldwm
#define STREGM stwm
#define RP_OFFSET 20
#define FRAME_SIZE 64
#endif
-#ifdef CONFIG_PA20
-#define BL b,l
-#else
-#define BL bl
-#endif
-
#ifdef __ASSEMBLY__
#ifdef __LP64__
#ifdef __ASSEMBLY__
#ifdef __LP64__
@@
-118,16
+110,6
@@
depd,z \r, 63-\sa, 64-\sa, \t
.endm
depd,z \r, 63-\sa, 64-\sa, \t
.endm
- /* Shift Right - note the r and t can NOT be the same! */
- .macro shr r, sa, t
- extru \r, 31-\sa, 32-\sa, \t
- .endm
-
- /* pa20w version of shift right */
- .macro shrd r, sa, t
- extrd,u \r, 63-\sa, 64-\sa, \t
- .endm
-
/* load 32-bit 'value' into 'reg' compensating for the ldil
* sign-extension when running in wide mode.
* WARNING!! neither 'value' nor 'reg' can be expressions
/* load 32-bit 'value' into 'reg' compensating for the ldil
* sign-extension when running in wide mode.
* WARNING!! neither 'value' nor 'reg' can be expressions