Merge branch 'NewInstpoint' into Defensive
authorKevin Roundy <roundy@cs.wisc.edu>
Thu, 14 Apr 2011 22:30:11 +0000 (17:30 -0500)
committerKevin Roundy <roundy@cs.wisc.edu>
Thu, 14 Apr 2011 22:30:11 +0000 (17:30 -0500)
commitb8248a5cb9eea1506ebcebf224d405c3d6715199
tree6883304147262b1d6da1a21d068580a1b2c3e745
parent95e08c743032d82874e24c5581c2a63752131a00
parentd2d9ff8f80b0b1abaf21b9164d16d1cbd20833a8
Merge branch 'NewInstpoint' into Defensive

Adds a bunch of KEVINTODO's where there is obvious work that
remains to be done, I'm sure it won't compile, all of the code
that I'd added in the defensive branch will still be using
int_function and int_block instead of the new names

Conflicts:
dataflowAPI/src/SymEval.C
dataflowAPI/src/stackanalysis.C
dyninstAPI/h/BPatch_point.h
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/Parsing.C
dyninstAPI/src/Relocation/Atoms/Atom.C
dyninstAPI/src/Relocation/Atoms/CFAtom.C
dyninstAPI/src/Relocation/Transformers/Defensive.C
dyninstAPI/src/addressSpace.C
dyninstAPI/src/addressSpace.h
dyninstAPI/src/baseTramp.C
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/block.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.C
dyninstAPI/src/hybridCallbacks.C
dyninstAPI/src/hybridOverwrites.C
dyninstAPI/src/inst-winnt.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/instPoint.h
dyninstAPI/src/mapped_object.C
dyninstAPI/src/parse-cfg.C
dyninstAPI/src/parse-cfg.h
dyninstAPI/src/pdwinnt.C
dyninstAPI/src/process.C
dyninstAPI/src/registerSpace.C
dyninstAPI/src/symtab.C
dyninstAPI/src/symtab.h
instructionAPI/src/Operation.C
parseAPI/src/Function.C
symtabAPI/src/emitWin.h
84 files changed:
common/common.vcproj
dataflowAPI/h/SymEval.h
dataflowAPI/src/AbslocInterface.C
dataflowAPI/src/SymEval.C
dataflowAPI/src/debug_dataflow.C
dataflowAPI/src/stackanalysis.C
dynC_API/ppc32-unknown-vxworks6.x/Makefile
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/h/BPatch_callbacks.h
dyninstAPI/h/BPatch_point.h
dyninstAPI/h/BPatch_process.h
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_asyncEventHandler.C
dyninstAPI/src/BPatch_binaryEdit.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/EventHandler.C
dyninstAPI/src/EventHandler.h
dyninstAPI/src/IAPI_to_AST.C
dyninstAPI/src/MemoryEmulator/memEmulator.C
dyninstAPI/src/MemoryEmulator/memEmulator.h
dyninstAPI/src/MemoryEmulator/memEmulatorAtom.C
dyninstAPI/src/MemoryEmulator/memEmulatorAtom.h
dyninstAPI/src/MemoryEmulator/memEmulatorTransformer.C
dyninstAPI/src/Parsing.C
dyninstAPI/src/Parsing.h
dyninstAPI/src/addressSpace.C
dyninstAPI/src/addressSpace.h
dyninstAPI/src/baseTramp.C
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/block.C
dyninstAPI/src/debug.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/function.C
dyninstAPI/src/hybridAnalysis.h
dyninstAPI/src/hybridCallbacks.C
dyninstAPI/src/hybridInstrumentation.C
dyninstAPI/src/hybridOverwrites.C
dyninstAPI/src/inst-winnt.C
dyninstAPI/src/inst-x86.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/os.h
dyninstAPI/src/parse-cfg.C
dyninstAPI/src/parse-cfg.h
dyninstAPI/src/pdwinnt.C
dyninstAPI/src/pdwinntDL.C
dyninstAPI/src/process.C
dyninstAPI/src/process.h
dyninstAPI/src/registerSpace.C
dyninstAPI/src/signalhandler.C
dyninstAPI/src/signalhandler.h
dyninstAPI/src/symtab.C
dyninstAPI/src/symtab.h
dyninstAPI/src/unix.C
dyninstAPI_RT/src/RTcommon.c
dyninstAPI_RT/src/RTmemEmulator.c
dyninstAPI_RT/src/RTwinnt.c
instructionAPI/src/Operation.C
parseAPI/h/CodeObject.h
parseAPI/h/ParseCallback.h
parseAPI/src/CodeObject.C
parseAPI/src/Function.C
parseAPI/src/IA_IAPI.C
parseAPI/src/IA_IAPI.h
parseAPI/src/IA_x86.C
parseAPI/src/Parser.C
parseAPI/src/Parser.h
parseAPI/src/ParserDetails.C
parseAPI/src/debug_parse.C
parseThat/src/config.C
parseThat/src/dyninstCompat.v5.C
parseThat/src/dyninstCore.C
parseThat/src/ipc.C
parseThat/src/parseThat.C
parseThat/src/reglist.h
symtabAPI/h/Symtab.h
symtabAPI/src/Object-nt.C
symtabAPI/src/Object-nt.h
symtabAPI/src/Symtab.C
symtabAPI/src/debug.C
symtabAPI/src/emitWin.C
symtabAPI/src/emitWin.h