Merge branch 'master' into Kevin-Drew. Work in progress; this still has bugs.
authorAndrew Bernat <bernat@antonio.cs.wisc.edu>
Fri, 10 Dec 2010 20:14:14 +0000 (14:14 -0600)
committerAndrew Bernat <bernat@antonio.cs.wisc.edu>
Fri, 10 Dec 2010 20:14:14 +0000 (14:14 -0600)
commitfd0c19d185ce81d9f23583a547dbd563537a1a93
tree787bf651545afa1909ad7805572d4ad8992e5fdf
parenta37279b74d2a0cf9d789816e54c6030daf70604a
parentf4eb92fbad0dd3583696add5e1b333895af4313b
Merge branch 'master' into Kevin-Drew. Work in progress; this still has bugs.

Conflicts:
dataflowAPI/h/slicing.h
dataflowAPI/src/slicing.C
dyninstAPI/src/BPatch.C
dyninstAPI/src/baseTramp.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/inst-x86.C
dyninstAPI/src/multiTramp.C
dyninstAPI/src/registerSpace.C
dyninstAPI/src/reloc-func.C
parseAPI/src/IA_IAPI.C
parseAPI/src/IA_IAPI.h
parseAPI/src/IA_x86.C
parseAPI/src/Parser.C
parseAPI/src/SymtabCodeSource.C
57 files changed:
common/h/arch-x86.h
dataflowAPI/h/slicing.h
dataflowAPI/src/SymEval.C
dataflowAPI/src/Visitors.C
dataflowAPI/src/debug_dataflow.C
dataflowAPI/src/slicing.C
dyninstAPI/h/BPatch.h
dyninstAPI/h/BPatch_function.h
dyninstAPI/h/BPatch_point.h
dyninstAPI/make.module.tmpl
dyninstAPI/src/BPatch.C
dyninstAPI/src/Relocation/Springboard.C
dyninstAPI/src/aix.C
dyninstAPI/src/baseTramp.C
dyninstAPI/src/baseTramp.h
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/emit-x86.h
dyninstAPI/src/hybridCallbacks.C
dyninstAPI/src/hybridInstrumentation.C
dyninstAPI/src/inst-power.C
dyninstAPI/src/inst-sparc.C
dyninstAPI/src/inst-x86.C
dyninstAPI/src/inst-x86.h
dyninstAPI/src/instPoint.C
dyninstAPI/src/linux-power.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/process.C
dyninstAPI/src/registerSpace.C
dyninstAPI/src/registerSpace.h
dyninstAPI/src/signalhandler.C
dyninstAPI_RT/make.module.tmpl
parseAPI/h/CFG.h
parseAPI/h/CodeObject.h
parseAPI/h/CodeSource.h
parseAPI/h/InstructionAdapter.h
parseAPI/h/ParseCallback.h
parseAPI/make.module.tmpl
parseAPI/src/CodeObject.C
parseAPI/src/Function.C
parseAPI/src/IA_IAPI.C
parseAPI/src/IA_IAPI.h
parseAPI/src/IA_power.C
parseAPI/src/IA_x86.C
parseAPI/src/InstructionAdapter.C
parseAPI/src/Parser.C
parseAPI/src/Parser.h
parseAPI/src/ParserDetails.C
parseAPI/src/SymtabCodeSource.C
parseThat/src/dyninstCore.C
symtabAPI/h/Symtab.h
symtabAPI/src/Symtab.C
testsuite/src/dyninst/test1_20.C
testsuite/src/dyninst/test1_33.C
testsuite/src/dyninst/test1_34.C
testsuite/src/dyninst/test1_37.C
testsuite/src/dyninst/test1_38.C