From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:18:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 705C71065725; Tue, 26 Feb 2008 14:18:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 299281065718 for ; Tue, 26 Feb 2008 14:18:06 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D6FD13C467 for ; Tue, 26 Feb 2008 14:18:06 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEI6kv046366 for ; Tue, 26 Feb 2008 14:18:06 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEI5nD046363 for perforce@freebsd.org; Tue, 26 Feb 2008 14:18:05 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:18:05 GMT Message-Id: <200802261418.m1QEI5nD046363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136245 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, 26 Feb 2008 14:18:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=136245 Change 136245 by rrs@rrs-mips2-jnpr on 2008/02/26 14:17:52 New do_ast Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#13 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#13 (text+ko) ==== @@ -306,21 +306,30 @@ /* * Call ast if required */ -#define DO_AST \ - GET_CPU_PCPU(a0) \ - lw a0, PC_CURTHREAD(a0); \ - lw t0, TD_FLAGS(a0); \ - and t0, t0, (TDF_ASTPENDING|TDF_NEEDRESCHED); \ - beq t0, zero, 27f; \ - nop; \ - lw a0, TD_FRAME(a0); \ - lw t0, TF_REG_SR(a0); \ - and t0, t0, SR_KSU_USER; \ - beq t0, zero, 27f; \ - nop; \ - jal ast; \ - nop; \ -27: +#define DO_AST \ +44: \ + GET_CPU_PCPU(a1) ;\ + lw a1, PC_CURPCB(a1) ;\ + la s0, _C_LABEL(disableintr) ;\ + jalr s0 ;\ + nop ;\ + GET_CPU_PCPU(s1) ;\ + lw s3, PC_CURPCB(s1) ;\ + lw s1, PC_CURTHREAD(s1) ;\ + lw s2, TD_FLAGS(s1) ;\ + li s0, TDF_ASTPENDING | TDF_NEEDRESCHED;\ + and s2, s0 ;\ + la s0, _C_LABEL(enableintr) ;\ + jalr s0 ;\ + nop ;\ + beq s2, zero, 4f ;\ + nop ;\ + la s0, _C_LABEL(ast) ;\ + jalr s0 ;\ + addu a0, s3, U_PCB_REGS ;\ + j 44b ;\ +4: + /* * XXX retain dialects XXX