Merge branch 'dyn_pc_integration' of follis:/p/paradyn/development/bill/pcsw_integrat...
authorBill Williams <bill@cs.wisc.edu>
Tue, 28 Jun 2011 22:21:19 +0000 (17:21 -0500)
committerBill Williams <bill@cs.wisc.edu>
Tue, 28 Jun 2011 22:21:19 +0000 (17:21 -0500)
commit278b0cd3331271c7caed104251682896092c4004
tree7ffa845df14c68c28c224362e44c94d69e56ec54
parentbe804cead79115f5e1fb8d1dab4ff04ed53ff7f3
parent8cd0966aa21abc0e2e8374e0a5226af161f8bb69
Merge branch 'dyn_pc_integration' of follis:/p/paradyn/development/bill/pcsw_integration/dyninst into dyn_pc_integration

Conflicts:
common/common.vcproj
dyninstAPI/dyninstAPI.vcproj
dyninstAPI/src/BPatch_module.C
dyninstAPI/src/inst-winnt.C
dyninstAPI/src/pdwinnt.C
dyninstAPI/src/pdwinntDL.C
dyninstAPI/src/templates-nt.C
dyninstAPI_RT/DyninstAPI_RT.vcproj
dynutil/h/util.h
instructionAPI/instructionAPI.vcproj
parseAPI/parseAPI.vcproj
proccontrol/src/irpc.h
proccontrol/src/process.C
stackwalk/stackwalk.vcproj
symtabAPI/symtabAPI.vcproj
testsuite/src/proccontrol/pc_breakpoint.C
62 files changed:
DyninstAPI.sln
common/h/dthread.h
common/h/ntHeaders.h
dataflowAPI/h/stackanalysis.h
dyninstAPI/h/BPatch_process.h
dyninstAPI/h/BPatch_thread.h
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_thread.C
dyninstAPI/src/pcEventHandler.C
dyninstAPI/src/pcProcess.h
dyninstAPI/src/pcThread.C
dyninstAPI/src/pcThread.h
dyninstAPI_RT/DyninstAPI_RT.vcproj
dyninstAPI_RT/h/dyninstAPI_RT.h
dyninstAPI_RT/src/RTcommon.c
dynutil/h/dyn_regs.h
dynutil/h/dyntypes.h
dynutil/h/util.h
parseAPI/parseAPI.vcproj
parseAPI/src/debug_parse.h
proccontrol/h/Decoder.h
proccontrol/h/Event.h
proccontrol/h/EventType.h
proccontrol/h/Generator.h
proccontrol/h/Handler.h
proccontrol/h/Mailbox.h
proccontrol/h/PCErrors.h
proccontrol/h/Process.h
proccontrol/src/event.C
proccontrol/src/generator.C
proccontrol/src/handler.C
proccontrol/src/int_handler.h
proccontrol/src/int_process.h
proccontrol/src/mailbox.C
proccontrol/src/pcerrors.C
proccontrol/src/procpool.C
stackwalk/h/frame.h
stackwalk/h/framestepper.h
stackwalk/h/procstate.h
stackwalk/h/swk_errors.h
stackwalk/h/symlookup.h
stackwalk/h/walker.h
stackwalk/src/framestepper.C
stackwalk/src/win-x86-swk.C
symtabAPI/h/SymtabReader.h
testsuite/i386-unknown-nt4.0/nmake.solo_mutatee.gen
testsuite/nmake.module.tmpl
testsuite/src/dyninst/test_thread_6.C
testsuite/src/dyninst/test_thread_8.C
testsuite/src/mutatee_driver.c
testsuite/src/mutatee_util.h
testsuite/src/proccontrol/communication.h
testsuite/src/proccontrol/pc_detach_mutatee.c
testsuite/src/proccontrol/pc_library.C
testsuite/src/proccontrol/pc_library_mutatee.c
testsuite/src/proccontrol/pc_terminate_common.C
testsuite/src/proccontrol/pc_thread_cont_mutatee.c
testsuite/src/proccontrol/pcontrol_mutatee_tools.c
testsuite/src/proccontrol/pcontrol_mutatee_tools.h
testsuite/src/proccontrol/proccontrol_comp.C
testsuite/src/proccontrol/proccontrol_comp.h
testsuite/src/test_lib_dll.h