Convert STARSInstrPtr in SMPInstr to unique_ptr.

include/base/SMPInstr.h

@@ -34,6 +34,7 @@
 
 #include <string>
 #include <bitset>
+#include <memory>
 
 #include <cstddef>
 #include <cstdint>
@@ -789,6 +790,7 @@ public:
 	bool IsBasicBlockTerminator(void) const;  // kind of inst that ALWAYS terminates a block
 	inline bool IsLastInBlock(void) const { return (booleans1 & INSTR_SET_BLOCK_TERM); }; // does terminate its block
 	inline bool IsJumpTarget(void) { return (booleans1 & INSTR_SET_JUMP_TARGET); };
+	inline bool IsJumpFromFixedCall(void) const { return this->STARSInstPtr->IsJumpFromFixedCall(); };
 	bool IsBranchToFarChunk(void);  // instr jumps outside current chunk
 	bool IsBranchToOtherFunc(void); // instr branches or jumps to another function
 	inline bool IsTailCall(void) const { return (booleans1 & INSTR_SET_TAIL_CALL); };
@@ -1018,7 +1020,7 @@ public:
 	bool IsLoopExitStatement(bool &InvertedExit); // true => jump is used to exit a loop
 	inline bool AnalyzeSwitchInfo(struct SwitchTableInfo &TableInfo) { return STARSInstPtr->AnalyzeSwitchStatement(this, TableInfo); };
 
-	inline STARS_Instruction_t* GetSTARSInstPtr() { return STARSInstPtr; } // pointer to either STARS_IDA_Instruction_t or STARS_IRDB_Instruction_t
+	// inline std::unique_ptr<STARS_Instruction_t> GetSTARSInstPtr() { return STARSInstPtr; } // pointer to either STARS_IDA_Instruction_t or STARS_IRDB_Instruction_t
 
 private:
 	// Data 
@@ -1028,7 +1030,7 @@ private:
 	uint32 features; // Canonical features for SMPcmd
 #endif
 	STARS_InstructionID_t STARS_ID;  // instruction ID; could be IDA Pro address or IRDB inst ID
-	STARS_Instruction_t *STARSInstPtr; // pointer to either STARS_IDA_Instruction_t or STARS_IRDB_Instruction_t
+	std::unique_ptr<STARS_Instruction_t> STARSInstPtr; // pointer to either STARS_IDA_Instruction_t or STARS_IRDB_Instruction_t
 	SMPitype  type; // Data flow analysis category
 #if 0
 	// Get this dynamically to save memory

include/interfaces/abstract/STARSInterface.h

@@ -2,6 +2,7 @@
 #define STARSInterface_h
 
 #include <cstdio>
+#include <memory>
 
 #if __unix__
 #include <sys/time.h>
@@ -51,7 +52,7 @@ class STARS_Interface_t
 		virtual void get_func_name(const STARS_ea_t &ea, char* name, const std::size_t &len) = 0;
 
 		// Instruction creation.
-		virtual STARS_Instruction_t *CreateInst(STARS_InstructionID_t InstID) = 0;
+		virtual std::unique_ptr<STARS_Instruction_t> CreateInst(STARS_InstructionID_t InstID) = 0;
 
 		// IDA Pro does not permit direct usage of common file and string library calls, so we
 		//  have to do them differently in the IDA Pro and IRDB interfaces.

include/interfaces/idapro/STARSInterface.h

@@ -3,6 +3,7 @@
 
 #include <cstdio>
 
+#include <memory>
 #include <map>
 
 #include <pro.h>
@@ -78,8 +79,8 @@ public:
 	}
 
 	// Instruction creation.
-	virtual STARS_Instruction_t *CreateInst(STARS_InstructionID_t InstID) {
-		return new STARS_IDA_Instruction_t(InstID);
+	virtual std::unique_ptr<STARS_Instruction_t> CreateInst(STARS_InstructionID_t InstID) {
+		return std::unique_ptr<STARS_Instruction_t>{(STARS_Instruction_t *) new STARS_IDA_Instruction_t(InstID)};
 	}
 
 	// File methods.

include/interfaces/irdb/STARSInterface.h

 #ifndef STARS_irdb_Interface_h
 #define STARS_irdb_Interface_h
 
+#include <memory>
 
 #include "interfaces/abstract/STARSInterface.h"
 #include "interfaces/abstract/STARSInstructionID.h"
@@ -140,7 +141,7 @@ public:
 	}
 
 // Instruction creation.
-	virtual STARS_Instruction_t *CreateInst(STARS_InstructionID_t InstID) ;
+	virtual std::unique_ptr<STARS_Instruction_t> CreateInst(STARS_InstructionID_t InstID) ;
 
 // File methods.
 	virtual FILE *STARS_fopen(const char *file, const char *mode) 

src/base/SMPInstr.cpp

@@ -4933,6 +4933,7 @@ SMPInstr::~SMPInstr() {
 		this->Uses.clear();
 	}
  
+#if 0
 	if (global_STARS_program->IsIDAProDriverMode() && (nullptr != this->STARSInstPtr)) {
 		delete this->STARSInstPtr;
 		this->STARSInstPtr = nullptr;
@@ -4942,6 +4943,7 @@ SMPInstr::~SMPInstr() {
 		delete this->STARSInstPtr;
 		this->STARSInstPtr = nullptr;
 	}
+#endif
 	return;
 }

src/interfaces/irdb/STARS_IRDB_Function.cpp

@@ -231,7 +231,7 @@ void STARS_IRDB_Function_t::FindFixedCalls(SMPFunction *CurrFunc) {
 
 		SMPInstr *CurrInst = (*InstIter);
 #if 1
-		if (CurrInst->GetSTARSInstPtr()->IsJumpFromFixedCall()) 
+		if (CurrInst->IsJumpFromFixedCall()) 
 		{
 			CurrInst->SetFixedCallJump();
 #if 0

src/interfaces/irdb/STARS_IRDB_Interface.cpp

-
+#include <memory>
 
 #include "interfaces/abstract/STARSInterface.h"
 #include "interfaces/irdb/STARSSegment.h"
@@ -15,27 +15,27 @@
 #include <stdio.h>
 #include <pqxx/pqxx>
 
+using namespace std;
 
-
-STARS_Instruction_t * STARS_IRDB_Interface_t::CreateInst(STARS_InstructionID_t InstID) 
+unique_ptr<STARS_Instruction_t> STARS_IRDB_Interface_t::CreateInst(STARS_InstructionID_t InstID)
 {
 	// check for pseudo-instructions
 	if (STARS_IsSSAMarkerPseudoID(InstID.GetIDWithinFile()))
-		return new STARS_IRDB_Instruction_t(InstID);
+		return unique_ptr<STARS_Instruction_t>{(STARS_Instruction_t *) new STARS_IRDB_Instruction_t(InstID)};
+
 	// already created, just return what we need.
 	STARS_Instruction_t* insn = nullptr;
+
 	if (InstID.HasCorrespondingInstructionIR())
 	{
-		insn = (STARS_Instruction_t*) InstID.GetInstruction();
+		return unique_ptr<STARS_Instruction_t>{(STARS_Instruction_t*)InstID.GetInstruction()};
 	}
 	else
 	{
 		// Look it up in the private map, create STARS_IRDB_Instruction_t with it.
-		insn = (STARS_Instruction_t*) new STARS_IRDB_Instruction_t(this->instr_id_to_irdb_insn_map[(IRDB_SDK::DatabaseID_t) InstID.GetIDWithinFile()]);
+		return unique_ptr<STARS_Instruction_t>{(STARS_Instruction_t*) new STARS_IRDB_Instruction_t(this->instr_id_to_irdb_insn_map[(IRDB_SDK::DatabaseID_t) InstID.GetIDWithinFile()])};
 	}
 
-	assert(insn != nullptr);
-	return insn;
 };