Fix several problems reported by valgrind

[gldbg.git] / source / commandinterpreter.cpp

diff --git a/source/commandinterpreter.cpp b/source/commandinterpreter.cpp
index 2a28f69acd6e06a2dc8c523ef2e58a388a62124d..b8a10a99d03cb0f30a4048c4754f370d42f09f8b 100644 (file)
--- a/source/commandinterpreter.cpp
+++ b/source/commandinterpreter.cpp
@@ -1,23 +1,15 @@
-/* $Id$
-
-This file is part of gldbg
-Copyright © 2009-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the GPL
-*/
-
+#include <stdexcept>
+#include <cstdlib>
 #include <signal.h>
 #include <readline/readline.h>
-#include <msp/core/except.h>
-#include <msp/io/print.h>
-#include <msp/strings/lexicalcast.h>
-#include <msp/strings/utils.h>
+#include "breakpoint.h"
 #include "commandinterpreter.h"
 #include "enums.h"
+#include "functions.h"
 #include "gldbg.h"
 #include "tracer.h"
 
 using namespace std;
-using namespace Msp;
 
 CommandInterpreter::CommandInterpreter(GlDbg &d):
        gldbg(d)
@@ -34,6 +26,19 @@ CommandInterpreter::CommandInterpreter(GlDbg &d):
 
        register_command("run", this, &CommandInterpreter::cmd_run)
                .set_help("Starts the program");
+       register_command("break", this, &CommandInterpreter::cmd_break)
+               .set_help("Sets a breakpoint",
+                       "break FUNC\n"
+                       "  Makes program execution stop at FUNC\n");
+       register_command("unbreak", this, &CommandInterpreter::cmd_unbreak)
+               .set_help("Removes a breakpoint",
+                       "unbreak FUNC\n"
+                       "  Makes program execution no longer stop at FUNC\n");
+       register_command("next", this, &CommandInterpreter::cmd_next)
+               .set_help("Resumes program execution until the next function call");
+       commands["step"] = new CommandAlias(commands["next"]);
+       register_command("finish", this, &CommandInterpreter::cmd_finish)
+               .set_help("Resumes program execution until the next function return");
        register_command("continue", this, &CommandInterpreter::cmd_continue)
                .set_help("Resumes program execution");
        register_command("kill", this, &CommandInterpreter::cmd_kill)
@@ -48,18 +53,24 @@ CommandInterpreter::CommandInterpreter(GlDbg &d):
 
 }
 
+CommandInterpreter::~CommandInterpreter()
+{
+       for(CommandMap::iterator i=commands.begin(); i!=commands.end(); ++i)
+               delete i->second;
+}
+
 void CommandInterpreter::execute(const string &cmd)
 {
        unsigned space = cmd.find(' ');
        string name = cmd.substr(0, space);
        CommandMap::const_iterator i = commands.lower_bound(name);
        if(i==commands.end() || i->first.compare(0, name.size(), name))
-               throw KeyError("Unknown command", name);
+               throw runtime_error("Unknown command "+name);
        if(i->first!=name)
        {
                CommandMap::const_iterator j = i;
                if((++j)!=commands.end() && !j->first.compare(0, name.size(), name))
-                       throw KeyError("Ambiguous command", name);
+                       throw runtime_error("Ambiguous command "+name);
        }
 
        string args;
@@ -75,21 +86,21 @@ void CommandInterpreter::cmd_help(const string &args)
        {
                for(CommandMap::const_iterator i=commands.begin(); i!=commands.end(); ++i)
                        if(!dynamic_cast<const CommandAlias *>(i->second))
-                               IO::print("%-10s : %s\n", i->first, i->second->get_description());
+                               printf("%-10s : %s\n", i->first.c_str(), i->second->get_description().c_str());
        }
        else
        {
                CommandMap::const_iterator i = commands.find(args);
                if(i==commands.end())
-                       throw KeyError("Unknown command", args);
+                       throw runtime_error("Unknown command "+args);
 
                const Command *cmd = i->second;
                while(const CommandAlias *alias = dynamic_cast<const CommandAlias *>(cmd))
                        cmd = alias->get_target();
 
-               IO::print("%s : %s\n", i->first, cmd->get_description());
+               printf("%s : %s\n", i->first.c_str(), cmd->get_description().c_str());
                if(!cmd->get_help().empty())
-                       IO::print("\n%s", cmd->get_help());
+                       printf("\n%s", cmd->get_help().c_str());
        }
 }
 
@@ -98,9 +109,39 @@ void CommandInterpreter::cmd_run(const string &)
        gldbg.launch();
 }
 
+void CommandInterpreter::cmd_break(const string &args)
+{
+       unsigned short func = get_function(args.c_str());
+       if(!func)
+               throw runtime_error("Unknown function");
+
+       gldbg.set_breakpoint(func, BREAK_CALL, 0);
+}
+
+void CommandInterpreter::cmd_unbreak(const string &args)
+{
+       unsigned short func = get_function(args.c_str());
+       if(!func)
+               throw runtime_error("Unknown function");
+
+       gldbg.clear_breakpoint(func, BREAK_CALL, 0);
+}
+
+void CommandInterpreter::cmd_next(const string &)
+{
+       gldbg.set_breakpoint(0, BREAK_CALL, 0);
+       gldbg.get_process().resume();
+}
+
+void CommandInterpreter::cmd_finish(const string &)
+{
+       gldbg.set_breakpoint(0, BREAK_RETURN, 0);
+       gldbg.get_process().resume();
+}
+
 void CommandInterpreter::cmd_continue(const string &)
 {
-       IO::print("Continuing.\n");
+       printf("Continuing.\n");
        gldbg.get_process().resume();
 }
 
@@ -117,10 +158,13 @@ void CommandInterpreter::cmd_signal(const string &args)
                sig = SIGSEGV;
        else if(args=="TERM" || args=="SIGTERM")
                sig = SIGTERM;
-       else if(isnumrc(args))
-               sig = lexical_cast<unsigned>(args);
        else
-               throw InvalidParameterValue("Invalid signal specification");
+       {
+               char *end;
+               sig = strtoul(args.c_str(), &end, 0);
+               if(end && *end)
+                       throw runtime_error("Invalid signal specification");
+       }
        gldbg.get_process().resume(sig);
 }
 
@@ -133,7 +177,7 @@ void CommandInterpreter::cmd_exit(const string &)
 {
        if(gldbg.get_process().get_state()!=Process::INACTIVE)
        {
-               IO::print("Program is still running.  Kill it?\n");
+               printf("Program is still running.  Kill it?\n");
                char *answer = readline("[y/n] ");
                if(answer[0]=='y')
                {
@@ -141,7 +185,7 @@ void CommandInterpreter::cmd_exit(const string &)
                        gldbg.quit(true);
                }
                else
-                       IO::print("Not confirmed.\n");
+                       printf("Not confirmed.\n");
        }
        else
                gldbg.quit(false);