replace boolT with plain old bool in a few places

include/BasicBlock.h

@@ -117,7 +117,7 @@ public:
     void findBBExps(LOCAL_ID &locals, Function *f);
     bool    valid() {return 0==(flg & INVALID_BB); }
     bool    wasTraversedAtLevel(int l) const {return traversed==l;}
-    ICODE * writeLoopHeader(int &indLevel, Function* pProc, int *numLoc, BB *&latch, boolT &repCond);
+    ICODE * writeLoopHeader(int &indLevel, Function* pProc, int *numLoc, BB *&latch, bool &repCond);
     void    addOutEdge(uint32_t ip)  // TODO: fix this
     {
         edges.push_back(TYPEADR_TYPE(ip));

include/Enums.h

@@ -177,7 +177,7 @@ enum llIcode
     iPOP,
     iPOPA,
     iPOPF,
-    iPUSH,
+    iPUSH,      // 77
     iPUSHA,
     iPUSHF,
     iRCL,		/* 80 */

include/Procedure.h

@@ -13,6 +13,7 @@ struct Expr;
 struct Disassembler;
 struct Function;
 struct CALL_GRAPH;
+struct PROG;
 
 typedef llvm::iplist<Function> FunctionListType;
 typedef FunctionListType lFunction;
@@ -189,6 +190,7 @@ public:
     void preprocessReturnDU(LivenessSet &_liveOut);
     Expr * adjustActArgType(Expr *_exp, hlType forType);
     std::string writeCall(Function *tproc, STKFRAME &args, int *numLoc);
+    void processDosInt(STATE *pstate, PROG &prog, bool done);
 protected:
     void extractJumpTableRange(ICODE& pIcode, STATE *pstate, JumpTable &table);
     bool followAllTableEntries(JumpTable &table, uint32_t cs, ICODE &pIcode, CALL_GRAPH *pcallGraph, STATE *pstate);

include/ast.h

@@ -29,6 +29,7 @@ struct STKFRAME;
 struct LOCAL_ID;
 struct ICODE;
 struct LLInst;
+struct LLOperand;
 struct ID;
 typedef std::list<ICODE>::iterator iICODE;
 typedef boost::iterator_range<iICODE> rICODE;
@@ -291,6 +292,7 @@ struct RegisterNode : public AstIdent
         regiType = reg_type;
         regiIdx = idx;
     }
+    RegisterNode(const LLOperand &, LOCAL_ID *locsym);
 
     RegisterNode(eReg regi, uint32_t icodeFlg, LOCAL_ID *locsym);
     virtual Expr *clone() const

include/dcc.h

@@ -22,22 +22,6 @@
 #include "BasicBlock.h"
 class Project;
 /* CALL GRAPH NODE */
-struct CALL_GRAPH
-{
-        ilFunction proc;               /* Pointer to procedure in pProcList	*/
-        std::vector<CALL_GRAPH *> outEdges; /* array of out edges                   */
-public:
-        void write();
-        CALL_GRAPH() : outEdges(0)
-        {
-        }
-public:
-        void writeNodeCallGraph(int indIdx);
-        bool insertCallGraph(ilFunction caller, ilFunction callee);
-        bool insertCallGraph(Function *caller, ilFunction callee);
-        void insertArc(ilFunction newProc);
-};
-//extern CALL_GRAPH * callGraph;	/* Pointer to the head of the call graph     */
 extern bundle cCode;			/* Output C procedure's declaration and code */
 
 /**** Global variables ****/
@@ -121,8 +105,8 @@ bool    LibCheck(Function &p);                              /* chklib.c     */
 boolT	insertCallGraph (CALL_GRAPH *, ilFunction, ilFunction);
 
 /* Exported functions from hlicode.c */
-char 	*writeJcond (const HLTYPE &, Function *, int *);
-char 	*writeJcondInv (HLTYPE, Function *, int *);
+const char *writeJcond(const HLTYPE &, Function *, int *);
+const char  *writeJcondInv (HLTYPE, Function *, int *);
 
 
 /* Exported funcions from locident.c */

include/icode.h

@@ -13,7 +13,7 @@
 #include <llvm/ADT/ilist.h>
 #include <llvm/ADT/ilist_node.h>
 #include <llvm/MC/MCInst.h>
-#include <llvm/Instruction.h>
+#include <llvm/IR/Instruction.h>
 #include <boost/range/iterator_range.hpp>
 #include "libdis.h"
 #include "Enums.h"
@@ -252,16 +252,26 @@ struct LLOperand
     eReg       regi;              /* 0 < regs < INDEXBASE <= index modes  */
     int16_t    off;               /* memory address offset                */
     uint32_t   opz;             /*   idx of immed src op        */
+    bool immed;
+    bool is_offset; // set by jumps
+    bool is_compound;
+    size_t width;
     //union {/* Source operand if (flg & I)  */
     struct {				/* Call & # actual arg bytes	*/
         Function *proc;     /*   pointer to target proc (for CALL(F))*/
         int     cb;		/*   # actual arg bytes			*/
     } proc;
-    LLOperand() : seg(rUNDEF),segOver(rUNDEF),segValue(0),regi(rUNDEF),off(0),opz(0)
+    LLOperand() : seg(rUNDEF),segOver(rUNDEF),segValue(0),regi(rUNDEF),off(0),
+        opz(0),immed(0),is_offset(false),is_compound(0),width(0)
     {
         proc.proc=0;
         proc.cb=0;
     }
+    LLOperand(eReg r,size_t w) : LLOperand()
+    {
+        regi=r;
+        width=w;
+    }
     bool operator==(const LLOperand &with) const
     {
         return (seg==with.seg) &&
@@ -279,12 +289,12 @@ struct LLOperand
     }
     eReg getReg2() const {return regi;}
     bool isReg() const;
-    static LLOperand CreateImm2(int64_t Val)
+    static LLOperand CreateImm2(int64_t Val,uint8_t wdth=2)
     {
         LLOperand Op;
-        //Op.Kind = kImmediate;
-        //Op.ImmVal = Val;
+        Op.immed=true;
         Op.opz = Val;
+        Op.width = wdth;
         return Op;
     }
     static LLOperand CreateReg2(unsigned Val)
@@ -298,6 +308,10 @@ struct LLOperand
         return not (*this == LLOperand());
     }
     void addProcInformation(int param_count,uint32_t call_conv);
+    bool isImmediate() const { return immed;}
+    void setImmediate(bool x) { immed=x;}
+    bool compound() const {return is_compound;} // dx:ax pair
+    size_t byteWidth() const { assert(width<=4); return width;}
 };
 struct LLInst : public llvm::MCInst //: public llvm::ilist_node<LLInst>
 {

include/project.h

@@ -4,6 +4,10 @@
 #include <cassert>
 #include <list>
 #include <llvm/ADT/ilist.h>
+#include <boost/icl/interval.hpp>
+#include <boost/icl/interval_map.hpp>
+#include <boost/icl/split_interval_map.hpp>
+#include <unordered_set>
 #include "symtab.h"
 #include "BinaryImage.h"
 #include "Procedure.h"

include/state.h

@@ -33,7 +33,7 @@ struct STATE
     void setMemoryByte(uint32_t addr,uint8_t val)
     {
         //TODO: make this into a full scale value tracking class !
-    };
+    }
 };