Author: nwhitehorn
Date: Sat Mar 7 20:27:00 2015
New Revision: 279751
URL: https://svnweb.freebsd.org/changeset/base/279751
Log:
Make assembly slightly more idiomatic (and able to be handled by clang's
integrated assembler).
Modified:
head/sys/powerpc/aim/trap_subr64.S
Modified: head/sys/powerpc/aim/trap_subr64.S
==============================================================================
--- head/sys/powerpc/aim/trap_subr64.S Sat Mar 7 20:14:46 2015
(r279750)
+++ head/sys/powerpc/aim/trap_subr64.S Sat Mar 7 20:27:00 2015
(r279751)
@@ -62,7 +62,7 @@ restore_usersrs:
clrrdi %r31,%r31,28
slbie %r31
1: ld %r31, 0(%r28) /* Load SLB entry pointer */
- cmpli 0, %r31, 0 /* If NULL, stop */
+ cmpdi %r31, 0 /* If NULL, stop */
beqlr
ld %r30, 0(%r31) /* Load SLBV */
@@ -86,18 +86,18 @@ restore_kernsrs:
slbmfee %r31,%r29
clrrdi %r31,%r31,28
slbie %r31
-1: cmpli 0, %r29, USER_SLB_SLOT /* Skip the user slot */
+1: cmpdi %r29, USER_SLB_SLOT /* Skip the user slot */
beq- 2f
ld %r31, 8(%r28) /* Load SLBE */
- cmpli 0, %r31, 0 /* If SLBE is not valid, stop */
+ cmpdi %r31, 0 /* If SLBE is not valid, stop */
beqlr
ld %r30, 0(%r28) /* Load SLBV */
slbmte %r30, %r31 /* Install SLB entry */
2: addi %r28, %r28, 16 /* Advance pointer */
addi %r29, %r29, 1
- cmpli 0, %r29, 64 /* Repeat if we are not at the end */
+ cmpdi %r29, 64 /* Repeat if we are not at the end */
blt 1b
blr
@@ -356,8 +356,7 @@ CNAME(trapcode):
mtsprg1 %r1 /* save SP */
mflr %r1 /* Save the old LR in r1 */
mtsprg2 %r1 /* And then in SPRG2 */
- li %r1,TRAP_GENTRAP
- ld %r1,0(%r1)
+ ld %r1,TRAP_GENTRAP(0)
mtlr %r1
li %r1, 0xe0 /* How to get the vector from LR */
blrl /* Branch to generictrap */
@@ -791,8 +790,7 @@ dbtrap:
andi. %r1,%r1,0xff00
mtsprg3 %r1
- li %r1,TRAP_TOCBASE /* get new SP */
- ld %r1,0(%r1)
+ ld %r1,TRAP_TOCBASE(0) /* get new SP */
ld %r1,TOC_REF(tmpstk)(%r1)
addi %r1,%r1,(TMPSTKSZ-48)
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
