projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pxa-fixes'
[powerpc.git]
/
include
/
asm-mips
/
asmmacro.h
diff --git
a/include/asm-mips/asmmacro.h
b/include/asm-mips/asmmacro.h
index
2c42f6b
..
7a88175
100644
(file)
--- a/
include/asm-mips/asmmacro.h
+++ b/
include/asm-mips/asmmacro.h
@@
-26,14
+26,14
@@
ori \reg, \reg, TCSTATUS_IXMT
xori \reg, \reg, TCSTATUS_IXMT
mtc0 \reg, CP0_TCSTATUS
ori \reg, \reg, TCSTATUS_IXMT
xori \reg, \reg, TCSTATUS_IXMT
mtc0 \reg, CP0_TCSTATUS
- ehb
+
_
ehb
.endm
.macro local_irq_disable reg=t0
mfc0 \reg, CP0_TCSTATUS
ori \reg, \reg, TCSTATUS_IXMT
mtc0 \reg, CP0_TCSTATUS
.endm
.macro local_irq_disable reg=t0
mfc0 \reg, CP0_TCSTATUS
ori \reg, \reg, TCSTATUS_IXMT
mtc0 \reg, CP0_TCSTATUS
- ehb
+
_
ehb
.endm
#else
.macro local_irq_enable reg=t0
.endm
#else
.macro local_irq_enable reg=t0
@@
-52,46
+52,31
@@
.endm
#endif /* CONFIG_MIPS_MT_SMTC */
.endm
#endif /* CONFIG_MIPS_MT_SMTC */
-#ifdef CONFIG_CPU_SB1
- .macro fpu_enable_hazard
- .set push
- .set noreorder
- .set mips2
- SSNOP
- bnezl $0, .+4
- SSNOP
- .set pop
- .endm
-#else
- .macro fpu_enable_hazard
- .endm
-#endif
-
/*
* Temporary until all gas have MT ASE support
*/
.macro DMT reg=0
/*
* Temporary until all gas have MT ASE support
*/
.macro DMT reg=0
- .word
(0x41600bc1 | (\reg << 16)
)
+ .word
0x41600bc1 | (\reg << 16
)
.endm
.macro EMT reg=0
.endm
.macro EMT reg=0
- .word
(0x41600be1 | (\reg << 16)
)
+ .word
0x41600be1 | (\reg << 16
)
.endm
.macro DVPE reg=0
.endm
.macro DVPE reg=0
- .word
(0x41600001 | (\reg << 16)
)
+ .word
0x41600001 | (\reg << 16
)
.endm
.macro EVPE reg=0
.endm
.macro EVPE reg=0
- .word
(0x41600021 | (\reg << 16)
)
+ .word
0x41600021 | (\reg << 16
)
.endm
.macro MFTR rt=0, rd=0, u=0, sel=0
.endm
.macro MFTR rt=0, rd=0, u=0, sel=0
- .word
(0x41000000 | (\rt << 16) | (\rd << 11) | (\u << 5) | (\sel)
)
+ .word
0x41000000 | (\rt << 16) | (\rd << 11) | (\u << 5) | (\sel
)
.endm
.macro MTTR rt=0, rd=0, u=0, sel=0
.endm
.macro MTTR rt=0, rd=0, u=0, sel=0
- .word
(0x41800000 | (\rt << 16) | (\rd << 11) | (\u << 5) | (\sel)
)
+ .word
0x41800000 | (\rt << 16) | (\rd << 11) | (\u << 5) | (\sel
)
.endm
#endif /* _ASM_ASMMACRO_H */
.endm
#endif /* _ASM_ASMMACRO_H */