[llvm] r188887 - MC CFG: Add an MCObjectSymbolizer in the MCObjectDisassembler.

[David Blaikie]

On Wed, Aug 21, 2013 at 12:28 AM, Ahmed Bougacha
<ahmed.bougacha at gmail.com> wrote:
> Author: ab
> Date: Wed Aug 21 02:28:48 2013
> New Revision: 188887
>
> URL: http://llvm.org/viewvc/llvm-project?rev=188887&view=rev
> Log:
> MC CFG: Add an MCObjectSymbolizer in the MCObjectDisassembler.
>
> Used to detect calls to function symbol stubs (future commit).

Probably nicer to roll this up to the usage, but debatable.

>
> Modified:
>     llvm/trunk/include/llvm/MC/MCObjectDisassembler.h
>     llvm/trunk/lib/MC/MCObjectDisassembler.cpp
>
> Modified: llvm/trunk/include/llvm/MC/MCObjectDisassembler.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCObjectDisassembler.h?rev=188887&r1=188886&r2=188887&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/MC/MCObjectDisassembler.h (original)
> +++ llvm/trunk/include/llvm/MC/MCObjectDisassembler.h Wed Aug 21 02:28:48 2013
> @@ -31,6 +31,7 @@ class MCDisassembler;
>  class MCFunction;
>  class MCInstrAnalysis;
>  class MCModule;
> +class MCObjectSymbolizer;
>
>  /// \brief Disassemble an ObjectFile to an MCModule and MCFunctions.
>  /// This class builds on MCDisassembler to disassemble whole sections, creating
> @@ -54,6 +55,13 @@ public:
>
>    MCModule *buildEmptyModule();
>
> +  /// \brief Set the symbolizer to use to get information on external functions.
> +  /// Note that this isn't used to do instruction-level symbolization (that is,
> +  /// plugged into MCDisassembler), but to symbolize function call targets.
> +  void setSymbolizer(MCObjectSymbolizer *ObjectSymbolizer) {
> +    MOS = ObjectSymbolizer;
> +  }
> +
>    /// \brief Get the effective address of the entrypoint, or 0 if there is none.
>    virtual uint64_t getEntrypoint();
>
> @@ -86,6 +94,7 @@ protected:
>    const object::ObjectFile &Obj;
>    const MCDisassembler &Dis;
>    const MCInstrAnalysis &MIA;
> +  MCObjectSymbolizer *MOS;
>
>  private:
>    /// \brief Fill \p Module by creating an atom for each section.
>
> Modified: llvm/trunk/lib/MC/MCObjectDisassembler.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCObjectDisassembler.cpp?rev=188887&r1=188886&r2=188887&view=diff
> ==============================================================================
> --- llvm/trunk/lib/MC/MCObjectDisassembler.cpp (original)
> +++ llvm/trunk/lib/MC/MCObjectDisassembler.cpp Wed Aug 21 02:28:48 2013
> @@ -18,6 +18,7 @@
>  #include "llvm/MC/MCFunction.h"
>  #include "llvm/MC/MCInstrAnalysis.h"
>  #include "llvm/MC/MCModule.h"
> +#include "llvm/MC/MCObjectSymbolizer.h"
>  #include "llvm/Object/MachO.h"
>  #include "llvm/Object/ObjectFile.h"
>  #include "llvm/Support/Debug.h"
> @@ -34,7 +35,7 @@ using namespace object;
>  MCObjectDisassembler::MCObjectDisassembler(const ObjectFile &Obj,
>                                             const MCDisassembler &Dis,
>                                             const MCInstrAnalysis &MIA)
> -  : Obj(Obj), Dis(Dis), MIA(MIA) {}
> +    : Obj(Obj), Dis(Dis), MIA(MIA), MOS(0) {}
>
>  uint64_t MCObjectDisassembler::getEntrypoint() {
>    error_code ec;
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits