Removing stringList and replacing it with std::list

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 12799]

1 files changed, 10 insertions, 8 deletions

diff --git a/cuobjdump_to_ptxplus/cuobjdumpInst.h b/cuobjdump_to_ptxplus/cuobjdumpInst.h
index 75053f2..d8f75ab 100644
--- a/cuobjdump_to_ptxplus/cuobjdumpInst.h
+++ b/cuobjdump_to_ptxplus/cuobjdumpInst.h
@@ -36,27 +36,27 @@
 
 // Local includes
 //#include "cuobjdumpInstList.h"
-#include "stringList.h"
 
 class cuobjdumpInst
 {
 protected:
 	//instruction data
 	const char* m_label; //instruction label
-	stringList* m_predicate; //instruction predicate
+	std::list<std::string>* m_predicate; //instruction predicate
 	const char* m_base; //instruction mnemonic
-	stringList* m_baseModifiers; //base modifiers
-	stringList* m_typeModifiers; //operand types
-	stringList* m_operands; //operands
-	stringList* m_predicateModifiers; //predicate modifiers
+	std::list<std::string>* m_baseModifiers; //base modifiers
+	std::list<std::string>* m_typeModifiers; //operand types
+	std::list<std::string>* m_operands; //operands
+	std::list<std::string>* m_predicateModifiers; //predicate modifiers
 
 public:
 	//Constructor
 	cuobjdumpInst();
+	~cuobjdumpInst();
 
 	//accessors
 	const char* getBase();
-	stringList* getTypeModifiers();
+	std::list<std::string>* getTypeModifiers();
 
 	//Mutators
 	void setLabel(const char* setLabelValue);
@@ -73,7 +73,7 @@ public:
 	void printCuobjdumpPredicate();
 	void printCuobjdumpTypeModifiers();
 	void printCuobjdumpBaseModifiers();
-	void printCuobjdumpOperand(stringListPiece* currentPiece, std::string operandDelimiter, const char* base);
+	void printCuobjdumpOperand(std::string currentPiece, std::string operandDelimiter, const char* base);
 	void printCuobjdumpOperandlohi(std::string op);
 	void printCuobjdumpOperands();
 
@@ -83,6 +83,8 @@ public:
 	bool printHeaderInst();
 	void printCuobjdumpInst();
 	void printHeaderPtx();
+
+	static void printStringList(std::list<std::string>* strlist);
 };
 
 #endif //_CUOBJDUMPINST_H_