Merge branch 'master' of xmeng@git.dyninst.org:/pub/dyninst into DataflowAPI-Liveness
authorXiaozhu Meng <xmeng@coriander.cs.wisc.edu>
Fri, 3 Feb 2012 17:34:33 +0000 (11:34 -0600)
committerXiaozhu Meng <xmeng@coriander.cs.wisc.edu>
Fri, 3 Feb 2012 17:34:33 +0000 (11:34 -0600)
commitd909dd4ab2d86a8ff6a41f2e7c82abbe75a050fe
tree0c75c78cddc731b911a588393e3b8e653ab4b8be
parent4b5208b4f95081bebbf431554819b9be55495638
parent1f5a3df758b38e96762c503d423418b3d2356e33
Merge branch 'master' of xmeng@git.dyninst.org:/pub/dyninst into DataflowAPI-Liveness

Conflicts:
dataflowAPI/h/ABI.h
dataflowAPI/h/InstructionCache.h
dataflowAPI/h/liveness.h
dataflowAPI/src/ABI.C
dataflowAPI/src/InstructionCache.h
dataflowAPI/src/liveness.C
dyninstAPI/src/BPatch_binaryEdit.C
dyninstAPI/src/InstructionCache.h
dyninstAPI/src/RegisterConversion-x86.C
dyninstAPI/src/Relocation/CodeMover.C
dyninstAPI/src/Relocation/patchapi_debug.h
dyninstAPI/src/bitArray.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/registerSpace.C
parseAPI/h/CFG.h
parseAPI/make.module.tmpl
testsuite/ppc64_bgq/symtab_group_test_group.c
41 files changed:
dataflowAPI/src/debug_dataflow.C
dataflowAPI/src/debug_dataflow.h
dataflowAPI/src/liveness.C
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/src/BPatch_binaryEdit.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/RegisterConversion-ppc.C
dyninstAPI/src/RegisterConversion-x86.C
dyninstAPI/src/RegisterConversion.h
dyninstAPI/src/Relocation/CFG/RelocBlock.C
dyninstAPI/src/Relocation/CodeMover.C
dyninstAPI/src/Relocation/CodeTracker.C
dyninstAPI/src/Relocation/Springboard.C
dyninstAPI/src/Relocation/Transformers/Instrumenter.C
dyninstAPI/src/Relocation/Transformers/Modification.C
dyninstAPI/src/Relocation/Transformers/Movement-analysis.C
dyninstAPI/src/Relocation/Widgets/CFPatch.C
dyninstAPI/src/Relocation/Widgets/CFWidget-ppc.C
dyninstAPI/src/Relocation/Widgets/CFWidget-x86.C
dyninstAPI/src/Relocation/Widgets/CFWidget.C
dyninstAPI/src/ast.C
dyninstAPI/src/ast.h
dyninstAPI/src/codegen.C
dyninstAPI/src/codegen.h
dyninstAPI/src/debug.C
dyninstAPI/src/debug.h
dyninstAPI/src/emit-x86.C
dyninstAPI/src/inst-power.C
dyninstAPI/src/inst-x86.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/instPoint.h
dyninstAPI/src/parse-cfg.h
dyninstAPI/src/pdwinnt.C
dyninstAPI/src/registerSpace.C
dyninstAPI/src/registerSpace.h
dyninstAPI/x86_64-unknown-linux2.4/Makefile
dyninstAPI_RT/src/RTlinux.c
parseAPI/h/CFG.h
parseAPI/h/Location.h
parseAPI/make.module.tmpl
testsuite/src/test_lib.C