From owner-p4-projects@FreeBSD.ORG Sun Apr 13 15:57:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9DF237B401; Sun, 13 Apr 2003 15:57:09 -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 67AE037B407 for ; Sun, 13 Apr 2003 15:57:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C8F643FA3 for ; Sun, 13 Apr 2003 15:57:09 -0700 (PDT) (envelope-from marcel@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 h3DMv80U028616 for ; Sun, 13 Apr 2003 15:57:08 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3DMv88p028613 for perforce@freebsd.org; Sun, 13 Apr 2003 15:57:08 -0700 (PDT) Date: Sun, 13 Apr 2003 15:57:08 -0700 (PDT) Message-Id: <200304132257.h3DMv88p028613@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 28895 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, 13 Apr 2003 22:57:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=28895 Change 28895 by marcel@marcel_nfs on 2003/04/13 15:56:20 There's no point creating an initial register state based on the current context, because as soon as we return to the caller, the context will be invalid. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/unwind.c#3 edit .. //depot/projects/ia64_epc/sys/ia64/include/unwind.h#3 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/unwind.c#3 (text+ko) ==== @@ -103,23 +103,6 @@ return (NULL); } -int -unw_state_create(struct unw_regstate *rs) -{ - struct pcb pcb; - - savectx(&pcb); - /* Cache the values. */ - rs->rs_val.special = pcb.pcb_special; - rs->rs_val.preserved = pcb.pcb_preserved; - rs->rs_val.preserved_fp = pcb.pcb_preserved_fp; - /* Set the location to 'self' (ie in the register itself). */ - memset(&rs->rs_loc.special, 0, sizeof(rs->rs_loc.special)); - memset(&rs->rs_loc.preserved, 0, sizeof(rs->rs_loc.preserved)); - memset(&rs->rs_loc.preserved_fp, 0, sizeof(rs->rs_loc.preserved_fp)); - return (0); -} - static __inline void unw_set_loc(void *rs, void *pcb, int sz) { @@ -131,9 +114,13 @@ } int -unw_state_create_from_pcb(struct unw_regstate *rs, struct pcb *pcb) +unw_state_create(struct unw_regstate *rs, struct pcb *pcb) { + uint64_t *fp; + /* Set the current IP to the code address of savectx. */ + fp = (void*)savectx; + rs->rs_val.special.iip = *fp; /* Cache the values. */ rs->rs_val.special = pcb->pcb_special; rs->rs_val.preserved = pcb->pcb_preserved; ==== //depot/projects/ia64_epc/sys/ia64/include/unwind.h#3 (text+ko) ==== @@ -53,8 +53,7 @@ struct _unw_regs rs_loc; }; -int unw_state_create(struct unw_regstate *); -int unw_state_create_from_pcb(struct unw_regstate *, struct pcb *); +int unw_state_create(struct unw_regstate *, struct pcb *); int unw_table_add(uint64_t, uint64_t, uint64_t); void unw_table_remove(uint64_t);