svn commit: r206247 - user/jmallett/octeon/sys/mips/mips

[Juli Mallett]

Author: jmallett
Date: Tue Apr  6 05:13:04 2010
New Revision: 206247
URL: http://svn.freebsd.org/changeset/base/206247

Log:
  Use PTR_LI where appropriate.

Modified:
  user/jmallett/octeon/sys/mips/mips/exception.S
  user/jmallett/octeon/sys/mips/mips/support.S
  user/jmallett/octeon/sys/mips/mips/swtch.S

Modified: user/jmallett/octeon/sys/mips/mips/exception.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/exception.S	Tue Apr  6 05:12:47 2010	(r206246)
+++ user/jmallett/octeon/sys/mips/mips/exception.S	Tue Apr  6 05:13:04 2010	(r206247)
@@ -811,7 +811,7 @@ NLEAF(MipsTLBInvalidException)
 	.set noreorder
 
 	MFC0		k0, COP_0_BAD_VADDR
-	li		k1, VM_MAXUSER_ADDRESS
+	PTR_LI		k1, VM_MAXUSER_ADDRESS
 	sltu		k1, k0, k1
 	bnez		k1, 1f
 	nop
@@ -975,7 +975,7 @@ END(MipsTLBInvalidException)
 NLEAF(MipsTLBMissException)
 	.set	noat
 	MFC0		k0, COP_0_BAD_VADDR		# k0=bad address
-	li		k1, VM_MAX_KERNEL_ADDRESS	# check fault address against
+	PTR_LI		k1, VM_MAX_KERNEL_ADDRESS	# check fault address against
 	sltu		k1, k1, k0			# upper bound of kernel_segmap
 	bnez		k1, MipsKernGenException	# out of bound
 	lui		k1, %hi(kernel_segmap)		# k1=hi of segbase
@@ -1151,7 +1151,7 @@ VECTOR(MipsCache, unknown)
 	PTR_LA	k0, _C_LABEL(MipsCacheException)
 	li	k1, MIPS_PHYS_MASK
 	and	k0, k1
-	li	k1, MIPS_KSEG1_START
+	PTR_LI	k1, MIPS_KSEG1_START
 	or	k0, k1
 	j	k0
 	nop

Modified: user/jmallett/octeon/sys/mips/mips/support.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/support.S	Tue Apr  6 05:12:47 2010	(r206246)
+++ user/jmallett/octeon/sys/mips/mips/support.S	Tue Apr  6 05:13:04 2010	(r206247)
@@ -1409,8 +1409,7 @@ END(fusufault)
        a pointer that is in user space.	 It will be used as the basic primitive
        for a kernel supported user space lock implementation. */
 LEAF(casuptr)
-
-	li	t0, VM_MAXUSER_ADDRESS /* verify address validity */
+	PTR_LI	t0, VM_MAXUSER_ADDRESS /* verify address validity */
 	blt	a0, t0, fusufault		/* trap faults */
 	nop
 

Modified: user/jmallett/octeon/sys/mips/mips/swtch.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/swtch.S	Tue Apr  6 05:12:47 2010	(r206246)
+++ user/jmallett/octeon/sys/mips/mips/swtch.S	Tue Apr  6 05:13:04 2010	(r206247)
@@ -294,7 +294,7 @@ blocked_loop:
 	PTR_L	a2, TD_PCB(a1)
 	PTR_S	a2, PC_CURPCB(a3)
 	PTR_L	v0, TD_KSTACK(a1)
-	li	s0, (MIPS_KSEG2_START+VM_KERNEL_ALLOC_OFFSET)		# If Uarea addr is below kseg2,
+	PTR_LI	s0, (MIPS_KSEG2_START+VM_KERNEL_ALLOC_OFFSET)		# If Uarea addr is below kseg2,
 	bltu	v0, s0, sw2			# no need to insert in TLB.
 	lw	a1, TD_UPTE(s7)			# t0 = u. pte
 /*
@@ -311,7 +311,7 @@ blocked_loop:
 	mfc0	s0, COP_0_TLB_INDEX
 	nop
 
-	li	t1, MIPS_KSEG0_START		# invalidate tlb entry
+	PTR_LI	t1, MIPS_KSEG0_START		# invalidate tlb entry
 	bltz	s0, entry0set
 	nop
 	sll	s0, PAGE_SHIFT