Merge branch 'master' into NewInstpoint
authorAndrew Bernat <bernat@cumin.cs.wisc.edu>
Thu, 12 May 2011 14:59:46 +0000 (09:59 -0500)
committerAndrew Bernat <bernat@cumin.cs.wisc.edu>
Thu, 12 May 2011 14:59:46 +0000 (09:59 -0500)
commit51da2a3eedfd05face45343f71c17ff726c5952f
tree26822f54f55e9c014a23766067cce1aed2949b1f
parenta4125a9e62a8fe58c944af9ea18b0bd2bd024fd4
parentcc1a487f778828a97bf1e1b4c367d497e2df1f32
Merge branch 'master' into NewInstpoint

Conflicts:
common/h/arch-x86.h
dataflowAPI/h/stackanalysis.h
dyninstAPI/dyninstAPI.vcproj
dyninstAPI/src/BPatch_basicBlock.C
dyninstAPI/src/BPatch_function.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/InstrucIter-Function.C
dyninstAPI/src/InstrucIter-Function.h
dyninstAPI/src/Parsing-arch.C
dyninstAPI/src/Parsing.h
dyninstAPI/src/addressSpace.C
dyninstAPI/src/ast.C
dyninstAPI/src/baseTramp.C
dyninstAPI/src/baseTramp.h
dyninstAPI/src/function.C
dyninstAPI/src/function.h
dyninstAPI/src/inst-sparc.C
dyninstAPI/src/inst.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/instPoint.h
dyninstAPI/src/mapped_object.C
dyninstAPI/src/mapped_object.h
dyninstAPI/src/multiTramp.C
dyninstAPI/src/multiTramp.h
dyninstAPI/src/parse-cfg.C
dyninstAPI/src/parse-cfg.h
dyninstAPI/src/reloc-func.C
dyninstAPI/src/solaris.C
dyninstAPI/src/templates0.C
parseAPI/src/Parser.C
parseAPI/src/ParserDetails.C
testsuite/src/comptester.h
testsuite/src/dyninst/test1_35.C
testsuite/src/proccontrol/pc_breakpoint.c
67 files changed:
common/h/arch-x86.h
common/src/dyn_regs.C
dataflowAPI/src/RoseInsnFactory.h
dyninstAPI/dyninstAPI.vcproj
dyninstAPI/h/BPatch_process.h
dyninstAPI/src/BPatch_basicBlock.C
dyninstAPI/src/BPatch_flowGraph.C
dyninstAPI/src/BPatch_function.C
dyninstAPI/src/BPatch_memoryAccess.C
dyninstAPI/src/BPatch_parRegion.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/Parsing-arch.C
dyninstAPI/src/Parsing.C
dyninstAPI/src/Parsing.h
dyninstAPI/src/addressSpace.C
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/dyn_lwp.h
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.C
dyninstAPI/src/instPoint.h
dyninstAPI/src/linux-x86.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/mapped_object.h
dyninstAPI/src/parse-cfg.C
dyninstAPI/src/parse-cfg.h
dyninstAPI/src/parse-power.C
dyninstAPI/src/process.C
dyninstAPI/src/process.h
dyninstAPI/src/registerSpace.C
dyninstAPI/src/rpcMgr-thr.C
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/AST.h
dynutil/h/Graph.h
dynutil/h/dyn_regs.h
parseAPI/src/Block.C
parseAPI/src/IA_IAPI.C
parseAPI/src/Parser.C
parseAPI/src/Parser.h
parseAPI/src/ParserDetails.C
symtabAPI/h/Symtab.h
symtabAPI/src/Object-elf.C
symtabAPI/src/Symtab-lookup.C
symtabAPI/src/Symtab.C
testsuite/src/dyninst/dyninst_comp.C
testsuite/src/dyninst/test1_20.C
testsuite/src/dyninst/test1_21.C
testsuite/src/dyninst/test1_24.C
testsuite/src/dyninst/test1_25.C
testsuite/src/dyninst/test1_30.C
testsuite/src/dyninst/test1_35.C
testsuite/src/dyninst/test1_36.C
testsuite/src/dyninst/test1_39.C
testsuite/src/dyninst/test3_3.C
testsuite/src/specification/spec-grouped.pl