From owner-p4-projects@FreeBSD.ORG Fri Jul 7 11:07:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83C0E16A4DE; Fri, 7 Jul 2006 11:07:33 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 4765C16A4DA for ; Fri, 7 Jul 2006 11:07:33 +0000 (UTC) (envelope-from wkoszek@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6FA343D55 for ; Fri, 7 Jul 2006 11:07:32 +0000 (GMT) (envelope-from wkoszek@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k67B7Wk8090995 for ; Fri, 7 Jul 2006 11:07:32 GMT (envelope-from wkoszek@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k67B7WSH090991 for perforce@freebsd.org; Fri, 7 Jul 2006 11:07:32 GMT (envelope-from wkoszek@FreeBSD.org) Date: Fri, 7 Jul 2006 11:07:32 GMT Message-Id: <200607071107.k67B7WSH090991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wkoszek@FreeBSD.org using -f From: "Wojciech A. Koszek" To: Perforce Change Reviews Cc: Subject: PERFORCE change 100860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jul 2006 11:07:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=100860 Change 100860 by wkoszek@wkoszek_laptop on 2006/07/07 11:07:28 Comment some things in src/sys/mips/mips/cpu.c because they're causing problems for now. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/cpu.c#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/cpu.c#2 (text+ko) ==== @@ -38,7 +38,14 @@ #include #include +/* + * XXXMIPS: This shoud me intr_machdep.h + */ +#if 0 #include +#endif +#include + #include #include #include @@ -49,6 +56,11 @@ */ int mips_num_tlb_entries, cpu_id, fpu_id; +/* + * XXXMIPS: CHange format strings. + * Uncomment this one once VECI macro defined below is uncommented. + */ +#if 0 static void mips_vector_install(vm_offset_t addr, char *begin, char *end) { @@ -56,7 +68,6 @@ max = 0x80; len = end - begin; - if (len > max) panic("exception code too big for vector %lx", addr); if (len == max) @@ -65,6 +76,7 @@ printf("Exception vector at %lx almost out of space\n", addr); memcpy((void *)addr, begin, len); } +#endif #define VEC(class) extern char class ## Vector[], class ## VectorEnd[] @@ -80,18 +92,28 @@ #undef VEC +/* + * XXXMIPS: error : large integer implicitly truncated to unsigned type + */ static void mips_vector_init(void) { + #define VECI(vec, class) mips_vector_install(MIPS_ ## vec ## _EXC_VEC, \ class ## Vector, \ class ## VectorEnd) +/* XXXMIPS */ +#if 0 VECI(UTLB_MISS, TLBMiss); VECI(XTLB_MISS, XTLBMiss); VECI(CACHE_ERR, Cache); VECI(GEN, Exception); +#endif #undef VECI +/* XXXMIPS */ +#if 0 mips_wr_status(mips_rd_status() & ~MIPS_SR_BEV); +#endif } /* @@ -302,7 +324,13 @@ device_printf(child, "could not activate irq\n"); return (error); } + /* + * XXXMIPS: error: structure has no member named `r_start' + */ +#if 0 intr = res->r_start; +#endif + intr = 0; cpu_establish_hardintr(intr, handler, arg); device_printf(child, "established CPU interrupt %d\n", intr);