From owner-svn-src-user@FreeBSD.ORG Tue Apr 6 05:13:04 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FE43106564A; Tue, 6 Apr 2010 05:13:04 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 547608FC19; Tue, 6 Apr 2010 05:13:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o365D4Xx054291; Tue, 6 Apr 2010 05:13:04 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o365D41Z054287; Tue, 6 Apr 2010 05:13:04 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201004060513.o365D41Z054287@svn.freebsd.org> From: Juli Mallett Date: Tue, 6 Apr 2010 05:13:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206247 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2010 05:13:04 -0000 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