Fix struct/class confusion for Function class.

This commit is contained in:
nemerle 2016-05-20 10:23:00 +02:00
parent 8875371cee
commit 7f1a4e26bd
9 changed files with 12 additions and 12 deletions

View File

@ -9,7 +9,7 @@
#include "graph.h" #include "graph.h"
//#include "icode.h" //#include "icode.h"
/* Basic block (BB) node definition */ /* Basic block (BB) node definition */
struct Function; class Function;
class CIcodeRec; class CIcodeRec;
struct BB; struct BB;
struct LOCAL_ID; struct LOCAL_ID;
@ -27,7 +27,7 @@ struct TYPEADR_TYPE
}; };
struct BB struct BB
{ {
friend struct Function; friend class Function;
private: private:
BB(const BB&); BB(const BB&);
BB() : nodeType(0),traversed(DFS_NONE), BB() : nodeType(0),traversed(DFS_NONE),

View File

@ -19,11 +19,11 @@ class QTextStream;
struct CALL_GRAPH; struct CALL_GRAPH;
struct Expr; struct Expr;
struct Disassembler; struct Disassembler;
struct Function; class Function;
struct CALL_GRAPH; struct CALL_GRAPH;
struct PROG; struct PROG;
struct IStructuredTextTarget; struct IStructuredTextTarget;
struct Function;
/* Procedure FLAGS */ /* Procedure FLAGS */
enum PROC_FLAGS enum PROC_FLAGS
@ -119,7 +119,7 @@ public:
} }
void push_back(BB *v) { m_listBB.push_back(v);} void push_back(BB *v) { m_listBB.push_back(v);}
}; };
typedef std::shared_ptr<struct Function> PtrFunction; typedef std::shared_ptr<Function> PtrFunction;
enum DecompilationStep : uint32_t { enum DecompilationStep : uint32_t {
eNotDecoded, // no processing done yet eNotDecoded, // no processing done yet
eDisassemblyInProgress, eDisassemblyInProgress,

View File

@ -28,7 +28,7 @@ static const condOp condOpJCond[12] = {LESS, LESS_EQUAL, GREATER_EQUAL, GREATER,
EQUAL, NOT_EQUAL, LESS, GREATER_EQUAL, EQUAL, NOT_EQUAL, LESS, GREATER_EQUAL,
LESS_EQUAL, GREATER, GREATER_EQUAL, LESS}; LESS_EQUAL, GREATER, GREATER_EQUAL, LESS};
struct AstIdent; struct AstIdent;
struct Function; class Function;
struct STKFRAME; struct STKFRAME;
struct LOCAL_ID; struct LOCAL_ID;
struct ICODE; struct ICODE;

View File

@ -14,7 +14,7 @@
#include <QTextStream> #include <QTextStream>
struct LLInst; struct LLInst;
struct Function; class Function;
typedef std::shared_ptr<Function> PtrFunction; typedef std::shared_ptr<Function> PtrFunction;
struct Disassembler struct Disassembler

View File

@ -8,7 +8,7 @@
#include <stdint.h> #include <stdint.h>
#include <list> #include <list>
struct Function; class Function;
/* Types of basic block nodes */ /* Types of basic block nodes */
/* Real basic blocks: type defined according to their out-edges */ /* Real basic blocks: type defined according to their out-edges */
enum eBBKind enum eBBKind

View File

@ -25,7 +25,7 @@
struct LOCAL_ID; struct LOCAL_ID;
struct BB; struct BB;
struct Function; class Function;
struct STKFRAME; struct STKFRAME;
class CIcodeRec; class CIcodeRec;
struct ICODE; struct ICODE;

View File

@ -86,7 +86,7 @@ public:
void updateSymType(uint32_t symbol, const TypeContainer &tc); void updateSymType(uint32_t symbol, const TypeContainer &tc);
SYM *updateGlobSym(uint32_t operand, int size, uint16_t duFlag, bool &inserted_new); SYM *updateGlobSym(uint32_t operand, int size, uint16_t duFlag, bool &inserted_new);
}; };
struct Function; class Function;
struct SYMTABLE struct SYMTABLE
{ {
std::string pSymName; /* Ptr to symbolic name or comment */ std::string pSymName; /* Ptr to symbolic name or comment */

View File

@ -7,7 +7,7 @@
#include <QtCore/QPair> #include <QtCore/QPair>
class Project; class Project;
struct Function; class Function;
typedef std::shared_ptr<Function> PtrFunction; typedef std::shared_ptr<Function> PtrFunction;
enum CommandLevel { enum CommandLevel {
eProject, eProject,

View File

@ -9,7 +9,7 @@
#include <QtCore/QString> #include <QtCore/QString>
#include <vector> #include <vector>
struct Function; class Function;
// This will create a PatternLocator instance load it and pass it to project instance. // This will create a PatternLocator instance load it and pass it to project instance.
struct LoadPatternLibrary : public Command { struct LoadPatternLibrary : public Command {