diff options
author | Chris Lattner <sabre@nondot.org> | 2004-01-06 05:37:16 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2004-01-06 05:37:16 +0000 |
commit | e1567ae5ef3dc5f8a089bfe85e43980a08b99ad1 (patch) | |
tree | 2f969c8c90c5f0697354a026f9b64d8cb6c1de40 | |
parent | 8b1125f53d41ae5befd87cb44839564321c8b791 (diff) | |
download | external_llvm-e1567ae5ef3dc5f8a089bfe85e43980a08b99ad1.zip external_llvm-e1567ae5ef3dc5f8a089bfe85e43980a08b99ad1.tar.gz external_llvm-e1567ae5ef3dc5f8a089bfe85e43980a08b99ad1.tar.bz2 |
* Implement set/show args
* Implement support for arguments to the 'run' command
* Minor cleanups and fixes
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10703 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | tools/llvm-db/CLIDebugger.h | 13 | ||||
-rw-r--r-- | tools/llvm-db/Commands.cpp | 62 |
2 files changed, 64 insertions, 11 deletions
diff --git a/tools/llvm-db/CLIDebugger.h b/tools/llvm-db/CLIDebugger.h index 046c2e8..e2dbaaf 100644 --- a/tools/llvm-db/CLIDebugger.h +++ b/tools/llvm-db/CLIDebugger.h @@ -184,16 +184,21 @@ namespace llvm { /// start executing the program. void startProgramRunning(); + /// printSourceLine - Print the specified line of the current source file. + /// If the specified line is invalid (the source file could not be loaded or + /// the line number is out of range), don't print anything, but return true. + bool printSourceLine(unsigned LineNo); + /// parseLineSpec - Parses a line specifier, for use by the 'list' command. /// If SourceFile is returned as a void pointer, then it was not specified. /// If the line specifier is invalid, an exception is thrown. void parseLineSpec(std::string &LineSpec, const SourceFile *&SourceFile, unsigned &LineNo); - /// printSourceLine - Print the specified line of the current source file. - /// If the specified line is invalid (the source file could not be loaded or - /// the line number is out of range), don't print anything, but return true. - bool printSourceLine(unsigned LineNo); + /// parseProgramOptions - This method parses the Options string and loads it + /// as options to be passed to the program. This is used by the run command + /// and by 'set args'. + void parseProgramOptions(std::string &Options); }; } diff --git a/tools/llvm-db/Commands.cpp b/tools/llvm-db/Commands.cpp index 9d0bcba..cd1797c 100644 --- a/tools/llvm-db/Commands.cpp +++ b/tools/llvm-db/Commands.cpp @@ -191,7 +191,22 @@ getOptionalUnsignedIntegerOption(const char *Msg, unsigned Default, // And parse normally. return getUnsignedIntegerOption(Msg, Val, isOnlyOption); } - + + +/// parseProgramOptions - This method parses the Options string and loads it +/// as options to be passed to the program. This is used by the run command +/// and by 'set args'. +void CLIDebugger::parseProgramOptions(std::string &Options) { + // FIXME: tokenizing by whitespace is clearly incorrect. Instead we should + // honor quotes and other things that a shell would. Also in the future we + // should support redirection of standard IO. + + std::vector<std::string> Arguments; + for (std::string A = getToken(Options); !A.empty(); A = getToken(Options)) + Arguments.push_back(A); + Dbg.setProgramArguments(Arguments.begin(), Arguments.end()); +} + //===----------------------------------------------------------------------===// // Program startup and shutdown options @@ -227,7 +242,7 @@ void CLIDebugger::fileCommand(std::string &Options) { assert(Dbg.isProgramLoaded() && "loadProgram succeeded, but not program loaded!"); TheProgramInfo = new ProgramInfo(Dbg.getProgram()); - std::cout << "success loading '" << Dbg.getProgramPath() << "'!\n"; + std::cout << "successfully loaded '" << Dbg.getProgramPath() << "'!\n"; } } @@ -276,12 +291,15 @@ void CLIDebugger::quitCommand(std::string &Options) { //===----------------------------------------------------------------------===// void CLIDebugger::runCommand(std::string &Options) { - if (!getToken(Options).empty()) throw "run arguments not supported yet."; if (!Dbg.isProgramLoaded()) throw "No program loaded."; if (Dbg.isProgramRunning() && !askYesNo("The program is already running. Restart from the beginning?")) return; + // Parse all of the options to the run command, which specify program + // arguments to run with. + parseProgramOptions(Options); + eliminateRunInfo(); // Start the program running. @@ -455,6 +473,24 @@ void CLIDebugger::frameCommand(std::string &Options) { //===----------------------------------------------------------------------===// void CLIDebugger::breakCommand(std::string &Options) { + // Figure out where the user wants a breakpoint. + const SourceFile *File; + unsigned LineNo; + + // Check to see if the user specified a line specifier. + std::string Option = getToken(Options); // strip whitespace + if (!Option.empty()) { + Options = Option + Options; // reconstruct string + + // Parse the line specifier. + parseLineSpec(FirstLineSpec, File, LineNo); + } else { + // Build a line specifier for the current stack frame. + throw "FIXME: breaking at the current location is not implemented yet!"; + } + + + throw "breakpoints not implemented yet!"; } @@ -628,7 +664,7 @@ void CLIDebugger::listCommand(std::string &Options) { assert(Tok == "-"); StartLine = LineListedStart-ListSize; EndLine = LineListedStart; - if ((int)StartLine < 0) StartLine = 1; + if ((int)StartLine <= 0) StartLine = 1; } } else { // Must be a normal line specifier. @@ -640,7 +676,7 @@ void CLIDebugger::listCommand(std::string &Options) { // ListSize lines centered at the specified line. if (File != 0) CurrentFile = File; StartLine = LineNo - (ListSize+1)/2; - if ((int)StartLine < 0) StartLine = 1; + if ((int)StartLine <= 0) StartLine = 1; EndLine = StartLine + ListSize; } @@ -705,7 +741,9 @@ void CLIDebugger::setCommand(std::string &Options) { if (What.empty()) throw "set command expects at least two arguments."; - if (What == "language") { + if (What == "args") { + parseProgramOptions(Options); + } else if (What == "language") { std::string Lang = getToken(Options); if (!getToken(Options).empty()) throw "set language expects one argument at most."; @@ -746,7 +784,17 @@ void CLIDebugger::showCommand(std::string &Options) { if (What.empty() || !getToken(Options).empty()) throw "show command expects one argument."; - if (What == "language") { + if (What == "args") { + std::cout << "Argument list to give program when started is \""; + // FIXME: This doesn't print stuff correctly if the arguments have spaces in + // them, but currently the only way to get that is to use the --args command + // line argument. This should really handle escaping all hard characters as + // needed. + for (unsigned i = 0, e = Dbg.getNumProgramArguments(); i != e; ++i) + std::cout << (i ? " " : "") << Dbg.getProgramArgument(i); + std::cout << "\"\n"; + + } else if (What == "language") { std::cout << "The current source language is '"; if (CurrentLanguage) std::cout << CurrentLanguage->getSourceLanguageName(); |