Merge branch 'NewInstpoint' into dyn_pc_integration
authorDaniel McNulty <mcnulty@cs.wisc.edu>
Fri, 13 May 2011 14:52:44 +0000 (09:52 -0500)
committerDaniel McNulty <mcnulty@cs.wisc.edu>
Fri, 13 May 2011 14:52:44 +0000 (09:52 -0500)
commit38b84ff782f679e0a276ea90d8519036ebd8b4f9
treeb12478008792857be14027f1b9e2639bd7f1c872
parent1c6b97884aa7aeb61ce799a2a4d07871fad43c3f
parent7bdc717693b386fdf87cc54cee35753f25c6583a
Merge branch 'NewInstpoint' into dyn_pc_integration

Conflicts:
autodyninst/make.config.local.in
configure
configure.in
dyninstAPI/i386-unknown-linux2.4/Makefile
dyninstAPI/ppc64_linux/Makefile
dyninstAPI/src/BPatch_parRegion.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/InstrucIter-Function.C
dyninstAPI/src/aix.C
dyninstAPI/src/baseTramp.C
dyninstAPI/src/dyn_lwp.h
dyninstAPI/src/dynamiclinking.C
dyninstAPI/src/dynamiclinking.h
dyninstAPI/src/linux-x86.C
dyninstAPI/src/linuxDL.C
dyninstAPI/src/process.C
dyninstAPI/src/process.h
dyninstAPI/src/rpcMgr-thr.C
dyninstAPI/src/sol_proc.C
dyninstAPI/src/solaris.C
dyninstAPI/src/templates0.C
dyninstAPI/src/unix.C
dyninstAPI/src/writeBackXCOFF.h
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/ppc32_bgp/tuples
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/Makefile
testsuite/sparc-sun-solaris2.8/dyninst_group_test_group.c
testsuite/sparc-sun-solaris2.8/make.mutators.gen
testsuite/sparc-sun-solaris2.8/make.solo_mutatee.gen
testsuite/sparc-sun-solaris2.8/test_info_new.gen.C
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/dyninst_group_test_group.c
testsuite/sparc-sun-solaris2.9/make.mutators.gen
testsuite/sparc-sun-solaris2.9/make.solo_mutatee.gen
testsuite/sparc-sun-solaris2.9/test_info_new.gen.C
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/dyninst/test6.h
testsuite/src/dyninst/test_mem_4.C
testsuite/src/dyninst/test_mem_5.C
testsuite/src/dyninst/test_mem_6.C
testsuite/src/dyninst/test_mem_7.C
testsuite/src/dyninst/test_mem_8.C
testsuite/src/dyninst/test_stack_2.C
testsuite/src/dyninst/test_stack_2_mutatee.c
testsuite/src/specification/spec-grouped.pl
testsuite/x86_64-unknown-linux2.4/tuples
76 files changed:
autodyninst/make.config.local.in
common/src/dyn_regs.C
configure
configure.in
dyninstAPI/h/BPatch_process.h
dyninstAPI/i386-unknown-linux2.4/Makefile
dyninstAPI/make.module.tmpl
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_basicBlock.C
dyninstAPI/src/BPatch_flowGraph.C
dyninstAPI/src/BPatch_function.C
dyninstAPI/src/BPatch_parRegion.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/Parsing.C
dyninstAPI/src/addressSpace.C
dyninstAPI/src/addressSpace.h
dyninstAPI/src/aix.C
dyninstAPI/src/ast.C
dyninstAPI/src/baseTramp.C
dyninstAPI/src/baseTramp.h
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/codegen.h
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.C
dyninstAPI/src/inst-power.C
dyninstAPI/src/instPoint.h
dyninstAPI/src/mapped_object.C
dyninstAPI/src/mapped_object.h
dyninstAPI/src/os.h
dyninstAPI/src/pdwinnt.C
dyninstAPI/src/registerSpace.C
dyninstAPI/src/sol_proc.C
dyninstAPI/src/solarisDL.h
dyninstAPI/src/symtab.C
dyninstAPI/src/symtab.h
dyninstAPI/src/templates0.C
dyninstAPI/src/templates1.C
dyninstAPI/src/unix.C
dyninstAPI/src/vxworks.C
dyninstAPI_RT/src/RTcommon.c
dynutil/h/dyn_regs.h
make.config
symtabAPI/src/Object-elf.C
symtabAPI/src/emitElf-64.C
symtabAPI/src/emitElf.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/ppc32_bgp/tuples
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/make.solo_mutatee.gen
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/src/dyninst/dyninst_comp.C
testsuite/src/dyninst/test2_7.C
testsuite/src/dyninst/test3_7.C
testsuite/src/dyninst/test6.h
testsuite/src/dyninst/test_mem_1.C
testsuite/src/dyninst/test_mem_2.C
testsuite/src/dyninst/test_mem_4.C
testsuite/src/dyninst/test_mem_5.C
testsuite/src/dyninst/test_mem_6.C
testsuite/src/dyninst/test_mem_7.C
testsuite/src/dyninst/test_mem_8.C
testsuite/src/dyninst/test_mem_util.c
testsuite/src/dyninst/test_mem_util.h
testsuite/src/dyninst/test_stack_2.C
testsuite/src/dyninst/test_stack_2_mutatee.c
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_lib.C
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/tuples