X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fcore%2FBasicBlock.hxx;h=3f877879c95942f6defc15111a69938b02948969;hp=9018b5b56aa8172d10d66e8f4248aeb9bb87de57;hb=4443ad3e38327c776dcc68538591456d37c9ed6f;hpb=9fe5caf6408d1b7d5eb86dacdb211bd22335398a

diff --git a/src/core/BasicBlock.hxx b/src/core/BasicBlock.hxx
index 9018b5b..3f87787 100644
--- a/src/core/BasicBlock.hxx
+++ b/src/core/BasicBlock.hxx
@@ -4,28 +4,21 @@
 #include <cassert>
 #include <string>
 #include <sstream>
+#include <list>
 
+class Instruction;
 class Disassembler;
 class InformationManager;
+class QXmlStreamWriter;
+class QXmlStreamReader;
 
 class BasicBlock {
 public:
-	BasicBlock(uint64_t start_address, Disassembler * disassembler,
-	           InformationManager* manager)
-		: start_address(start_address)
-		, disassembler(disassembler)
-		, manager(manager) {
-		next_blocks[0] = 0;
-		next_blocks[1] = 0;
-	}
-
-	uint64_t getStartAddress() const {
-		return start_address;
-	}
-
-	uint64_t getEndAddress() const {
-		return end_address;
-	}
+	InformationManager* getManager() const {return manager;}
+	uint64_t getStartAddress() const {return start_address;}
+	uint64_t getEndAddress() const {return end_address;}
+	void setStartAddress(uint64_t address) {start_address = address;}
+	void setEndAddress(uint64_t address) {end_address = address;}
 
 	uint64_t getNextBlock(size_t index) const {
 		assert(index < 2);
@@ -37,33 +30,32 @@ public:
 		next_blocks[index] = address;
 	}
 
-	void setStartAddress(uint64_t address) {
-		start_address = address;
-	}
-
-	void setEndAddress(uint64_t address) {
-		end_address = address;
-	}
-
-	std::string getName() {
+	std::string getName() const {
 		std::stringstream s;
 		s << "BLOCK_" << std::hex << start_address << '_' << end_address;
 		return s.str();
 	}
 
-	Disassembler * getDisassembler() {
-		return disassembler;
-	}
+	std::list<Instruction> getInstructions() const;
+	void serialize(QXmlStreamWriter& stream);
+	static BasicBlock* deserialize(QXmlStreamReader& stream, InformationManager* manager);
 
-	InformationManager* getManager() const {
-		return manager;
-	}
 private:
+	BasicBlock(uint64_t start_address, InformationManager* manager)
+		: start_address(start_address)
+		, end_address(0)
+		, manager(manager) {
+		next_blocks[0] = 0;
+		next_blocks[1] = 0;
+	}
+
 	uint64_t start_address;
 	uint64_t end_address;
 	Disassembler* disassembler;
 	InformationManager* manager;
 	uint64_t next_blocks[2];
+
+	friend class InformationManager;
 };
 
 #endif