Merge branch 'patchapi_snippet' into merge
authorAndrew Bernat <bernat@follis.cs.wisc.edu>
Tue, 26 Jun 2012 16:00:48 +0000 (11:00 -0500)
committerAndrew Bernat <bernat@follis.cs.wisc.edu>
Tue, 26 Jun 2012 16:00:48 +0000 (11:00 -0500)
commit2c9fdfe63be7fd2ff230e5a4cff912334d9cb683
tree009248fda93b379ec95d0d6f99674d93246fea3f
parent4823dbfc4172b07446451b5d74c94eea723d1edd
parentde7a59d8fb999bf39dd69583c8740001cbf4ae60
Merge branch 'patchapi_snippet' into merge

Conflicts:
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/h/BPatch_module.h
dyninstAPI/make.module.tmpl
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_asyncEventHandler.C
dyninstAPI/src/BPatch_basicBlock.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/Relocation/Transformers/Movement-adhoc.C
dyninstAPI/src/Relocation/Transformers/Movement-adhoc.h
dyninstAPI/src/addressSpace.C
dyninstAPI/src/baseTramp.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/inst.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/instPoint.h
dyninstAPI/src/linux.C
dyninstAPI/src/miniTramp.C
dyninstAPI/src/miniTramp.h
dyninstAPI/src/process.C
dyninstAPI/src/signalhandler.C
dyninstAPI/src/syscall-linux.C
instructionAPI/src/InstructionDecoder-x86.C
patchAPI/h/PatchCommon.h
patchAPI/h/Snippet.h
stackwalk/src/linux-swk.C
symtabAPI/h/Symtab.h
symtabAPI/src/Symtab-edit.C
62 files changed:
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/h/BPatch_module.h
dyninstAPI/h/BPatch_point.h
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/make.module.tmpl
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_basicBlock.C
dyninstAPI/src/BPatch_module.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/Relocation/CFG/RelocBlock.h
dyninstAPI/src/Relocation/CFG/RelocGraph.h
dyninstAPI/src/Relocation/DynCommon.h
dyninstAPI/src/Relocation/DynInstrumenter.C
dyninstAPI/src/Relocation/Springboard.C
dyninstAPI/src/Relocation/Transformers/Instrumenter.h
dyninstAPI/src/Relocation/Transformers/Movement-adhoc.h
dyninstAPI/src/Relocation/Widgets/CFWidget.h
dyninstAPI/src/Relocation/Widgets/InsnWidget.h
dyninstAPI/src/Relocation/Widgets/InstWidget.h
dyninstAPI/src/addressSpace.C
dyninstAPI/src/addressSpace.h
dyninstAPI/src/ast.C
dyninstAPI/src/ast.h
dyninstAPI/src/baseTramp.C
dyninstAPI/src/baseTramp.h
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/binaryEdit.h
dyninstAPI/src/block.C
dyninstAPI/src/codegen-power.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.C
dyninstAPI/src/function.h
dyninstAPI/src/inst.C
dyninstAPI/src/inst.h
dyninstAPI/src/instPoint.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/miniTramp.C
dyninstAPI/src/miniTramp.h
dyninstAPI/src/unix.C
parseAPI/h/CFG.h
parseAPI/h/CodeSource.h
parseAPI/src/Block.C
parseAPI/src/CFGModifier.C
parseAPI/src/Parser.C
patchAPI/h/PatchCommon.h
patchAPI/h/PatchMgr.h
patchAPI/h/PatchObject.h
patchAPI/h/Point.h
patchAPI/h/Snippet.h
patchAPI/src/PatchBlock.C
patchAPI/src/PatchObject.C
symtabAPI/h/Symtab.h
symtabAPI/src/Symtab-edit.C
symtabAPI/src/Symtab-lookup.C
symtabAPI/src/Symtab.C
testsuite-merge/src/patchapi/patch1_1.C
testsuite-merge/src/patchapi/patch1_2.C
testsuite-merge/src/patchapi/patch2_1.C
testsuite-merge/src/patchapi/patch_modifier.C
testsuite-merge/src/patchapi/patchapi_comp.h