From owner-p4-projects@FreeBSD.ORG Wed May 14 13:09:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E47337B404; Wed, 14 May 2003 13:08:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EF0E37B401 for ; Wed, 14 May 2003 13:08:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCD3243F3F for ; Wed, 14 May 2003 13:08:58 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4EK8w0U054977 for ; Wed, 14 May 2003 13:08:58 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4EK8wH0054974 for perforce@freebsd.org; Wed, 14 May 2003 13:08:58 -0700 (PDT) Date: Wed, 14 May 2003 13:08:58 -0700 (PDT) Message-Id: <200305142008.h4EK8wH0054974@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 31185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2003 20:09:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=31185 Change 31185 by jmallett@jmallett_dalek on 2003/05/14 13:08:56 Move some stuff around, remove cruft. Affected files ... .. //depot/projects/mips/sys/mips/include/locore.h#4 edit .. //depot/projects/mips/sys/mips/include/md_var.h#8 edit Differences ... ==== //depot/projects/mips/sys/mips/include/locore.h#4 (text+ko) ==== @@ -79,71 +79,6 @@ uint32_t mips3_cp0_wired_read(void); void mips3_cp0_wired_write(uint32_t); -uint64_t mips3_ld(uint64_t *); -void mips3_sd(uint64_t *, uint64_t); - -static __inline uint32_t mips3_lw_a64(uint64_t addr) - __attribute__((__unused__)); -static __inline void mips3_sw_a64(uint64_t addr, uint32_t val) - __attribute__ ((__unused__)); - -static __inline uint32_t -mips3_lw_a64(uint64_t addr) -{ - uint32_t addrlo, addrhi; - uint32_t rv; - uint32_t sr; - - sr = mips_cp0_status_read(); - mips_cp0_status_write(sr | MIPS3_SR_KX); - - addrlo = addr & 0xffffffff; - addrhi = addr >> 32; - __asm__ __volatile__ (" \n\ - .set push \n\ - .set mips3 \n\ - .set noreorder \n\ - .set noat \n\ - dsll32 $3, %1, 0 \n\ - dsll32 $1, %2, 0 \n\ - dsrl32 $3, $3, 0 \n\ - or $1, $1, $3 \n\ - lw %0, 0($1) \n\ - .set pop \n\ - " : "=r"(rv) : "r"(addrlo), "r"(addrhi) : "$1", "$3" ); - - mips_cp0_status_write(sr); - - return (rv); -} - -static __inline void -mips3_sw_a64(uint64_t addr, uint32_t val) -{ - uint32_t addrlo, addrhi; - uint32_t sr; - - sr = mips_cp0_status_read(); - mips_cp0_status_write(sr | MIPS3_SR_KX); - - addrlo = addr & 0xffffffff; - addrhi = addr >> 32; - __asm__ __volatile__ (" \n\ - .set push \n\ - .set mips3 \n\ - .set noreorder \n\ - .set noat \n\ - dsll32 $3, %1, 0 \n\ - dsll32 $1, %2, 0 \n\ - dsrl32 $3, $3, 0 \n\ - or $1, $1, $3 \n\ - sw %0, 0($1) \n\ - .set pop \n\ - " : : "r"(val), "r"(addrlo), "r"(addrhi) : "$1", "$3" ); - - mips_cp0_status_write(sr); -} - /* * A vector with an entry for each mips-ISA-level dependent * locore function, and macros which jump through it. @@ -159,12 +94,8 @@ void (*wbflush)(void); } mips_locore_jumpvec_t; -void mips_set_wbflush(void (*)(void)); void mips_wait_idle(void); -void stacktrace(void); -void logstacktrace(void); - /* * The "active" locore-fuction vector, and */ @@ -210,10 +141,6 @@ * such as cache size, from locore to higher-level code (e.g., pmap). */ -extern int mips_num_tlb_entries; - -void mips_pagecopy(caddr_t dst, caddr_t src); -void mips_pagezero(caddr_t dst); #ifdef __HAVE_MIPS_MACHDEP_CACHE_CONFIG void mips_machdep_cache_config(void); ==== //depot/projects/mips/sys/mips/include/md_var.h#8 (text+ko) ==== @@ -31,6 +31,8 @@ extern vm_offset_t kstack0; extern vm_paddr_t kstack0_phys; +extern int mips_num_tlb_entries; + extern int cpu_id; extern int fpu_id;