From owner-svn-src-user@FreeBSD.ORG Mon Mar 1 04:43:18 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 4E5BC1065675; Mon, 1 Mar 2010 04:43:18 +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 23E568FC13; Mon, 1 Mar 2010 04:43:18 +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 o214hIuO094257; Mon, 1 Mar 2010 04:43:18 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o214hIMe094254; Mon, 1 Mar 2010 04:43:18 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003010443.o214hIMe094254@svn.freebsd.org> From: Juli Mallett Date: Mon, 1 Mar 2010 04:43:17 +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: r204505 - in user/jmallett/octeon/sys/mips: include 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: Mon, 01 Mar 2010 04:43:18 -0000 Author: jmallett Date: Mon Mar 1 04:43:17 2010 New Revision: 204505 URL: http://svn.freebsd.org/changeset/base/204505 Log: Sign extend some more addresses. Seem to no longer require my nkpt hack. Fix PMAP_DEBUG compilation. Modified: user/jmallett/octeon/sys/mips/include/vmparam.h user/jmallett/octeon/sys/mips/mips/pmap.c Modified: user/jmallett/octeon/sys/mips/include/vmparam.h ============================================================================== --- user/jmallett/octeon/sys/mips/include/vmparam.h Mon Mar 1 04:07:56 2010 (r204504) +++ user/jmallett/octeon/sys/mips/include/vmparam.h Mon Mar 1 04:43:17 2010 (r204505) @@ -97,17 +97,17 @@ /* user/kernel map constants */ #define VM_MIN_ADDRESS ((vm_offset_t)0x00000000) -#define VM_MAXUSER_ADDRESS ((vm_offset_t)0x80000000) +#define VM_MAXUSER_ADDRESS ((vm_offset_t)(intptr_t)(int32_t)0x80000000) #define VM_MAX_MMAP_ADDR VM_MAXUSER_ADDRESS -#define VM_MAX_ADDRESS ((vm_offset_t)0x80000000) +#define VM_MAX_ADDRESS ((vm_offset_t)(intptr_t)(int32_t)0x80000000) #ifndef VM_KERNEL_ALLOC_OFFSET #define VM_KERNEL_ALLOC_OFFSET ((vm_offset_t)0x00000000) #endif -#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)0xC0000000) +#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)(intptr_t)(int32_t)0xC0000000) #define VM_KERNEL_WIRED_ADDR_END (VM_MIN_KERNEL_ADDRESS + VM_KERNEL_ALLOC_OFFSET) -#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xFFFFC000) +#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)(intptr_t)(int32_t)0xFFFFC000) /* * Disable superpage reservations. (not sure if this is right Modified: user/jmallett/octeon/sys/mips/mips/pmap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/pmap.c Mon Mar 1 04:07:56 2010 (r204504) +++ user/jmallett/octeon/sys/mips/mips/pmap.c Mon Mar 1 04:43:17 2010 (r204505) @@ -297,16 +297,8 @@ again: phys_avail[i] = round_page(phys_avail[i]); phys_avail[i + 1] = trunc_page(phys_avail[i + 1]); - if (phys_avail[i] >= MIPS_KSEG0_LARGEST_PHYS) { - phys_avail[i] = 0; - phys_avail[i + 1] = 0; - } - if (phys_avail[i + 1] >= MIPS_KSEG0_LARGEST_PHYS) { -#if 0 memory_larger_than_512meg++; -#endif - phys_avail[i + 1] = trunc_page(MIPS_KSEG0_LARGEST_PHYS - 1); } if (i < 2) continue; @@ -704,7 +696,7 @@ pmap_kenter(vm_offset_t va, vm_paddr_t p pt_entry_t npte, opte; #ifdef PMAP_DEBUG - printf("pmap_kenter: va: 0x%08x -> pa: 0x%08x\n", va, pa); + printf("pmap_kenter: va: %p -> pa: %p\n", (void *)va, (void *)pa); #endif npte = mips_paddr_to_tlbpfn(pa) | PTE_RW | PTE_V | PTE_G | PTE_W; @@ -1916,7 +1908,7 @@ validate: rw = init_pte_prot(va, m, prot); #ifdef PMAP_DEBUG - printf("pmap_enter: va: 0x%08x -> pa: 0x%08x\n", va, pa); + printf("pmap_enter: va: %p -> pa: %p\n", (void *)va, (void *)pa); #endif /* * Now validate mapping with desired protection/wiring.