Merge branch 'liveness' into master_copy
authorXiaozhu Meng <xmeng@coriander.cs.wisc.edu>
Wed, 16 Nov 2011 22:07:30 +0000 (16:07 -0600)
committerXiaozhu Meng <xmeng@coriander.cs.wisc.edu>
Wed, 16 Nov 2011 22:07:30 +0000 (16:07 -0600)
commited8228a8117b1fac1f114f25eb79b617a9c228d2
tree854ca7991854b232f615cb61d8eb77e48c0a9c38
parent3d079e66931bde68d960c097573c6a13e4c3ee17
parent0bc9696d9ba579e61beb06953b8b7a81d3d9bd5d
Merge branch 'liveness' into master_copy

Conflicts:
dataflowAPI/src/debug_dataflow.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.C
dyninstAPI/src/inst-x86.C
dyninstAPI/src/mapped_object.C
patchAPI/h/PatchMgr.h
patchAPI/h/Point.h
patchAPI/src/PatchBlock.C
patchAPI/src/PatchFunction.C
patchAPI/src/PatchMgr.C
testsuite/src/patchapi/patch1_2.C
testsuite/src/patchapi/patch2_1.C
33 files changed:
common/src/dyn_regs.C
dataflowAPI/src/debug_dataflow.C
dyninstAPI/make.module.tmpl
dyninstAPI/src/BPatch_function.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/block.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.C
dyninstAPI/src/function.h
dyninstAPI/src/inst-power.C
dyninstAPI/src/inst-x86.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/instPoint.h
dyninstAPI/src/mapped_object.C
dyninstAPI/src/mapped_object.h
dyninstAPI/src/parse-cfg.C
dyninstAPI/src/parse-cfg.h
dyninstAPI/src/registerSpace.C
dyninstAPI/src/signalhandler.C
dyninstAPI/src/symtab.C
dyninstAPI/src/symtab.h
dyninstAPI/src/unix.C
parseAPI/h/CFG.h
parseAPI/src/Function.C
patchAPI/h/PatchCFG.h
patchAPI/h/PatchMgr.h
patchAPI/h/Point.h
patchAPI/src/PatchBlock.C
patchAPI/src/PatchFunction.C
patchAPI/src/PatchMgr.C
patchAPI/src/PointMaker.C
testsuite/src/patchapi/patch1_2.C
testsuite/src/patchapi/patch2_1.C