From owner-p4-projects@FreeBSD.ORG Tue Mar 21 08:03:44 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 385C316A426; Tue, 21 Mar 2006 08:03:44 +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 10BAF16A401 for ; Tue, 21 Mar 2006 08:03:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7988843D55 for ; Tue, 21 Mar 2006 08:03:43 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L83hah014529 for ; Tue, 21 Mar 2006 08:03:43 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L83hJQ014524 for perforce@freebsd.org; Tue, 21 Mar 2006 08:03:43 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 08:03:43 GMT Message-Id: <200603210803.k2L83hJQ014524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93697 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: Tue, 21 Mar 2006 08:03:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=93697 Change 93697 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 08:02:40 convert tl2 register spill / fill exception handlers over to use physical addresses Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#9 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#9 (text+ko) ==== @@ -35,20 +35,13 @@ ENTRY(fault_64bit_sn1) /* XXX need to use physical addresses here */ - GET_PCB(%g6) -! MAGIC_TRAP_ON - stx %sp, [%g6 + PCB_RWSP] - SPILL(stx, %g6 + PCB_RW, 8) -#ifdef PMAP_DEBUG - ldx [%g6 + PCB_NSAVED], %g5 - brz %g5, 1f - nop - MAGIC_TRAP_ON - MAGIC_EXIT -1: -#endif - mov 1, %g5 - stx %g5, [%g6 + PCB_NSAVED] + GET_PCB_PHYS(%g5, %g6) + wr %g0, ASI_REAL, %asi + stxa %sp, [%g6 + PCB_RWSP]%asi + add %g6, PCB_RW, %g5 + SAVE_WINDOW_ASI(%g5) + mov 1, %g5 + stxa %g5, [%g6 + PCB_NSAVED]%asi saved set tl0_trap, %g5 wrpr %g5, %tnpc @@ -61,12 +54,13 @@ END(fault_32bit_sk) ENTRY(fault_64bit_sk) - GET_PCPU_SCRATCH - stx %sp, [PCPU_REG + PC_KWBUF_SP] + GET_PCPU_PHYS_SCRATCH(%g5) + wr %g0, ASI_REAL, %asi + stxa %sp, [PCPU_REG + PC_KWBUF_SP]%asi add PCPU_REG, PC_KWBUF, %g6 - SAVE_WINDOW(%g6) + SAVE_WINDOW_ASI(%g6) mov 1, %g6 - st %g6, [PCPU_REG + PC_KWBUF_FULL] + sta %g6, [PCPU_REG + PC_KWBUF_FULL]%asi saved retry END(fault_64bit_sk) @@ -74,7 +68,6 @@ ENTRY(fault_64bit_so0) GET_PCB(%g6) -! MAGIC_TRAP_ON ldx [%g6 + PCB_NSAVED], %g2 add %g2, 1, %g3 stx %g3, [%g6 + PCB_NSAVED] @@ -91,25 +84,25 @@ END(fault_64bit_so0) ENTRY(fault_64bit_so1) - /* XXX need to use physical addresses */ -! MAGIC_TRAP_ON - GET_PCB(%g6) - ldx [%g6 + PCB_NSAVED], %g2 + GET_PCB_PHYS(%g5, %g6) + wr %g0, ASI_REAL, %asi + ldxa [%g6 + PCB_NSAVED]%asi, %g2 add %g2, 1, %g3 - stx %g3, [%g6 + PCB_NSAVED] + stxa %g3, [%g6 + PCB_NSAVED]%asi sll %g2, PTR_SHIFT, %g4 add %g6, PCB_RWSP, %g3 - stx %sp, [%g3 + %g4] + add %g3, %g4, %g4 + stxa %sp, [%g4]%asi + sll %g2, RW_SHIFT, %g4 ! offset add %g6, PCB_RW, %g3 ! start of wbuf area add %g3, %g4, %g3 ! offset into wbuf area - SAVE_WINDOW(%g3) + SAVE_WINDOW_ASI(%g3) saved set tl0_trap, %g5 wrpr %g5, %tnpc - MAGIC_TRAP_OFF done END(fault_64bit_so1)