diff -c -r -N orc-2.1/src/Make.cross orc-2.1-new/src/Make.cross *** orc-2.1/src/Make.cross Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/Make.cross Fri Nov 26 11:18:08 2004 *************** *** 164,172 **** gmake clobber -C $(CROSS_BUILD_DIR)/whirl2c gmake clobber -C $(CROSS_BUILD_DIR)/whirl2f gmake clobber -C $(CROSS_BUILD_DIR)/targ_info ! gmake clean -C $(CROSS_BUILD_DIR)/../libkapi gmake clobber -C $(CROSS_BUILD_DIR)/ir_tools gmake clobber -C $(CROSS_BUILD_DIR)/crayf90/sgi @for i in libcif libcmplrs libcomutil libcsup libdwarf libelf libelfutil \ libiberty libunwindP ; do \ make clobber -C "$(CROSS_BUILD_DIR)/$${i}" ; \ --- 164,174 ---- gmake clobber -C $(CROSS_BUILD_DIR)/whirl2c gmake clobber -C $(CROSS_BUILD_DIR)/whirl2f gmake clobber -C $(CROSS_BUILD_DIR)/targ_info ! gmake clean -C $(CROSS_BUILD_DIR)/../libkapi gmake clobber -C $(CROSS_BUILD_DIR)/ir_tools + gmake clobber -C $(CROSS_BUILD_DIR)/cord gmake clobber -C $(CROSS_BUILD_DIR)/crayf90/sgi + cd $(CROSS_BUILD_DIR_LD); gmake clean @for i in libcif libcmplrs libcomutil libcsup libdwarf libelf libelfutil \ libiberty libunwindP ; do \ make clobber -C "$(CROSS_BUILD_DIR)/$${i}" ; \ diff -c -r -N orc-2.1/src/Make.native orc-2.1-new/src/Make.native *** orc-2.1/src/Make.native Fri Dec 24 14:14:34 2004 --- orc-2.1-new/src/Make.native Fri Nov 26 11:18:08 2004 *************** *** 166,171 **** --- 166,173 ---- gmake clobber -C $(NATIVE_BUILD_DIR)/targ_info gmake clean -C $(NATIVE_BUILD_DIR)/../libkapi gmake clobber -C $(NATIVE_BUILD_DIR)/ir_tools + gmake clobber -C $(NATIVE_BUILD_DIR)/cord + cd $(NATIVE_BUILD_DIR_LD); gmake clean gmake clobber -C $(NATIVE_BUILD_DIR)/crayf90/sgi gmake clobber -C $(NATIVE_BUILD_DIR_LIB)/include gmake clobber -C $(NATIVE_BUILD_DIR_LIB)/libfortran diff -c -r -N orc-2.1/src/osprey1.0/Makefile orc-2.1-new/src/osprey1.0/Makefile *** orc-2.1/src/osprey1.0/Makefile Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/Makefile Tue Nov 9 22:31:24 2004 *************** *** 33,39 **** # # ! #ident "$Revision: 1.76 $" SHELL=/bin/sh ECHO=echo --- 33,39 ---- # # ! #ident "$Revision: 1.3 $" SHELL=/bin/sh ECHO=echo diff -c -r -N orc-2.1/src/osprey1.0/arith/PRINTMSG_dummy.c orc-2.1-new/src/osprey1.0/arith/PRINTMSG_dummy.c *** orc-2.1/src/osprey1.0/arith/PRINTMSG_dummy.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/PRINTMSG_dummy.c Mon Jun 25 14:32:38 2001 *************** *** 53,56 **** if(msg_severity==Internal || msg_severity==Error) exit(1); } ! static char rcsid [] = "$Id: PRINTMSG_dummy.c,v 2.3 1995/08/16 22:08:55 jk Exp $"; --- 53,56 ---- if(msg_severity==Internal || msg_severity==Error) exit(1); } ! static char rcsid [] = "$Id: PRINTMSG_dummy.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/bits.c orc-2.1-new/src/osprey1.0/arith/bits.c *** orc-2.1/src/osprey1.0/arith/bits.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/bits.c Mon Jun 25 14:32:38 2001 *************** *** 1275,1278 **** } static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: bits.c,v 2.5 1997/06/02 19:14:13 gbt Exp $"; --- 1275,1278 ---- } static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: bits.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/compare.c orc-2.1-new/src/osprey1.0/arith/compare.c *** orc-2.1/src/osprey1.0/arith/compare.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/compare.c Mon Jun 25 14:32:38 2001 *************** *** 473,476 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: compare.c,v 2.7 1997/04/25 02:55:47 gbt Exp $"; --- 473,476 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: compare.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/confidence.c orc-2.1-new/src/osprey1.0/arith/confidence.c *** orc-2.1/src/osprey1.0/arith/confidence.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/confidence.c Mon Jun 25 14:32:38 2001 *************** *** 2632,2635 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: confidence.c,v 2.6 1997/04/25 02:55:50 gbt Exp $"; --- 2632,2635 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: confidence.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/convert.c orc-2.1-new/src/osprey1.0/arith/convert.c *** orc-2.1/src/osprey1.0/arith/convert.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/convert.c Mon Jun 25 14:32:38 2001 *************** *** 1395,1398 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: convert.c,v 2.11 1997/07/22 23:31:18 gbt Exp $"; --- 1395,1398 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: convert.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/cray_fadd.c orc-2.1-new/src/osprey1.0/arith/cray_fadd.c *** orc-2.1/src/osprey1.0/arith/cray_fadd.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/cray_fadd.c Mon Jun 25 14:32:38 2001 *************** *** 281,284 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: cray_fadd.c,v 2.2 1995/08/16 22:09:16 jk Exp $"; --- 281,284 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: cray_fadd.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/cray_fdiv.c orc-2.1-new/src/osprey1.0/arith/cray_fdiv.c *** orc-2.1/src/osprey1.0/arith/cray_fdiv.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/cray_fdiv.c Mon Jun 25 14:32:38 2001 *************** *** 489,492 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: cray_fdiv.c,v 2.3 1997/04/25 02:55:58 gbt Exp $"; --- 489,492 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: cray_fdiv.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/cray_fmul.c orc-2.1-new/src/osprey1.0/arith/cray_fmul.c *** orc-2.1/src/osprey1.0/arith/cray_fmul.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/cray_fmul.c Mon Jun 25 14:32:38 2001 *************** *** 287,290 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: cray_fmul.c,v 2.3 1997/04/25 02:56:00 gbt Exp $"; --- 287,290 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: cray_fmul.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/ctgen.c orc-2.1-new/src/osprey1.0/arith/ctgen.c *** orc-2.1/src/osprey1.0/arith/ctgen.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/ctgen.c Mon Jun 25 14:32:38 2001 *************** *** 594,597 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ctgen.c,v 2.2 1995/02/08 19:55:17 jk Exp $"; --- 594,597 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ctgen.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/cvt.c orc-2.1-new/src/osprey1.0/arith/cvt.c *** orc-2.1/src/osprey1.0/arith/cvt.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/cvt.c Mon Jun 25 14:32:38 2001 *************** *** 715,718 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: cvt.c,v 2.7 1997/04/02 00:04:26 gbt Exp $"; --- 715,718 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: cvt.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/dummy_dc.f orc-2.1-new/src/osprey1.0/arith/dummy_dc.f *** orc-2.1/src/osprey1.0/arith/dummy_dc.f Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/dummy_dc.f Mon Jun 25 14:32:38 2001 *************** *** 58,61 **** END c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: dummy_dc.f,v 2.1 1994/10/18 19:48:32 jk Exp $"; --- 58,61 ---- END c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: dummy_dc.f,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/fintrin.f orc-2.1-new/src/osprey1.0/arith/fintrin.f *** orc-2.1/src/osprey1.0/arith/fintrin.f Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/fintrin.f Mon Jun 25 14:32:38 2001 *************** *** 146,149 **** END c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: fintrin.f,v 2.1 1994/10/18 19:48:38 jk Exp $"; --- 146,149 ---- END c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: fintrin.f,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/fintrin_dc.f orc-2.1-new/src/osprey1.0/arith/fintrin_dc.f *** orc-2.1/src/osprey1.0/arith/fintrin_dc.f Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/fintrin_dc.f Mon Jun 25 14:32:38 2001 *************** *** 83,86 **** END c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: fintrin_dc.f,v 2.1 1994/10/18 19:48:41 jk Exp $"; --- 83,86 ---- END c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: fintrin_dc.f,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/fintrin_dc_sparc.f orc-2.1-new/src/osprey1.0/arith/fintrin_dc_sparc.f *** orc-2.1/src/osprey1.0/arith/fintrin_dc_sparc.f Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/fintrin_dc_sparc.f Mon Jun 25 14:32:38 2001 *************** *** 117,120 **** END c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: fintrin_dc_sparc.f,v 2.3 1995/09/26 20:40:21 jk Exp $"; --- 117,120 ---- END c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: fintrin_dc_sparc.f,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/fintrin_sparc.f orc-2.1-new/src/osprey1.0/arith/fintrin_sparc.f *** orc-2.1/src/osprey1.0/arith/fintrin_sparc.f Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/fintrin_sparc.f Mon Jun 25 14:32:38 2001 *************** *** 270,273 **** END c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: fintrin_sparc.f,v 2.3 1995/09/26 20:40:23 jk Exp $"; --- 270,273 ---- END c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: fintrin_sparc.f,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/ieee_fadd.c orc-2.1-new/src/osprey1.0/arith/ieee_fadd.c *** orc-2.1/src/osprey1.0/arith/ieee_fadd.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/ieee_fadd.c Mon Jun 25 14:32:38 2001 *************** *** 603,606 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ieee_fadd.c,v 2.2 1996/08/15 23:09:15 gbt Exp $"; --- 603,606 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ieee_fadd.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/ieee_fdiv.c orc-2.1-new/src/osprey1.0/arith/ieee_fdiv.c *** orc-2.1/src/osprey1.0/arith/ieee_fdiv.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/ieee_fdiv.c Mon Jun 25 14:32:38 2001 *************** *** 585,588 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ieee_fdiv.c,v 2.5 1997/07/22 23:31:26 gbt Exp $"; --- 585,588 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ieee_fdiv.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/ieee_fmul.c orc-2.1-new/src/osprey1.0/arith/ieee_fmul.c *** orc-2.1/src/osprey1.0/arith/ieee_fmul.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/ieee_fmul.c Mon Jun 25 14:32:38 2001 *************** *** 392,395 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ieee_fmul.c,v 2.5 1997/07/22 23:31:29 gbt Exp $"; --- 392,395 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ieee_fmul.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/ieee_norm.c orc-2.1-new/src/osprey1.0/arith/ieee_norm.c *** orc-2.1/src/osprey1.0/arith/ieee_norm.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/ieee_norm.c Mon Jun 25 14:32:38 2001 *************** *** 428,432 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ieee_norm.c,v 2.4 1997/06/17 17:46:24 gbt Exp $"; --- 428,432 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ieee_norm.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/ieee_sqrt.c orc-2.1-new/src/osprey1.0/arith/ieee_sqrt.c *** orc-2.1/src/osprey1.0/arith/ieee_sqrt.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/ieee_sqrt.c Mon Jun 25 14:32:38 2001 *************** *** 165,168 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ieee_sqrt.c,v 2.3 1997/07/22 23:31:31 gbt Exp $"; --- 165,168 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: ieee_sqrt.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/int64.h orc-2.1-new/src/osprey1.0/arith/int64.h *** orc-2.1/src/osprey1.0/arith/int64.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/int64.h Mon Jun 25 14:32:38 2001 *************** *** 235,238 **** #define WORD_SWAP(x) #endif ! /* $Id: int64.h,v 2.3 1997/04/25 02:56:12 gbt Exp $ */ --- 235,238 ---- #define WORD_SWAP(x) #endif ! /* $Id: int64.h,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $ */ diff -c -r -N orc-2.1/src/osprey1.0/arith/intrin.c orc-2.1-new/src/osprey1.0/arith/intrin.c *** orc-2.1/src/osprey1.0/arith/intrin.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/intrin.c Mon Jun 25 14:32:38 2001 *************** *** 382,385 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: intrin.c,v 2.3 1997/04/25 02:56:14 gbt Exp $"; --- 382,385 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: intrin.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/itgen.c orc-2.1-new/src/osprey1.0/arith/itgen.c *** orc-2.1/src/osprey1.0/arith/itgen.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/itgen.c Mon Jun 25 14:32:38 2001 *************** *** 588,591 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: itgen.c,v 2.1 1994/10/18 19:49:21 jk Exp $"; --- 588,591 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: itgen.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/itgenf.f orc-2.1-new/src/osprey1.0/arith/itgenf.f *** orc-2.1/src/osprey1.0/arith/itgenf.f Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/itgenf.f Mon Jun 25 14:32:38 2001 *************** *** 43,46 **** end c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: itgenf.f,v 2.0 1994/08/11 16:22:08 jk Exp $"; --- 43,46 ---- end c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: itgenf.f,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/math.c orc-2.1-new/src/osprey1.0/arith/math.c *** orc-2.1/src/osprey1.0/arith/math.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/math.c Mon Jun 25 14:32:38 2001 *************** *** 2448,2451 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: math.c,v 2.8 1997/04/25 02:56:17 gbt Exp $"; --- 2448,2451 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: math.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/miscmath.c orc-2.1-new/src/osprey1.0/arith/miscmath.c *** orc-2.1/src/osprey1.0/arith/miscmath.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/miscmath.c Mon Jun 25 14:32:38 2001 *************** *** 1072,1075 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: miscmath.c,v 2.12 1997/04/25 19:23:20 gbt Exp $"; --- 1072,1075 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: miscmath.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/mpp_sim.c orc-2.1-new/src/osprey1.0/arith/mpp_sim.c *** orc-2.1/src/osprey1.0/arith/mpp_sim.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/mpp_sim.c Mon Jun 25 14:32:38 2001 *************** *** 3074,3077 **** #endif static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: mpp_sim.c,v 2.21 1997/04/25 02:56:24 gbt Exp $"; --- 3074,3077 ---- #endif static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: mpp_sim.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/native.c orc-2.1-new/src/osprey1.0/arith/native.c *** orc-2.1/src/osprey1.0/arith/native.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/native.c Mon Jun 25 14:32:38 2001 *************** *** 1761,1764 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: native.c,v 2.14 1997/05/06 17:28:22 gbt Exp $"; --- 1761,1764 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: native.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/no_intrin.c orc-2.1-new/src/osprey1.0/arith/no_intrin.c *** orc-2.1/src/osprey1.0/arith/no_intrin.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/no_intrin.c Mon Jun 25 14:32:38 2001 *************** *** 160,163 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: no_intrin.c,v 2.5 1997/04/25 02:56:29 gbt Exp $"; --- 160,163 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: no_intrin.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/sim_c1_gen.f orc-2.1-new/src/osprey1.0/arith/sim_c1_gen.f *** orc-2.1/src/osprey1.0/arith/sim_c1_gen.f Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/sim_c1_gen.f Mon Jun 25 14:32:38 2001 *************** *** 1517,1520 **** end c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: sim_c1_gen.f,v 2.2 1995/01/04 16:06:22 jk Exp $"; --- 1517,1520 ---- end c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: sim_c1_gen.f,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/sim_mpp_gen.f orc-2.1-new/src/osprey1.0/arith/sim_mpp_gen.f *** orc-2.1/src/osprey1.0/arith/sim_mpp_gen.f Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/sim_mpp_gen.f Mon Jun 25 14:32:38 2001 *************** *** 1685,1688 **** end c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: sim_mpp_gen.f,v 2.5 1995/09/26 20:40:33 jk Exp $"; --- 1685,1688 ---- end c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: sim_mpp_gen.f,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/simulate.c orc-2.1-new/src/osprey1.0/arith/simulate.c *** orc-2.1/src/osprey1.0/arith/simulate.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/simulate.c Mon Jun 25 14:32:38 2001 *************** *** 1073,1076 **** #endif static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: simulate.c,v 2.9 1997/04/25 02:56:32 gbt Exp $"; --- 1073,1076 ---- #endif static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: simulate.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/strcvt.c orc-2.1-new/src/osprey1.0/arith/strcvt.c *** orc-2.1/src/osprey1.0/arith/strcvt.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/strcvt.c Mon Jun 25 14:32:38 2001 *************** *** 845,848 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: strcvt.c,v 2.16 1997/05/01 15:25:23 gbt Exp $"; --- 845,848 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: strcvt.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/test_ar_intrin.c orc-2.1-new/src/osprey1.0/arith/test_ar_intrin.c *** orc-2.1/src/osprey1.0/arith/test_ar_intrin.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/test_ar_intrin.c Mon Jun 25 14:32:38 2001 *************** *** 442,445 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: test_ar_intrin.c,v 2.6 1996/08/30 19:40:08 gbt Exp $"; --- 442,445 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: test_ar_intrin.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/test_cray1_sim.c orc-2.1-new/src/osprey1.0/arith/test_cray1_sim.c *** orc-2.1/src/osprey1.0/arith/test_cray1_sim.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/test_cray1_sim.c Mon Jun 25 14:32:38 2001 *************** *** 333,336 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: test_cray1_sim.c,v 2.2 1995/08/16 22:10:00 jk Exp $"; --- 333,336 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: test_cray1_sim.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/test_mpp_sim.c orc-2.1-new/src/osprey1.0/arith/test_mpp_sim.c *** orc-2.1/src/osprey1.0/arith/test_mpp_sim.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/test_mpp_sim.c Mon Jun 25 14:32:38 2001 *************** *** 359,362 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: test_mpp_sim.c,v 2.4 1995/09/26 20:40:38 jk Exp $"; --- 359,362 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: test_mpp_sim.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/test_native.f orc-2.1-new/src/osprey1.0/arith/test_native.f *** orc-2.1/src/osprey1.0/arith/test_native.f Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/test_native.f Mon Jun 25 14:32:38 2001 *************** *** 1178,1181 **** c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: test_native.f,v 2.4 1996/08/30 19:40:14 gbt Exp $"; --- 1178,1181 ---- c USMID = "\n%Z%%M% %I% %G% %U%\n"; ! c rcsid = "$Id: test_native.f,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/test_tsieee_sim.c orc-2.1-new/src/osprey1.0/arith/test_tsieee_sim.c *** orc-2.1/src/osprey1.0/arith/test_tsieee_sim.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/test_tsieee_sim.c Mon Jun 25 14:32:38 2001 *************** *** 378,381 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: test_tsieee_sim.c,v 2.1 1995/08/16 22:10:05 jk Exp $"; --- 378,381 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: test_tsieee_sim.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/testcvt.c orc-2.1-new/src/osprey1.0/arith/testcvt.c *** orc-2.1/src/osprey1.0/arith/testcvt.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/testcvt.c Mon Jun 25 14:32:38 2001 *************** *** 3536,3539 **** #endif /* _CRAY */ static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: testcvt.c,v 2.2 1995/08/16 22:10:07 jk Exp $"; --- 3536,3539 ---- #endif /* _CRAY */ static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: testcvt.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/arith/testint.c orc-2.1-new/src/osprey1.0/arith/testint.c *** orc-2.1/src/osprey1.0/arith/testint.c Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/arith/testint.c Mon Jun 25 14:32:38 2001 *************** *** 4403,4406 **** static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: testint.c,v 2.5 1997/06/02 19:14:20 gbt Exp $"; --- 4403,4406 ---- static char USMID [] = "\n%Z%%M% %I% %G% %U%\n"; ! static char rcsid [] = "$Id: testint.c,v 1.1.1.1 2001/06/25 06:32:38 llx Exp $"; diff -c -r -N orc-2.1/src/osprey1.0/be/be/cleanup.cxx orc-2.1-new/src/osprey1.0/be/be/cleanup.cxx *** orc-2.1/src/osprey1.0/be/be/cleanup.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/cleanup.cxx Tue Nov 9 22:31:24 2004 *************** *** 37,46 **** * ==================================================================== * * Module: cleanup.c ! * $Revision: 1.16 $ ! * $Date: 2001/03/10 01:46:13 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/be/RCS/cleanup.cxx,v $ * * Revision history: * 21-Feb-95 - Original Version --- 37,46 ---- * ==================================================================== * * Module: cleanup.c ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:24 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/be/cleanup.cxx,v $ * * Revision history: * 21-Feb-95 - Original Version diff -c -r -N orc-2.1/src/osprey1.0/be/be/driver.cxx orc-2.1-new/src/osprey1.0/be/be/driver.cxx *** orc-2.1/src/osprey1.0/be/be/driver.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/driver.cxx Fri Nov 19 11:01:17 2004 *************** *** 278,290 **** #ifndef __GNUC__ #pragma weak Prompf_Emit_Whirl_to_Source__GP7pu_infoP2WN #else #pragma weak Prompf_Emit_Whirl_to_Source__FP7pu_infoP2WN ! #endif extern void Prompf_Emit_Whirl_to_Source(PU_Info* current_pu, WN* func_nd); - static INT ecount = 0; static BOOL need_wopt_output = FALSE; static BOOL need_lno_output = FALSE; --- 278,291 ---- #ifndef __GNUC__ #pragma weak Prompf_Emit_Whirl_to_Source__GP7pu_infoP2WN + #elif __GNUC__ >= 3 + extern void Prompf_Emit_Whirl_to_Source(PU_Info* current_pu, WN* func_nd) __attribute__((weak)); #else #pragma weak Prompf_Emit_Whirl_to_Source__FP7pu_infoP2WN ! #endif // __GNUC__ >= 3 extern void Prompf_Emit_Whirl_to_Source(PU_Info* current_pu, WN* func_nd); static INT ecount = 0; static BOOL need_wopt_output = FALSE; static BOOL need_lno_output = FALSE; diff -c -r -N orc-2.1/src/osprey1.0/be/be/driver_util.h orc-2.1-new/src/osprey1.0/be/be/driver_util.h *** orc-2.1/src/osprey1.0/be/be/driver_util.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/driver_util.h Tue Nov 9 22:31:24 2004 *************** *** 37,46 **** * ==================================================================== * * Module: driver_util.h ! * $Revision: 1.10 $ ! * $Date: 2001/03/10 01:47:03 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/be/RCS/driver_util.h,v $ * * Revision history: * 17-Feb-95 - Original Version --- 37,46 ---- * ==================================================================== * * Module: driver_util.h ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:24 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/be/driver_util.h,v $ * * Revision history: * 17-Feb-95 - Original Version diff -c -r -N orc-2.1/src/osprey1.0/be/be/ia64/driver_targ.cxx orc-2.1-new/src/osprey1.0/be/be/ia64/driver_targ.cxx *** orc-2.1/src/osprey1.0/be/be/ia64/driver_targ.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/ia64/driver_targ.cxx Fri Nov 19 11:01:18 2004 *************** *** 73,79 **** break; case TARGET_ITANIUM2: proc = PROCESSOR_itanium; ! version = "2"; break; default: FmtAssert(FALSE, ("targinfo doesn't handle target: %s\n", Targ_Name(Target))); --- 73,80 ---- break; case TARGET_ITANIUM2: proc = PROCESSOR_itanium; ! version[0] = '2'; ! version[1] = '\0'; break; default: FmtAssert(FALSE, ("targinfo doesn't handle target: %s\n", Targ_Name(Target))); diff -c -r -N orc-2.1/src/osprey1.0/be/be/iter.cxx orc-2.1-new/src/osprey1.0/be/be/iter.cxx *** orc-2.1/src/osprey1.0/be/be/iter.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/iter.cxx Tue Nov 9 22:31:24 2004 *************** *** 37,46 **** * ==================================================================== * * Module: iter.c ! * $Revision: 1.8 $ ! * $Date: 2001/03/10 01:47:13 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/be/RCS/iter.cxx,v $ * * Revision history: * 3-MAR-96 dahl - Original Version --- 37,46 ---- * ==================================================================== * * Module: iter.c ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:24 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/be/iter.cxx,v $ * * Revision history: * 3-MAR-96 dahl - Original Version *************** *** 54,60 **** #define rbi_CXX "iter.c" #ifdef _KEEP_RCS_ID ! static char *rcs_id = iter_C"$Revision: 1.8 $"; #endif /* _KEEP_RCS_ID */ #include /* for Elf64_Word */ --- 54,60 ---- #define rbi_CXX "iter.c" #ifdef _KEEP_RCS_ID ! static char *rcs_id = iter_C"$Revision: 1.3 $"; #endif /* _KEEP_RCS_ID */ #include /* for Elf64_Word */ diff -c -r -N orc-2.1/src/osprey1.0/be/be/iter.h orc-2.1-new/src/osprey1.0/be/be/iter.h *** orc-2.1/src/osprey1.0/be/be/iter.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/iter.h Tue Nov 9 22:31:24 2004 *************** *** 37,46 **** * ==================================================================== * * Module: iter.h ! * $Revision: 1.6 $ ! * $Date: 2001/03/10 01:47:18 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/be/RCS/iter.h,v $ * * Revision history: * 03-MAR-96 - Original Version --- 37,46 ---- * ==================================================================== * * Module: iter.h ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:24 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/be/iter.h,v $ * * Revision history: * 03-MAR-96 - Original Version *************** *** 55,61 **** #define iter_INCLUDED #ifdef _KEEP_RCS_ID ! static char *be_utilrcs_id = "$Source: /isms/cmplrs.src/osprey1.0/be/be/RCS/iter.h,v $ $Revision: 1.6 $"; #endif /* _KEEP_RCS_ID */ #ifdef __cplusplus --- 55,61 ---- #define iter_INCLUDED #ifdef _KEEP_RCS_ID ! static char *be_utilrcs_id = "$Source: /u/merge/src/osprey1.0/be/be/iter.h,v $ $Revision: 1.3 $"; #endif /* _KEEP_RCS_ID */ #ifdef __cplusplus diff -c -r -N orc-2.1/src/osprey1.0/be/be/omp_lower.cxx orc-2.1-new/src/osprey1.0/be/be/omp_lower.cxx *** orc-2.1/src/osprey1.0/be/be/omp_lower.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/omp_lower.cxx Tue Nov 9 22:31:24 2004 *************** *** 35,44 **** /* ==================================================================== * Module: omp_lower.cxx ! * $Revision: 1.78 $ ! * $Date: 2001/03/10 01:47:33 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/be/RCS/omp_lower.cxx,v $ * * Revision history: * 26-Jun-97 : First created by Dave Kohr --- 35,44 ---- /* ==================================================================== * Module: omp_lower.cxx ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:24 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/be/omp_lower.cxx,v $ * * Revision history: * 26-Jun-97 : First created by Dave Kohr diff -c -r -N orc-2.1/src/osprey1.0/be/be/omp_lower.h orc-2.1-new/src/osprey1.0/be/be/omp_lower.h *** orc-2.1/src/osprey1.0/be/be/omp_lower.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/omp_lower.h Tue Nov 9 22:31:24 2004 *************** *** 35,44 **** /* ==================================================================== * Module: omp_lower.h ! * $Revision: 1.10 $ ! * $Date: 2001/03/10 01:47:39 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/be/RCS/omp_lower.h,v $ * * Revision history: * 26-Jun-97 : First created by Dave Kohr --- 35,44 ---- /* ==================================================================== * Module: omp_lower.h ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:24 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/be/omp_lower.h,v $ * * Revision history: * 26-Jun-97 : First created by Dave Kohr diff -c -r -N orc-2.1/src/osprey1.0/be/be/pragma_weak.h orc-2.1-new/src/osprey1.0/be/be/pragma_weak.h *** orc-2.1/src/osprey1.0/be/be/pragma_weak.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/pragma_weak.h Tue Nov 9 22:31:24 2004 *************** *** 36,45 **** /* ==================================================================== * * Module: pragma_weak.c ! * $Revision: 1.7 $ ! * $Date: 2001/03/10 01:47:44 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/be/RCS/pragma_weak.h,v $ * * Revision history: * 4-Jan-96 - Original Version --- 36,45 ---- /* ==================================================================== * * Module: pragma_weak.c ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:24 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/be/pragma_weak.h,v $ * * Revision history: * 4-Jan-96 - Original Version diff -c -r -N orc-2.1/src/osprey1.0/be/be/wn_outlining.cxx orc-2.1-new/src/osprey1.0/be/be/wn_outlining.cxx *** orc-2.1/src/osprey1.0/be/be/wn_outlining.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/wn_outlining.cxx Fri Nov 19 11:01:17 2004 *************** *** 1145,1151 **** (*(_current_cwt_elmt->Local_label_list()))[j].wn )) >= 0) Is_True((k>=0), ! ("Error in the splitter, discrepancy between the -local-label-list and -global-label-list(2)")); // if there are more gotos to this label in --- 1145,1151 ---- (*(_current_cwt_elmt->Local_label_list()))[j].wn )) >= 0) Is_True((k>=0), ! ("Error in the splitter, discrepancy between the\ -local-label-list and -global-label-list(2)")); // if there are more gotos to this label in diff -c -r -N orc-2.1/src/osprey1.0/be/be/wn_outlining.h orc-2.1-new/src/osprey1.0/be/be/wn_outlining.h *** orc-2.1/src/osprey1.0/be/be/wn_outlining.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/be/wn_outlining.h Fri Nov 19 11:01:17 2004 *************** *** 105,111 **** } #endif ! typedef hash_map BLOCK_FREQ_MAP;//OUTLINING^$ typedef enum { --- 105,118 ---- } #endif ! #if __GNUC__ >= 3 ! #include ! #else ! #include ! #endif // __GNUC__ >= 3 ! ! ! typedef __GNUEXT::hash_map BLOCK_FREQ_MAP; //OUTLINING^$ typedef enum { diff -c -r -N orc-2.1/src/osprey1.0/be/cg/bb.h orc-2.1-new/src/osprey1.0/be/cg/bb.h *** orc-2.1/src/osprey1.0/be/cg/bb.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/bb.h Tue Nov 9 22:31:25 2004 *************** *** 37,45 **** * ==================================================================== * * Module: bb.h ! * $Revision: 1.13 $ ! * $Date: 2003/04/01 03:01:44 $ ! * $Author: wyz $ * $Source: /u/merge/src/osprey1.0/be/cg/bb.h,v $ * * Description: --- 37,45 ---- * ==================================================================== * * Module: bb.h ! * $Revision: 1.15 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/bb.h,v $ * * Description: diff -c -r -N orc-2.1/src/osprey1.0/be/cg/calls.cxx orc-2.1-new/src/osprey1.0/be/cg/calls.cxx *** orc-2.1/src/osprey1.0/be/cg/calls.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/calls.cxx Tue Nov 9 22:31:25 2004 *************** *** 37,45 **** * ==================================================================== * * Module: calls.cxx ! * $Revision: 1.25 $ ! * $Date: 2002/04/11 10:57:09 $ ! * $Author: bcheng $ * $Source: /u/merge/src/osprey1.0/be/cg/calls.cxx,v $ * * Revision history: --- 37,45 ---- * ==================================================================== * * Module: calls.cxx ! * $Revision: 1.29 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/calls.cxx,v $ * * Revision history: *************** *** 94,100 **** #include "entry_exit_targ.h" #include "targ_abi_properties.h" #include "targ_isa_registers.h" - #include "scheduler.h" INT64 Frame_Len; extern BOOL IPFEC_Enable_Edge_Profile; --- 94,99 ---- diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cflow.cxx orc-2.1-new/src/osprey1.0/be/cg/cflow.cxx *** orc-2.1/src/osprey1.0/be/cg/cflow.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cflow.cxx Fri Nov 19 11:01:19 2004 *************** *** 37,45 **** * ==================================================================== * * Module: cflow.cxx ! * $Revision: 1.24 $ ! * $Date: 2003/06/06 07:42:46 $ ! * $Author: gange $ * $Source: /u/merge/src/osprey1.0/be/cg/cflow.cxx,v $ * * Description: --- 37,45 ---- * ==================================================================== * * Module: cflow.cxx ! * $Revision: 1.25 $ ! * $Date: 2004/11/19 03:01:19 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/cflow.cxx,v $ * * Description: *************** *** 7154,7160 **** tgt_label = Gen_Label_For_BB(tgt_succ); if (CFLOW_Trace_Empty_BB_Elim) { ! fprintf(TFile, "The label %s of empty BB: %d will be copied to BB labeled with %s\n", LABEL_name(old_label), BB_id(bp), LABEL_name(tgt_label)); } --- 7154,7160 ---- tgt_label = Gen_Label_For_BB(tgt_succ); if (CFLOW_Trace_Empty_BB_Elim) { ! fprintf(TFile, "The label %s of empty BB: %d will be copied\ to BB labeled with %s\n", LABEL_name(old_label), BB_id(bp), LABEL_name(tgt_label)); } diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cg.cxx orc-2.1-new/src/osprey1.0/be/cg/cg.cxx *** orc-2.1/src/osprey1.0/be/cg/cg.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cg.cxx Fri Nov 19 11:01:19 2004 *************** *** 37,45 **** * ==================================================================== * * Module: cg.cxx ! * $Revision: 1.82 $ ! * $Date: 2003/06/26 06:27:17 $ ! * $Author: flv $ * $Source: /u/merge/src/osprey1.0/be/cg/cg.cxx,v $ * * Description: --- 37,45 ---- * ==================================================================== * * Module: cg.cxx ! * $Revision: 1.85 $ ! * $Date: 2004/11/19 03:01:19 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/cg.cxx,v $ * * Description: *************** *** 1156,1162 **** INT phase, /* Phase after which we're printing */ const char *pname, /* Print name for phase */ BB *cur_bb, /* BB to limit traces to */ ! BOOL after = TRUE) { INT cur_bb_id = cur_bb ? BB_id(cur_bb) : 0; if ( Get_Trace(TKIND_IR, phase) --- 1156,1162 ---- INT phase, /* Phase after which we're printing */ const char *pname, /* Print name for phase */ BB *cur_bb, /* BB to limit traces to */ ! BOOL after) { INT cur_bb_id = cur_bb ? BB_id(cur_bb) : 0; if ( Get_Trace(TKIND_IR, phase) diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cg_dep_graph.cxx orc-2.1-new/src/osprey1.0/be/cg/cg_dep_graph.cxx *** orc-2.1/src/osprey1.0/be/cg/cg_dep_graph.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cg_dep_graph.cxx Fri Nov 19 11:01:19 2004 *************** *** 38,46 **** * ======================================================================= * * Module: cg_dep_graph.cxx ! * $Revision: 1.24 $ ! * $Date: 2003/04/25 05:44:48 $ ! * $Author: lyz $ * $Source: /u/merge/src/osprey1.0/be/cg/cg_dep_graph.cxx,v $ * * Description: --- 38,46 ---- * ======================================================================= * * Module: cg_dep_graph.cxx ! * $Revision: 1.25 $ ! * $Date: 2004/11/19 03:01:19 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/cg_dep_graph.cxx,v $ * * Description: *************** *** 59,67 **** #define USE_STANDARD_TYPES #include ! #include ! #include ! #include #include "defs.h" #include "mempool.h" #include "errors.h" --- 59,67 ---- #define USE_STANDARD_TYPES #include ! #include ! #include ! #include #include "defs.h" #include "mempool.h" #include "errors.h" *************** *** 114,121 **** #include "data_layout.h" /* for ORC's dag constructor */ ! #include ! #include #include "ipfec_defs.h" #include "region_bb_util.h" #include "dag.h" --- 114,127 ---- #include "data_layout.h" /* for ORC's dag constructor */ ! #include ! ! #if __GNUC__ >=3 ! #include // STL hash_map. ! #else ! #include ! #endif ! #include "ipfec_defs.h" #include "region_bb_util.h" #include "dag.h" diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cg_dep_graph.h orc-2.1-new/src/osprey1.0/be/cg/cg_dep_graph.h *** orc-2.1/src/osprey1.0/be/cg/cg_dep_graph.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cg_dep_graph.h Tue Nov 9 22:31:25 2004 *************** *** 37,45 **** * ======================================================================= * * Module: cg_dep_graph.h ! * $Revision: 1.5 $ ! * $Date: 2003/04/25 05:44:48 $ ! * $Author: lyz $ * $Source: /u/merge/src/osprey1.0/be/cg/cg_dep_graph.h,v $ * * Revision comments: --- 37,45 ---- * ======================================================================= * * Module: cg_dep_graph.h ! * $Revision: 1.7 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/cg_dep_graph.h,v $ * * Revision comments: *************** *** 387,393 **** #define CG_DEP_GRAPH_INCLUDED #ifdef _KEEP_RCS_ID ! static char *cg_dep_graph_rcs_id = "$Source: /u/merge/src/osprey1.0/be/cg/cg_dep_graph.h,v $ $Revision: 1.5 $"; #endif /* _KEEP_RCS_ID */ #include --- 387,393 ---- #define CG_DEP_GRAPH_INCLUDED #ifdef _KEEP_RCS_ID ! static char *cg_dep_graph_rcs_id = "$Source: /u/merge/src/osprey1.0/be/cg/cg_dep_graph.h,v $ $Revision: 1.7 $"; #endif /* _KEEP_RCS_ID */ #include diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cg_loop.cxx orc-2.1-new/src/osprey1.0/be/cg/cg_loop.cxx *** orc-2.1/src/osprey1.0/be/cg/cg_loop.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cg_loop.cxx Fri Nov 19 11:01:19 2004 *************** *** 38,46 **** * ======================================================================= * * Module: cg_loop.cxx ! * $Revision: 1.12 $ ! * $Date: 2003/06/05 08:17:14 $ ! * $Author: flv $ * $Source: /u/merge/src/osprey1.0/be/cg/cg_loop.cxx,v $ * * --- 38,46 ---- * ======================================================================= * * Module: cg_loop.cxx ! * $Revision: 1.16 $ ! * $Date: 2004/11/19 03:01:19 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/cg_loop.cxx,v $ * * *************** *** 5686,5692 **** // Perform loop optimizations for all inner loops // in the PU. // ! void Perform_Loop_Optimizations(void *rgn_loop_update=NULL) { MEM_POOL loop_descr_pool; MEM_POOL_Initialize(&loop_descr_pool, "loop_descriptors", TRUE); --- 5686,5692 ---- // Perform loop optimizations for all inner loops // in the PU. // ! void Perform_Loop_Optimizations(void *rgn_loop_update) { MEM_POOL loop_descr_pool; MEM_POOL_Initialize(&loop_descr_pool, "loop_descriptors", TRUE); diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cg_spill.cxx orc-2.1-new/src/osprey1.0/be/cg/cg_spill.cxx *** orc-2.1/src/osprey1.0/be/cg/cg_spill.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cg_spill.cxx Tue Nov 9 22:31:25 2004 *************** *** 37,45 **** * ======================================================================= * * Module: cg_spill.c ! * $Revision: 1.5 $ ! * $Date: 2002/06/27 07:46:04 $ ! * $Author: llx $ * $Source: /u/merge/src/osprey1.0/be/cg/cg_spill.cxx,v $ * * Description: --- 37,45 ---- * ======================================================================= * * Module: cg_spill.c ! * $Revision: 1.7 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/cg_spill.cxx,v $ * * Description: diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cg_vector.cxx orc-2.1-new/src/osprey1.0/be/cg/cg_vector.cxx *** orc-2.1/src/osprey1.0/be/cg/cg_vector.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cg_vector.cxx Tue Nov 9 22:31:25 2004 *************** *** 37,46 **** * ======================================================================= * * Module: vector.c ! * $Revision: 1.10 $ ! * $Date: 2001/03/10 01:55:59 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/cg/RCS/cg_vector.cxx,v $ * * Description: * ============ --- 37,46 ---- * ======================================================================= * * Module: vector.c ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/cg/cg_vector.cxx,v $ * * Description: * ============ diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cg_vector.h orc-2.1-new/src/osprey1.0/be/cg/cg_vector.h *** orc-2.1/src/osprey1.0/be/cg/cg_vector.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cg_vector.h Tue Nov 9 22:31:25 2004 *************** *** 37,46 **** * ======================================================================= * * Module: vector.h ! * $Revision: 1.9 $ ! * $Date: 2001/03/10 01:56:04 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/cg/RCS/cg_vector.h,v $ * * Description: * ============ --- 37,46 ---- * ======================================================================= * * Module: vector.h ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/cg/cg_vector.h,v $ * * Description: * ============ diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cgdwarf.cxx orc-2.1-new/src/osprey1.0/be/cg/cgdwarf.cxx *** orc-2.1/src/osprey1.0/be/cg/cgdwarf.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cgdwarf.cxx Tue Nov 9 22:31:25 2004 *************** *** 36,44 **** /* ==================================================================== * ==================================================================== * Module: cgdwarf.c ! * $Revision: 1.3 $ ! * $Date: 2002/03/22 07:03:44 $ ! * $Author: llx $ * $Source: /u/merge/src/osprey1.0/be/cg/cgdwarf.cxx,v $ * * Description: --- 36,44 ---- /* ==================================================================== * ==================================================================== * Module: cgdwarf.c ! * $Revision: 1.5 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/cgdwarf.cxx,v $ * * Description: diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cgemit.cxx orc-2.1-new/src/osprey1.0/be/cg/cgemit.cxx *** orc-2.1/src/osprey1.0/be/cg/cgemit.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cgemit.cxx Tue Nov 9 22:31:25 2004 *************** *** 36,44 **** /* ==================================================================== * * Module: cgemit.c ! * $Revision: 1.33 $ ! * $Date: 2003/06/23 09:26:12 $ ! * $Author: wyz $ * $Source: /u/merge/src/osprey1.0/be/cg/cgemit.cxx,v $ * * Description: --- 36,44 ---- /* ==================================================================== * * Module: cgemit.c ! * $Revision: 1.35 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/cgemit.cxx,v $ * * Description: diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cgexp.h orc-2.1-new/src/osprey1.0/be/cg/cgexp.h *** orc-2.1/src/osprey1.0/be/cg/cgexp.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cgexp.h Tue Nov 9 22:31:25 2004 *************** *** 37,46 **** * ==================================================================== * * Module: cgexp.h ! * $Revision: 3.71 $ ! * $Date: 2001/03/10 01:56:55 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/cg/RCS/cgexp.h,v $ * * Description: * ------------ --- 37,46 ---- * ==================================================================== * * Module: cgexp.h ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/cg/cgexp.h,v $ * * Description: * ------------ diff -c -r -N orc-2.1/src/osprey1.0/be/cg/cgprep.h orc-2.1-new/src/osprey1.0/be/cg/cgprep.h *** orc-2.1/src/osprey1.0/be/cg/cgprep.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/cgprep.h Tue Nov 9 22:31:25 2004 *************** *** 37,46 **** * ======================================================================= * * Module: cgprep.h ! * $Revision: 1.42 $ ! * $Date: 2001/03/10 01:57:15 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/cg/RCS/cgprep.h,v $ * * Revision comments: * --- 37,46 ---- * ======================================================================= * * Module: cgprep.h ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/cg/cgprep.h,v $ * * Revision comments: * diff -c -r -N orc-2.1/src/osprey1.0/be/cg/ebo_special.h orc-2.1-new/src/osprey1.0/be/cg/ebo_special.h *** orc-2.1/src/osprey1.0/be/cg/ebo_special.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/ebo_special.h Tue Nov 9 22:31:25 2004 *************** *** 37,46 **** * ======================================================================= * * Module: ebo_special.h ! * $Revision: 1.11 $ ! * $Date: 2001/03/10 01:58:16 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/cg/RCS/ebo_special.h,v $ * * Revision comments: * --- 37,46 ---- * ======================================================================= * * Module: ebo_special.h ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/cg/ebo_special.h,v $ * * Revision comments: * diff -c -r -N orc-2.1/src/osprey1.0/be/cg/eh_region.cxx orc-2.1-new/src/osprey1.0/be/cg/eh_region.cxx *** orc-2.1/src/osprey1.0/be/cg/eh_region.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/eh_region.cxx Fri Nov 19 11:01:19 2004 *************** *** 145,151 **** * are retained during the frontend but eliminated at this * point. */ - class RID_POST_ITER { private: RID * start; --- 145,150 ---- *************** *** 161,166 **** --- 160,166 ---- RID_POST_ITER& operator++(); RID_POST_ITER operator++(int); friend bool operator==(const RID_POST_ITER&, const RID_POST_ITER&); + friend bool operator!=(const RID_POST_ITER&, const RID_POST_ITER&); }; RID_POST_ITER::RID_POST_ITER(RID * p): start(p), own(p) { *************** *** 199,204 **** --- 199,209 ---- return x.own == y.own; } + inline bool operator!=(const RID_POST_ITER& x, const RID_POST_ITER & y) + { + return x.own != y.own; + } + class RID_PARENT_ITER { private: RID * p; *************** *** 217,222 **** --- 222,228 ---- return tmp; } friend bool operator==(const RID_PARENT_ITER&, const RID_PARENT_ITER &); + friend bool operator!=(const RID_PARENT_ITER&, const RID_PARENT_ITER &); }; *************** *** 224,229 **** --- 230,239 ---- return x.p == y.p; } + bool operator!=(const RID_PARENT_ITER& x, const RID_PARENT_ITER& y) { + return x.p != y.p; + } + struct IS_EH_RID { bool operator()(const RID* rid) { *************** *** 333,339 **** EH_RANGE_LIST_PARENT_ITER(EH_RANGE_LIST::iterator x): iter(x) {} EH_RANGE& operator*() {return *iter;} EH_RANGE_LIST_PARENT_ITER& operator++() { ! iter = iter->parent; return *this;} EH_RANGE_LIST_PARENT_ITER operator++(int) { EH_RANGE_LIST_PARENT_ITER tmp = *this; ++*this; --- 343,351 ---- EH_RANGE_LIST_PARENT_ITER(EH_RANGE_LIST::iterator x): iter(x) {} EH_RANGE& operator*() {return *iter;} EH_RANGE_LIST_PARENT_ITER& operator++() { ! iter = EH_RANGE_LIST::iterator(iter->parent); ! return *this; ! } EH_RANGE_LIST_PARENT_ITER operator++(int) { EH_RANGE_LIST_PARENT_ITER tmp = *this; ++*this; *************** *** 341,346 **** --- 353,360 ---- } friend bool operator==(const EH_RANGE_LIST_PARENT_ITER&, const EH_RANGE_LIST_PARENT_ITER&); + friend bool operator!=(const EH_RANGE_LIST_PARENT_ITER&, + const EH_RANGE_LIST_PARENT_ITER&); }; inline bool operator==(const EH_RANGE_LIST_PARENT_ITER & x, *************** *** 348,353 **** --- 362,372 ---- return x.iter == y.iter; } + inline bool operator!=(const EH_RANGE_LIST_PARENT_ITER & x, + const EH_RANGE_LIST_PARENT_ITER &y) { + return x.iter != y.iter; + } + /* There is always just one EH_RANGE_LIST which belongs to * eh_region.cxx and which is cleared at the beginning of * EH_Generate_Range_List. *************** *** 404,410 **** EH_RANGE_LIST::iterator list_last (range_list.end()); for (EH_RANGE_LIST::iterator p = list_first; p!=list_last; p++) ! RID_eh_range_ptr(p->rid) = p; for_each(list_first, list_last, SET_PARENT()); } --- 423,429 ---- EH_RANGE_LIST::iterator list_last (range_list.end()); for (EH_RANGE_LIST::iterator p = list_first; p!=list_last; p++) ! RID_eh_range_ptr(p->rid) = &(*p); for_each(list_first, list_last, SET_PARENT()); } *************** *** 449,455 **** { LABEL_IDX label; if (p->kind == ehk_guard) { ! EH_RANGE_LIST::reverse_iterator rfirst(p); EH_RANGE_LIST::reverse_iterator rlast = range_list.rend(); EH_RANGE_LIST::reverse_iterator riter = find_if(rfirst, rlast, IS_SIB_RANGE(p)); --- 468,477 ---- { LABEL_IDX label; if (p->kind == ehk_guard) { ! EH_RANGE_LIST::reverse_iterator rfirst = range_list.rbegin(); ! while (&(*rfirst) != p) ! rfirst++; ! EH_RANGE_LIST::reverse_iterator rlast = range_list.rend(); EH_RANGE_LIST::reverse_iterator riter = find_if(rfirst, rlast, IS_SIB_RANGE(p)); *************** *** 503,509 **** p->has_call = TRUE; if (p->kind == ehk_mask) { // set has_call for associated guard region also ! EH_RANGE_LIST::reverse_iterator rfirst(p); EH_RANGE_LIST::reverse_iterator rlast = range_list.rend(); rfirst = find_if(rfirst, rlast, IS_SIB_RANGE(p)); Is_True(rfirst != rlast && rfirst->kind == ehk_guard, --- 525,534 ---- p->has_call = TRUE; if (p->kind == ehk_mask) { // set has_call for associated guard region also ! EH_RANGE_LIST::reverse_iterator rfirst = range_list.rbegin(); ! while (&(*rfirst) != p) ! rfirst++; ! EH_RANGE_LIST::reverse_iterator rlast = range_list.rend(); rfirst = find_if(rfirst, rlast, IS_SIB_RANGE(p)); Is_True(rfirst != rlast && rfirst->kind == ehk_guard, *************** *** 648,655 **** struct FIX_MASK_PARENT { void operator()(EH_RANGE& r) { if (r.kind == ehk_mask) { ! EH_RANGE_LIST_PARENT_ITER first(r.parent); ! EH_RANGE_LIST_PARENT_ITER last (NULL); first = find_if(first, last, IS_CLEANUP_RANGE()); Is_True(first != last, ("mask region must have cleanup ancestor")); r.parent = (*first).parent; --- 673,680 ---- struct FIX_MASK_PARENT { void operator()(EH_RANGE& r) { if (r.kind == ehk_mask) { ! EH_RANGE_LIST_PARENT_ITER first(EH_RANGE_LIST::iterator(r.parent)); ! EH_RANGE_LIST_PARENT_ITER last(EH_RANGE_LIST::iterator(NULL)); first = find_if(first, last, IS_CLEANUP_RANGE()); Is_True(first != last, ("mask region must have cleanup ancestor")); r.parent = (*first).parent; *************** *** 819,821 **** --- 844,847 ---- { Label_Table[label].Print(stderr); } + diff -c -r -N orc-2.1/src/osprey1.0/be/cg/gen_gtn_set orc-2.1-new/src/osprey1.0/be/cg/gen_gtn_set *** orc-2.1/src/osprey1.0/be/cg/gen_gtn_set Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/gen_gtn_set Tue Nov 9 22:31:25 2004 *************** *** 4,12 **** ### ### Module: gen_gtn_set ### $Revision: 1.3 $ ! ### $Date: 1997/08/22 02:26:22 $ ! ### $Author: ho $ ! ### $Source: /isms/cmplrs.src/osprey1.0/be/cg/RCS/gen_gtn_set,v $ ### Revision history: ### 5-May-92 - Original version ### --- 4,12 ---- ### ### Module: gen_gtn_set ### $Revision: 1.3 $ ! ### $Date: 2004/11/09 14:31:25 $ ! ### $Author: jczhang $ ! ### $Source: /u/merge/src/osprey1.0/be/cg/gen_gtn_set,v $ ### Revision history: ### 5-May-92 - Original version ### diff -c -r -N orc-2.1/src/osprey1.0/be/cg/gen_st_list.csh orc-2.1-new/src/osprey1.0/be/cg/gen_st_list.csh *** orc-2.1/src/osprey1.0/be/cg/gen_st_list.csh Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/gen_st_list.csh Tue Nov 9 22:31:25 2004 *************** *** 3,12 **** ### ====================================================================== ### ### Module: gen_st_list.csh ! ### $Revision: 1.2 $ ! ### $Date: 1997/08/22 02:26:24 $ ! ### $Author: ho $ ! ### $Source: /isms/cmplrs.src/osprey1.0/be/cg/RCS/gen_st_list.csh,v $ ### Revision history: ### 27-Feb-92 - Original version ### --- 3,12 ---- ### ====================================================================== ### ### Module: gen_st_list.csh ! ### $Revision: 1.3 $ ! ### $Date: 2004/11/09 14:31:25 $ ! ### $Author: jczhang $ ! ### $Source: /u/merge/src/osprey1.0/be/cg/gen_st_list.csh,v $ ### Revision history: ### 27-Feb-92 - Original version ### diff -c -r -N orc-2.1/src/osprey1.0/be/cg/hb_sched.h orc-2.1-new/src/osprey1.0/be/cg/hb_sched.h *** orc-2.1/src/osprey1.0/be/cg/hb_sched.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/hb_sched.h Tue Nov 9 22:31:25 2004 *************** *** 37,45 **** * ==================================================================== * * Module: hb_sched.h ! * $Revision: 1.1.1.1 $ ! * $Date: 2001/06/25 06:32:37 $ ! * $Author: llx $ * $Source: /u/merge/src/osprey1.0/be/cg/hb_sched.h,v $ * * Description: --- 37,45 ---- * ==================================================================== * * Module: hb_sched.h ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/hb_sched.h,v $ * * Description: diff -c -r -N orc-2.1/src/osprey1.0/be/cg/ia64/cg_swp_bundle.cxx orc-2.1-new/src/osprey1.0/be/cg/ia64/cg_swp_bundle.cxx *** orc-2.1/src/osprey1.0/be/cg/ia64/cg_swp_bundle.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/ia64/cg_swp_bundle.cxx Fri Nov 19 11:01:19 2004 *************** *** 947,953 **** // reset op'bb because it will insert some noop instructions; OP *tmp; ! if (OP_bb(op)) FOR_ALL_OPS_OPs(&ops, tmp) {OP_bb(tmp) = OP_bb(op);} } } --- 947,953 ---- // reset op'bb because it will insert some noop instructions; OP *tmp; ! if (OP_bb(op)) FOR_ALL_OPS_OPs(&ops, tmp) {Set_OP_bb(tmp, OP_bb(op));} } } *************** *** 961,968 **** // Restore the & of each op for (INT i = 0; i < OP_Partial_Backup.size(); i++) { if (OP_Partial_Backup[i].valid) { ! OP_prev(op_state[i].op) = OP_Partial_Backup[i].prev; ! OP_next(op_state[i].op) = OP_Partial_Backup[i].next; } } --- 961,968 ---- // Restore the & of each op for (INT i = 0; i < OP_Partial_Backup.size(); i++) { if (OP_Partial_Backup[i].valid) { ! Set_OP_prev(op_state[i].op, OP_Partial_Backup[i].prev); ! Set_OP_next(op_state[i].op, OP_Partial_Backup[i].next); } } *************** *** 980,987 **** for (INT i = 0; i < OP_Partial_Backup.size(); i++) { if (OP_Partial_Backup[i].valid) { ! OP_prev(op_state[i].op) = OP_Partial_Backup[i].prev; ! OP_next(op_state[i].op) = OP_Partial_Backup[i].next; } } --- 980,987 ---- for (INT i = 0; i < OP_Partial_Backup.size(); i++) { if (OP_Partial_Backup[i].valid) { ! Set_OP_prev(op_state[i].op, OP_Partial_Backup[i].prev); ! Set_OP_next(op_state[i].op, OP_Partial_Backup[i].next); } } diff -c -r -N orc-2.1/src/osprey1.0/be/cg/ia64/entry_exit_targ.cxx orc-2.1-new/src/osprey1.0/be/cg/ia64/entry_exit_targ.cxx *** orc-2.1/src/osprey1.0/be/cg/ia64/entry_exit_targ.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/ia64/entry_exit_targ.cxx Tue Nov 9 22:31:26 2004 *************** *** 51,57 **** #include "stblock.h" #include "cgtarget.h" #include "whirl2ops.h" - #include "scheduler.h" void EETARG_Save_Pfs (TN *saved_pfs, OPS *ops) --- 51,56 ---- diff -c -r -N orc-2.1/src/osprey1.0/be/cg/ia64/float_rf.cxx orc-2.1-new/src/osprey1.0/be/cg/ia64/float_rf.cxx *** orc-2.1/src/osprey1.0/be/cg/ia64/float_rf.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/ia64/float_rf.cxx Tue Nov 9 22:31:26 2004 *************** *** 36,45 **** * ==================================================================== * * Module: float_rf.cxx ! * $Revision: 1.4 $ ! * $Date: 2001/03/10 01:12:01 $ ! * $Author: mtibuild $ ! * $Source: /osprey.src/osprey1.0/be/cg/ia64/RCS/float_rf.cxx,v $ * * 82-bit register format floating point utilities interface. * --- 36,45 ---- * ==================================================================== * * Module: float_rf.cxx ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:26 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/cg/ia64/float_rf.cxx,v $ * * 82-bit register format floating point utilities interface. * *************** *** 3443,3452 **** * ==================================================================== * * Module: fpround.c ! * $Revision: 1.4 $ ! * $Date: 2001/03/10 01:12:01 $ ! * $Author: mtibuild $ ! * $Source: /osprey.src/osprey1.0/be/cg/ia64/RCS/float_rf.cxx,v $ * * Revision history: * 12-Jun-94 - Original Version --- 3443,3452 ---- * ==================================================================== * * Module: fpround.c ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:26 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/cg/ia64/float_rf.cxx,v $ * * Revision history: * 12-Jun-94 - Original Version *************** *** 3457,3463 **** * ==================================================================== */ ! #ident "$Revision: 1.4 $" #include --- 3457,3463 ---- * ==================================================================== */ ! #ident "$Revision: 1.3 $" #include diff -c -r -N orc-2.1/src/osprey1.0/be/cg/igls.cxx orc-2.1-new/src/osprey1.0/be/cg/igls.cxx *** orc-2.1/src/osprey1.0/be/cg/igls.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/igls.cxx Tue Nov 9 22:31:25 2004 *************** *** 37,45 **** // ======================================================================= // // Module: igls.cxx ! // $Revision: 1.1.1.1 $ ! // $Date: 2001/06/25 06:32:37 $ ! // $Author: llx $ // $Source: /u/merge/src/osprey1.0/be/cg/igls.cxx,v $ // // Description: --- 37,45 ---- // ======================================================================= // // Module: igls.cxx ! // $Revision: 1.3 $ ! // $Date: 2004/11/09 14:31:25 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/igls.cxx,v $ // // Description: diff -c -r -N orc-2.1/src/osprey1.0/be/cg/localize.h orc-2.1-new/src/osprey1.0/be/cg/localize.h *** orc-2.1/src/osprey1.0/be/cg/localize.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/localize.h Tue Nov 9 22:31:25 2004 *************** *** 37,46 **** * ======================================================================= * * Module: localize.h ! * $Revision: 1.10 $ ! * $Date: 2001/03/10 02:03:40 $ ! * $Author: mtibuild $ ! * $Source: /isms/cmplrs.src/osprey1.0/be/cg/RCS/localize.h,v $ * * Description: * ============ --- 37,46 ---- * ======================================================================= * * Module: localize.h ! * $Revision: 1.3 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ ! * $Source: /u/merge/src/osprey1.0/be/cg/localize.h,v $ * * Description: * ============ diff -c -r -N orc-2.1/src/osprey1.0/be/cg/op.h orc-2.1-new/src/osprey1.0/be/cg/op.h *** orc-2.1/src/osprey1.0/be/cg/op.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/op.h Fri Nov 19 11:01:19 2004 *************** *** 37,44 **** * ==================================================================== * * Module: op.h ! * $Revision: 1.20 $ ! * $Date: 2002/12/12 09:41:31 $ * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/op.h,v $ * --- 37,44 ---- * ==================================================================== * * Module: op.h ! * $Revision: 1.23 $ ! * $Date: 2004/11/19 03:01:19 $ * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/op.h,v $ * *************** *** 397,402 **** --- 397,406 ---- #define Set_OP_opnd(o,opnd,tn) \ ((o)->res_opnd[(opnd) + OP_opnd_offset(o)] = (tn)) + #define Set_OP_bb(o,b) ((o)->bb = (b)) + #define Set_OP_prev(o,p) ((o)->prev = (p)) + #define Set_OP_next(o,n) ((o)->next = (n)) + /* * Define the OP cond def mask. * diff -c -r -N orc-2.1/src/osprey1.0/be/cg/oputil.cxx orc-2.1-new/src/osprey1.0/be/cg/oputil.cxx *** orc-2.1/src/osprey1.0/be/cg/oputil.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/oputil.cxx Tue Nov 9 22:31:25 2004 *************** *** 37,45 **** * ==================================================================== * * Module: oputil.c ! * $Revision: 1.12 $ ! * $Date: 2003/01/03 03:54:55 $ ! * $Author: lyz $ * $Source: /u/merge/src/osprey1.0/be/cg/oputil.cxx,v $ * * Revision history: --- 37,45 ---- * ==================================================================== * * Module: oputil.c ! * $Revision: 1.14 $ ! * $Date: 2004/11/09 14:31:25 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/oputil.cxx,v $ * * Revision history: diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/db_dump.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/db_dump.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/db_dump.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/db_dump.cxx Fri Nov 19 11:01:20 2004 *************** *** 29,37 **** * ==================================================================== * * Module: db_dump.c ! * $Revision: 1.18 $ ! * $Date: 2003/01/21 12:56:37 $ ! * $Author: sxyang $ * $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/db_dump.cxx,v $ * * Revision history: --- 29,37 ---- * ==================================================================== * * Module: db_dump.c ! * $Revision: 1.21 $ ! * $Date: 2004/11/19 03:01:20 $ ! * $Author: jczhang $ * $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/db_dump.cxx,v $ * * Revision history: *************** *** 136,142 **** fflush(stderr); } ! void dp::dump_rotate_info(struct ROTATING_KERNEL_INFO *info, int type = 0) { static char *reg_class[] = { "u","r","f","p","b","a","c"}; --- 136,142 ---- fflush(stderr); } ! void dp::dump_rotate_info(struct ROTATING_KERNEL_INFO *info, int type) { static char *reg_class[] = { "u","r","f","p","b","a","c"}; diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/dump_feedback.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/dump_feedback.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/dump_feedback.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/dump_feedback.cxx Fri Nov 19 11:01:20 2004 *************** *** 30,37 **** //********************************************************************* // // Module: dump_feedback.cxx ! // $Date: 2003/01/21 12:56:38 $ ! // $Author: sxyang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/dump_feedback.cxx,v $ // // Description: --- 30,37 ---- //********************************************************************* // // Module: dump_feedback.cxx ! // $Date: 2004/11/19 03:01:20 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/dump_feedback.cxx,v $ // // Description: *************** *** 48,54 **** extern char* Src_File_Name; /* dump an edge's feedback info */ ! void Dump_Edge_Info(BB* source_bb,BBLIST* edge,FILE* fp=TFile) { BB* target_bb = BBLIST_item(edge); fprintf(fp,"Freq:%f Source BB:%d-->Target BB:%d\n",BBLIST_freq(edge), --- 48,54 ---- extern char* Src_File_Name; /* dump an edge's feedback info */ ! void Dump_Edge_Info(BB* source_bb,BBLIST* edge,FILE* fp) { BB* target_bb = BBLIST_item(edge); fprintf(fp,"Freq:%f Source BB:%d-->Target BB:%d\n",BBLIST_freq(edge), *************** *** 56,62 **** } /* dump current PU's feedback data */ ! void Dump_Fb_Data(PU_PROFILE_HANDLES fb_handles,FILE* fp=TFile) { fprintf(fp,"\n======= Cur PU Name:"); --- 56,62 ---- } /* dump current PU's feedback data */ ! void Dump_Fb_Data(PU_PROFILE_HANDLES fb_handles,FILE* fp) { fprintf(fp,"\n======= Cur PU Name:"); diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/edge_profile.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/edge_profile.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/edge_profile.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/edge_profile.cxx Fri Nov 19 11:01:20 2004 *************** *** 30,37 **** //********************************************************************* // // Module: edge_profile.cxx ! // $Date: 2003/01/21 12:56:40 $ ! // $Author: sxyang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/edge_profile.cxx,v $ // // Description: --- 30,37 ---- //********************************************************************* // // Module: edge_profile.cxx ! // $Date: 2004/11/19 03:01:20 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/edge_profile.cxx,v $ // // Description: *************** *** 84,90 **** } WN * ! Gen_Call( char *name, WN *arg1, WN *arg2, TYPE_ID rtype = MTYPE_V ) { WN *call = Gen_Call_Shell( name, rtype, 2 ); WN_actual( call, 0 ) = Gen_Param( arg1, WN_PARM_BY_VALUE ); --- 84,90 ---- } WN * ! Gen_Call( char *name, WN *arg1, WN *arg2, TYPE_ID rtype) { WN *call = Gen_Call_Shell( name, rtype, 2 ); WN_actual( call, 0 ) = Gen_Param( arg1, WN_PARM_BY_VALUE ); *************** *** 1408,1414 **** } BB* EDGE_PROFILE::Gen_Call_BB( char* function_name, char* str_arg, ! INT64 int_arg,int restore_type,int restore_sum = 0 ) { BB *bb=Gen_BB( ); SRCPOS srcpos = REGION_First_BB->ops.last->srcpos; --- 1408,1414 ---- } BB* EDGE_PROFILE::Gen_Call_BB( char* function_name, char* str_arg, ! INT64 int_arg,int restore_type,int restore_sum) { BB *bb=Gen_BB( ); SRCPOS srcpos = REGION_First_BB->ops.last->srcpos; *************** *** 1543,1549 **** } BB* EDGE_PROFILE::Gen_Call_BB( char* function_name, TN * PU_Handle, ! INT64 int_arg,int restore_type,int restore_sum = 0 ) { BB *bb=Gen_BB( ); SRCPOS srcpos = REGION_First_BB->ops.last->srcpos; --- 1543,1549 ---- } BB* EDGE_PROFILE::Gen_Call_BB( char* function_name, TN * PU_Handle, ! INT64 int_arg,int restore_type,int restore_sum) { BB *bb=Gen_BB( ); SRCPOS srcpos = REGION_First_BB->ops.last->srcpos; *************** *** 1779,1785 **** { BB* entry_bb= BB_LIST_first( elist ); save_gp_op = Mk_OP(TOP_mov,save_gp_TN,True_TN,GP_TN); ! OP_bb(save_gp_op) = entry_bb; BB_Insert_Op(entry_bb,entry_bb->ops.first->next, save_gp_op,false); } --- 1779,1785 ---- { BB* entry_bb= BB_LIST_first( elist ); save_gp_op = Mk_OP(TOP_mov,save_gp_TN,True_TN,GP_TN); ! Set_OP_bb(save_gp_op, entry_bb); BB_Insert_Op(entry_bb,entry_bb->ops.first->next, save_gp_op,false); } diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/interval_processor.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/interval_processor.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/interval_processor.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/interval_processor.cxx Fri Nov 19 11:01:20 2004 *************** *** 30,38 **** //====================================================================== // // Module: interval_processor.cxx ! // $Revision: 1.9 $ ! // $Date: 2003/01/21 12:56:44 $ ! // $Author: sxyang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/interval_processor.cxx,v $ // //====================================================================== --- 30,38 ---- //====================================================================== // // Module: interval_processor.cxx ! // $Revision: 1.12 $ ! // $Date: 2004/11/19 03:01:20 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/interval_processor.cxx,v $ // //====================================================================== *************** *** 225,234 **** _backedges.push_back(e); } else { ! if (!Find_In_Vector(src,_improper_node)) { _improper_node.push_back(src); } ! if (!Find_In_Vector(dest,_improper_node)) { _improper_node.push_back(dest); } } --- 225,234 ---- _backedges.push_back(e); } else { ! if (!Found_In_Vector(src,_improper_node)) { _improper_node.push_back(src); } ! if (!Found_In_Vector(dest,_improper_node)) { _improper_node.push_back(dest); } } *************** *** 360,366 **** REGIONAL_CFG_EDGE *front = tar_edges.front(); tar_edges.pop(); ! if (!Find_In_Vector(front->Src(),loop_nodes)) { REGIONAL_CFG_EDGE *new_edge = cfg->Find_Edge(front->Src(),r_node); if (new_edge != NULL) { --- 360,366 ---- REGIONAL_CFG_EDGE *front = tar_edges.front(); tar_edges.pop(); ! if (!Found_In_Vector(front->Src(),loop_nodes)) { REGIONAL_CFG_EDGE *new_edge = cfg->Find_Edge(front->Src(),r_node); if (new_edge != NULL) { diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/ipfec_options.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/ipfec_options.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/ipfec_options.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/ipfec_options.cxx Fri Nov 19 11:01:20 2004 *************** *** 30,37 **** //********************************************************************* // // Module: ipfec_options.cxx ! // $Date: 2003/07/03 08:54:02 $ ! // $Author: wjj $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/ipfec_options.cxx,v $ // // Description: --- 30,37 ---- //********************************************************************* // // Module: ipfec_options.cxx ! // $Date: 2004/11/19 03:01:20 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/ipfec_options.cxx,v $ // // Description: *************** *** 574,580 **** */ BOOL ! IPFEC_Query_Skiplist ( SKIPLIST *skip, INT32 elmt, INT32 field = -1 ) { INT32 i; BOOL ok; --- 574,580 ---- */ BOOL ! IPFEC_Query_Skiplist ( SKIPLIST *skip, INT32 elmt, INT32 field) { INT32 i; BOOL ok; diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/region.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/region.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/region.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/region.cxx Wed Nov 24 15:31:37 2004 *************** *** 30,38 **** //============================================================================= // // Module: region.cxx ! // $Revision: 1.13 $ ! // $Date: 2003/01/21 12:56:56 $ ! // $Author: sxyang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/region.cxx,v $ // //============================================================================= --- 30,38 ---- //============================================================================= // // Module: region.cxx ! // $Revision: 1.17 $ ! // $Date: 2004/11/24 07:31:37 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/region.cxx,v $ // //============================================================================= *************** *** 95,100 **** --- 95,101 ---- temp_rgn.seed_freq = 0; } + NODE_VECTOR_ITER Find_In_Vector(REGIONAL_CFG_NODE *node,NODE_VECTOR& nodes) { for (NODE_VECTOR_ITER iter = nodes.begin();iter != nodes.end();iter++) { *************** *** 105,113 **** if (n == node) return iter; } ! return NULL; } BB_VECTOR_ITER Find_In_BB_Vector(BB *bb,BB_VECTOR& bbs) { for (BB_VECTOR_ITER iter = bbs.begin();iter != bbs.end();iter++) { --- 106,119 ---- if (n == node) return iter; } ! return nodes.end(); } + BOOL + Found_In_Vector(REGIONAL_CFG_NODE *node,NODE_VECTOR& nodes) { + return Find_In_Vector(node, nodes) != nodes.end(); + } + BB_VECTOR_ITER Find_In_BB_Vector(BB *bb,BB_VECTOR& bbs) { for (BB_VECTOR_ITER iter = bbs.begin();iter != bbs.end();iter++) { *************** *** 118,126 **** if (b == bb) return iter; } ! return NULL; } //============================================================================= // // REGIONAL_CFG_NODE class --- 124,140 ---- if (b == bb) return iter; } ! return bbs.end(); } + BOOL + Found_In_BB_Vector(BB *bb,BB_VECTOR& bbs) { + return Find_In_BB_Vector(bb, bbs) != bbs.end(); + } + + + + //============================================================================= // // REGIONAL_CFG_NODE class *************** *** 861,880 **** for (NODE_VECTOR_ITER iter = nodes.begin();iter != nodes.end();iter++) { REGIONAL_CFG_NODE *node = *iter; Is_True(node != NULL,("Node is NULL in Do Selective Add when iterate all nodes.")); ! if ((node != main_exit)&&!Find_In_Vector(node,duplicate)) { //Do not add main exit's succ. for (CFG_SUCC_NODE_ITER succ_iter(node); succ_iter != 0;++succ_iter) { REGIONAL_CFG_NODE *succ = *succ_iter; ! if (!Find_In_Vector(succ,nodes)) { BOOL not_side_entry = TRUE; for (CFG_PRED_NODE_ITER pred_iter(succ); pred_iter != 0;++pred_iter) { REGIONAL_CFG_NODE *pred = *pred_iter; ! if (!Find_In_Vector(pred,nodes)) { not_side_entry = FALSE; } } --- 875,894 ---- for (NODE_VECTOR_ITER iter = nodes.begin();iter != nodes.end();iter++) { REGIONAL_CFG_NODE *node = *iter; Is_True(node != NULL,("Node is NULL in Do Selective Add when iterate all nodes.")); ! if ((node != main_exit)&&!Found_In_Vector(node,duplicate)) { //Do not add main exit's succ. for (CFG_SUCC_NODE_ITER succ_iter(node); succ_iter != 0;++succ_iter) { REGIONAL_CFG_NODE *succ = *succ_iter; ! if (!Found_In_Vector(succ,nodes)) { BOOL not_side_entry = TRUE; for (CFG_PRED_NODE_ITER pred_iter(succ); pred_iter != 0;++pred_iter) { REGIONAL_CFG_NODE *pred = *pred_iter; ! if (!Found_In_Vector(pred,nodes)) { not_side_entry = FALSE; } } *************** *** 894,900 **** nsucc_iter != 0;++nsucc_iter) { REGIONAL_CFG_NODE *end = *nsucc_iter; ! if (!Find_In_Vector(end,nodes)) { if ((succ->Unique_Succ() == end) &&(end->Unique_Pred() == succ)) { //--------------------------------------------- --- 908,914 ---- nsucc_iter != 0;++nsucc_iter) { REGIONAL_CFG_NODE *end = *nsucc_iter; ! if (!Found_In_Vector(end,nodes)) { if ((succ->Unique_Succ() == end) &&(end->Unique_Pred() == succ)) { //--------------------------------------------- *************** *** 920,926 **** end = end->Unique_Succ(); if (end) { ! if (Find_In_Vector(end,nodes)) { break; } else { --- 934,940 ---- end = end->Unique_Succ(); if (end) { ! if (Found_In_Vector(end,nodes)) { break; } else { *************** *** 945,951 **** // the completion prob is changed. //------------------------------------------------- if (!exit_prob == 0) { ! if ((end != main_exit)&&Find_In_Vector(end,exits)) { //--------------------------------------------- // Update the completion prob of main exit // now very time recompute the completion --- 959,965 ---- // the completion prob is changed. //------------------------------------------------- if (!exit_prob == 0) { ! if ((end != main_exit)&&Found_In_Vector(end,exits)) { //--------------------------------------------- // Update the completion prob of main exit // now very time recompute the completion *************** *** 981,987 **** REGIONAL_CFG_NODE *pred_node = *pred_node_iter; NODE_VECTOR_ITER leaf = Find_In_Vector(pred_node,leaf_nodes); ! if (leaf != NULL ) { leaf_nodes.erase(leaf); } } --- 995,1001 ---- REGIONAL_CFG_NODE *pred_node = *pred_node_iter; NODE_VECTOR_ITER leaf = Find_In_Vector(pred_node,leaf_nodes); ! if (leaf != leaf_nodes.end() ) { leaf_nodes.erase(leaf); } } *************** *** 1072,1078 **** for (CFG_SUCC_NODE_ITER succ_iter(node); succ_iter != 0;++succ_iter) { ! if (Find_In_Vector((*succ_iter),nodes) != NULL) { is_leaf = FALSE; } } --- 1086,1092 ---- for (CFG_SUCC_NODE_ITER succ_iter(node); succ_iter != 0;++succ_iter) { ! if (Found_In_Vector((*succ_iter),nodes)) { is_leaf = FALSE; } } *************** *** 1158,1169 **** // use pred because we believe there are no cycles in the // reginal cfg. //--------------------------------------------------------- ! if (Find_In_Vector(pred,temp_dup)) { BOOL is_leaf = TRUE; for (CFG_SUCC_NODE_ITER succ_iter(pred); succ_iter != 0;++succ_iter) { ! if (Find_In_Vector((*succ_iter),nodes)) { is_leaf = FALSE; break; --- 1172,1183 ---- // use pred because we believe there are no cycles in the // reginal cfg. //--------------------------------------------------------- ! if (Found_In_Vector(pred,temp_dup)) { BOOL is_leaf = TRUE; for (CFG_SUCC_NODE_ITER succ_iter(pred); succ_iter != 0;++succ_iter) { ! if (Found_In_Vector((*succ_iter),nodes)) { is_leaf = FALSE; break; *************** *** 1219,1225 **** for (CFG_PRED_NODE_ITER pred_iter(node); pred_iter != 0;++pred_iter) { ! if (!Find_In_Vector((*pred_iter),nodes)) { side_entries.push_back(node); break; } --- 1233,1239 ---- for (CFG_PRED_NODE_ITER pred_iter(node); pred_iter != 0;++pred_iter) { ! if (!Found_In_Vector((*pred_iter),nodes)) { side_entries.push_back(node); break; } *************** *** 1244,1250 **** succ_iter != 0;++succ_iter) { REGIONAL_CFG_NODE *succ = *succ_iter; ! if (!Find_In_Vector(succ,nodes)) { exits.push_back(node); break; } --- 1258,1264 ---- succ_iter != 0;++succ_iter) { REGIONAL_CFG_NODE *succ = *succ_iter; ! if (!Found_In_Vector(succ,nodes)) { exits.push_back(node); break; } *************** *** 1318,1330 **** if (node->First_Succ() != NULL) { ! if (Find_In_Vector(node,dup)) { for (NODE_PROF_VECTOR_ITER prof_iter = node_profs.begin(); prof_iter != node_profs.end();prof_iter++) { NODE_PROF p = *prof_iter; ! if ((p.src == node) && (!Find_In_Vector(p.dest,nodes))) { exit_freq += p.freq; } } --- 1332,1344 ---- if (node->First_Succ() != NULL) { ! if (Found_In_Vector(node,dup)) { for (NODE_PROF_VECTOR_ITER prof_iter = node_profs.begin(); prof_iter != node_profs.end();prof_iter++) { NODE_PROF p = *prof_iter; ! if ((p.src == node) && (!Found_In_Vector(p.dest,nodes))) { exit_freq += p.freq; } } *************** *** 1333,1346 **** succ_iter != 0;++succ_iter) { REGIONAL_CFG_NODE *succ = (*succ_iter)->Dest(); ! if (!Find_In_Vector(succ,nodes)) { exit_freq += (*succ_iter)->Freq(); } } } } else if (node->First_Pred() != NULL){ ! if (Find_In_Vector(node,dup)) { for (NODE_PROF_VECTOR_ITER prof_iter = node_profs.begin(); prof_iter != node_profs.end();prof_iter++) { --- 1347,1360 ---- succ_iter != 0;++succ_iter) { REGIONAL_CFG_NODE *succ = (*succ_iter)->Dest(); ! if (!Found_In_Vector(succ,nodes)) { exit_freq += (*succ_iter)->Freq(); } } } } else if (node->First_Pred() != NULL){ ! if (Found_In_Vector(node,dup)) { for (NODE_PROF_VECTOR_ITER prof_iter = node_profs.begin(); prof_iter != node_profs.end();prof_iter++) { *************** *** 1361,1367 **** pred_iter != 0;++pred_iter) { REGIONAL_CFG_NODE *pred = (*pred_iter)->Src(); ! if (Find_In_Vector(pred,nodes)) { exit_freq += (*pred_iter)->Freq(); } } --- 1375,1381 ---- pred_iter != 0;++pred_iter) { REGIONAL_CFG_NODE *pred = (*pred_iter)->Src(); ! if (Found_In_Vector(pred,nodes)) { exit_freq += (*pred_iter)->Freq(); } } *************** *** 1376,1388 **** // Compute the main exit's exit probability. //------------------------------------------- if (exit->First_Succ() != NULL) { ! if (Find_In_Vector(exit,dup)) { for (NODE_PROF_VECTOR_ITER prof_iter = node_profs.begin(); prof_iter != node_profs.end();prof_iter++) { NODE_PROF p = *prof_iter; ! if ((p.src == exit) && (!Find_In_Vector(p.dest,nodes))) { main_exit_freq += p.freq; } } --- 1390,1402 ---- // Compute the main exit's exit probability. //------------------------------------------- if (exit->First_Succ() != NULL) { ! if (Found_In_Vector(exit,dup)) { for (NODE_PROF_VECTOR_ITER prof_iter = node_profs.begin(); prof_iter != node_profs.end();prof_iter++) { NODE_PROF p = *prof_iter; ! if ((p.src == exit) && (!Found_In_Vector(p.dest,nodes))) { main_exit_freq += p.freq; } } *************** *** 1394,1400 **** } } } else if (exit->First_Pred() != NULL) { ! if (Find_In_Vector(exit,dup)) { for (NODE_PROF_VECTOR_ITER prof_iter = node_profs.begin(); prof_iter != node_profs.end();prof_iter++) { --- 1408,1414 ---- } } } else if (exit->First_Pred() != NULL) { ! if (Found_In_Vector(exit,dup)) { for (NODE_PROF_VECTOR_ITER prof_iter = node_profs.begin(); prof_iter != node_profs.end();prof_iter++) { *************** *** 1409,1415 **** pred_iter != 0;++pred_iter) { REGIONAL_CFG_NODE *pred = (*pred_iter)->Src(); ! if (Find_In_Vector(pred,nodes)) { main_exit_freq += (*pred_iter)->Freq(); } } --- 1423,1429 ---- pred_iter != 0;++pred_iter) { REGIONAL_CFG_NODE *pred = (*pred_iter)->Src(); ! if (Found_In_Vector(pred,nodes)) { main_exit_freq += (*pred_iter)->Freq(); } } *************** *** 1475,1481 **** for (CFG_SUCC_NODE_ITER succ_iter(node);succ_iter != 0;++succ_iter) { REGIONAL_CFG_NODE *succ = *succ_iter; Is_True(succ != NULL,("The succ of node is NULL.")); ! if ((!BS_MemberP(visited,succ->Id()))&&(Find_In_Vector(succ,nodes))) { BS_Union1D(visited,node->Id(),&_m); BOOL is_cutted = TRUE; --- 1489,1495 ---- for (CFG_SUCC_NODE_ITER succ_iter(node);succ_iter != 0;++succ_iter) { REGIONAL_CFG_NODE *succ = *succ_iter; Is_True(succ != NULL,("The succ of node is NULL.")); ! if ((!BS_MemberP(visited,succ->Id()))&&(Found_In_Vector(succ,nodes))) { BS_Union1D(visited,node->Id(),&_m); BOOL is_cutted = TRUE; *************** *** 1486,1492 **** // If its pred is a node in nodes and not been cutted,then // it will not be cutted. //---------------------------------------------------------- ! if (!BS_MemberP(cutted,(*pred_iter)->Id())&&Find_In_Vector((*pred_iter),nodes)) { is_cutted = FALSE; break; } --- 1500,1506 ---- // If its pred is a node in nodes and not been cutted,then // it will not be cutted. //---------------------------------------------------------- ! if (!BS_MemberP(cutted,(*pred_iter)->Id())&&Found_In_Vector((*pred_iter),nodes)) { is_cutted = FALSE; break; } *************** *** 1626,1632 **** for (CFG_PRED_NODE_ITER iter(succ);iter != 0;++iter) { if (!BS_MemberP(visited,(*iter)->Id()) ! &&Find_In_Vector((*iter),nodes)) { all_pred_visited = FALSE; } } --- 1640,1646 ---- for (CFG_PRED_NODE_ITER iter(succ);iter != 0;++iter) { if (!BS_MemberP(visited,(*iter)->Id()) ! &&Found_In_Vector((*iter),nodes)) { all_pred_visited = FALSE; } } *************** *** 1634,1651 **** // If the node not visited yet and in the selected nodes. //-------------------------------------------------------- if ((!BS_MemberP(visited,succ->Id())) ! &&Find_In_Vector(succ,nodes)&&(all_pred_visited)) { BS_Union1D(visited,succ->Id(),&_m); queue.push(succ); for (CFG_PRED_NODE_ITER pred_iter(succ); pred_iter != 0;++pred_iter) { ! if (!Find_In_Vector((*pred_iter),nodes)) { dup_nodes.push_back(succ); break; ! } else if (Find_In_Vector((*pred_iter),dup_nodes)) { ! if (!Find_In_Vector(succ,dup_nodes)) { dup_nodes.push_back(succ); } --- 1648,1665 ---- // If the node not visited yet and in the selected nodes. //-------------------------------------------------------- if ((!BS_MemberP(visited,succ->Id())) ! &&Found_In_Vector(succ,nodes)&&(all_pred_visited)) { BS_Union1D(visited,succ->Id(),&_m); queue.push(succ); for (CFG_PRED_NODE_ITER pred_iter(succ); pred_iter != 0;++pred_iter) { ! if (!Found_In_Vector((*pred_iter),nodes)) { dup_nodes.push_back(succ); break; ! } else if (Found_In_Vector((*pred_iter),dup_nodes)) { ! if (!Found_In_Vector(succ,dup_nodes)) { dup_nodes.push_back(succ); } *************** *** 1740,1746 **** } } ! if ((freq > max_freq)&&(!is_improper)&&(!Find_In_Vector(node,bad_nodes)) &&(!node->Is_Loop_Tail())&&(!node->Is_Region())){ // Not include loop head and tail in SEME region // because of exit prob computation --- 1754,1760 ---- } } ! if ((freq > max_freq)&&(!is_improper)&&(!Found_In_Vector(node,bad_nodes)) &&(!node->Is_Loop_Tail())&&(!node->Is_Region())){ // Not include loop head and tail in SEME region // because of exit prob computation *************** *** 1770,1776 **** REGIONAL_CFG_EDGE *succ = *iter; REGIONAL_CFG_NODE *succ_node = succ->Dest(); ! if (!Find_In_Vector(succ_node,nodes)) { freq = Edge_Freq(succ); --- 1784,1790 ---- REGIONAL_CFG_EDGE *succ = *iter; REGIONAL_CFG_NODE *succ_node = succ->Dest(); ! if (!Found_In_Vector(succ_node,nodes)) { freq = Edge_Freq(succ); *************** *** 1818,1824 **** REGIONAL_CFG_NODE *pred_node = pred->Src(); Is_True(pred_node != NULL,("The src node of pred edge is NULL in select freq pred.")); ! if (!Find_In_Vector(pred_node,nodes)) { freq = Edge_Freq(pred); BOOL is_improper = FALSE; --- 1832,1838 ---- REGIONAL_CFG_NODE *pred_node = pred->Src(); Is_True(pred_node != NULL,("The src node of pred edge is NULL in select freq pred.")); ! if (!Found_In_Vector(pred_node,nodes)) { freq = Edge_Freq(pred); BOOL is_improper = FALSE; *************** *** 1833,1839 **** } if ((freq > max_freq)&&(!is_improper) ! &&(!Find_In_Vector(pred_node,bad_nodes)) &&(!pred_node->Is_Loop_Tail())) { // Not include loop head and tail in SEME region // because of exit prob computation --- 1847,1853 ---- } if ((freq > max_freq)&&(!is_improper) ! &&(!Found_In_Vector(pred_node,bad_nodes)) &&(!pred_node->Is_Loop_Tail())) { // Not include loop head and tail in SEME region // because of exit prob computation *************** *** 1878,1884 **** float freq = -1; REGIONAL_CFG_NODE *cand = *succ_iter; ! if (!Find_In_Vector(cand,nodes)) { pred_freq = 0.0; succ_freq = 0.0; freq = 0.0; --- 1892,1898 ---- float freq = -1; REGIONAL_CFG_NODE *cand = *succ_iter; ! if (!Found_In_Vector(cand,nodes)) { pred_freq = 0.0; succ_freq = 0.0; freq = 0.0; *************** *** 1887,1893 **** pred_edge_iter != 0;++pred_edge_iter) { REGIONAL_CFG_NODE *pred = (*pred_edge_iter)->Src(); ! if (Find_In_Vector(pred,nodes)) { pred_freq += Edge_Freq((*pred_edge_iter)); } } --- 1901,1907 ---- pred_edge_iter != 0;++pred_edge_iter) { REGIONAL_CFG_NODE *pred = (*pred_edge_iter)->Src(); ! if (Found_In_Vector(pred,nodes)) { pred_freq += Edge_Freq((*pred_edge_iter)); } } *************** *** 1896,1902 **** succ_edge_iter != 0;++succ_edge_iter) { REGIONAL_CFG_NODE *succ = (*succ_edge_iter)->Dest(); ! if (Find_In_Vector(succ,nodes)) { succ_freq += Edge_Freq((*succ_edge_iter)); } } --- 1910,1916 ---- succ_edge_iter != 0;++succ_edge_iter) { REGIONAL_CFG_NODE *succ = (*succ_edge_iter)->Dest(); ! if (Found_In_Vector(succ,nodes)) { succ_freq += Edge_Freq((*succ_edge_iter)); } } *************** *** 2397,2403 **** } BB *bb; ! for (bb = entry; bb && Find_In_BB_Vector(bb,bbs); last_duplicated = bb,bb = BB_next(bb)); if (bb) { --- 2411,2417 ---- } BB *bb; ! for (bb = entry; bb && Found_In_BB_Vector(bb,bbs); last_duplicated = bb,bb = BB_next(bb)); if (bb) { *************** *** 2542,2548 **** for(CFG_PRED_EDGE_ITER pred_iter(node);pred_iter != 0;++pred_iter) { REGIONAL_CFG_EDGE *pred = *pred_iter; ! if (!Find_In_Vector(pred->Src(),nodes)) { Del_Edge(pred); } } --- 2556,2562 ---- for(CFG_PRED_EDGE_ITER pred_iter(node);pred_iter != 0;++pred_iter) { REGIONAL_CFG_EDGE *pred = *pred_iter; ! if (!Found_In_Vector(pred->Src(),nodes)) { Del_Edge(pred); } } *************** *** 2664,2670 **** if (fall_dup) { *last = fall_dup; ! } else if (!Find_In_BB_Vector(pred,bbs)) { *last = pred; } --- 2678,2684 ---- if (fall_dup) { *last = fall_dup; ! } else if (!Found_In_BB_Vector(pred,bbs)) { *last = pred; } *************** *** 2773,2779 **** BB_Remove_Branch(dup); Add_Goto(dup, new_bb); } ! } else if (Find_In_BB_Vector(pred,bbs)) { continue; } else { new_freq += BB_freq(pred) * BBLIST_prob(blsucc); --- 2787,2793 ---- BB_Remove_Branch(dup); Add_Goto(dup, new_bb); } ! } else if (Found_In_BB_Vector(pred,bbs)) { continue; } else { new_freq += BB_freq(pred) * BBLIST_prob(blsucc); *************** *** 2793,2799 **** //------------------------------------------------------------------ FOR_ALL_BB_SUCCS(old_bb, bl) { BB* succ = BBLIST_item(bl); ! if (!Find_In_BB_Vector(succ,bbs) || succ == entry) { if (BB_Fall_Thru_Successor(old_bb) == succ) { //----------------------------------------------------------- --- 2807,2813 ---- //------------------------------------------------------------------ FOR_ALL_BB_SUCCS(old_bb, bl) { BB* succ = BBLIST_item(bl); ! if (!Found_In_BB_Vector(succ,bbs) || succ == entry) { if (BB_Fall_Thru_Successor(old_bb) == succ) { //----------------------------------------------------------- *************** *** 2852,2858 **** void REGIONAL_CFG::Update_BB_Prof_Info(BB_VECTOR bbs,BB_VECTOR dup,BB_MAP duplicate, BB_MAP rev_duplicate,BB_VECTOR br_bbs,BB *main_entry) { ! typedef list BB_LIST; typedef queue BB_QUEUE; BB_ALLOC temp_alloc(&_m); --- 2866,2872 ---- void REGIONAL_CFG::Update_BB_Prof_Info(BB_VECTOR bbs,BB_VECTOR dup,BB_MAP duplicate, BB_MAP rev_duplicate,BB_VECTOR br_bbs,BB *main_entry) { ! typedef list BB_LIST; typedef queue BB_QUEUE; BB_ALLOC temp_alloc(&_m); *************** *** 2878,2884 **** FOR_ALL_BB_SUCCS(entry,lists) { BB* bb = BBLIST_item(lists); ! if (Find_In_BB_Vector(bb,bbs)) { if (!BS_MemberP(visited,BB_id(bb))) { BOOL all_pred_visited = TRUE; --- 2892,2898 ---- FOR_ALL_BB_SUCCS(entry,lists) { BB* bb = BBLIST_item(lists); ! if (Found_In_BB_Vector(bb,bbs)) { if (!BS_MemberP(visited,BB_id(bb))) { BOOL all_pred_visited = TRUE; *************** *** 2914,2920 **** BS_Union1D(visited,BB_id(bb),&_m); queue.push(bb); ! if (Find_In_BB_Vector(bb,dup)) { float total_freq = 0.0; BB *new_bb = (BB *)BB_MAP_Get(duplicate,bb); //------------------------------------------------- --- 2928,2934 ---- BS_Union1D(visited,BB_id(bb),&_m); queue.push(bb); ! if (Found_In_BB_Vector(bb,dup)) { float total_freq = 0.0; BB *new_bb = (BB *)BB_MAP_Get(duplicate,bb); //------------------------------------------------- *************** *** 2934,2940 **** } BB *old_bb = (BB *)BB_MAP_Get(rev_duplicate,pred); ! if ((old_bb == NULL)&&(!Find_In_BB_Vector(pred,br_bbs))) { Set_Freq(pred,bb,freq); } --- 2948,2954 ---- } BB *old_bb = (BB *)BB_MAP_Get(rev_duplicate,pred); ! if ((old_bb == NULL)&&(!Found_In_BB_Vector(pred,br_bbs))) { Set_Freq(pred,bb,freq); } *************** *** 2980,2986 **** DevWarn("IN UPDATE BB PROFILE:Freq zero BB%d to BB%d.\n",BB_id(new_pred),BB_id(new_bb)); } new_bb_freq += Freq(new_pred,new_bb); ! } else if (!Find_In_BB_Vector(new_pred,br_bbs)) { //----------------------------------------- // The br bbs do not have corresponding // old pred too,but it is not a old bb --- 2994,3000 ---- DevWarn("IN UPDATE BB PROFILE:Freq zero BB%d to BB%d.\n",BB_id(new_pred),BB_id(new_bb)); } new_bb_freq += Freq(new_pred,new_bb); ! } else if (!Found_In_BB_Vector(new_pred,br_bbs)) { //----------------------------------------- // The br bbs do not have corresponding // old pred too,but it is not a old bb *************** *** 3009,3015 **** // If the succ is the newly added br bb,set // the br bb's succ edge's freq and prob too. //------------------------------------------- ! if (Find_In_BB_Vector(new_succ,br_bbs)) { is_br_bb = TRUE; //----------------------------------------- // Find last BB which is also the only --- 3023,3029 ---- // If the succ is the newly added br bb,set // the br bb's succ edge's freq and prob too. //------------------------------------------- ! if (Found_In_BB_Vector(new_succ,br_bbs)) { is_br_bb = TRUE; //----------------------------------------- // Find last BB which is also the only *************** *** 3101,3109 **** queue.pop(); for (CFG_SUCC_NODE_ITER iter(node);iter != 0;++iter) { ! if (Find_In_Vector(*iter,nodes)) { ! if (Find_In_Vector(*iter,dup)) { REGIONAL_CFG_NODE *succ = *iter; float total_freq = 0.0; --- 3115,3123 ---- queue.pop(); for (CFG_SUCC_NODE_ITER iter(node);iter != 0;++iter) { ! if (Found_In_Vector(*iter,nodes)) { ! if (Found_In_Vector(*iter,dup)) { REGIONAL_CFG_NODE *succ = *iter; float total_freq = 0.0; *************** *** 3201,3209 **** if(node->First_Pred() == NULL) _candi_s.push(node); } ! _cur = _candi_s.front(); // pop _candi_s to _cur ! _candi_s.pop(); ! Set_Visited(_cur); // set _cur is visited } --- 3215,3233 ---- if(node->First_Pred() == NULL) _candi_s.push(node); } ! ! // Bug found by gcc3.4.3 ! // _cur = _candi_s.front(); // pop _candi_s to _cur ! // _candi_s.pop(); ! // Set_Visited(_cur); // set _cur is visited ! if (!_candi_s.empty()) { ! _cur = _candi_s.front(); // pop _candi_s to _cur ! _candi_s.pop(); ! Set_Visited(_cur); // set _cur is visited ! } else { ! _cur = NULL; ! } ! } *************** *** 3862,3868 **** REGIONAL_CFG_EDGE *e = *pred_iter; REGIONAL_CFG_NODE *pred = e->Src(); ! if (!Find_In_Vector(pred,nodes)) { is_entry = TRUE; cfg->Del_Edge(e); cfg->Add_Edge(pred,kid_node); --- 3886,3892 ---- REGIONAL_CFG_EDGE *e = *pred_iter; REGIONAL_CFG_NODE *pred = e->Src(); ! if (!Found_In_Vector(pred,nodes)) { is_entry = TRUE; cfg->Del_Edge(e); cfg->Add_Edge(pred,kid_node); *************** *** 3873,3879 **** REGIONAL_CFG_EDGE *e = *succ_iter; REGIONAL_CFG_NODE *succ = e->Dest(); ! if (!Find_In_Vector(succ,nodes)) { is_exit = TRUE; cfg->Del_Edge(e); cfg->Add_Edge(kid_node,succ); --- 3897,3903 ---- REGIONAL_CFG_EDGE *e = *succ_iter; REGIONAL_CFG_NODE *succ = e->Dest(); ! if (!Found_In_Vector(succ,nodes)) { is_exit = TRUE; cfg->Del_Edge(e); cfg->Add_Edge(kid_node,succ); diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/region.h orc-2.1-new/src/osprey1.0/be/cg/orc_ict/region.h *** orc-2.1/src/osprey1.0/be/cg/orc_ict/region.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/region.h Fri Nov 19 11:01:20 2004 *************** *** 197,202 **** --- 197,206 ---- NODE_VECTOR& nodes); inline BB_VECTOR_ITER Find_In_BB_Vector(BB *bb,BB_VECTOR& bbs); + BOOL Found_In_Vector(REGIONAL_CFG_NODE *node, + NODE_VECTOR& nodes); + BOOL Found_In_BB_Vector(BB *bb,BB_VECTOR& bbs); + inline void Print_Node_Vector(NODE_VECTOR nodes); inline void Print_Ops_In_BB(BB *bb); inline void Print_BB_Vector(BB_VECTOR bbs); diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/region_bb_util.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/region_bb_util.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/region_bb_util.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/region_bb_util.cxx Fri Nov 19 11:01:20 2004 *************** *** 29,37 **** //============================================================================= // // Module: region_bb_util.cxx ! // $Revision: 1.10 $ ! // $Date: 2003/05/20 03:18:01 $ ! // $Author: lyz $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/region_bb_util.cxx,v $ // //============================================================================= --- 29,37 ---- //============================================================================= // // Module: region_bb_util.cxx ! // $Revision: 1.13 $ ! // $Date: 2004/11/19 03:01:20 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/region_bb_util.cxx,v $ // //============================================================================= *************** *** 194,200 **** // See interface description in region_bb_util.h. // //============================================================================= ! BB *RGN_Gen_And_Insert_BB_After(BB *point, REGIONAL_CFG *regional_cfg=NULL){ if (Get_Trace(TP_A_REGION, TT_RGN_SUMMERY)) fprintf(TFile, "*** beginning of RGN_Gen_And_Insert_BB_After(bb_id:%d *** \n", BB_id(point)); --- 194,200 ---- // See interface description in region_bb_util.h. // //============================================================================= ! BB *RGN_Gen_And_Insert_BB_After(BB *point, REGIONAL_CFG *regional_cfg){ if (Get_Trace(TP_A_REGION, TT_RGN_SUMMERY)) fprintf(TFile, "*** beginning of RGN_Gen_And_Insert_BB_After(bb_id:%d *** \n", BB_id(point)); *************** *** 678,684 **** if (Get_Trace(TP_A_REGION, TT_RGN_DETAILED)) pred_node->Print(TFile); Is_True(pred_node->Is_Exit(), ! ("RGN_Del_Regional_Cfg_Edge(pred_bb_id:%d, succ_bb_id:%d):: pred_node Id:%d should be a exit node of region %d", BB_id(pred), BB_id(succ), pred_node->Id(), pred_rgn->Id())); --- 678,684 ---- if (Get_Trace(TP_A_REGION, TT_RGN_DETAILED)) pred_node->Print(TFile); Is_True(pred_node->Is_Exit(), ! ("RGN_Del_Regional_Cfg_Edge(pred_bb_id:%d, succ_bb_id:%d)::\ pred_node Id:%d should be a exit node of region %d", BB_id(pred), BB_id(succ), pred_node->Id(), pred_rgn->Id())); *************** *** 760,766 **** // See interface description in region_bb_util.h. // //============================================================================= ! void RGN_Unlink_Pred_Succ(BB *pred, BB *succ, REGIONAL_CFG *regional_cfg=NULL){ if (Get_Trace(TP_A_REGION, TT_RGN_UTIL_DEBUG)) fprintf(TFile, "*** beginning of RGN_Unlink_Pred_Succ(pred_bb_id:%d, succ_bb_id:%d) *** \n", BB_id(pred), BB_id(succ)); --- 760,766 ---- // See interface description in region_bb_util.h. // //============================================================================= ! void RGN_Unlink_Pred_Succ(BB *pred, BB *succ, REGIONAL_CFG *regional_cfg){ if (Get_Trace(TP_A_REGION, TT_RGN_UTIL_DEBUG)) fprintf(TFile, "*** beginning of RGN_Unlink_Pred_Succ(pred_bb_id:%d, succ_bb_id:%d) *** \n", BB_id(pred), BB_id(succ)); diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/region_verify.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/region_verify.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/region_verify.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/region_verify.cxx Fri Nov 19 11:01:20 2004 *************** *** 31,38 **** // // Module: region_verify.cxx // Author: lren ! // $Revision: 1.6 $ ! // $Date: 2003/01/21 12:57:07 $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/region_verify.cxx,v $ // //============================================================================= --- 31,38 ---- // // Module: region_verify.cxx // Author: lren ! // $Revision: 1.9 $ ! // $Date: 2004/11/19 03:01:20 $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/region_verify.cxx,v $ // //============================================================================= *************** *** 217,223 **** for(TOPOLOGICAL_REGIONAL_CFG_ITER iter(cfg); iter!=0; ++iter){ REGIONAL_CFG_NODE *node = *iter; for(CFG_PRED_NODE_ITER pred_iter(node); pred_iter!=0; ++pred_iter) ! Is_True(Find_In_Vector(*pred_iter, nodes),("verify topological_cfg_iter")); nodes.push_back(node); } --- 217,223 ---- for(TOPOLOGICAL_REGIONAL_CFG_ITER iter(cfg); iter!=0; ++iter){ REGIONAL_CFG_NODE *node = *iter; for(CFG_PRED_NODE_ITER pred_iter(node); pred_iter!=0; ++pred_iter) ! Is_True(Found_In_Vector(*pred_iter, nodes),("verify topological_cfg_iter")); nodes.push_back(node); } *************** *** 227,233 **** for(REVERSE_TOPO_REGIONAL_CFG_ITER iter(cfg); iter!=0; ++iter){ REGIONAL_CFG_NODE *node = *iter; for(CFG_SUCC_NODE_ITER succ_iter(node); succ_iter!=0; ++succ_iter) ! Is_True(Find_In_Vector(*succ_iter, nodes),("verify topological_cfg_iter")); nodes.push_back(node); } } --- 227,233 ---- for(REVERSE_TOPO_REGIONAL_CFG_ITER iter(cfg); iter!=0; ++iter){ REGIONAL_CFG_NODE *node = *iter; for(CFG_SUCC_NODE_ITER succ_iter(node); succ_iter!=0; ++succ_iter) ! Is_True(Found_In_Vector(*succ_iter, nodes),("verify topological_cfg_iter")); nodes.push_back(node); } } diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/region_verify.h orc-2.1-new/src/osprey1.0/be/cg/orc_ict/region_verify.h *** orc-2.1/src/osprey1.0/be/cg/orc_ict/region_verify.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/region_verify.h Tue Nov 9 22:31:26 2004 *************** *** 31,38 **** // // Module: region_verify.h // Author: lren ! // $Revision: 1.6 $ ! // $Date: 2003/01/21 12:57:08 $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/region_verify.h,v $ // //============================================================================= --- 31,38 ---- // // Module: region_verify.h // Author: lren ! // $Revision: 1.8 $ ! // $Date: 2004/11/09 14:31:26 $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/region_verify.h,v $ // //============================================================================= diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/scc_finder.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/scc_finder.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/scc_finder.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/scc_finder.cxx Fri Nov 19 11:01:20 2004 *************** *** 30,38 **** //====================================================================== // // Module: scc_finder.cxx ! // $Revision: 1.9 $ ! // $Date: 2003/01/21 12:57:09 $ ! // $Author: sxyang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/scc_finder.cxx,v $ // //====================================================================== --- 30,38 ---- //====================================================================== // // Module: scc_finder.cxx ! // $Revision: 1.12 $ ! // $Date: 2004/11/19 03:01:20 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/scc_finder.cxx,v $ // //====================================================================== *************** *** 83,89 **** next_dfn+=1; dfn[id] = next_dfn; low_link[id] = dfn[id]; ! if (!Find_In_Vector(node,_in_stack)) { _stack.push(node); _in_stack.push_back(node); } --- 83,89 ---- next_dfn+=1; dfn[id] = next_dfn; low_link[id] = dfn[id]; ! if (!Found_In_Vector(node,_in_stack)) { _stack.push(node); _in_stack.push_back(node); } diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/stride_prefetch.h orc-2.1-new/src/osprey1.0/be/cg/orc_ict/stride_prefetch.h *** orc-2.1/src/osprey1.0/be/cg/orc_ict/stride_prefetch.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/stride_prefetch.h Fri Nov 19 11:01:20 2004 *************** *** 41,47 **** #include "mempool.h" #include "profile_util.h" #include "calls.h" ! #include "hash_map.h" #include "bb_map.h" #include "cggrp_microsched.h" --- 41,53 ---- #include "mempool.h" #include "profile_util.h" #include "calls.h" ! ! #if __GNUC__ >=3 ! #include // STL hash_map. ! #else ! #include ! #endif ! #include "bb_map.h" #include "cggrp_microsched.h" diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/vt_dag.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/vt_dag.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/vt_dag.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/vt_dag.cxx Fri Nov 19 11:01:20 2004 *************** *** 30,37 **** //********************************************************************* // // Module: vt_dag.cxx ! // $Date: 2003/01/21 12:57:15 $ ! // $Author: sxyang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/vt_dag.cxx,v $ // // Description: --- 30,37 ---- //********************************************************************* // // Module: vt_dag.cxx ! // $Date: 2004/11/19 03:01:20 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/vt_dag.cxx,v $ // // Description: *************** *** 585,591 **** * * ==================================================================== */ ! void draw_bb_dependence_graph(BB *bb,const char *mes = NULL) { if (! DaVinci::enabled(TRUE)) return; --- 585,591 ---- * * ==================================================================== */ ! void draw_bb_dependence_graph(BB *bb,const char *mes) { if (! DaVinci::enabled(TRUE)) return; *************** *** 728,734 **** * * ==================================================================== */ ! void draw_regional_dependence_graph(REGION *r,const char *mes = NULL) { if (! DaVinci::enabled(TRUE)) return; --- 728,734 ---- * * ==================================================================== */ ! void draw_regional_dependence_graph(REGION *r,const char *mes) { if (! DaVinci::enabled(TRUE)) return; diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_ict/vt_region.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_ict/vt_region.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_ict/vt_region.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_ict/vt_region.cxx Fri Nov 19 11:01:20 2004 *************** *** 30,37 **** //********************************************************************* // // Module: vt_region.cxx ! // $Date: 2003/01/21 12:57:20 $ ! // $Author: sxyang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/vt_region.cxx,v $ // // Description: --- 30,37 ---- //********************************************************************* // // Module: vt_region.cxx ! // $Date: 2004/11/19 03:01:20 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_ict/vt_region.cxx,v $ // // Description: *************** *** 78,84 **** * * ==================================================================== */ ! void draw_bb_op (BB *bb,const char *mes = NULL) { if (! DaVinci::enabled(TRUE)) return; --- 78,84 ---- * * ==================================================================== */ ! void draw_bb_op (BB *bb,const char *mes) { if (! DaVinci::enabled(TRUE)) return; *************** *** 229,235 **** * * ==================================================================== */ ! void draw_regional_cfg (REGION *r,const char *mes = NULL) { if (! DaVinci::enabled (TRUE)) return; --- 229,235 ---- * * ==================================================================== */ ! void draw_regional_cfg (REGION *r,const char *mes) { if (! DaVinci::enabled (TRUE)) return; *************** *** 407,413 **** * * ==================================================================== */ ! void draw_region_tree (REGION *r,const char *mes = NULL) { if (! DaVinci::enabled(TRUE)) return; --- 407,413 ---- * * ==================================================================== */ ! void draw_region_tree (REGION *r,const char *mes) { if (! DaVinci::enabled(TRUE)) return; *************** *** 555,561 **** * ==================================================================== */ void ! draw_global_cfg(const char *mes = NULL) { if (! DaVinci::enabled (TRUE)) return; --- 555,561 ---- * ==================================================================== */ void ! draw_global_cfg(const char *mes) { if (! DaVinci::enabled (TRUE)) return; diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_intel/cggrp_microsched.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_intel/cggrp_microsched.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_intel/cggrp_microsched.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_intel/cggrp_microsched.cxx Fri Nov 19 11:01:20 2004 *************** *** 31,37 **** // // Module : cggrp_microsched.cxx // $Date : $ ! // $Author: lrq $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_intel/cggrp_microsched.cxx,v $ // // Description: --- 31,37 ---- // // Module : cggrp_microsched.cxx // $Date : $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_intel/cggrp_microsched.cxx,v $ // // Description: *************** *** 471,477 **** OP_IDX CYCLE_STATE::Add_OP( OP * inst, ! ISSUE_PORT issue_port = ip_invalid) { // Record all this inst's predecessors in cur cycle vector preds_vector; --- 471,477 ---- OP_IDX CYCLE_STATE::Add_OP( OP * inst, ! ISSUE_PORT issue_port) { // Record all this inst's predecessors in cur cycle vector preds_vector; *************** *** 1043,1049 **** static BOOL Bundle_Helper(OP_IDX new_op); ! BOOL CGGRP_Issue_OP(OP * inst, BOOL commit = FALSE) { vector deps; OP_IDX op_index; --- 1043,1049 ---- static BOOL Bundle_Helper(OP_IDX new_op); ! BOOL CGGRP_Issue_OP(OP * inst, BOOL commit) { vector deps; OP_IDX op_index; *************** *** 2204,2210 **** } void ! PTN_TABLE_LINE::Dump (FILE *f = stderr) { for (INT i = 0; i < size; i++) { fprintf(f,"%d ",i); ptns[i].Dump(f); --- 2204,2210 ---- } void ! PTN_TABLE_LINE::Dump (FILE *f) { for (INT i = 0; i < size; i++) { fprintf(f,"%d ",i); ptns[i].Dump(f); *************** *** 2229,2235 **** } } ! void CYCLE_STATE::Dump (FILE *f=stderr) { extern void dump_op(const OP *op); fprintf(f, "\nValid:%d ",_valid); --- 2229,2235 ---- } } ! void CYCLE_STATE::Dump (FILE *f) { extern void dump_op(const OP *op); fprintf(f, "\nValid:%d ",_valid); diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_intel/dag.cxx orc-2.1-new/src/osprey1.0/be/cg/orc_intel/dag.cxx *** orc-2.1/src/osprey1.0/be/cg/orc_intel/dag.cxx Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_intel/dag.cxx Fri Nov 19 11:01:20 2004 *************** *** 34,41 **** //********************************************************************* // // Module: dag.cxx ! // $Date: 2003/04/16 01:49:13 $ ! // $Author: wyz $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_intel/dag.cxx,v $ // // Description: --- 34,41 ---- //********************************************************************* // // Module: dag.cxx ! // $Date: 2004/11/19 03:01:20 $ ! // $Author: jczhang $ // $Source: /u/merge/src/osprey1.0/be/cg/orc_intel/dag.cxx,v $ // // Description: *************** *** 44,51 **** // //********************************************************************* ! #include ! #include #include "defs.h" #include "tracing.h" #include "cgtarget.h" --- 44,57 ---- // //********************************************************************* ! #include ! ! #if __GNUC__ >=3 ! #include // STL hash_map. ! #else ! #include ! #endif ! #include "defs.h" #include "tracing.h" #include "cgtarget.h" diff -c -r -N orc-2.1/src/osprey1.0/be/cg/orc_intel/dag.h orc-2.1-new/src/osprey1.0/be/cg/orc_intel/dag.h *** orc-2.1/src/osprey1.0/be/cg/orc_intel/dag.h Fri Dec 24 14:14:13 2004 --- orc-2.1-new/src/osprey1.0/be/cg/orc_intel/dag