From owner-p4-projects@FreeBSD.ORG Sun Mar 20 01:09:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59ED516A4D0; Sun, 20 Mar 2005 01:09:56 +0000 (GMT) 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 3477816A4CE for ; Sun, 20 Mar 2005 01:09:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFC4B43D5D for ; Sun, 20 Mar 2005 01:09:55 +0000 (GMT) (envelope-from jmallett@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 j2K19tQF060646 for ; Sun, 20 Mar 2005 01:09:55 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2K19t0f060643 for perforce@freebsd.org; Sun, 20 Mar 2005 01:09:55 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 20 Mar 2005 01:09:55 GMT Message-Id: <200503200109.j2K19t0f060643@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 73550 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: Sun, 20 Mar 2005 01:09:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=73550 Change 73550 by jmallett@jmallett_windward on 2005/03/20 01:09:47 tweak pcb Affected files ... .. //depot/projects/mips/sys/mips/include/pcb.h#10 edit .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#20 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pcb.h#10 (text+ko) ==== @@ -37,18 +37,18 @@ __register_t pcb_regs[12]; }; -#define PCB_REG_S0 (0x00) -#define PCB_REG_S1 (0x01) -#define PCB_REG_S2 (0x02) -#define PCB_REG_S3 (0x03) -#define PCB_REG_S4 (0x04) -#define PCB_REG_S5 (0x05) -#define PCB_REG_S6 (0x06) -#define PCB_REG_S7 (0x07) -#define PCB_REG_SP (0x08) -#define PCB_REG_S8 (0x09) -#define PCB_REG_SR (0x0a) -#define PCB_REG_RA (0x0b) +#define PCB_REG_S0 (0) +#define PCB_REG_S1 (1) +#define PCB_REG_S2 (2) +#define PCB_REG_S3 (3) +#define PCB_REG_S4 (4) +#define PCB_REG_S5 (5) +#define PCB_REG_S6 (6) +#define PCB_REG_S7 (7) +#define PCB_REG_S8 (8) +#define PCB_REG_SP (9) +#define PCB_REG_SR (10) +#define PCB_REG_RA (11) #ifdef _KERNEL #define PCB_FSR(pcb) (0) ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#20 (text+ko) ==== @@ -80,10 +80,10 @@ /* * Call fork_trampoline into fork_return via the pcb. */ - td2->td_pcb->pcb_regs[10] = (register_t)fork_trampoline; - td2->td_pcb->pcb_regs[0] = (register_t)fork_return; - td2->td_pcb->pcb_regs[1] = (register_t)td2; - td2->td_pcb->pcb_regs[2] = (register_t)td2->td_frame; + td2->td_pcb->pcb_regs[PCB_REG_RA] = (register_t)fork_trampoline; + td2->td_pcb->pcb_regs[PCB_REG_S0] = (register_t)fork_return; + td2->td_pcb->pcb_regs[PCB_REG_S1] = (register_t)td2; + td2->td_pcb->pcb_regs[PCB_REG_S2] = (register_t)td2->td_frame; /* * Now cpu_switch() can schedule the new process. @@ -118,9 +118,9 @@ td->td_pcb = (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; td->td_frame = (struct trapframe *)td->td_pcb - 1; - td->td_pcb->pcb_regs[11] = MIPS_SR_KX | MIPS_SR_INT_IE; + td->td_pcb->pcb_regs[PCB_REG_SR] = MIPS_SR_KX | MIPS_SR_INT_IE; /* Stack pointer. */ - td->td_pcb->pcb_regs[8] = (register_t)_ALIGN(td->td_frame - 1); + td->td_pcb->pcb_regs[PCB_REG_SP] = (register_t)_ALIGN(td->td_frame - 1); } /* @@ -130,8 +130,8 @@ void cpu_set_fork_handler(struct thread *td, void (*func)(void *), void *arg) { - td->td_pcb->pcb_regs[0] = (register_t)func; - td->td_pcb->pcb_regs[1] = (register_t)arg; + td->td_pcb->pcb_regs[PCB_REG_S0] = (register_t)func; + td->td_pcb->pcb_regs[PCB_REG_S1] = (register_t)arg; } void