Refactor breakpoint class

Author: prateekroy

breakpoint.hpp

@@ -7,24 +7,21 @@ using namespace std;
 
 class breakpoint{
 		public:
-		uint64_t pid; uint64_t addr;
-		uint64_t orig_data;
-		breakpoint(){}
-		breakpoint(uint64_t _pid, uint64_t _addr){pid = _pid; addr = _addr;}
-		void set_breakpoint(){
-			orig_data = ptrace(PTRACE_PEEKTEXT, pid, addr, 0);			
+		static int64_t set_breakpoint(int pid, uint64_t addr){
+			uint64_t orig_data = ptrace(PTRACE_PEEKTEXT, pid, addr, 0);			
 			printf("Address : %lx Orig Data : %lx\n", addr, orig_data);
 			uint64_t new_data = (orig_data&~0xFF)|0xCC; 		//Insert a int3 = 0xcc
 			printf("New Data : %lx\n", new_data);
 			ptrace(PTRACE_POKETEXT, pid, addr, new_data);
+			return orig_data;
 		}
 
-		void unset_breakpoint(uint64_t in_addr, uint64_t in_data)
+		static void unset_breakpoint(uint64_t pid, uint64_t in_addr, uint64_t in_data)
 		{
 			//uint64_t data = ptrace(PTRACE_PEEKTEXT, pid, addr, 0);
 			printf("New Data : %lx \n", in_data);
-            uint64_t new_data = in_data;         //Insert a int3 = 0xcc
+			uint64_t new_data = in_data;         //Insert a int3 = 0xcc
 			printf("Restore Address : %ld Orig Data : %lx\n", in_addr, new_data);
-            ptrace(PTRACE_POKETEXT, pid, in_addr, new_data);			
+			ptrace(PTRACE_POKETEXT, pid, in_addr, new_data);			
 		}
 };

debugger.cpp

@@ -29,7 +29,7 @@ void run_target(string prog)
 }
 
 map<uint64_t, uint64_t> originalInst;
-bool continue_execution(int pid, breakpoint* bp)
+bool continue_execution(int pid)
 {
 	// Lets continue execution
 	ptrace(PTRACE_CONT, pid, 0, 0);
@@ -48,15 +48,14 @@ bool continue_execution(int pid, breakpoint* bp)
 	ptrace(PTRACE_SETREGS, pid, NULL, &regs);
 
 	// Replace the original instruction
-	bp->unset_breakpoint(regs.rip, originalInst[regs.rip]);	
+	breakpoint::unset_breakpoint(pid, regs.rip, originalInst[regs.rip]);	
 	return true;
 }
 
 void run_debugger(int pid)
 {
 	wait(NULL);
 
-	breakpoint* bp = new breakpoint();	
 	while(1)
 	{
 		cout << "\n>";
@@ -67,14 +66,12 @@ void run_debugger(int pid)
 
 		if(iaddr == 1)
 		{
-			if(!continue_execution(pid, bp))return;	
+			if(!continue_execution(pid))return;	
 		}
 		else
 		{
-			bp->pid = pid; bp->addr = iaddr;
-			bp->set_breakpoint();
 			// Save the original instruction data
-			originalInst[bp->addr] = bp->orig_data;
+			originalInst[iaddr] = breakpoint::set_breakpoint(pid, iaddr);
 		}
 	}
 }