Merge branch 'master' into merge branch
authorAndrew Bernat <bernat@cumin.cs.wisc.edu>
Tue, 19 Jun 2012 21:12:47 +0000 (16:12 -0500)
committerAndrew Bernat <bernat@cumin.cs.wisc.edu>
Tue, 19 Jun 2012 21:12:47 +0000 (16:12 -0500)
commit982e4c234fea0924e0de789826bf97a033cd9876
tree139bd15500f4383376df57049e64455064477247
parente3ed0acc46dcecb88db6a884fe8cdcc0bf4fde9d
parent41da13ce85caa2ca7d2d92edf392ae1aa464b07e
Merge branch 'master' into merge branch

Conflicts:
DyninstAPI.sln
Makefile
common/common.vcproj
common/h/IntervalTree.h
common/src/addrtranslate-sysv.C
dataflowAPI/h/SymEval.h
dyninstAPI/amd64-unknown-freebsd7.2/Makefile
dyninstAPI/dyninstAPI.vcproj
dyninstAPI/h/BPatch_process.h
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/i386-unknown-freebsd7.2/Makefile
dyninstAPI/make.module.tmpl
dyninstAPI/ppc64_bgq/Makefile
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_asyncEventHandler.C
dyninstAPI/src/BPatch_basicBlock.C
dyninstAPI/src/BPatch_image.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/EventHandler.C
dyninstAPI/src/EventHandler.h
dyninstAPI/src/MemoryEmulator/memEmulatorTransformer.C
dyninstAPI/src/MemoryEmulator/memEmulatorTransformer.h
dyninstAPI/src/Parsing.C
dyninstAPI/src/Relocation/CodeMover.C
dyninstAPI/src/Relocation/CodeTracker.C
dyninstAPI/src/Relocation/Springboard.C
dyninstAPI/src/Relocation/Transformers/Movement-analysis.C
dyninstAPI/src/Relocation/Widgets/CFWidget-x86.C
dyninstAPI/src/Relocation/Widgets/CFWidget.C
dyninstAPI/src/addressSpace.C
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/binaryEdit.h
dyninstAPI/src/debug.C
dyninstAPI/src/debug.h
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.h
dyninstAPI/src/instPoint.C
dyninstAPI/src/instPoint.h
dyninstAPI/src/linux-power.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/linux.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/pdwinnt.C
dyninstAPI/src/process.C
dyninstAPI/src/process.h
dyninstAPI/src/registerSpace.C
dyninstAPI/src/signalhandler.C
dyninstAPI/src/signalhandler.h
dyninstAPI/src/stackwalk-x86.C
dyninstAPI/src/symtab.h
dyninstAPI/src/syscall-linux.C
dyninstAPI/src/unix.C
dyninstAPI/x86_64-unknown-linux2.4/Makefile
dyninstAPI_RT/DyninstAPI_RT.vcproj
dyninstAPI_RT/ppc64_bgq/Makefile
dyninstAPI_RT/src/RTcommon.c
dyninstAPI_RT/src/RTmemEmulator.c
dyninstAPI_RT/src/RTthread.c
dynutil/h/dyn_regs.h
instructionAPI/src/InstructionDecoder-x86.C
make.config
make.library.tmpl
parseAPI/parseAPI.vcproj
parseAPI/src/IA_x86Details.C
parseThat/Makefile.in
proccontrol/amd64-unknown-freebsd7.2/Makefile
proccontrol/i386-unknown-freebsd7.2/Makefile
proccontrol/i386-unknown-linux2.4/Makefile
proccontrol/src/linux.C
proccontrol/src/process.C
proccontrol/x86_64-unknown-linux2.4/Makefile
stackwalk/h/walker.h
stackwalk/i386-unknown-linux2.4/Makefile
stackwalk/src/bluegene-swk.C
stackwalk/src/dbginfo-stepper.C
stackwalk/src/dbgstepper-impl.h
stackwalk/src/linux-ppc-swk.C
stackwalk/src/linux-swk.C
stackwalk/src/linux-swk.h
stackwalk/src/linux-x86-swk.C
stackwalk/x86_64-unknown-linux2.4/Makefile
stackwalk/x86_64_cnl/Makefile
symtabAPI/h/symutil.h
symtabAPI/src/Symbol.C
symtabAPI/src/Symtab.C
symtabAPI/src/debug.C
symtabAPI/src/emitWin.h
symtabAPI/x86_64_cnl/Makefile
testsuite/Makefile
testsuite/amd64-unknown-freebsd7.2/make.mutators.gen
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.mutators.gen
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.mutators.gen
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/Makefile
testsuite/i386-unknown-nt4.0/nmake.mutators.gen
testsuite/i386-unknown-nt4.0/nmake.solo_mutatee.gen
testsuite/i386-unknown-nt4.0/test_info_new.gen.C
testsuite/i386-unknown-nt4.0/tuples
testsuite/make.module.tmpl
testsuite/nmake.module.tmpl
testsuite/ppc32_bgp/make.mutators.gen
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/test_info_new.gen.C
testsuite/ppc32_bgp/tuples
testsuite/ppc32_linux/test_info_new.gen.C
testsuite/ppc32_linux/tuples
testsuite/ppc64_bgq/symtab_group_test_group.c
testsuite/ppc64_linux/test_info_new.gen.C
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/test_info_new.gen.C
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/src/StdOutputDriver.h
testsuite/src/TestOutputDriver.h
testsuite/src/dyninst/dyninst_comp.C
testsuite/src/dyninst/libtestB.c
testsuite/src/dyninst/test2_14.C
testsuite/src/dyninst/test5_3.C
testsuite/src/mutatee_driver.c
testsuite/src/proccontrol/pc_breakpoint.C
testsuite/src/runTests.C
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_driver.C
testsuite/src/test_lib.C
testsuite/x86_64-unknown-linux2.4/make.mutators.gen
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
226 files changed:
.gitignore
common/common.vcproj
common/h/IntervalTree.h
common/h/SymLite-elf.h
common/h/dwarfExpr.h
common/h/dwarfSW.h
common/src/addrtranslate-sysv.C
common/src/dyn_regs.C
common/x86_64-unknown-linux2.4/Makefile
common/x86_64_cnl/Makefile
dataflowAPI/h/Absloc.h
dataflowAPI/h/SymEval.h
dataflowAPI/h/stackanalysis.h
dataflowAPI/src/AbslocInterface.C
dataflowAPI/src/SymEval.C
dataflowAPI/src/slicing.C
dataflowAPI/src/stackanalysis.C
dyninstAPI/amd64-unknown-freebsd7.2/Makefile
dyninstAPI/dyninstAPI.vcproj
dyninstAPI/h/BPatch_binaryEdit.h
dyninstAPI/h/BPatch_function.h
dyninstAPI/h/BPatch_image.h
dyninstAPI/h/BPatch_module.h
dyninstAPI/h/BPatch_point.h
dyninstAPI/h/BPatch_process.h
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/i386-unknown-freebsd7.2/Makefile
dyninstAPI/make.module.tmpl
dyninstAPI/ppc32_bgp/Makefile
dyninstAPI/ppc64_bgq/Makefile
dyninstAPI/src/BPatch.C
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_basicBlock.C
dyninstAPI/src/BPatch_binaryEdit.C
dyninstAPI/src/BPatch_edge.C
dyninstAPI/src/BPatch_flowGraph.C
dyninstAPI/src/BPatch_function.C
dyninstAPI/src/BPatch_image.C
dyninstAPI/src/BPatch_module.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/MemoryEmulator/memEmulatorTransformer.C
dyninstAPI/src/MemoryEmulator/memEmulatorTransformer.h
dyninstAPI/src/MemoryEmulator/memEmulatorWidget.h
dyninstAPI/src/Parsing.C
dyninstAPI/src/RegisterConversion-ppc.C
dyninstAPI/src/RegisterConversion-x86.C
dyninstAPI/src/RegisterConversion.h
dyninstAPI/src/Relocation/CFG/RelocGraph.h
dyninstAPI/src/Relocation/CodeMover.h
dyninstAPI/src/Relocation/Springboard.h
dyninstAPI/src/Relocation/Transformers/Instrumenter.h
dyninstAPI/src/Relocation/Transformers/Movement-adhoc.C
dyninstAPI/src/Relocation/Transformers/Movement-analysis.C
dyninstAPI/src/Relocation/Transformers/Movement-analysis.h
dyninstAPI/src/Relocation/Widgets/CFWidget.h
dyninstAPI/src/Relocation/Widgets/Widget.h
dyninstAPI/src/addressSpace.C
dyninstAPI/src/addressSpace.h
dyninstAPI/src/ast.C
dyninstAPI/src/ast.h
dyninstAPI/src/baseTramp.C
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/block.C
dyninstAPI/src/codegen-power.C
dyninstAPI/src/codegen-x86.C
dyninstAPI/src/codegen.C
dyninstAPI/src/codegen.h
dyninstAPI/src/debug.C
dyninstAPI/src/debug.h
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.C
dyninstAPI/src/function.h
dyninstAPI/src/hybridAnalysis.h
dyninstAPI/src/hybridCallbacks.C
dyninstAPI/src/hybridInstrumentation.C
dyninstAPI/src/hybridOverwrites.C
dyninstAPI/src/inst-power.C
dyninstAPI/src/inst-winnt.C
dyninstAPI/src/inst-x86.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/mapped_module.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/mapped_object.h
dyninstAPI/src/miniTramp.C
dyninstAPI/src/os.h
dyninstAPI/src/pdwinnt.C
dyninstAPI/src/pdwinntDL.C
dyninstAPI/src/registerSpace.C
dyninstAPI/src/registerSpace.h
dyninstAPI/src/symtab.C
dyninstAPI/src/symtab.h
dyninstAPI/src/syscall-linux.C
dyninstAPI/src/unix.C
dyninstAPI/src/vxworks.C
dyninstAPI/x86_64-unknown-linux2.4/Makefile
dyninstAPI_RT/DyninstAPI_RT.vcproj
dyninstAPI_RT/h/dyninstAPI_RT.h
dyninstAPI_RT/ppc32_linux/Makefile
dyninstAPI_RT/ppc64_bgq/Makefile
dyninstAPI_RT/ppc64_linux/Makefile
dyninstAPI_RT/src/RTcommon.c
dyninstAPI_RT/src/RTlinux.c
dyninstAPI_RT/src/RTmemEmulator.c
dyninstAPI_RT/src/RTthread.c
dynutil/Makefile
dynutil/h/DynAST.h
dynutil/h/SymReader.h
dynutil/h/dyn_regs.h
dynutil/h/entryIDs.h
dynutil/h/util.h
instructionAPI/instructionAPI.vcproj
instructionAPI/src/InstructionDecoder-x86.C
instructionAPI/src/Operation.C
make.config
merge.out
parseAPI/src/IA_IAPI.C
parseAPI/src/Parser.C
parseAPI/src/debug_parse.h
parseThat/Makefile.in
proccontrol/i386-unknown-freebsd7.2/Makefile
proccontrol/src/freebsd.C
proccontrol/src/linux.C
stackwalk/h/swk_errors.h
stackwalk/h/walker.h
stackwalk/ppc32_bgl_compute/Makefile
stackwalk/ppc32_bgl_ion/Makefile
stackwalk/ppc32_bgp_compute/Makefile
stackwalk/ppc32_bgp_ion/Makefile
stackwalk/ppc32_linux/Makefile
stackwalk/ppc64_linux/Makefile
stackwalk/src/bluegene-swk.C
stackwalk/src/dbginfo-stepper.C
stackwalk/src/dbgstepper-impl.h
stackwalk/src/linux-swk.C
stackwalk/src/linux-x86-swk.C
stackwalk/src/walker.C
stackwalk/src/x86-wanderer.C
stackwalk/x86_64_cnl/Makefile
symtabAPI/amd64-unknown-freebsd7.2/Makefile
symtabAPI/h/Region.h
symtabAPI/h/symutil.h
symtabAPI/i386-unknown-freebsd7.2/Makefile
symtabAPI/i386-unknown-linux2.4/Makefile
symtabAPI/i386-unknown-vxworks6.x/Makefile
symtabAPI/ppc32-unknown-vxworks6.x/Makefile
symtabAPI/ppc32_bgl_ion/Makefile
symtabAPI/ppc32_bgp/Makefile
symtabAPI/ppc32_bgp_ion/Makefile
symtabAPI/ppc32_linux/Makefile
symtabAPI/ppc64-unknown-linux2.4/Makefile
symtabAPI/ppc64_bgq/Makefile
symtabAPI/ppc64_linux/Makefile
symtabAPI/sparc-sun-solaris2.8/Makefile
symtabAPI/sparc-sun-solaris2.9/Makefile
symtabAPI/src/Collections.C
symtabAPI/src/Object-elf.C
symtabAPI/src/Region.C
symtabAPI/src/Symbol.C
symtabAPI/src/Symtab.C
symtabAPI/src/emitElf-64.C
symtabAPI/src/emitElf.C
symtabAPI/src/parseDwarf.C
symtabAPI/symtabAPI.vcproj
symtabAPI/x86_64-unknown-linux2.4/Makefile
symtabAPI/x86_64_cnl/Makefile
testsuite/Makefile
testsuite/amd64-unknown-freebsd7.2/make.mutators.gen
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.mutators.gen
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.mutators.gen
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/Makefile
testsuite/i386-unknown-nt4.0/nmake.mutators.gen
testsuite/i386-unknown-nt4.0/nmake.solo_mutatee.gen
testsuite/i386-unknown-nt4.0/test_info_new.gen.C
testsuite/i386-unknown-nt4.0/tuples
testsuite/make.module.tmpl
testsuite/nmake.module.tmpl
testsuite/ppc32_bgp/make.mutators.gen
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/test_info_new.gen.C
testsuite/ppc32_bgp/tuples
testsuite/ppc32_bgp_ion/make.mutators.gen
testsuite/ppc32_bgp_ion/make.solo_mutatee.gen
testsuite/ppc32_bgp_ion/test_info_new.gen.C
testsuite/ppc32_bgp_ion/tuples
testsuite/ppc32_linux/make.mutators.gen
testsuite/ppc32_linux/test_info_new.gen.C
testsuite/ppc32_linux/tuples
testsuite/ppc64_bgq/symtab_group_test_group.c
testsuite/ppc64_bgq_ion/make.mutators.gen
testsuite/ppc64_bgq_ion/make.solo_mutatee.gen
testsuite/ppc64_bgq_ion/test_info_new.gen.C
testsuite/ppc64_bgq_ion/tuples
testsuite/ppc64_linux/make.mutators.gen
testsuite/ppc64_linux/test_info_new.gen.C
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/src/StdOutputDriver.h
testsuite/src/TestOutputDriver.h
testsuite/src/dyninst/dyninst_comp.C
testsuite/src/dyninst/dyninst_comp.h
testsuite/src/dyninst/test2_14.C
testsuite/src/dyninst/test4_4.C
testsuite/src/dyninst/test_lib_mutateeStart.C
testsuite/src/libtestA.c
testsuite/src/mutatee_driver.c
testsuite/src/proccontrol/pc_breakpoint.C
testsuite/src/runTests-utils-nt.C
testsuite/src/runTests.C
testsuite/src/specification/spec-grouped.pl
testsuite/src/specification/spec-ungrouped.pl
testsuite/src/test_driver.C
testsuite/x86_64-unknown-linux2.4/make.mutators.gen
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
testsuite/x86_64_cnl/make.mutators.gen
testsuite/x86_64_cnl/test_info_new.gen.C
testsuite/x86_64_cnl/tuples