+ +

The Test Program and Input

+ +

We have a simple C program (dictionary.c) that reads in a text file, and + stores all the words from the file in a Binary Search Tree, sorted + alphabetically. It then enters a loop prompting the user for a word, searching + for the word in the tree (using Binary Search), and reporting to the user + whether or not it found the word in the tree.

+ +

The input text file we are using to test our program contains the text for + William Shakespeare's famous tragedy "Romeo and Juliet".

+ +

The Bug

+ +

When we try running our program, we find there is a problem. While it + successfully finds some of the words we would expect to find, such as "love" + or "sun", it fails to find the word "Romeo", which MUST be in the input text + file:

+ +


+                   % ./dictionary Romeo-and-Juliet.txt

+                   Dictionary loaded.

+                   Enter search word: love

+                   Yes!

+                   Enter search word: sun

+                   Yes!

+                   Enter search word: Romeo

+                   No!

+                   Enter search word: ^D

+                   %

+

+ +

+ + +

Is the word in our tree: Using Depth First Search

+ +

Our first job is to determine if the word "Romeo" actually got inserted into + the tree or not. Since "Romeo and Juliet" has thousands of words, trying to + examine our binary search tree by hand is completely impractical. Therefore we + will write a Python script to search the tree for us. We will write a recursive + Depth First Search function that traverses the entire tree searching for a word, + and maintaining information about the path from the root of the tree to the + current node. If it finds the word in the tree, it returns the path from the + root to the node containing the word. This is what our DFS function in Python + would look like, with line numbers added for easy reference in later + explanations:

+ +


+
+ 1: def DFS (root, word, cur_path):
+ 2:     root_word_ptr = root.GetChildMemberWithName ("word")
+ 3:     left_child_ptr = root.GetChildMemberWithName ("left")
+ 4:     right_child_ptr = root.GetChildMemberWithName ("right")
+ 5:     root_word = root_word_ptr.GetSummary()
+ 6:     end = len (root_word) - 1
+ 7:     if root_word[0] == '"' and root_word[end] == '"':
+ 8:         root_word = root_word[1:end]
+ 9:     end = len (root_word) - 1
+10:     if root_word[0] == '\'' and root_word[end] == '\'':
+11:        root_word = root_word[1:end]
+12:     if root_word == word:
+13:         return cur_path
+14:     elif word < root_word:
+15:         if left_child_ptr.GetValue() == None:
+16:             return ""
+17:         else:
+18:             cur_path = cur_path + "L"
+19:             return DFS (left_child_ptr, word, cur_path)
+20:     else:
+21:         if right_child_ptr.GetValue() == None:
+22:             return ""
+23:         else:
+24:             cur_path = cur_path + "R"
+25:             return DFS (right_child_ptr, word, cur_path)
+
+

+ +

+ + +

Accessing & Manipulating Program Variables in Python +

+ +

Before we can call any Python function on any of our program's variables, we + need to get the variable into a form that Python can access. To show you how to + do this we will look at the parameters for the DFS function. The first + parameter is going to be a node in our binary search tree, put into a Python + variable. The second parameter is the word we are searching for (a string), and + the third parameter is a string representing the path from the root of the tree + to our current node.

+ +

The most interesting parameter is the first one, the Python variable that + needs to contain a node in our search tree. How can we take a variable out of + our program and put it into a Python variable? What kind of Python variable + will it be? The answers are to use the LLDB API functions, provided as part of + the LLDB Python module. Running Python from inside LLDB, LLDB will + automatically give us our current frame object as a Python variable, + "lldb.frame". This variable has the type "SBFrame" (see the LLDB API for + more information about SBFrame objects). One of the things we can do with a + frame object, is to ask it to find and return its local variable. We will call + the API function "FindVariable" on the lldb.frame object to give us our + dictionary variable as a Python variable:

+ +


+                      root = lldb.frame.FindVariable ("dictionary")
+

+ +

The line above, executed in the Python script interpreter in LLDB, asks the + current frame to find the variable named "dictionary" and return it. We then + store the returned value in the Python variable named "root". This answers the + question of HOW to get the variable, but it still doesn't explain WHAT actually + gets put into "root". If you examine the LLDB API, you will find that the + SBFrame method "FindVariable" returns an object of type SBValue. SBValue + objects are used, among other things, to wrap up program variables and values. + There are many useful methods defined in the SBValue class to allow you to get + information or children values out of SBValues. For complete information, see + the header file SBValue.h. The + SBValue methods that we use in our DFS function are + GetChildMemberWithName(), + GetSummary(), and GetValue().

+ +

+ + +

Explaining Depth First Search Script in Detail

+ +

"DFS" Overview. Before diving into the details of this + code, it would be best to give a high-level overview of what it does. The nodes + in our binary search tree were defined to have type tree_node *, + which is defined as: + + +

typedef struct tree_node
+{
+  const char *word;
+  struct tree_node *left;
+  struct tree_node *right;
+} tree_node;

+ +

Lines 2-11 of DFS are getting data out of the current tree node and getting + ready to do the actual search; lines 12-25 are the actual depth-first search. + Lines 2-4 of our DFS function get the word, left and + right fields out of the current node and store them in Python + variables. Since root_word_ptr is a pointer to our word, and we + want the actual word, line 5 calls GetSummary() to get a string + containing the value out of the pointer. Since GetSummary() adds + quotes around its result, lines 6-11 strip surrounding quotes off the word.

+ +

Line 12 checks to see if the word in the current node is the one we are + searching for. If so, we are done, and line 13 returns the current path. + Otherwise, line 14 checks to see if we should go left (search word comes before + the current word). If we decide to go left, line 15 checks to see if the left + pointer child is NULL ("None" is the Python equivalent of NULL). If the left + pointer is NULL, then the word is not in this tree and we return an empty path + (line 16). Otherwise, we add an "L" to the end of our current path string, to + indicate we are going left (line 18), and then recurse on the left child (line + 19). Lines 20-25 are the same as lines 14-19, except for going right rather + than going left.

+ +

One other note: Typing something as long as our DFS function directly into + the interpreter can be difficult, as making a single typing mistake means having + to start all over. Therefore we recommend doing as we have done: Writing your + longer, more complicated script functions in a separate file (in this case + tree_utils.py) and then importing it into your LLDB Python interpreter.

+ +

+ + +

Seeing the DFS Script in Action

+ + +

At this point we are ready to use the DFS function to see if the word "Romeo" + is in our tree or not. To actually use it in LLDB on our dictionary program, + you would do something like this:

+ +


+                     % lldb

+                     (lldb) process attach -n "dictionary"

+                     Architecture set to: x86_64.

+                     Process 521 stopped

+                     * thread #1: tid = 0x2c03, 0x00007fff86c8bea0 libSystem.B.dylib`read$NOCANCEL + 8, stop reason = signal SIGSTOP

+                     frame #0: 0x00007fff86c8bea0 libSystem.B.dylib`read$NOCANCEL + 8

+                     (lldb) br s -n find_word

+                     Breakpoint created: 1: name = 'find_word', locations = 1, resolved = 1

+                     (lldb) c

+                     Process 521 resuming

+                     Process 521 stopped

+                     * thread #1: tid = 0x2c03, 0x0000000100001830 dictionary`find_word + 16 

+                     at dictionary.c:105, stop reason = breakpoint 1.1

+                     frame #0: 0x0000000100001830 dictionary`find_word + 16 at dictionary.c:105

+                     102 int

+                     103 find_word (tree_node *dictionary, char *word)

+                     104 {

+                     -> 105   if (!word || !dictionary)

+                     106     return 0;

+                     107 

+                     108   int compare_value = strcmp (word, dictionary->word);

+                     (lldb) script

+                     Python Interactive Interpreter. To exit, type 'quit()', 'exit()' or Ctrl-D.

+                     >>> import tree_utils

+                     >>> root = lldb.frame.FindVariable ("dictionary")

+                     >>> current_path = ""

+                     >>> path = tree_utils.DFS (root, "Romeo", current_path)

+                     >>> print path

+                     LLRRL

+                     >>> ^D

+                     (lldb) 

+

+ +

The first bit of code above shows starting lldb, attaching to the dictionary + program, and getting to the find_word function in LLDB. The interesting part + (as far as this example is concerned) begins when we enter the + script command and drop into the embedded interactive Python + interpreter. We will go over this Python code line by line. The first line

+ +


+                     import tree_utils
+

+ +

imports the file where we our DFS function, tree_utils.py, into Python. + Notice that to import the file we leave off the ".py" extension. We can now + call any function in that file, giving it the prefix "tree_utils.", so that + Python knows where to look for the function. The line

+ +


+                     root = lldb.frame.FindVariable ("dictionary")
+

+ +

gets our program variable "dictionary" (which contains the binary search + tree) and puts it into the Python variable "root". See + Accessing & Manipulating Program Variables in Python + above for more details about how this works. The next line is

+ +


+                     current_path = ""
+

+ +

This line initializes the current_path from the root of the tree to our + current node. Since we are starting at the root of the tree, our current path + starts as an empty string. As we go right and left through the tree, the DFS + function will append an 'R' or an 'L' to the current path, as appropriate. The + line

+ +


+                     path = tree_utils.DFS (root, "Romeo", current_path)
+

+ +

calls our DFS function (prefixing it with the module name so that Python can + find it). We pass in our binary tree stored in the variable root, + the word we are searching for, and our current path. We assign whatever path + the DFS function returns to the Python variable path.

+ + +

Finally, we want to see if the word was found or not, and if so we want to + see the path through the tree to the word. So we do

+ +


+                     print path
+

+ +

From this we can see that the word "Romeo" was indeed found in the tree, and + the path from the root of the tree to the node containing "Romeo" is + left-left-right-right-left.

+ +

+ + +

What next? Using Breakpoint Command Scripts...

+ +

We are halfway to figuring out what the problem is. We know the word we are + looking for is in the binary tree, and we know exactly where it is in the binary + tree. Now we need to figure out why our binary search algorithm is not finding + the word. We will do this using breakpoint command scripts.

+ + +

The idea is as follows. The binary search algorithm has two main decision + points: the decision to follow the right branch; and, the decision to follow + the left branch. We will set a breakpoint at each of these decision points, and + attach a Python breakpoint command script to each breakpoint. The breakpoint + commands will use the global path Python variable that we got from + our DFS function. Each time one of these decision breakpoints is hit, the script + will compare the actual decision with the decision the front of the + path variable says should be made (the first character of the + path). If the actual decision and the path agree, then the front character is + stripped off the path, and execution is resumed. In this case the user never + even sees the breakpoint being hit. But if the decision differs from what the + path says it should be, then the script prints out a message and does NOT resume + execution, leaving the user sitting at the first point where a wrong decision is + being made.

+ +

+ + +

Side Note: Python Breakpoint Command Scripts are NOT What They Seem

+ +

What do we mean by that? When you enter a Python breakpoint command in LLDB, + it appears that you are entering one or more plain lines of Python. BUT LLDB + then takes what you entered and wraps it into a Python FUNCTION (just like using + the "def" Python command). It automatically gives the function an obscure, + unique, hard-to-stumble-across function name, and gives it two parameters: + frame and bp_loc. When the breakpoint gets hit, LLDB + wraps up the frame object where the breakpoint was hit, and the breakpoint + location object for the breakpoint that was hit, and puts them into Python + variables for you. It then calls the Python function that was created for the + breakpoint command, and passes in the frame and breakpoint location objects.

+ +

So, being practical, what does this mean for you when you write your Python + breakpoint commands? It means that there are two things you need to keep in + mind: 1. If you want to access any Python variables created outside your script, + you must declare such variables to be global. If you do not + declare them as global, then the Python function will treat them as local + variables, and you will get unexpected behavior. 2. All Python + breakpoint command scripts automatically have a frame and a + bp_loc variable. The variables are pre-loaded by LLDB + with the correct context for the breakpoint. You do not have to use these + variables, but they are there if you want them.

+ +

+ + +

The Decision Point Breakpoint Commands

+ +

This is what the Python breakpoint command script would look like for the + decision to go right:

+ +


+global path
+if path[0] == 'R':
+    path = path[1:]
+    thread = frame.GetThread()
+    process = thread.GetProcess()
+    process.Continue()
+else:
+    print "Here is the problem; going right, should go left!"
+

+ +

Just as a reminder, LLDB is going to take this script and wrap it up in a + function, like this:

+ +


+def some_unique_and_obscure_function_name (frame, bp_loc):
+    global path
+    if path[0] == 'R':
+        path = path[1:]
+        thread = frame.GetThread()
+        process = thread.GetProcess()
+        process.Continue()
+    else:
+        print "Here is the problem; going right, should go left!"
+

+ +

LLDB will call the function, passing in the correct frame and breakpoint + location whenever the breakpoint gets hit. There are several things to notice + about this function. The first one is that we are accessing and updating a + piece of state (the path variable), and actually conditioning our + behavior based upon this variable. Since the variable was defined outside of + our script (and therefore outside of the corresponding function) we need to tell + Python that we are accessing a global variable. That is what the first line of + the script does. Next we check where the path says we should go and compare it to + our decision (recall that we are at the breakpoint for the decision to go + right). If the path agrees with our decision, then we strip the first character + off of the path.

+ +

Since the decision matched the path, we want to resume execution. To do this + we make use of the frame parameter that LLDB guarantees will be + there for us. We use LLDB API functions to get the current thread from the + current frame, and then to get the process from the thread. Once we have the + process, we tell it to resume execution (using the Continue() API + function).

+ +

If the decision to go right does not agree with the path, then we do not + resume execution. We allow the breakpoint to remain stopped (by doing nothing), + and we print an informational message telling the user we have found the + problem, and what the problem is.

+ +

Actually Using the Breakpoint Commands

+ +

Now we will look at what happens when we actually use these breakpoint + commands on our program. Doing a source list -n find_word shows + us the function containing our two decision points. Looking at the code below, + we see that we want to set our breakpoints on lines 113 and 115:

+ +


+(lldb) source list -n find_word
+File: /Volumes/Data/HD2/carolinetice/Desktop/LLDB-Web-Examples/dictionary.c.
+101 
+102 int
+103 find_word (tree_node *dictionary, char *word)
+104 {
+105   if (!word || !dictionary)
+106     return 0;
+107 
+108   int compare_value = strcmp (word, dictionary->word);
+109 
+110   if (compare_value == 0)
+111     return 1;
+112   else if (compare_value < 0)
+113     return find_word (dictionary->left, word);
+114   else
+115     return find_word (dictionary->right, word);
+116 }
+117 
+

+ +

So, we set our breakpoints, enter our breakpoint command scripts, and see + what happens:

+ +


+(lldb) breakpoint set -l 113
+Breakpoint created: 2: file ='dictionary.c', line = 113, locations = 1, resolved = 1
+(lldb) breakpoint set -l 115
+Breakpoint created: 3: file ='dictionary.c', line = 115, locations = 1, resolved = 1
+(lldb) breakpoint command add -s python 2
+Enter your Python command(s). Type 'DONE' to end.
+> global path
+> if (path[0] == 'L'):
+>     path = path[1:]
+>     thread = frame.GetThread()
+>     process = thread.GetProcess()
+>     process.Continue()
+> else:
+>     print "Here is the problem. Going left, should go right!"
+> DONE
+(lldb) breakpoint command add -s python 3
+Enter your Python command(s). Type 'DONE' to end.
+> global path
+> if (path[0] == 'R'):
+>     path = path[1:]
+>     thread = frame.GetThread()
+>     process = thread.GetProcess()
+>     process.Continue()
+> else:
+>     print "Here is the problem. Going right, should go left!"
+> DONE
+(lldb) continue
+Process 696 resuming
+Here is the problem. Going right, should go left!
+Process 696 stopped
+* thread #1: tid = 0x2d03, 0x000000010000189f dictionary`find_word + 127 at dictionary.c:115, stop reason = breakpoint 3.1
+  frame #0: 0x000000010000189f dictionary`find_word + 127 at dictionary.c:115
+    112   else if (compare_value < 0)
+    113     return find_word (dictionary->left, word);
+    114   else
+ -> 115     return find_word (dictionary->right, word);
+    116 }
+    117 
+    118 void
+(lldb)
+

+ + +

After setting our breakpoints, adding our breakpoint commands and continuing, + we run for a little bit and then hit one of our breakpoints, printing out the + error message from the breakpoint command. Apparently at this point the the + tree, our search algorithm decided to go right, but our path says the node we + want is to the left. Examining the word at the node where we stopped, and our + search word, we see:

+ +


+                     (lldb) expr dictionary->word

+                     (const char *) $1 = 0x0000000100100080 "dramatis"

+                     (lldb) expr word

+                     (char *) $2 = 0x00007fff5fbff108 "romeo"

+

+ +

So the word at our current node is "dramatis", and the word we are searching + for is "romeo". "romeo" comes after "dramatis" alphabetically, so it seems like + going right would be the correct decision. Let's ask Python what it thinks the + path from the current node to our word is:

+ +


+                     (lldb) script print path

+                     LLRRL

+

+ +

According to Python we need to go left-left-right-right-left from our current + node to find the word we are looking for. Let's double check our tree, and see + what word it has at that node:

+ +


+                     (lldb) expr dictionary->left->left->right->right->left->word

+                     (const char *) $4 = 0x0000000100100880 "Romeo"

+

+ +

So the word we are searching for is "romeo" and the word at our DFS location + is "Romeo". Aha! One is uppercase and the other is lowercase: We seem to have + a case conversion problem somewhere in our program (we do).

+ +

This is the end of our example on how you might use Python scripting in LLDB + to help you find bugs in your program.

+ +

Source Files for The Example

+ + +

+ +

The complete code for the Dictionary program (with case-conversion bug), + the DFS function and other Python script examples (tree_utils.py) used for this + example are available via following file links:

+ +tree_utils.py - Example Python functions using LLDB's API, including DFS
+dictionary.c - Sample dictionary program, with bug
+ +

The text for "Romeo and Juliet" can be obtained from the Gutenberg Project + (http://www.gutenberg.org).

+ + Propchange: lldb/trunk/www/scripting.html ------------------------------------------------------------------------------ svn:executable = * From gclayton at apple.com Thu Jun 2 18:50:04 2011 From: gclayton at apple.com (Greg Clayton) Date: Thu, 02 Jun 2011 23:50:04 -0000 Subject: [Lldb-commits] [lldb] r132515 - /lldb/trunk/www/sidebar.incl Message-ID: <20110602235004.C284F2A6C12C@llvm.org> Author: gclayton Date: Thu Jun 2 18:50:04 2011 New Revision: 132515 URL: http://llvm.org/viewvc/llvm-project?rev=132515&view=rev Log: Cleanup the sidebar and include a link to the new python scripting tutorial. Modified: lldb/trunk/www/sidebar.incl Modified: lldb/trunk/www/sidebar.incl URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/www/sidebar.incl?rev=132515&r1=132514&r2=132515&view=diff ============================================================================== --- lldb/trunk/www/sidebar.incl (original) +++ lldb/trunk/www/sidebar.incl Thu Jun 2 18:50:04 2011 @@ -8,8 +8,6 @@

From jingham at apple.com Thu Jun 2 18:58:26 2011 From: jingham at apple.com (Jim Ingham) Date: Thu, 02 Jun 2011 23:58:26 -0000 Subject: [Lldb-commits] [lldb] r132517 - in /lldb/trunk: include/lldb/Core/Debugger.h source/Breakpoint/BreakpointLocation.cpp source/Commands/CommandObjectBreakpointCommand.cpp source/Core/Debugger.cpp source/Target/Target.cpp Message-ID: <20110602235826.957952A6C12C@llvm.org> Author: jingham Date: Thu Jun 2 18:58:26 2011 New Revision: 132517 URL: http://llvm.org/viewvc/llvm-project?rev=132517&view=rev Log: Added Debugger::GetAsync{Output/Error}Stream, and use it to print parse errors when we go to run a breakpoint condition. Modified: lldb/trunk/include/lldb/Core/Debugger.h lldb/trunk/source/Breakpoint/BreakpointLocation.cpp lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp lldb/trunk/source/Core/Debugger.cpp lldb/trunk/source/Target/Target.cpp Modified: lldb/trunk/include/lldb/Core/Debugger.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Debugger.h?rev=132517&r1=132516&r2=132517&view=diff ============================================================================== --- lldb/trunk/include/lldb/Core/Debugger.h (original) +++ lldb/trunk/include/lldb/Core/Debugger.h Thu Jun 2 18:58:26 2011 @@ -321,6 +321,12 @@ return m_error_file; } + lldb::StreamSP + GetAsyncOutputStream (); + + lldb::StreamSP + GetAsyncErrorStream (); + CommandInterpreter & GetCommandInterpreter () { Modified: lldb/trunk/source/Breakpoint/BreakpointLocation.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/BreakpointLocation.cpp?rev=132517&r1=132516&r2=132517&view=diff ============================================================================== --- lldb/trunk/source/Breakpoint/BreakpointLocation.cpp (original) +++ lldb/trunk/source/Breakpoint/BreakpointLocation.cpp Thu Jun 2 18:58:26 2011 @@ -16,6 +16,7 @@ #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Breakpoint/BreakpointID.h" #include "lldb/Breakpoint/StoppointCallbackContext.h" +#include "lldb/Core/Debugger.h" #include "lldb/Core/Log.h" #include "lldb/Target/Target.h" #include "lldb/Target/ThreadPlan.h" @@ -219,9 +220,6 @@ if (m_hit_count <= GetIgnoreCount()) return false; - // Next in order of importance is the condition. See if it is true: - StreamString errors; - // We only run synchronous callbacks in ShouldStop: context->is_synchronous = true; should_stop = InvokeCallback (context); @@ -230,29 +228,40 @@ if (should_stop) { + // We need to make sure the user sees any parse errors in their condition, so we'll hook the + // constructor errors up to the debugger's Async I/O. + + StreamString errors; ThreadPlanSP condition_plan_sp(GetThreadPlanToTestCondition(context->exe_ctx, errors)); - log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS); - if (log && errors.GetSize() > 0) + + if (condition_plan_sp == NULL) { - log->Printf("Error evaluating condition: \"%s\".\n", errors.GetData()); + if (log) + log->Printf("Error evaluating condition: \"%s\"\n", errors.GetData()); + + Debugger &debugger = context->exe_ctx.target->GetDebugger(); + StreamSP error_sp = debugger.GetAsyncErrorStream (); + error_sp->PutCString ("Error parsing breakpoint condition:\n"); + error_sp->PutCString (errors.GetData()); + error_sp->EOL(); + error_sp->Flush(); + } - else if (condition_plan_sp != NULL) + else { + // Queue our condition, then continue so that we can run it. context->exe_ctx.thread->QueueThreadPlan(condition_plan_sp, false); - return false; + should_stop = false; } } - if (should_stop) + if (log) { - log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS); - if (log) - { - StreamString s; - GetDescription (&s, lldb::eDescriptionLevelVerbose); - log->Printf ("Hit breakpoint location: %s\n", s.GetData()); - } + StreamString s; + GetDescription (&s, lldb::eDescriptionLevelVerbose); + log->Printf ("Hit breakpoint location: %s, %s.\n", s.GetData(), should_stop ? "stopping" : "continuing"); } + return should_stop; } Modified: lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp?rev=132517&r1=132516&r2=132517&view=diff ============================================================================== --- lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp (original) +++ lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp Thu Jun 2 18:58:26 2011 @@ -803,10 +803,8 @@ // Rig up the results secondary output stream to the debugger's, so the output will come out synchronously // if the debugger is set up that way. - StreamSP output_stream (new StreamAsynchronousIO (debugger.GetCommandInterpreter(), - CommandInterpreter::eBroadcastBitAsynchronousOutputData)); - StreamSP error_stream (new StreamAsynchronousIO (debugger.GetCommandInterpreter(), - CommandInterpreter::eBroadcastBitAsynchronousErrorData)); + StreamSP output_stream (debugger.GetAsyncOutputStream()); + StreamSP error_stream (debugger.GetAsyncErrorStream()); result.SetImmediateOutputStream (output_stream); result.SetImmediateErrorStream (error_stream); Modified: lldb/trunk/source/Core/Debugger.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Debugger.cpp?rev=132517&r1=132516&r2=132517&view=diff ============================================================================== --- lldb/trunk/source/Core/Debugger.cpp (original) +++ lldb/trunk/source/Core/Debugger.cpp Thu Jun 2 18:58:26 2011 @@ -13,6 +13,7 @@ #include "lldb/Core/InputReader.h" #include "lldb/Core/RegisterValue.h" #include "lldb/Core/State.h" +#include "lldb/Core/StreamAsynchronousIO.h" #include "lldb/Core/StreamString.h" #include "lldb/Core/Timer.h" #include "lldb/Host/Terminal.h" @@ -600,6 +601,20 @@ } } +StreamSP +Debugger::GetAsyncOutputStream () +{ + return StreamSP (new StreamAsynchronousIO (GetCommandInterpreter(), + CommandInterpreter::eBroadcastBitAsynchronousOutputData)); +} + +StreamSP +Debugger::GetAsyncErrorStream () +{ + return StreamSP (new StreamAsynchronousIO (GetCommandInterpreter(), + CommandInterpreter::eBroadcastBitAsynchronousErrorData)); +} + DebuggerSP Debugger::FindDebuggerWithID (lldb::user_id_t id) { Modified: lldb/trunk/source/Target/Target.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=132517&r1=132516&r2=132517&view=diff ============================================================================== --- lldb/trunk/source/Target/Target.cpp (original) +++ lldb/trunk/source/Target/Target.cpp Thu Jun 2 18:58:26 2011 @@ -1199,12 +1199,8 @@ if (num_exe_ctx == 0) return; - StreamSP output_stream (new StreamAsynchronousIO (m_debugger.GetCommandInterpreter(), - CommandInterpreter::eBroadcastBitAsynchronousOutputData)); - StreamSP error_stream (new StreamAsynchronousIO (m_debugger.GetCommandInterpreter(), - CommandInterpreter::eBroadcastBitAsynchronousErrorData)); - result.SetImmediateOutputStream (output_stream); - result.SetImmediateErrorStream (error_stream); + result.SetImmediateOutputStream (m_debugger.GetAsyncOutputStream()); + result.SetImmediateErrorStream (m_debugger.GetAsyncErrorStream()); bool keep_going = true; bool hooks_ran = false; From ctice at apple.com Fri Jun 3 11:38:17 2011 From: ctice at apple.com (Caroline Tice) Date: Fri, 03 Jun 2011 16:38:17 -0000 Subject: [Lldb-commits] [lldb] r132554 - /lldb/trunk/www/scripting.html Message-ID: <20110603163817.C985C2A6C12C@llvm.org> Author: ctice Date: Fri Jun 3 11:38:17 2011 New Revision: 132554 URL: http://llvm.org/viewvc/llvm-project?rev=132554&view=rev Log: Make a few minor changes/corrections to scripting example on the web. Modified: lldb/trunk/www/scripting.html Modified: lldb/trunk/www/scripting.html URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/www/scripting.html?rev=132554&r1=132553&r2=132554&view=diff ============================================================================== --- lldb/trunk/www/scripting.html (original) +++ lldb/trunk/www/scripting.html Fri Jun 3 11:38:17 2011 @@ -210,15 +210,15 @@ you would do something like this:


-                     % lldb

-                     (lldb) process attach -n "dictionary"

+                     % lldb

+                     (lldb) process attach -n "dictionary"

                      Architecture set to: x86_64.

                      Process 521 stopped

                      * thread #1: tid = 0x2c03, 0x00007fff86c8bea0 libSystem.B.dylib`read$NOCANCEL + 8, stop reason = signal SIGSTOP

                      frame #0: 0x00007fff86c8bea0 libSystem.B.dylib`read$NOCANCEL + 8

-                     (lldb) br s -n find_word

+                     (lldb) breakpoint set -n find_word

                      Breakpoint created: 1: name = 'find_word', locations = 1, resolved = 1

-                     (lldb) c

+                     (lldb) continue

                      Process 521 resuming

                      Process 521 stopped

                      * thread #1: tid = 0x2c03, 0x0000000100001830 dictionary`find_word + 16 

@@ -231,15 +231,15 @@
                      106     return 0;

                      107 

                      108   int compare_value = strcmp (word, dictionary->word);

-                     (lldb) script

+                     (lldb) script

                      Python Interactive Interpreter. To exit, type 'quit()', 'exit()' or Ctrl-D.

-                     >>> import tree_utils

-                     >>> root = lldb.frame.FindVariable ("dictionary")

-                     >>> current_path = ""

-                     >>> path = tree_utils.DFS (root, "Romeo", current_path)

-                     >>> print path

+                     >>> import tree_utils

+                     >>> root = lldb.frame.FindVariable ("dictionary")

+                     >>> current_path = ""

+                     >>> path = tree_utils.DFS (root, "Romeo", current_path)

+                     >>> print path

                      LLRRL

-                     >>> ^D

+                     >>> ^D

                      (lldb)

@@ -253,7 +253,7 @@ import tree_utils -

imports the file where we our DFS function, tree_utils.py, into Python. +

imports the file where we wrote our DFS function, tree_utils.py, into Python. Notice that to import the file we leave off the ".py" extension. We can now call any function in that file, giving it the prefix "tree_utils.", so that Python knows where to look for the function. The line

From peter at pcc.me.uk Fri Jun 3 15:39:58 2011 From: peter at pcc.me.uk (Peter Collingbourne) Date: Fri, 03 Jun 2011 20:39:58 -0000 Subject: [Lldb-commits] [lldb] r132582 - /lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Message-ID: <20110603203958.357262A6C12C@llvm.org> Author: pcc Date: Fri Jun 3 15:39:58 2011 New Revision: 132582 URL: http://llvm.org/viewvc/llvm-project?rev=132582&view=rev Log: Scan dynamic symbol table of ELF object files Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp?rev=132582&r1=132581&r2=132582&view=diff ============================================================================== --- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (original) +++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Fri Jun 3 15:39:58 2011 @@ -1085,7 +1085,7 @@ for (SectionHeaderCollIter I = m_section_headers.begin(); I != m_section_headers.end(); ++I) { - if (I->sh_type == SHT_SYMTAB) + if (I->sh_type == SHT_SYMTAB || I->sh_type == SHT_DYNSYM) { const ELFSectionHeader &symtab_header = *I; user_id_t section_id = SectionIndex(I); From peter at pcc.me.uk Fri Jun 3 15:40:12 2011 From: peter at pcc.me.uk (Peter Collingbourne) Date: Fri, 03 Jun 2011 20:40:12 -0000 Subject: [Lldb-commits] [lldb] r132583 - /lldb/trunk/source/Expression/ClangExpressionParser.cpp Message-ID: <20110603204012.EFAF62A6C12C@llvm.org> Author: pcc Date: Fri Jun 3 15:40:12 2011 New Revision: 132583 URL: http://llvm.org/viewvc/llvm-project?rev=132583&view=rev Log: Disable MCJIT on non-Darwin platforms Currently the runtime dynamic linker lacks object file support for anything other than Mach-O. Modified: lldb/trunk/source/Expression/ClangExpressionParser.cpp Modified: lldb/trunk/source/Expression/ClangExpressionParser.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionParser.cpp?rev=132583&r1=132582&r2=132583&view=diff ============================================================================== --- lldb/trunk/source/Expression/ClangExpressionParser.cpp (original) +++ lldb/trunk/source/Expression/ClangExpressionParser.cpp Fri Jun 3 15:40:12 2011 @@ -52,7 +52,10 @@ #include "llvm/ADT/StringRef.h" #include "llvm/ExecutionEngine/ExecutionEngine.h" -//#define USE_STANDARD_JIT +#if !defined(__APPLE__) +#define USE_STANDARD_JIT +#endif + #if defined (USE_STANDARD_JIT) #include "llvm/ExecutionEngine/JIT.h" #else From peter at pcc.me.uk Fri Jun 3 15:40:38 2011 From: peter at pcc.me.uk (Peter Collingbourne) Date: Fri, 03 Jun 2011 20:40:38 -0000 Subject: [Lldb-commits] [lldb] r132584 - in /lldb/trunk/source/Plugins/Process: Utility/InferiorCallPOSIX.cpp Utility/InferiorCallPOSIX.h gdb-remote/ProcessGDBRemote.cpp Message-ID: <20110603204038.C3C4A2A6C12C@llvm.org> Author: pcc Date: Fri Jun 3 15:40:38 2011 New Revision: 132584 URL: http://llvm.org/viewvc/llvm-project?rev=132584&view=rev Log: Move inferior mmap/munmap call code into their own functions in utility lib Added: lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.h Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Added: lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp?rev=132584&view=auto ============================================================================== --- lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp (added) +++ lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp Fri Jun 3 15:40:38 2011 @@ -0,0 +1,179 @@ +#include "InferiorCallPOSIX.h" +#include "lldb/Core/StreamFile.h" +#include "lldb/Core/Value.h" +#include "lldb/Symbol/SymbolContext.h" +#include "lldb/Target/ExecutionContext.h" +#include "lldb/Target/Process.h" +#include "lldb/Target/Target.h" +#include "lldb/Target/ThreadPlanCallFunction.h" + +#include + +using namespace lldb; +using namespace lldb_private; + +bool lldb_private::InferiorCallMmap(Process *process, addr_t &allocated_addr, + addr_t addr, addr_t length, unsigned prot, + unsigned flags, addr_t fd, addr_t offset) { + Thread *thread = process->GetThreadList().GetSelectedThread().get(); + if (thread == NULL) + thread = process->GetThreadList().GetThreadAtIndex(0).get(); + + const bool append = true; + const bool include_symbols = true; + SymbolContextList sc_list; + const uint32_t count + = process->GetTarget().GetImages().FindFunctions (ConstString ("mmap"), + eFunctionNameTypeFull, + include_symbols, + append, + sc_list); + if (count > 0) + { + SymbolContext sc; + if (sc_list.GetContextAtIndex(0, sc)) + { + const uint32_t range_scope = eSymbolContextFunction | eSymbolContextSymbol; + const bool use_inline_block_range = false; + const bool stop_other_threads = true; + const bool discard_on_error = true; + const bool try_all_threads = true; + const uint32_t single_thread_timeout_usec = 500000; + + addr_t prot_arg, flags_arg = 0; + if (prot == eMmapProtNone) + prot_arg = PROT_NONE; + else { + prot_arg = 0; + if (prot & eMmapProtExec) + prot_arg |= PROT_EXEC; + if (prot & eMmapProtRead) + prot_arg |= PROT_READ; + if (prot & eMmapProtWrite) + prot_arg |= PROT_WRITE; + } + + if (flags & eMmapFlagsPrivate) + flags_arg |= MAP_PRIVATE; + if (flags & eMmapFlagsAnon) + flags_arg |= MAP_ANON; + + AddressRange mmap_range; + if (sc.GetAddressRange(range_scope, 0, use_inline_block_range, mmap_range)) + { + ThreadPlanCallFunction *call_function_thread_plan + = new ThreadPlanCallFunction (*thread, + mmap_range.GetBaseAddress(), + stop_other_threads, + discard_on_error, + &addr, + &length, + &prot_arg, + &flags_arg, + &fd, + &offset); + lldb::ThreadPlanSP call_plan_sp (call_function_thread_plan); + if (call_plan_sp) + { + ValueSP return_value_sp (new Value); + ClangASTContext *clang_ast_context = process->GetTarget().GetScratchClangASTContext(); + lldb::clang_type_t clang_void_ptr_type = clang_ast_context->GetVoidPtrType(false); + return_value_sp->SetValueType (Value::eValueTypeScalar); + return_value_sp->SetContext (Value::eContextTypeClangType, clang_void_ptr_type); + call_function_thread_plan->RequestReturnValue (return_value_sp); + + StreamFile error_strm; + StackFrame *frame = thread->GetStackFrameAtIndex (0).get(); + if (frame) + { + ExecutionContext exe_ctx; + frame->CalculateExecutionContext (exe_ctx); + ExecutionResults result = process->RunThreadPlan (exe_ctx, + call_plan_sp, + stop_other_threads, + try_all_threads, + discard_on_error, + single_thread_timeout_usec, + error_strm); + if (result == eExecutionCompleted) + { + allocated_addr = return_value_sp->GetScalar().ULongLong(); + if (process->GetAddressByteSize() == 4) + { + if (allocated_addr == UINT32_MAX) + return false; + } + return true; + } + } + } + } + } + } + + return false; +} + +bool lldb_private::InferiorCallMunmap(Process *process, addr_t addr, + addr_t length) { + Thread *thread = process->GetThreadList().GetSelectedThread().get(); + if (thread == NULL) + thread = process->GetThreadList().GetThreadAtIndex(0).get(); + + const bool append = true; + const bool include_symbols = true; + SymbolContextList sc_list; + const uint32_t count + = process->GetTarget().GetImages().FindFunctions (ConstString ("munmap"), + eFunctionNameTypeFull, + include_symbols, + append, + sc_list); + if (count > 0) + { + SymbolContext sc; + if (sc_list.GetContextAtIndex(0, sc)) + { + const uint32_t range_scope = eSymbolContextFunction | eSymbolContextSymbol; + const bool use_inline_block_range = false; + const bool stop_other_threads = true; + const bool discard_on_error = true; + const bool try_all_threads = true; + const uint32_t single_thread_timeout_usec = 500000; + + AddressRange munmap_range; + if (sc.GetAddressRange(range_scope, 0, use_inline_block_range, munmap_range)) + { + lldb::ThreadPlanSP call_plan_sp (new ThreadPlanCallFunction (*thread, + munmap_range.GetBaseAddress(), + stop_other_threads, + discard_on_error, + &addr, + &length)); + if (call_plan_sp) + { + StreamFile error_strm; + StackFrame *frame = thread->GetStackFrameAtIndex (0).get(); + if (frame) + { + ExecutionContext exe_ctx; + frame->CalculateExecutionContext (exe_ctx); + ExecutionResults result = process->RunThreadPlan (exe_ctx, + call_plan_sp, + stop_other_threads, + try_all_threads, + discard_on_error, + single_thread_timeout_usec, + error_strm); + if (result == eExecutionCompleted) + { + return true; + } + } + } + } + } + } + + return false; +} Added: lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.h?rev=132584&view=auto ============================================================================== --- lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.h (added) +++ lldb/trunk/source/Plugins/Process/Utility/InferiorCallPOSIX.h Fri Jun 3 15:40:38 2011 @@ -0,0 +1,41 @@ +//===-- InferiorCallPOSIX.h -------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef lldb_InferiorCallPOSIX_h_ +#define lldb_InferiorCallPOSIX_h_ + +// Inferior execution of POSIX functions. + +#include "lldb/lldb-types.h" + +namespace lldb_private { + +class Process; + +enum MmapProt { + eMmapProtNone = 0, + eMmapProtExec = 1, + eMmapProtRead = 2, + eMmapProtWrite = 4 +}; + +enum MmapFlags { + eMmapFlagsPrivate = 1, + eMmapFlagsAnon = 2 +}; + +bool InferiorCallMmap(Process *proc, lldb::addr_t &allocated_addr, + lldb::addr_t addr, lldb::addr_t length, unsigned prot, + unsigned flags, lldb::addr_t fd, lldb::addr_t offset); + +bool InferiorCallMunmap(Process *proc, lldb::addr_t addr, lldb::addr_t length); + +} // namespace lldb_private + +#endif // lldb_InferiorCallPOSIX_h_ Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp?rev=132584&r1=132583&r2=132584&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (original) +++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Fri Jun 3 15:40:38 2011 @@ -45,6 +45,7 @@ // Project includes #include "lldb/Host/Host.h" +#include "Plugins/Process/Utility/InferiorCallPOSIX.h" #include "Utility/StringExtractorGDBRemote.h" #include "GDBRemoteRegisterContext.h" #include "ProcessGDBRemote.h" @@ -1561,97 +1562,20 @@ return allocated_addr; case eLazyBoolNo: - // Call mmap() to create executable memory in the inferior.. - { - Thread *thread = GetThreadList().GetSelectedThread().get(); - if (thread == NULL) - thread = GetThreadList().GetThreadAtIndex(0).get(); - - const bool append = true; - const bool include_symbols = true; - SymbolContextList sc_list; - const uint32_t count = m_target.GetImages().FindFunctions (ConstString ("mmap"), - eFunctionNameTypeFull, - include_symbols, - append, - sc_list); - if (count > 0) - { - SymbolContext sc; - if (sc_list.GetContextAtIndex(0, sc)) - { - const uint32_t range_scope = eSymbolContextFunction | eSymbolContextSymbol; - const bool use_inline_block_range = false; - const bool stop_other_threads = true; - const bool discard_on_error = true; - const bool try_all_threads = true; - const uint32_t single_thread_timeout_usec = 500000; - addr_t arg1_addr = 0; - addr_t arg2_len = size; - addr_t arg3_prot = PROT_NONE; - addr_t arg4_flags = MAP_ANON | MAP_PRIVATE; - addr_t arg5_fd = -1; - addr_t arg6_offset = 0; - if (permissions & lldb::ePermissionsReadable) - arg3_prot |= PROT_READ; - if (permissions & lldb::ePermissionsWritable) - arg3_prot |= PROT_WRITE; - if (permissions & lldb::ePermissionsExecutable) - arg3_prot |= PROT_EXEC; - - AddressRange mmap_range; - if (sc.GetAddressRange(range_scope, 0, use_inline_block_range, mmap_range)) - { - ThreadPlanCallFunction *call_function_thread_plan = new ThreadPlanCallFunction (*thread, - mmap_range.GetBaseAddress(), - stop_other_threads, - discard_on_error, - &arg1_addr, - &arg2_len, - &arg3_prot, - &arg4_flags, - &arg5_fd, - &arg6_offset); - lldb::ThreadPlanSP call_plan_sp (call_function_thread_plan); - if (call_plan_sp) - { - ValueSP return_value_sp (new Value); - ClangASTContext *clang_ast_context = m_target.GetScratchClangASTContext(); - lldb::clang_type_t clang_void_ptr_type = clang_ast_context->GetVoidPtrType(false); - return_value_sp->SetValueType (Value::eValueTypeScalar); - return_value_sp->SetContext (Value::eContextTypeClangType, clang_void_ptr_type); - call_function_thread_plan->RequestReturnValue (return_value_sp); - - StreamFile error_strm; - StackFrame *frame = thread->GetStackFrameAtIndex (0).get(); - if (frame) - { - ExecutionContext exe_ctx; - frame->CalculateExecutionContext (exe_ctx); - ExecutionResults result = RunThreadPlan (exe_ctx, - call_plan_sp, - stop_other_threads, - try_all_threads, - discard_on_error, - single_thread_timeout_usec, - error_strm); - if (result == eExecutionCompleted) - { - allocated_addr = return_value_sp->GetScalar().ULongLong(); - if (GetAddressByteSize() == 4) - { - if (allocated_addr == UINT32_MAX) - allocated_addr = LLDB_INVALID_ADDRESS; - } - if (allocated_addr != LLDB_INVALID_ADDRESS) - m_addr_to_mmap_size[allocated_addr] = size; - } - } - } - } - } - } - } + // Call mmap() to create memory in the inferior.. + unsigned prot = 0; + if (permissions & lldb::ePermissionsReadable) + prot |= eMmapProtRead; + if (permissions & lldb::ePermissionsWritable) + prot |= eMmapProtWrite; + if (permissions & lldb::ePermissionsExecutable) + prot |= eMmapProtExec; + + if (InferiorCallMmap(this, allocated_addr, 0, size, prot, + eMmapFlagsAnon | eMmapFlagsPrivate, -1, 0)) + m_addr_to_mmap_size[allocated_addr] = size; + else + allocated_addr = LLDB_INVALID_ADDRESS; break; } @@ -1682,71 +1606,14 @@ break; case eLazyBoolNo: - // Call munmap() to create executable memory in the inferior.. + // Call munmap() to deallocate memory in the inferior.. { MMapMap::iterator pos = m_addr_to_mmap_size.find(addr); - if (pos != m_addr_to_mmap_size.end()) - { - Thread *thread = GetThreadList().GetSelectedThread().get(); - if (thread == NULL) - thread = GetThreadList().GetThreadAtIndex(0).get(); - - const bool append = true; - const bool include_symbols = true; - SymbolContextList sc_list; - const uint32_t count = m_target.GetImages().FindFunctions (ConstString ("munmap"), - eFunctionNameTypeFull, - include_symbols, - append, - sc_list); - if (count > 0) - { - SymbolContext sc; - if (sc_list.GetContextAtIndex(0, sc)) - { - const uint32_t range_scope = eSymbolContextFunction | eSymbolContextSymbol; - const bool use_inline_block_range = false; - const bool stop_other_threads = true; - const bool discard_on_error = true; - const bool try_all_threads = true; - const uint32_t single_thread_timeout_usec = 500000; - addr_t arg1_addr = addr; - addr_t arg2_len = pos->second; - - AddressRange munmap_range; - if (sc.GetAddressRange(range_scope, 0, use_inline_block_range, munmap_range)) - { - lldb::ThreadPlanSP call_plan_sp (new ThreadPlanCallFunction (*thread, - munmap_range.GetBaseAddress(), - stop_other_threads, - discard_on_error, - &arg1_addr, - &arg2_len)); - if (call_plan_sp) - { - StreamFile error_strm; - StackFrame *frame = thread->GetStackFrameAtIndex (0).get(); - if (frame) - { - ExecutionContext exe_ctx; - frame->CalculateExecutionContext (exe_ctx); - ExecutionResults result = RunThreadPlan (exe_ctx, - call_plan_sp, - stop_other_threads, - try_all_threads, - discard_on_error, - single_thread_timeout_usec, - error_strm); - if (result == eExecutionCompleted) - { - m_addr_to_mmap_size.erase (pos); - } - } - } - } - } - } - } + if (pos != m_addr_to_mmap_size.end() && + InferiorCallMunmap(this, addr, pos->second)) + m_addr_to_mmap_size.erase (pos); + else + error.SetErrorStringWithFormat("unable to deallocate memory at 0x%llx", addr); } break; } From peter at pcc.me.uk Fri Jun 3 15:40:44 2011 From: peter at pcc.me.uk (Peter Collingbourne) Date: Fri, 03 Jun 2011 20:40:44 -0000 Subject: [Lldb-commits] [lldb] r132585 - in /lldb/trunk/source/Plugins/Process/Linux: ProcessLinux.cpp ProcessLinux.h Message-ID: <20110603204044.9B1862A6C12D@llvm.org> Author: pcc Date: Fri Jun 3 15:40:44 2011 New Revision: 132585 URL: http://llvm.org/viewvc/llvm-project?rev=132585&view=rev Log: Implement ProcessLinux::Do{Allocate,Deallocate}Memory using inferior mmap/munmap calls Modified: lldb/trunk/source/Plugins/Process/Linux/ProcessLinux.cpp lldb/trunk/source/Plugins/Process/Linux/ProcessLinux.h Modified: lldb/trunk/source/Plugins/Process/Linux/ProcessLinux.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/ProcessLinux.cpp?rev=132585&r1=132584&r2=132585&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/ProcessLinux.cpp (original) +++ lldb/trunk/source/Plugins/Process/Linux/ProcessLinux.cpp Fri Jun 3 15:40:44 2011 @@ -13,12 +13,14 @@ // C++ Includes // Other libraries and framework includes #include "lldb/Core/PluginManager.h" +#include "lldb/Core/State.h" #include "lldb/Host/Host.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Target/DynamicLoader.h" #include "lldb/Target/Target.h" #include "ProcessLinux.h" +#include "Plugins/Process/Utility/InferiorCallPOSIX.h" #include "ProcessMonitor.h" #include "LinuxThread.h" @@ -345,19 +347,40 @@ ProcessLinux::DoAllocateMemory(size_t size, uint32_t permissions, Error &error) { - return 0; -} + addr_t allocated_addr = LLDB_INVALID_ADDRESS; -addr_t -ProcessLinux::AllocateMemory(size_t size, uint32_t permissions, Error &error) -{ - return 0; + unsigned prot = 0; + if (permissions & lldb::ePermissionsReadable) + prot |= eMmapProtRead; + if (permissions & lldb::ePermissionsWritable) + prot |= eMmapProtWrite; + if (permissions & lldb::ePermissionsExecutable) + prot |= eMmapProtExec; + + if (InferiorCallMmap(this, allocated_addr, 0, size, prot, + eMmapFlagsAnon | eMmapFlagsPrivate, -1, 0)) { + m_addr_to_mmap_size[allocated_addr] = size; + error.Clear(); + } else { + allocated_addr = LLDB_INVALID_ADDRESS; + error.SetErrorStringWithFormat("unable to allocate %zu bytes of memory with permissions %s", size, GetPermissionsAsCString (permissions)); + } + + return allocated_addr; } Error -ProcessLinux::DoDeallocateMemory(lldb::addr_t ptr) +ProcessLinux::DoDeallocateMemory(lldb::addr_t addr) { - return Error(1, eErrorTypeGeneric); + Error error; + MMapMap::iterator pos = m_addr_to_mmap_size.find(addr); + if (pos != m_addr_to_mmap_size.end() && + InferiorCallMunmap(this, addr, pos->second)) + m_addr_to_mmap_size.erase (pos); + else + error.SetErrorStringWithFormat("unable to deallocate memory at 0x%llx", addr); + + return error; } size_t Modified: lldb/trunk/source/Plugins/Process/Linux/ProcessLinux.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/ProcessLinux.h?rev=132585&r1=132584&r2=132585&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/ProcessLinux.h (original) +++ lldb/trunk/source/Plugins/Process/Linux/ProcessLinux.h Fri Jun 3 15:40:44 2011 @@ -114,10 +114,6 @@ DoAllocateMemory(size_t size, uint32_t permissions, lldb_private::Error &error); - lldb::addr_t - AllocateMemory(size_t size, uint32_t permissions, - lldb_private::Error &error); - virtual lldb_private::Error DoDeallocateMemory(lldb::addr_t ptr); @@ -220,6 +216,9 @@ /// Returns true if the process is stopped. bool IsStopped(); + + typedef std::map MMapMap; + MMapMap m_addr_to_mmap_size; }; #endif // liblldb_MacOSXProcess_H_ From peter at pcc.me.uk Fri Jun 3 15:40:54 2011 From: peter at pcc.me.uk (Peter Collingbourne) Date: Fri, 03 Jun 2011 20:40:54 -0000 Subject: [Lldb-commits] [lldb] r132586 - in /lldb/trunk: include/lldb/Target/Thread.h source/Plugins/Process/Linux/LinuxThread.cpp source/Plugins/Process/Linux/LinuxThread.h source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.cpp source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.h source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp source/Plugins/Process/gdb-remote/ThreadGDBRemote.h source/Target/Thread.cpp Message-ID: <20110603204055.07EAC2A6C12C@llvm.org> Author: pcc Date: Fri Jun 3 15:40:54 2011 New Revision: 132586 URL: http://llvm.org/viewvc/llvm-project?rev=132586&view=rev Log: Move SaveFrameZeroState and RestoreSaveFrameZero implementations to Thread base class Modified: lldb/trunk/include/lldb/Target/Thread.h lldb/trunk/source/Plugins/Process/Linux/LinuxThread.cpp lldb/trunk/source/Plugins/Process/Linux/LinuxThread.h lldb/trunk/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.cpp lldb/trunk/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.h lldb/trunk/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp lldb/trunk/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h lldb/trunk/source/Target/Thread.cpp Modified: lldb/trunk/include/lldb/Target/Thread.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Thread.h?rev=132586&r1=132585&r2=132586&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/Thread.h (original) +++ lldb/trunk/include/lldb/Target/Thread.h Fri Jun 3 15:40:54 2011 @@ -751,10 +751,10 @@ SetStopInfo (const lldb::StopInfoSP &stop_info_sp); virtual bool - SaveFrameZeroState (RegisterCheckpoint &checkpoint) = 0; + SaveFrameZeroState (RegisterCheckpoint &checkpoint); virtual bool - RestoreSaveFrameZero (const RegisterCheckpoint &checkpoint) = 0; + RestoreSaveFrameZero (const RegisterCheckpoint &checkpoint); virtual lldb_private::Unwind * GetUnwinder () = 0; Modified: lldb/trunk/source/Plugins/Process/Linux/LinuxThread.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/LinuxThread.cpp?rev=132586&r1=132585&r2=132586&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/LinuxThread.cpp (original) +++ lldb/trunk/source/Plugins/Process/Linux/LinuxThread.cpp Fri Jun 3 15:40:54 2011 @@ -85,18 +85,6 @@ return m_reg_context_sp; } -bool -LinuxThread::SaveFrameZeroState(RegisterCheckpoint &checkpoint) -{ - return false; -} - -bool -LinuxThread::RestoreSaveFrameZero(const RegisterCheckpoint &checkpoint) -{ - return false; -} - lldb::RegisterContextSP LinuxThread::CreateRegisterContextForFrame(lldb_private::StackFrame *frame) { Modified: lldb/trunk/source/Plugins/Process/Linux/LinuxThread.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/LinuxThread.h?rev=132586&r1=132585&r2=132586&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/LinuxThread.h (original) +++ lldb/trunk/source/Plugins/Process/Linux/LinuxThread.h Fri Jun 3 15:40:54 2011 @@ -54,13 +54,6 @@ void Notify(const ProcessMessage &message); -protected: - virtual bool - SaveFrameZeroState(RegisterCheckpoint &checkpoint); - - virtual bool - RestoreSaveFrameZero(const RegisterCheckpoint &checkpoint); - private: RegisterContextLinux * GetRegisterContextLinux () Modified: lldb/trunk/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.cpp?rev=132586&r1=132585&r2=132586&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.cpp (original) +++ lldb/trunk/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.cpp Fri Jun 3 15:40:54 2011 @@ -633,35 +633,6 @@ bool -ThreadMacOSX::SaveFrameZeroState (RegisterCheckpoint &checkpoint) -{ - lldb::StackFrameSP frame_sp(GetStackFrameAtIndex (0)); - if (frame_sp) - { - checkpoint.SetStackID(frame_sp->GetStackID()); - return frame_sp->GetRegisterContext()->ReadAllRegisterValues (checkpoint.GetData()); - } - return false; -} - -bool -ThreadMacOSX::RestoreSaveFrameZero (const RegisterCheckpoint &checkpoint) -{ - lldb::StackFrameSP frame_sp(GetStackFrameAtIndex (0)); - if (frame_sp) - { - bool ret = frame_sp->GetRegisterContext()->WriteAllRegisterValues (checkpoint.GetData()); - - // Clear out all stack frames as our world just changed. - ClearStackFrames(); - frame_sp->GetRegisterContext()->InvalidateIfNeeded(true); - - return ret; - } - return false; -} - -bool ThreadMacOSX::ClearHardwareBreakpoint (const BreakpointSite *bp) { if (bp != NULL && bp->IsHardware()) Modified: lldb/trunk/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.h?rev=132586&r1=132585&r2=132586&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.h (original) +++ lldb/trunk/source/Plugins/Process/MacOSX-User/source/ThreadMacOSX.h Fri Jun 3 15:40:54 2011 @@ -118,12 +118,6 @@ GetPrivateStopReason (); protected: - virtual bool - SaveFrameZeroState (RegisterCheckpoint &checkpoint); - - virtual bool - RestoreSaveFrameZero (const RegisterCheckpoint &checkpoint); - bool GetIdentifierInfo (); Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp?rev=132586&r1=132585&r2=132586&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp (original) +++ lldb/trunk/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp Fri Jun 3 15:40:54 2011 @@ -221,32 +221,6 @@ return gdb_reg_ctx->PrivateSetRegisterValue (reg, response); } -bool -ThreadGDBRemote::SaveFrameZeroState (RegisterCheckpoint &checkpoint) -{ - lldb::StackFrameSP frame_sp(GetStackFrameAtIndex (0)); - if (frame_sp) - { - checkpoint.SetStackID(frame_sp->GetStackID()); - return frame_sp->GetRegisterContext()->ReadAllRegisterValues (checkpoint.GetData()); - } - return false; -} - -bool -ThreadGDBRemote::RestoreSaveFrameZero (const RegisterCheckpoint &checkpoint) -{ - lldb::StackFrameSP frame_sp(GetStackFrameAtIndex (0)); - if (frame_sp) - { - bool ret = frame_sp->GetRegisterContext()->WriteAllRegisterValues (checkpoint.GetData()); - frame_sp->GetRegisterContext()->InvalidateIfNeeded(true); - ClearStackFrames(); - return ret; - } - return false; -} - lldb::StopInfoSP ThreadGDBRemote::GetPrivateStopReason () { Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h?rev=132586&r1=132585&r2=132586&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h (original) +++ lldb/trunk/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h Fri Jun 3 15:40:54 2011 @@ -99,12 +99,6 @@ friend class ProcessGDBRemote; - virtual bool - SaveFrameZeroState (RegisterCheckpoint &checkpoint); - - virtual bool - RestoreSaveFrameZero (const RegisterCheckpoint &checkpoint); - bool PrivateSetRegisterValue (uint32_t reg, StringExtractor &response); Modified: lldb/trunk/source/Target/Thread.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Thread.cpp?rev=132586&r1=132585&r2=132586&view=diff ============================================================================== --- lldb/trunk/source/Target/Thread.cpp (original) +++ lldb/trunk/source/Target/Thread.cpp Fri Jun 3 15:40:54 2011 @@ -1156,7 +1156,34 @@ source_lines_after); } +bool +Thread::SaveFrameZeroState (RegisterCheckpoint &checkpoint) +{ + lldb::StackFrameSP frame_sp(GetStackFrameAtIndex (0)); + if (frame_sp) + { + checkpoint.SetStackID(frame_sp->GetStackID()); + return frame_sp->GetRegisterContext()->ReadAllRegisterValues (checkpoint.GetData()); + } + return false; +} + +bool +Thread::RestoreSaveFrameZero (const RegisterCheckpoint &checkpoint) +{ + lldb::StackFrameSP frame_sp(GetStackFrameAtIndex (0)); + if (frame_sp) + { + bool ret = frame_sp->GetRegisterContext()->WriteAllRegisterValues (checkpoint.GetData()); + // Clear out all stack frames as our world just changed. + ClearStackFrames(); + frame_sp->GetRegisterContext()->InvalidateIfNeeded(true); + + return ret; + } + return false; +} #pragma mark "Thread::SettingsController" //-------------------------------------------------------------- From peter at pcc.me.uk Fri Jun 3 15:41:02 2011 From: peter at pcc.me.uk (Peter Collingbourne) Date: Fri, 03 Jun 2011 20:41:02 -0000 Subject: [Lldb-commits] [lldb] r132587 - in /lldb/trunk/source/Plugins/Process/Linux: ProcessMonitor.cpp ProcessMonitor.h RegisterContextLinux_x86_64.cpp RegisterContextLinux_x86_64.h Message-ID: <20110603204102.D16502A6C12C@llvm.org> Author: pcc Date: Fri Jun 3 15:41:02 2011 New Revision: 132587 URL: http://llvm.org/viewvc/llvm-project?rev=132587&view=rev Log: Implement RegisterContextLinux_x86_64::{Read,Write}AllRegisterValues Modified: lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.h lldb/trunk/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.cpp lldb/trunk/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.h Modified: lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp?rev=132587&r1=132586&r2=132587&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp (original) +++ lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp Fri Jun 3 15:41:02 2011 @@ -334,6 +334,58 @@ } //------------------------------------------------------------------------------ +/// @class WriteGPROperation +/// @brief Implements ProcessMonitor::WriteGPR. +class WriteGPROperation : public Operation +{ +public: + WriteGPROperation(void *buf, bool &result) + : m_buf(buf), m_result(result) + { } + + void Execute(ProcessMonitor *monitor); + +private: + void *m_buf; + bool &m_result; +}; + +void +WriteGPROperation::Execute(ProcessMonitor *monitor) +{ + if (ptrace(PTRACE_SETREGS, monitor->GetPID(), NULL, m_buf) < 0) + m_result = false; + else + m_result = true; +} + +//------------------------------------------------------------------------------ +/// @class WriteFPROperation +/// @brief Implements ProcessMonitor::WriteFPR. +class WriteFPROperation : public Operation +{ +public: + WriteFPROperation(void *buf, bool &result) + : m_buf(buf), m_result(result) + { } + + void Execute(ProcessMonitor *monitor); + +private: + void *m_buf; + bool &m_result; +}; + +void +WriteFPROperation::Execute(ProcessMonitor *monitor) +{ + if (ptrace(PTRACE_SETFPREGS, monitor->GetPID(), NULL, m_buf) < 0) + m_result = false; + else + m_result = true; +} + +//------------------------------------------------------------------------------ /// @class ResumeOperation /// @brief Implements ProcessMonitor::Resume. class ResumeOperation : public Operation @@ -1134,6 +1186,24 @@ } bool +ProcessMonitor::WriteGPR(void *buf) +{ + bool result; + WriteGPROperation op(buf, result); + DoOperation(&op); + return result; +} + +bool +ProcessMonitor::WriteFPR(void *buf) +{ + bool result; + WriteFPROperation op(buf, result); + DoOperation(&op); + return result; +} + +bool ProcessMonitor::Resume(lldb::tid_t tid, uint32_t signo) { bool result; Modified: lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.h?rev=132587&r1=132586&r2=132587&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.h (original) +++ lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.h Fri Jun 3 15:41:02 2011 @@ -117,6 +117,14 @@ bool ReadFPR(void *buf); + /// Writes all general purpose registers into the specified buffer. + bool + WriteGPR(void *buf); + + /// Writes all floating point registers into the specified buffer. + bool + WriteFPR(void *buf); + /// Writes a siginfo_t structure corresponding to the given thread ID to the /// memory region pointed to by @p siginfo. bool Modified: lldb/trunk/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.cpp?rev=132587&r1=132586&r2=132587&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.cpp (original) +++ lldb/trunk/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.cpp Fri Jun 3 15:41:02 2011 @@ -11,6 +11,7 @@ #include #include +#include "lldb/Core/DataBufferHeap.h" #include "lldb/Core/DataExtractor.h" #include "lldb/Core/Scalar.h" #include "lldb/Target/Thread.h" @@ -324,6 +325,8 @@ { gcc_dwarf_fpu_##reg##i, gcc_dwarf_fpu_##reg##i, \ LLDB_INVALID_REGNUM, gdb_fpu_##reg##i, fpu_##reg##i } } +#define REG_CONTEXT_SIZE (sizeof(RegisterContextLinux_x86_64::GPR) + sizeof(RegisterContextLinux_x86_64::FPU)) + static RegisterInfo g_register_infos[k_num_registers] = { @@ -487,6 +490,16 @@ bool RegisterContextLinux_x86_64::ReadAllRegisterValues(DataBufferSP &data_sp) { + data_sp.reset (new DataBufferHeap (REG_CONTEXT_SIZE, 0)); + if (data_sp && ReadGPR () && ReadFPR ()) + { + uint8_t *dst = data_sp->GetBytes(); + ::memcpy (dst, &user.regs, sizeof(user.regs)); + dst += sizeof(user.regs); + + ::memcpy (dst, &user.i387, sizeof(user.i387)); + return true; + } return false; } @@ -500,8 +513,17 @@ } bool -RegisterContextLinux_x86_64::WriteAllRegisterValues(const DataBufferSP &data) +RegisterContextLinux_x86_64::WriteAllRegisterValues(const DataBufferSP &data_sp) { + if (data_sp && data_sp->GetByteSize() == REG_CONTEXT_SIZE) + { + const uint8_t *src = data_sp->GetBytes(); + ::memcpy (&user.regs, src, sizeof(user.regs)); + src += sizeof(user.regs); + + ::memcpy (&user.i387, src, sizeof(user.i387)); + return WriteGPR() & WriteFPR(); + } return false; } @@ -699,3 +721,17 @@ ProcessMonitor &monitor = GetMonitor(); return monitor.ReadFPR(&user.i387); } + +bool +RegisterContextLinux_x86_64::WriteGPR() +{ + ProcessMonitor &monitor = GetMonitor(); + return monitor.WriteGPR(&user.regs); +} + +bool +RegisterContextLinux_x86_64::WriteFPR() +{ + ProcessMonitor &monitor = GetMonitor(); + return monitor.WriteFPR(&user.i387); +} Modified: lldb/trunk/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.h?rev=132587&r1=132586&r2=132587&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.h (original) +++ lldb/trunk/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.h Fri Jun 3 15:41:02 2011 @@ -151,6 +151,9 @@ bool ReadGPR(); bool ReadFPR(); + + bool WriteGPR(); + bool WriteFPR(); }; #endif // #ifndef liblldb_RegisterContextLinux_x86_64_H_ From peter at pcc.me.uk Fri Jun 3 15:41:09 2011 From: peter at pcc.me.uk (Peter Collingbourne) Date: Fri, 03 Jun 2011 20:41:09 -0000 Subject: [Lldb-commits] [lldb] r132588 - in /lldb/trunk: include/lldb/Utility/SharedCluster.h source/Target/ThreadPlanCallFunction.cpp Message-ID: <20110603204109.67DE42A6C12D@llvm.org> Author: pcc Date: Fri Jun 3 15:41:09 2011 New Revision: 132588 URL: http://llvm.org/viewvc/llvm-project?rev=132588&view=rev Log: Fix some order-of-initialisation warnings Modified: lldb/trunk/include/lldb/Utility/SharedCluster.h lldb/trunk/source/Target/ThreadPlanCallFunction.cpp Modified: lldb/trunk/include/lldb/Utility/SharedCluster.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/SharedCluster.h?rev=132588&r1=132587&r2=132588&view=diff ============================================================================== --- lldb/trunk/include/lldb/Utility/SharedCluster.h (original) +++ lldb/trunk/include/lldb/Utility/SharedCluster.h Fri Jun 3 15:41:09 2011 @@ -21,7 +21,7 @@ class shared_ptr_refcount : public lldb_private::imp::shared_count { public: - template shared_ptr_refcount (Y *in) : manager(in), shared_count (0) {} + template shared_ptr_refcount (Y *in) : shared_count (0), manager(in) {} shared_ptr_refcount() : shared_count (0) {} @@ -44,8 +44,8 @@ { public: ClusterManager () : - m_external_ref(0), m_objects(), + m_external_ref(0), m_mutex(Mutex::eMutexTypeNormal) {} ~ClusterManager () Modified: lldb/trunk/source/Target/ThreadPlanCallFunction.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanCallFunction.cpp?rev=132588&r1=132587&r2=132588&view=diff ============================================================================== --- lldb/trunk/source/Target/ThreadPlanCallFunction.cpp (original) +++ lldb/trunk/source/Target/ThreadPlanCallFunction.cpp Fri Jun 3 15:41:09 2011 @@ -45,10 +45,10 @@ ThreadPlan (ThreadPlan::eKindCallFunction, "Call function plan", thread, eVoteNoOpinion, eVoteNoOpinion), m_valid (false), m_stop_other_threads (stop_other_threads), + m_function_sp (NULL), m_process (thread.GetProcess()), m_thread (thread), - m_takedown_done (false), - m_function_sp (NULL) + m_takedown_done (false) { SetOkayToDiscard (discard_on_error); @@ -158,10 +158,10 @@ ThreadPlan (ThreadPlan::eKindCallFunction, "Call function plan", thread, eVoteNoOpinion, eVoteNoOpinion), m_valid (false), m_stop_other_threads (stop_other_threads), + m_function_sp(NULL), m_process (thread.GetProcess()), m_thread (thread), - m_takedown_done (false), - m_function_sp(NULL) + m_takedown_done (false) { SetOkayToDiscard (discard_on_error); From gclayton at apple.com Fri Jun 3 15:55:38 2011 From: gclayton at apple.com (Greg Clayton) Date: Fri, 03 Jun 2011 13:55:38 -0700 Subject: [Lldb-commits] [lldb] r132582 - /lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp In-Reply-To: <20110603203958.357262A6C12C@llvm.org> References: <20110603203958.357262A6C12C@llvm.org> Message-ID: A few quick ELF questions: - Will the content of SHT_SYMTAB always contain the all the same symbols found in SHT_DYNSYM? If so, why parse the SHT_DYNSYM as well? Shouldn't we just parse the SHT_DYNSYM and fall back to the SHT_DYNSYM if there is no SHT_DYNSYM? On Jun 3, 2011, at 1:39 PM, Peter Collingbourne wrote: > Author: pcc > Date: Fri Jun 3 15:39:58 2011 > New Revision: 132582 > > URL: http://llvm.org/viewvc/llvm-project?rev=132582&view=rev > Log: > Scan dynamic symbol table of ELF object files > > Modified: > lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp > > Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp > URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp?rev=132582&r1=132581&r2=132582&view=diff > ============================================================================== > --- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (original) > +++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Fri Jun 3 15:39:58 2011 > @@ -1085,7 +1085,7 @@ > for (SectionHeaderCollIter I = m_section_headers.begin(); > I != m_section_headers.end(); ++I) > { > - if (I->sh_type == SHT_SYMTAB) > + if (I->sh_type == SHT_SYMTAB || I->sh_type == SHT_DYNSYM) > { > const ELFSectionHeader &symtab_header = *I; > user_id_t section_id = SectionIndex(I); > > > _______________________________________________ > lldb-commits mailing list > lldb-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits From gclayton at apple.com Fri Jun 3 16:03:09 2011 From: gclayton at apple.com (Greg Clayton) Date: Fri, 03 Jun 2011 14:03:09 -0700 Subject: [Lldb-commits] [lldb] r132582 - /lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp In-Reply-To: References: <20110603203958.357262A6C12C@llvm.org> Message-ID: <3571CC2D-495F-4F1B-A7F9-E84B1C4A5A77@apple.com> Yikes, copy/paste errors abound in my previous reply. This should have read: - Will the content of SHT_SYMTAB always contain the all the same symbols found in SHT_DYNSYM? If so, why parse the SHT_DYNSYM as well? Shouldn't we just parse the SHT_SYMTAB and fall back to the SHT_DYNSYM if there is no SHT_SYMTAB? On Jun 3, 2011, at 1:55 PM, Greg Clayton wrote: > A few quick ELF questions: > > - Will the content of SHT_SYMTAB always contain the all the same symbols found in SHT_DYNSYM? If so, why parse the SHT_DYNSYM as well? > Shouldn't we just parse the SHT_DYNSYM and fall back to the SHT_DYNSYM if there is no SHT_DYNSYM? > > > > > On Jun 3, 2011, at 1:39 PM, Peter Collingbourne wrote: > >> Author: pcc >> Date: Fri Jun 3 15:39:58 2011 >> New Revision: 132582 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=132582&view=rev >> Log: >> Scan dynamic symbol table of ELF object files >> >> Modified: >> lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp >> >> Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp >> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp?rev=132582&r1=132581&r2=132582&view=diff >> ============================================================================== >> --- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (original) >> +++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Fri Jun 3 15:39:58 2011 >> @@ -1085,7 +1085,7 @@ >> for (SectionHeaderCollIter I = m_section_headers.begin(); >> I != m_section_headers.end(); ++I) >> { >> - if (I->sh_type == SHT_SYMTAB) >> + if (I->sh_type == SHT_SYMTAB || I->sh_type == SHT_DYNSYM) >> { >> const ELFSectionHeader &symtab_header = *I; >> user_id_t section_id = SectionIndex(I); >> >> >> _______________________________________________ >> lldb-commits mailing list >> lldb-commits at cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits > > _______________________________________________ > lldb-commits mailing list > lldb-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits From gclayton at apple.com Fri Jun 3 16:08:58 2011 From: gclayton at apple.com (Greg Clayton) Date: Fri, 03 Jun 2011 14:08:58 -0700 Subject: [Lldb-commits] [lldb] r132582 - /lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp In-Reply-To: <3571CC2D-495F-4F1B-A7F9-E84B1C4A5A77@apple.com> References: <20110603203958.357262A6C12C@llvm.org> <3571CC2D-495F-4F1B-A7F9-E84B1C4A5A77@apple.com> Message-ID: <333C44C2-643C-441D-B052-ED2B62C91641@apple.com> Another clarification I meant to initially convey, so one more time: Will the content of SHT_SYMTAB always contain the all the same symbols found in SHT_DYNSYM and more symbol (symbols that aren't required by the dynamic loader)? Or do the symbols for the dynamic loader only get put into the SHT_DYNSYM sections, and any other symbols get put into the SHT_SYMTAB sections? Shouldn't we just parse the SHT_SYMTAB sections and fall back to the SHT_DYNSYM section(s) if there are no SHT_SYMTAB sections? On Jun 3, 2011, at 2:03 PM, Greg Clayton wrote: > Yikes, copy/paste errors abound in my previous reply. This should have read: > > - Will the content of SHT_SYMTAB always contain the all the same symbols found in SHT_DYNSYM? If so, why parse the SHT_DYNSYM as well? > Shouldn't we just parse the SHT_SYMTAB and fall back to the SHT_DYNSYM if there is no SHT_SYMTAB? > > On Jun 3, 2011, at 1:55 PM, Greg Clayton wrote: > >> A few quick ELF questions: >> >> - Will the content of SHT_SYMTAB always contain the all the same symbols found in SHT_DYNSYM? If so, why parse the SHT_DYNSYM as well? >> Shouldn't we just parse the SHT_DYNSYM and fall back to the SHT_DYNSYM if there is no SHT_DYNSYM? >> >> >> >> >> On Jun 3, 2011, at 1:39 PM, Peter Collingbourne wrote: >> >>> Author: pcc >>> Date: Fri Jun 3 15:39:58 2011 >>> New Revision: 132582 >>> >>> URL: http://llvm.org/viewvc/llvm-project?rev=132582&view=rev >>> Log: >>> Scan dynamic symbol table of ELF object files >>> >>> Modified: >>> lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp >>> >>> Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp >>> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp?rev=132582&r1=132581&r2=132582&view=diff >>> ============================================================================== >>> --- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (original) >>> +++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Fri Jun 3 15:39:58 2011 >>> @@ -1085,7 +1085,7 @@ >>> for (SectionHeaderCollIter I = m_section_headers.begin(); >>> I != m_section_headers.end(); ++I) >>> { >>> - if (I->sh_type == SHT_SYMTAB) >>> + if (I->sh_type == SHT_SYMTAB || I->sh_type == SHT_DYNSYM) >>> { >>> const ELFSectionHeader &symtab_header = *I; >>> user_id_t section_id = SectionIndex(I); >>> >>> >>> _______________________________________________ >>> lldb-commits mailing list >>> lldb-commits at cs.uiuc.edu >>> http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits >> >> _______________________________________________ >> lldb-commits mailing list >> lldb-commits at cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits > From johnny.chen at apple.com Fri Jun 3 16:27:29 2011 From: johnny.chen at apple.com (Johnny Chen) Date: Fri, 03 Jun 2011 21:27:29 -0000 Subject: [Lldb-commits] [lldb] r132594 - /lldb/trunk/lldb.xcodeproj/project.pbxproj Message-ID: <20110603212729.1C5C22A6C12C@llvm.org> Author: johnny Date: Fri Jun 3 16:27:28 2011 New Revision: 132594 URL: http://llvm.org/viewvc/llvm-project?rev=132594&view=rev Log: Add InferiorCallPOSIX.cpp/.h into the xcode project file to fix build error. Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=132594&r1=132593&r2=132594&view=diff ============================================================================== --- lldb/trunk/lldb.xcodeproj/project.pbxproj (original) +++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Jun 3 16:27:28 2011 @@ -418,6 +418,7 @@ 9AC70390117675270086C050 /* SBInstructionList.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC7038F117675270086C050 /* SBInstructionList.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9AC703AF117675410086C050 /* SBInstruction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC703AE117675410086C050 /* SBInstruction.cpp */; }; 9AC703B1117675490086C050 /* SBInstructionList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC703B0117675490086C050 /* SBInstructionList.cpp */; }; + B28058A1139988B0002D96D0 /* InferiorCallPOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B28058A0139988B0002D96D0 /* InferiorCallPOSIX.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -1228,6 +1229,8 @@ AF68D3301255A110002FF25B /* UnwindLLDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UnwindLLDB.h; path = Utility/UnwindLLDB.h; sourceTree = ""; }; AF94005711C03F6500085DB9 /* SymbolVendor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SymbolVendor.cpp; path = source/Symbol/SymbolVendor.cpp; sourceTree = ""; }; B23DD24F12EDFAC1000C3894 /* ARMUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ARMUtils.h; path = Utility/ARMUtils.h; sourceTree = ""; }; + B28058A0139988B0002D96D0 /* InferiorCallPOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InferiorCallPOSIX.cpp; path = Utility/InferiorCallPOSIX.cpp; sourceTree = ""; }; + B28058A2139988C6002D96D0 /* InferiorCallPOSIX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = InferiorCallPOSIX.h; path = Utility/InferiorCallPOSIX.h; sourceTree = ""; }; B287E63E12EFAE2C00C9BEFE /* ARMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ARMDefines.h; path = Utility/ARMDefines.h; sourceTree = ""; }; B296983412C2FB2B002D92C3 /* CommandObjectVersion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectVersion.cpp; path = source/Commands/CommandObjectVersion.cpp; sourceTree = ""; }; B296983512C2FB2B002D92C3 /* CommandObjectVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandObjectVersion.h; path = source/Commands/CommandObjectVersion.h; sourceTree = ""; }; @@ -1822,6 +1825,8 @@ B2D3033612EFA5C500F84EB3 /* InstructionUtils.h */, B287E63E12EFAE2C00C9BEFE /* ARMDefines.h */, B23DD24F12EDFAC1000C3894 /* ARMUtils.h */, + B28058A0139988B0002D96D0 /* InferiorCallPOSIX.cpp */, + B28058A2139988C6002D96D0 /* InferiorCallPOSIX.h */, AF68D32F1255A110002FF25B /* UnwindLLDB.cpp */, AF68D3301255A110002FF25B /* UnwindLLDB.h */, AF68D2541255416E002FF25B /* RegisterContextLLDB.cpp */, @@ -3209,6 +3214,7 @@ 26A69C5F137A17A500262477 /* RegisterValue.cpp in Sources */, 2690B3711381D5C300ECFBAE /* Memory.cpp in Sources */, 9A9E1EFF1398086D005AC039 /* InputReaderStack.cpp in Sources */, + B28058A1139988B0002D96D0 /* InferiorCallPOSIX.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From gclayton at apple.com Fri Jun 3 17:08:57 2011 From: gclayton at apple.com (Greg Clayton) Date: Fri, 03 Jun 2011 22:08:57 -0000 Subject: [Lldb-commits] [lldb] r132597 - /lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj Message-ID: <20110603220857.1F9362A6C12C@llvm.org> Author: gclayton Date: Fri Jun 3 17:08:56 2011 New Revision: 132597 URL: http://llvm.org/viewvc/llvm-project?rev=132597&view=rev Log: Don't codesign with lldb_codesign for non MacOSX SDKs. Modified: lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj Modified: lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj?rev=132597&r1=132596&r2=132597&view=diff ============================================================================== --- lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj (original) +++ lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj Fri Jun 3 17:08:56 2011 @@ -565,7 +565,7 @@ isa = XCBuildConfiguration; buildSettings = { "CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist"; - CODE_SIGN_IDENTITY = lldb_codesign; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 139; FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks; @@ -595,7 +595,7 @@ ); OTHER_MIGFLAGS = "-I$(DERIVED_FILE_DIR)"; PRODUCT_NAME = debugserver; - PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=macosx*]" = ""; USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR)"; ZERO_LINK = NO; }; @@ -605,7 +605,7 @@ isa = XCBuildConfiguration; buildSettings = { "CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist"; - CODE_SIGN_IDENTITY = lldb_codesign; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 139; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -635,7 +635,7 @@ ); OTHER_MIGFLAGS = "-I$(DERIVED_FILE_DIR)"; PRODUCT_NAME = debugserver; - PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=macosx*]" = ""; USER_HEADER_SEARCH_PATHS = "./source ../../source $(DERIVED_SOURCES_DIR)"; ZERO_LINK = NO; }; From gclayton at apple.com Fri Jun 3 17:12:43 2011 From: gclayton at apple.com (Greg Clayton) Date: Fri, 03 Jun 2011 22:12:43 -0000 Subject: [Lldb-commits] [lldb] r132599 - /lldb/trunk/source/Target/Process.cpp Message-ID: <20110603221243.281A42A6C12C@llvm.org> Author: gclayton Date: Fri Jun 3 17:12:42 2011 New Revision: 132599 URL: http://llvm.org/viewvc/llvm-project?rev=132599&view=rev Log: Make sure we are ok to stop in a thread plan and have no stop reason for the thread we were running on (other thread crashed or had exceptional stop reason). Modified: lldb/trunk/source/Target/Process.cpp Modified: lldb/trunk/source/Target/Process.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=132599&r1=132598&r2=132599&view=diff ============================================================================== --- lldb/trunk/source/Target/Process.cpp (original) +++ lldb/trunk/source/Target/Process.cpp Fri Jun 3 17:12:42 2011 @@ -3439,49 +3439,54 @@ switch (stop_state) { case lldb::eStateStopped: - { - // Yay, we're done. Now make sure that our thread plan actually completed. - ThreadSP thread_sp = exe_ctx.process->GetThreadList().FindThreadByIndexID (thread_idx_id); - if (!thread_sp) - { - // Ooh, our thread has vanished. Unlikely that this was successful execution... - if (log) - log->Printf ("Execution completed but our thread (index-id=%u) has vanished.", thread_idx_id); - return_value = eExecutionInterrupted; - } - else { - StopInfoSP stop_info_sp = thread_sp->GetStopInfo (); - StopReason stop_reason = stop_info_sp->GetStopReason(); - if (stop_reason == eStopReasonPlanComplete) + // Yay, we're done. Now make sure that our thread plan actually completed. + ThreadSP thread_sp = exe_ctx.process->GetThreadList().FindThreadByIndexID (thread_idx_id); + if (!thread_sp) { + // Ooh, our thread has vanished. Unlikely that this was successful execution... if (log) - log->Printf ("Execution completed successfully."); - // Now mark this plan as private so it doesn't get reported as the stop reason - // after this point. - if (thread_plan_sp) - thread_plan_sp->SetPrivate (orig_plan_private); - return_value = eExecutionCompleted; + log->Printf ("Execution completed but our thread (index-id=%u) has vanished.", thread_idx_id); + return_value = eExecutionInterrupted; } else { - if (log) - log->Printf ("Thread plan didn't successfully complete."); - - return_value = eExecutionInterrupted; + StopInfoSP stop_info_sp (thread_sp->GetStopInfo ()); + StopReason stop_reason = eStopReasonInvalid; + if (stop_info_sp) + stop_reason = stop_info_sp->GetStopReason(); + if (stop_reason == eStopReasonPlanComplete) + { + if (log) + log->Printf ("Execution completed successfully."); + // Now mark this plan as private so it doesn't get reported as the stop reason + // after this point. + if (thread_plan_sp) + thread_plan_sp->SetPrivate (orig_plan_private); + return_value = eExecutionCompleted; + } + else + { + if (log) + log->Printf ("Thread plan didn't successfully complete."); + + return_value = eExecutionInterrupted; + } } - } - } - break; + } + break; + case lldb::eStateCrashed: if (log) log->Printf ("Execution crashed."); return_value = eExecutionInterrupted; break; + case lldb::eStateRunning: do_resume = false; keep_going = true; break; + default: if (log) log->Printf("Execution stopped with unexpected state: %s.", StateAsCString(stop_state)); From gclayton at apple.com Fri Jun 3 20:26:30 2011 From: gclayton at apple.com (Greg Clayton) Date: Sat, 04 Jun 2011 01:26:30 -0000 Subject: [Lldb-commits] [lldb] r132615 - in /lldb/trunk: include/lldb/Target/StopInfo.h source/Core/EmulateInstruction.cpp source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp source/Target/StopInfo.cpp Message-ID: <20110604012630.2148C2A6C12C@llvm.org> Author: gclayton Date: Fri Jun 3 20:26:29 2011 New Revision: 132615 URL: http://llvm.org/viewvc/llvm-project?rev=132615&view=rev Log: Created a std::string in the base StopInfo class for the description and cleaned up all base classes that had their own copy. Added a SetDescription accessor to the StopInfo class. Modified: lldb/trunk/include/lldb/Target/StopInfo.h lldb/trunk/source/Core/EmulateInstruction.cpp lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp lldb/trunk/source/Target/StopInfo.cpp Modified: lldb/trunk/include/lldb/Target/StopInfo.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/StopInfo.h?rev=132615&r1=132614&r2=132615&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/StopInfo.h (original) +++ lldb/trunk/include/lldb/Target/StopInfo.h Fri Jun 3 20:26:29 2011 @@ -12,6 +12,8 @@ // C Includes // C++ Includes +#include + // Other libraries and framework includes // Project includes #include "lldb/lldb-public.h" @@ -92,8 +94,19 @@ } virtual const char * - GetDescription () = 0; + GetDescription () + { + return m_description.c_str(); + } + virtual void + SetDescription (const char *desc_cstr) + { + if (desc_cstr && desc_cstr[0]) + m_description.assign (desc_cstr); + else + m_description.clear(); + } static lldb::StopInfoSP CreateStopReasonWithBreakpointSiteID (Thread &thread, lldb::break_id_t break_id); @@ -114,6 +127,9 @@ static lldb::StopInfoSP CreateStopReasonWithPlan (lldb::ThreadPlanSP &plan); + static lldb::StopInfoSP + CreateStopReasonWithException (Thread &thread, const char *description); + protected: //------------------------------------------------------------------ // Classes that inherit from StackID can see and modify these @@ -121,6 +137,7 @@ Thread & m_thread; // The thread corresponding to the stop reason. uint32_t m_stop_id; // The process stop ID for which this stop info is valid uint64_t m_value; // A generic value that can be used for things pertaining to this stop info + std::string m_description; // A textual description describing this stop. private: friend class Thread; Modified: lldb/trunk/source/Core/EmulateInstruction.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/EmulateInstruction.cpp?rev=132615&r1=132614&r2=132615&view=diff ============================================================================== --- lldb/trunk/source/Core/EmulateInstruction.cpp (original) +++ lldb/trunk/source/Core/EmulateInstruction.cpp Fri Jun 3 20:26:29 2011 @@ -454,6 +454,10 @@ strm.PutCString ("adjust sp"); break; + case eContextSetFramePointer: + strm.PutCString ("set frame pointer"); + break; + case eContextAdjustBaseRegister: strm.PutCString ("adjusting (writing value back to) a base register"); break; Modified: lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp?rev=132615&r1=132614&r2=132615&view=diff ============================================================================== --- lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp (original) +++ lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp Fri Jun 3 20:26:29 2011 @@ -391,9 +391,6 @@ pc_reg_num == LLDB_INVALID_REGNUM) return false; - unwind_plan.Clear(); - unwind_plan.SetRegisterKind (eRegisterKindDWARF); - UnwindPlan::Row row; // Our previous Call Frame Address is the stack pointer @@ -439,7 +436,7 @@ return false; UnwindPlan::Row row; - const int32_t ptr_size = 8; + const int32_t ptr_size = 4; unwind_plan.SetRegisterKind (eRegisterKindGeneric); row.SetCFARegister (fp_reg_num); Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp?rev=132615&r1=132614&r2=132615&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (original) +++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Fri Jun 3 20:26:29 2011 @@ -1120,6 +1120,8 @@ std::string name; std::string value; std::string thread_name; + std::string reason; + std::string description; uint32_t exc_type = 0; std::vector exc_data; uint32_t tid = LLDB_INVALID_THREAD_ID; @@ -1174,6 +1176,18 @@ { thread_dispatch_qaddr = Args::StringToUInt64 (value.c_str(), 0, 16); } + else if (name.compare("reason") == 0) + { + reason.swap(value); + } + else if (name.compare("description") == 0) + { + StringExtractor desc_extractor; + // Swap "value" over into "name_extractor" + desc_extractor.GetStringRef().swap(value); + // Now convert the HEX bytes into a string value + desc_extractor.GetHexByteString (thread_name); + } else if (name.size() == 2 && ::isxdigit(name[0]) && ::isxdigit(name[1])) { // We have a register number that contains an expedited @@ -1218,8 +1232,83 @@ exc_data_size >= 1 ? exc_data[0] : 0, exc_data_size >= 2 ? exc_data[1] : 0)); } - else if (signo) + else { + bool handled = false; + if (!reason.empty()) + { + if (reason.compare("trace") == 0) + { + gdb_thread->SetStopInfo (StopInfo::CreateStopReasonToTrace (*thread_sp)); + handled = true; + } + else if (reason.compare("breakpoint") == 0) + { + addr_t pc = gdb_thread->GetRegisterContext()->GetPC(); + lldb::BreakpointSiteSP bp_site_sp = gdb_thread->GetProcess().GetBreakpointSiteList().FindByAddress(pc); + if (bp_site_sp) + { + // If the breakpoint is for this thread, then we'll report the hit, but if it is for another thread, + // we can just report no reason. We don't need to worry about stepping over the breakpoint here, that + // will be taken care of when the thread resumes and notices that there's a breakpoint under the pc. + if (bp_site_sp->ValidForThisThread (gdb_thread)) + { + gdb_thread->SetStopInfo (StopInfo::CreateStopReasonWithBreakpointSiteID (*thread_sp, bp_site_sp->GetID())); + handled = true; + } + } + + if (!handled) + { + gdb_thread->SetStopInfo (StopInfo::CreateStopReasonToTrace (*thread_sp)); + } + } + else if (reason.compare("trap") == 0) + { + // Let the trap just use the standard signal stop reason below... + } + else if (reason.compare("watchpoint") == 0) + { + break_id_t watch_id = LLDB_INVALID_WATCH_ID; + // TODO: locate the watchpoint somehow... + gdb_thread->SetStopInfo (StopInfo::CreateStopReasonWithWatchpointID (*thread_sp, watch_id)); + handled = true; + } + else if (reason.compare("exception") == 0) + { + gdb_thread->SetStopInfo (StopInfo::CreateStopReasonWithException(*thread_sp, description.c_str())); + handled = true; + } + } + + if (signo) + { + if (signo == SIGTRAP) + { + // Currently we are going to assume SIGTRAP means we are either + // hitting a breakpoint or hardware single stepping. + addr_t pc = gdb_thread->GetRegisterContext()->GetPC(); + lldb::BreakpointSiteSP bp_site_sp = gdb_thread->GetProcess().GetBreakpointSiteList().FindByAddress(pc); + if (bp_site_sp) + { + // If the breakpoint is for this thread, then we'll report the hit, but if it is for another thread, + // we can just report no reason. We don't need to worry about stepping over the breakpoint here, that + // will be taken care of when the thread resumes and notices that there's a breakpoint under the pc. + if (bp_site_sp->ValidForThisThread (gdb_thread)) + { + gdb_thread->SetStopInfo (StopInfo::CreateStopReasonWithBreakpointSiteID (*thread_sp, bp_site_sp->GetID())); + handled = true; + } + } + if (!handled) + { + // TODO: check for breakpoint or trap opcode in case there is a hard + // coded software trap + gdb_thread->SetStopInfo (StopInfo::CreateStopReasonToTrace (*thread_sp)); + handled = true; + } + } + if (!handled) gdb_thread->SetStopInfo (StopInfo::CreateStopReasonWithSignal (*thread_sp, signo)); } else @@ -1227,6 +1316,20 @@ StopInfoSP invalid_stop_info_sp; gdb_thread->SetStopInfo (invalid_stop_info_sp); } + + if (!description.empty()) + { + lldb::StopInfoSP stop_info_sp (gdb_thread->GetStopInfo ()); + if (stop_info_sp) + { + stop_info_sp->SetDescription (description.c_str()); + } + else + { + gdb_thread->SetStopInfo (StopInfo::CreateStopReasonWithException (*thread_sp, description.c_str())); + } + } + } } return eStateStopped; } Modified: lldb/trunk/source/Target/StopInfo.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StopInfo.cpp?rev=132615&r1=132614&r2=132615&view=diff ============================================================================== --- lldb/trunk/source/Target/StopInfo.cpp (original) +++ lldb/trunk/source/Target/StopInfo.cpp Fri Jun 3 20:26:29 2011 @@ -253,8 +253,7 @@ public: StopInfoUnixSignal (Thread &thread, int signo) : - StopInfo (thread, signo), - m_description() + StopInfo (thread, signo) { } @@ -306,9 +305,6 @@ } return m_description.c_str(); } - -private: - std::string m_description; }; //---------------------------------------------------------------------- @@ -337,7 +333,47 @@ virtual const char * GetDescription () { + if (m_description.empty()) return "trace"; + else + return m_description.c_str(); + } +}; + + +//---------------------------------------------------------------------- +// StopInfoException +//---------------------------------------------------------------------- + +class StopInfoException : public StopInfo +{ +public: + + StopInfoException (Thread &thread, const char *description) : + StopInfo (thread, LLDB_INVALID_UID) + { + if (description) + SetDescription (description); + } + + virtual + ~StopInfoException () + { + } + + virtual StopReason + GetStopReason () const + { + return eStopReasonException; + } + + virtual const char * + GetDescription () + { + if (m_description.empty()) + return "exception"; + else + return m_description.c_str(); } }; @@ -380,7 +416,6 @@ private: ThreadPlanSP m_plan_sp; - std::string m_description; }; StopInfoSP @@ -418,3 +453,9 @@ { return StopInfoSP (new StopInfoThreadPlan (plan_sp)); } + +StopInfoSP +StopInfo::CreateStopReasonWithException (Thread &thread, const char *description) +{ + return StopInfoSP (new StopInfoException (thread, description)); +} From peter at pcc.me.uk Sun Jun 5 11:35:29 2011 From: peter at pcc.me.uk (Peter Collingbourne) Date: Sun, 5 Jun 2011 17:35:29 +0100 Subject: [Lldb-commits] [lldb] r132582 - /lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp In-Reply-To: <333C44C2-643C-441D-B052-ED2B62C91641@apple.com> References: <20110603203958.357262A6C12C@llvm.org> <3571CC2D-495F-4F1B-A7F9-E84B1C4A5A77@apple.com> <333C44C2-643C-441D-B052-ED2B62C91641@apple.com> Message-ID: <20110605163529.GA1543@pcc.me.uk> On Fri, Jun 03, 2011 at 02:08:58PM -0700, Greg Clayton wrote: > Another clarification I meant to initially convey, so one more time: > > Will the content of SHT_SYMTAB always contain the all the same symbols found in SHT_DYNSYM and more symbol (symbols that aren't required by the dynamic loader)? Or do the symbols for the dynamic loader only get put into the SHT_DYNSYM sections, and any other symbols get put into the SHT_SYMTAB sections? > > Shouldn't we just parse the SHT_SYMTAB sections and fall back to the SHT_DYNSYM section(s) if there are no SHT_SYMTAB sections? Hi Greg, Generally .dynsym is a subset of .symtab (if present), and this does seem to be an implicit rule in the ELF specification [1]. However, in practice this rule is not always adhered to (I have at least one (shared) object file on my system in which both .dynsym and .symtab are present but .dynsym is not a subset of .symtab). So I think the safest thing to do is to parse both symbol tables, under the "be lenient in what you accept" principle. Is it a problem to have duplicate symbols in Symtab? If we do this, should we be filtering out duplicates somehow? Thanks, -- Peter [1] http://www.skyfree.org/linux/references/ELF_Format.pdf page 1-10