From granata.enrico at gmail.com  Mon Oct 24 12:22:21 2011
From: granata.enrico at gmail.com (Enrico Granata)
Date: Mon, 24 Oct 2011 17:22:21 -0000
Subject: [Lldb-commits] [lldb] r142802 - in /lldb/trunk:
 include/lldb/Interpreter/ScriptInterpreterPython.h
 source/Interpreter/ScriptInterpreterPython.cpp
Message-ID: <20111024172221.A9914312800A@llvm.org>

Author: enrico
Date: Mon Oct 24 12:22:21 2011
New Revision: 142802

URL: http://llvm.org/viewvc/llvm-project?rev=142802&view=rev
Log:
Decoupling of lock-related code from the core of ScriptInterpreterPython. All that concerns locking the Python interpreter is now delegated to the internal ScriptInterpreterPython::Locker class. Several changes in ScriptInterpreterPython to accommodate this new pattern.

Modified:
    lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h
    lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp

Modified: lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h?rev=142802&r1=142801&r2=142802&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h (original)
+++ lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h Mon Oct 24 12:22:21 2011
@@ -161,19 +161,50 @@
 	class Locker
 	{
 	public:
-    	Locker (ScriptInterpreterPython *py_interpreter,
-        	    FILE* wait_msg_handle = NULL,
-            	bool need_session = true);
-    
-    	bool
-    	HasAcquiredLock ()
-    	{
-        	return m_release_lock;
-	    }
-    
+        
+        enum OnEntry
+        {
+            AcquireLock         = 0x0001,
+            InitSession         = 0x0002
+        };
+        
+        enum OnLeave
+        {
+            FreeLock            = 0x0001,
+            FreeAcquiredLock    = 0x0002,    // do not free the lock if we already held it when calling constructor
+            TearDownSession     = 0x0004
+        };
+        
+        Locker (ScriptInterpreterPython *py_interpreter = NULL,
+                uint16_t on_entry = AcquireLock | InitSession,
+                uint16_t on_leave = FreeLock | TearDownSession,
+                FILE* wait_msg_handle = NULL);
+        
     	~Locker ();
     
+        static bool
+        CurrentThreadHasPythonLock ();
+        
 	private:
+        
+        bool
+        DoAcquireLock ();
+        
+        bool
+        DoInitSession ();
+        
+        bool
+        DoFreeLock ();
+        
+        bool
+        DoTearDownSession ();
+        
+        static bool
+        TryGetPythonLock (uint32_t seconds_to_wait);
+        
+        static void
+        ReleasePythonLock ();
+        
     	bool                     m_need_session;
     	bool                     m_release_lock;
     	ScriptInterpreterPython *m_python_interpreter;

Modified: lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp?rev=142802&r1=142801&r2=142802&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp (original)
+++ lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp Mon Oct 24 12:22:21 2011
@@ -63,8 +63,8 @@
     return g_interpreter_is_running;
 }
 
-static bool
-CurrentThreadHasPythonLock ()
+bool
+ScriptInterpreterPython::Locker::CurrentThreadHasPythonLock ()
 {
     TimeValue timeout;
 
@@ -73,8 +73,8 @@
     return PythonMutexPredicate().WaitForValueEqualTo (Host::GetCurrentThreadID(), &timeout, NULL);
 }
 
-static bool
-GetPythonLock (uint32_t seconds_to_wait)
+bool
+ScriptInterpreterPython::Locker::TryGetPythonLock (uint32_t seconds_to_wait)
 {
     
     TimeValue timeout;
@@ -89,40 +89,88 @@
                                                                     Host::GetCurrentThreadID(), &timeout, NULL);
 }
 
-static void
-ReleasePythonLock ()
+void
+ScriptInterpreterPython::Locker::ReleasePythonLock ()
 {
     PythonMutexPredicate().SetValue (LLDB_INVALID_THREAD_ID, eBroadcastAlways);
 }
 
-ScriptInterpreterPython::Locker::Locker (ScriptInterpreterPython *pi,
-                                        FILE* tmp_fh,
-                                        bool ns) :
-    m_need_session(ns),
-    m_release_lock(false),
-    m_python_interpreter(pi),
-    m_tmp_fh(tmp_fh)
+ScriptInterpreterPython::Locker::Locker (ScriptInterpreterPython *py_interpreter,
+                                         uint16_t on_entry,
+                                         uint16_t on_leave,
+                                         FILE* wait_msg_handle) :
+    m_need_session( (on_leave & TearDownSession) == TearDownSession ),
+    m_release_lock ( false ), // decide in constructor body
+    m_python_interpreter(py_interpreter),
+    m_tmp_fh(wait_msg_handle)
+{
+    if (m_python_interpreter && !m_tmp_fh)
+        m_tmp_fh = (m_python_interpreter->m_dbg_stdout ? m_python_interpreter->m_dbg_stdout : stdout);
+    
+    if ( (on_entry & AcquireLock) == AcquireLock )
+    {
+        if (CurrentThreadHasPythonLock())
+        {
+            if ( (on_leave & FreeLock) == FreeLock )
+                m_release_lock = true;
+        }
+        else
+        {
+            DoAcquireLock();
+            if ( (on_leave & FreeLock) == FreeLock )
+                m_release_lock = true;
+            if ( (on_leave & FreeAcquiredLock) == FreeAcquiredLock )
+                m_release_lock = true;
+        }
+    }
+    if ( (on_entry & InitSession) == InitSession )
+        DoInitSession();
+}
+
+bool
+ScriptInterpreterPython::Locker::DoAcquireLock()
 {
-    // if Enter/LeaveSession() must be called, then m_python_interpreter must be != NULL
-    assert(m_need_session && m_python_interpreter);
     if (!CurrentThreadHasPythonLock())
     {
-        while (!GetPythonLock (1))
-            if (tmp_fh)
-                fprintf (tmp_fh, 
+        while (!TryGetPythonLock (1))
+            if (m_tmp_fh)
+                fprintf (m_tmp_fh, 
                          "Python interpreter locked on another thread; waiting to acquire lock...\n");
-        m_release_lock = true;
     }
-    if (m_need_session)
-        m_python_interpreter->EnterSession ();
+    return true;
+}
+
+bool
+ScriptInterpreterPython::Locker::DoInitSession()
+{
+    if (!m_python_interpreter)
+        return false;
+    m_python_interpreter->EnterSession ();
+    return true;
+}
+
+bool
+ScriptInterpreterPython::Locker::DoFreeLock()
+{
+    ReleasePythonLock ();
+    return true;
+}
+
+bool
+ScriptInterpreterPython::Locker::DoTearDownSession()
+{
+    if (!m_python_interpreter)
+        return false;
+    m_python_interpreter->LeaveSession ();
+    return true;
 }
 
 ScriptInterpreterPython::Locker::~Locker()
 {
     if (m_need_session)
-        m_python_interpreter->LeaveSession ();
+        DoTearDownSession();
     if (m_release_lock)
-        ReleasePythonLock ();
+        DoFreeLock();
 }
 
 ScriptInterpreterPython::ScriptInterpreterPython (CommandInterpreter &interpreter) :
@@ -145,33 +193,11 @@
         g_initialized = true;
         ScriptInterpreterPython::InitializePrivate ();
     }
-
-    bool safe_to_run = false;
-    bool need_to_release_lock = true;
-    int interval = 5;          // Number of seconds to try getting the Python lock before timing out.
-    
-    // We don't dare exit this function without finishing setting up the script interpreter, so we must wait until
-    // we can get the Python lock.
     
-    if (CurrentThreadHasPythonLock())
-    {
-        safe_to_run = true;
-        need_to_release_lock = false;
-    }
+    Locker locker(this,
+                  ScriptInterpreterPython::Locker::AcquireLock,
+                  ScriptInterpreterPython::Locker::FreeAcquiredLock);
 
-    while (!safe_to_run)
-    {
-        safe_to_run = GetPythonLock (interval);
-        if (!safe_to_run)
-        {
-            FILE *tmp_fh = (m_dbg_stdout ? m_dbg_stdout : stdout);
-            fprintf (tmp_fh, 
-                     "Python interpreter is locked on another thread; "
-                     "please release interpreter in order to continue.\n");
-            interval = interval * 2;
-        }
-    }
-    
     m_dictionary_name.append("_dict");
     StreamString run_string;
     run_string.Printf ("%s = dict()", m_dictionary_name.c_str());
@@ -221,9 +247,6 @@
     {
         m_new_sysout = PyFile_FromFile (m_dbg_stdout, (char *) "", (char *) "w", _check_and_flush);
     }
-    
-    if (need_to_release_lock)
-        ReleasePythonLock();
 }
 
 ScriptInterpreterPython::~ScriptInterpreterPython ()
@@ -242,16 +265,10 @@
     
     if (m_new_sysout)
     {
-        FILE *tmp_fh = (m_dbg_stdout ? m_dbg_stdout : stdout);
-        if (!CurrentThreadHasPythonLock ())
-        {
-            while (!GetPythonLock (1))
-                fprintf (tmp_fh, "Python interpreter locked on another thread; waiting to acquire lock...\n");
-            Py_DECREF ((PyObject*)m_new_sysout);
-            ReleasePythonLock ();
-        }
-        else
-            Py_DECREF ((PyObject*)m_new_sysout);
+        Locker locker(this,
+                      ScriptInterpreterPython::Locker::AcquireLock,
+                      ScriptInterpreterPython::Locker::FreeLock);
+        Py_DECREF ((PyObject*)m_new_sysout);
     }
 }
 
@@ -263,9 +280,7 @@
         
     m_dbg_stdout = fh;
 
-    FILE *tmp_fh = (m_dbg_stdout ? m_dbg_stdout : stdout);
-    
-    Locker py_lock(this, tmp_fh);
+    Locker py_lock(this);
     
     m_new_sysout = PyFile_FromFile (m_dbg_stdout, (char *) "", (char *) "w", _check_and_flush);
 }
@@ -290,8 +305,6 @@
     m_terminal_state.Restore();
 }
 
-
-
 void
 ScriptInterpreterPython::LeaveSession ()
 {
@@ -389,26 +402,15 @@
     if (!m_valid_session)
         return false;
         
-        
-
     // We want to call run_one_line, passing in the dictionary and the command string.  We cannot do this through
     // PyRun_SimpleString here because the command string may contain escaped characters, and putting it inside
     // another string to pass to PyRun_SimpleString messes up the escaping.  So we use the following more complicated
     // method to pass the command string directly down to Python.
 
+    Locker locker(this,
+                  ScriptInterpreterPython::Locker::AcquireLock | ScriptInterpreterPython::Locker::InitSession,
+                  ScriptInterpreterPython::Locker::FreeAcquiredLock | ScriptInterpreterPython::Locker::TearDownSession);
 
-    bool need_to_release_lock = true;
-
-    if (CurrentThreadHasPythonLock())
-        need_to_release_lock = false;
-    else if (!GetPythonLock (1))
-    {
-        fprintf ((m_dbg_stdout ? m_dbg_stdout : stdout), 
-                 "Python interpreter is currently locked by another thread; unable to process command.\n");
-        return false;
-    }
-
-    EnterSession ();
     bool success = false;
 
     if (command)
@@ -492,11 +494,6 @@
             }
         }
 
-        LeaveSession ();
-        
-        if (need_to_release_lock)
-            ReleasePythonLock();
-
         if (success)
             return true;
 
@@ -506,18 +503,11 @@
         return false;
     }
 
-    LeaveSession ();
-
-    if (need_to_release_lock)
-        ReleasePythonLock ();
-
     if (result)
         result->AppendError ("empty command passed to python\n");
     return false;
 }
 
-
-
 size_t
 ScriptInterpreterPython::InputReaderCallback
 (
@@ -535,7 +525,7 @@
         return 0;
         
     ScriptInterpreterPython *script_interpreter = (ScriptInterpreterPython *) baton;
-        
+    
     if (script_interpreter->m_script_lang != eScriptLanguagePython)
         return 0;
     
@@ -559,18 +549,11 @@
 
             script_interpreter->SaveTerminalState(input_fd);
 
-            if (!CurrentThreadHasPythonLock())
             {
-                while (!GetPythonLock(1)) 
-                {
-                    out_stream->Printf ("Python interpreter locked on another thread; waiting to acquire lock...\n");
-                    out_stream->Flush();
-                }
-                script_interpreter->EnterSession ();
-                ReleasePythonLock();
+                ScriptInterpreterPython::Locker locker(script_interpreter,
+                                                       ScriptInterpreterPython::Locker::AcquireLock | ScriptInterpreterPython::Locker::InitSession,
+                                                       ScriptInterpreterPython::Locker::FreeAcquiredLock);
             }
-            else
-                script_interpreter->EnterSession ();
 
             char error_str[1024];
             if (script_interpreter->m_embedded_python_pty.OpenFirstAvailableMaster (O_RDWR|O_NOCTTY, error_str, 
@@ -610,17 +593,11 @@
         break;
 
     case eInputReaderReactivate:
-        if (!CurrentThreadHasPythonLock())
         {
-            while (!GetPythonLock(1))
-            {
-                // Wait until lock is acquired.
-            }
-            script_interpreter->EnterSession ();
-            ReleasePythonLock();
+            ScriptInterpreterPython::Locker locker(script_interpreter,
+                                                   ScriptInterpreterPython::Locker::AcquireLock | ScriptInterpreterPython::Locker::InitSession,
+                                                   ScriptInterpreterPython::Locker::FreeAcquiredLock);
         }
-        else
-            script_interpreter->EnterSession ();
         break;
         
     case eInputReaderAsynchronousOutputWritten:
@@ -716,18 +693,9 @@
                                                    void *ret_value)
 {
 
-    bool need_to_release_lock = true;
-
-    if (CurrentThreadHasPythonLock())
-        need_to_release_lock = false;
-    else if (!GetPythonLock (1))
-    {
-        fprintf ((m_dbg_stdout ? m_dbg_stdout : stdout), 
-                 "Python interpreter is currently locked by another thread; unable to process command.\n");
-        return false;
-    }
-
-    EnterSession ();
+    Locker locker(this,
+                  ScriptInterpreterPython::Locker::AcquireLock | ScriptInterpreterPython::Locker::InitSession,
+                  ScriptInterpreterPython::Locker::FreeAcquiredLock | ScriptInterpreterPython::Locker::TearDownSession);
 
     PyObject *py_return = NULL;
     PyObject *mainmod = PyImport_AddModule ("__main__");
@@ -896,11 +864,6 @@
         PyErr_Clear();
         ret_success = false;
     }
-    
-    LeaveSession ();
-
-    if (need_to_release_lock)
-        ReleasePythonLock();
 
     return ret_success;
 }
@@ -908,18 +871,11 @@
 bool
 ScriptInterpreterPython::ExecuteMultipleLines (const char *in_string)
 {
-    FILE *tmp_fh = (m_dbg_stdout ? m_dbg_stdout : stdout);
-    bool need_to_release_lock = true;
-
-    if (CurrentThreadHasPythonLock())
-        need_to_release_lock = false;
-    else
-    {
-        while (!GetPythonLock (1))
-            fprintf (tmp_fh, "Python interpreter locked on another thread; waiting to acquire lock...\n");
-    }
-
-    EnterSession ();
+    
+    
+    Locker locker(this,
+                  ScriptInterpreterPython::Locker::AcquireLock | ScriptInterpreterPython::Locker::InitSession,
+                  ScriptInterpreterPython::Locker::FreeAcquiredLock | ScriptInterpreterPython::Locker::TearDownSession);
 
     bool success = false;
     PyObject *py_return = NULL;
@@ -990,11 +946,6 @@
         success = false;
     }
 
-    LeaveSession ();
-
-    if (need_to_release_lock)
-        ReleasePythonLock();
-
     return success;
 }
 
@@ -1303,7 +1254,7 @@
         return false;
     
     // Take what the user wrote, wrap it all up inside one big auto-generated Python function, passing in the
-    // ValueObject as parameter to the function.
+    // required data as parameters to the function.
     
     sstr.Printf ("lldb_autogen_python_cmd_alias_func_%d", num_created_functions);
     ++num_created_functions;
@@ -1425,11 +1376,9 @@
         return NULL;
     
     void* ret_val;
-    
-    FILE *tmp_fh = (python_interpreter->m_dbg_stdout ? python_interpreter->m_dbg_stdout : stdout);
-    
+
     {
-        Locker py_lock(this, tmp_fh);
+        Locker py_lock(this);
         ret_val = g_swig_synthetic_script    (class_name, 
                                               python_interpreter->m_dictionary_name.c_str(),
                                               valobj);
@@ -1539,10 +1488,8 @@
     if (python_function_name 
         && *python_function_name)
     {
-        FILE *tmp_fh = (python_interpreter->m_dbg_stdout ? python_interpreter->m_dbg_stdout : stdout);
-        
         {
-            Locker py_lock(python_interpreter, tmp_fh);
+            Locker py_lock(python_interpreter);
             ret_val = g_swig_typescript_callback (python_function_name, 
                                                   python_interpreter->m_dictionary_name.c_str(),
                                                   valobj);
@@ -1594,10 +1541,8 @@
             if (stop_frame_sp && bp_loc_sp)
             {
                 bool ret_val = true;
-                FILE *tmp_fh = (python_interpreter->m_dbg_stdout ? python_interpreter->m_dbg_stdout : stdout);
-                
                 {
-                    Locker py_lock(python_interpreter, tmp_fh);
+                    Locker py_lock(python_interpreter);
                     ret_val = g_swig_breakpoint_callback (python_function_name, 
                                                           python_interpreter->m_dictionary_name.c_str(),
                                                           stop_frame_sp, 
@@ -1624,31 +1569,15 @@
     
     char error_str[1024];
     const char *pty_slave_name = script_interpreter->m_embedded_python_pty.GetSlaveName (error_str, sizeof (error_str));
-    bool need_to_release_lock = true;
-    bool safe_to_run = false;
 
-    if (CurrentThreadHasPythonLock())
-    {
-        safe_to_run = true;
-        need_to_release_lock = false;
-    }
-    else
-    {
-        int interval = 1;
-        safe_to_run = GetPythonLock (interval);
-        while (!safe_to_run)
-        {
-            interval = interval * 2;
-            safe_to_run = GetPythonLock (interval);
-        }
-    }
-    
-    if (pty_slave_name != NULL && safe_to_run)
+    Locker locker(script_interpreter,
+                  ScriptInterpreterPython::Locker::AcquireLock | ScriptInterpreterPython::Locker::InitSession,
+                  ScriptInterpreterPython::Locker::FreeAcquiredLock | ScriptInterpreterPython::Locker::TearDownSession);
+
+    if (pty_slave_name != NULL)
     {
         StreamString run_string;
         
-        script_interpreter->EnterSession ();
-        
         run_string.Printf ("run_one_line (%s, 'save_stderr = sys.stderr')", script_interpreter->m_dictionary_name.c_str());
         PyRun_SimpleString (run_string.GetData());
         run_string.Clear ();
@@ -1697,18 +1626,9 @@
         run_string.Printf ("run_one_line (%s, 'sys.stderr = save_stderr')", script_interpreter->m_dictionary_name.c_str());
         PyRun_SimpleString (run_string.GetData());
         run_string.Clear();
-
-        script_interpreter->LeaveSession ();
         
     }
     
-    if (!safe_to_run)
-        fprintf ((script_interpreter->m_dbg_stdout ? script_interpreter->m_dbg_stdout : stdout), 
-                 "Python interpreter locked on another thread; unable to acquire lock.\n");
-    
-    if (need_to_release_lock)
-        ReleasePythonLock ();
-    
     if (script_interpreter->m_embedded_thread_input_reader_sp)
         script_interpreter->m_embedded_thread_input_reader_sp->SetIsDone (true);
     
@@ -1738,15 +1658,11 @@
     
     if (!g_swig_calc_children)
         return 0;
-    
-    ScriptInterpreterPython *python_interpreter = this;
-    
+
     uint32_t ret_val = 0;
     
-    FILE *tmp_fh = (python_interpreter->m_dbg_stdout ? python_interpreter->m_dbg_stdout : stdout);
-
     {
-        Locker py_lock(python_interpreter, tmp_fh);
+        Locker py_lock(this);
         ret_val = g_swig_calc_children       (implementor);
     }
     
@@ -1762,16 +1678,12 @@
     if (!g_swig_get_child_index || !g_swig_cast_to_sbvalue)
         return lldb::ValueObjectSP();
     
-    ScriptInterpreterPython *python_interpreter = this;
-    
     void* child_ptr = NULL;
     lldb::SBValue* value_sb = NULL;
     lldb::ValueObjectSP ret_val;
     
-    FILE *tmp_fh = (python_interpreter->m_dbg_stdout ? python_interpreter->m_dbg_stdout : stdout);
-    
     {
-        Locker py_lock(python_interpreter, tmp_fh);
+        Locker py_lock(this);
         child_ptr = g_swig_get_child_index       (implementor,idx);
         if (child_ptr != NULL && child_ptr != Py_None)
         {
@@ -1799,14 +1711,10 @@
     if (!g_swig_get_index_child)
         return UINT32_MAX;
     
-    ScriptInterpreterPython *python_interpreter = this;
-    
     int ret_val = UINT32_MAX;
     
-    FILE *tmp_fh = (python_interpreter->m_dbg_stdout ? python_interpreter->m_dbg_stdout : stdout);
-    
     {
-        Locker py_lock(python_interpreter, tmp_fh);
+        Locker py_lock(this);
         ret_val = g_swig_get_index_child       (implementor, child_name);
     }
     
@@ -1822,12 +1730,8 @@
     if (!g_swig_update_provider)
         return;
     
-    ScriptInterpreterPython *python_interpreter = this;
-        
-    FILE *tmp_fh = (python_interpreter->m_dbg_stdout ? python_interpreter->m_dbg_stdout : stdout);
-    
     {
-        Locker py_lock(python_interpreter, tmp_fh);
+        Locker py_lock(this);
         g_swig_update_provider       (implementor);
     }
     
@@ -1850,14 +1754,10 @@
         return false;
     }
     
-    ScriptInterpreterPython *python_interpreter = this;
-    
     lldb::DebuggerSP debugger_sp = m_interpreter.GetDebugger().GetSP();
-    
-    FILE *tmp_fh = (python_interpreter->m_dbg_stdout ? python_interpreter->m_dbg_stdout : stdout);
-    
+
     {
-        Locker py_lock(python_interpreter, tmp_fh);
+        Locker py_lock(this);
         
         FileSpec target_file(pathname, true);
         
@@ -1877,7 +1777,7 @@
         command_stream.Printf("if not (sys.path.__contains__('%s')):\n    sys.path.append('%s');\n\n",
                               directory,
                               directory);
-        bool syspath_retval = python_interpreter->ExecuteMultipleLines(command_stream.GetData());
+        bool syspath_retval = ExecuteMultipleLines(command_stream.GetData());
         if (!syspath_retval)
         {
             error.SetErrorString("Python sys.path handling failed");
@@ -1897,7 +1797,7 @@
         int refcount = 0;
         // this call will fail if the module does not exist (because the parameter to it is not a string
         // but an actual Python module object, which is non-existant if the module was not imported before)
-        if (python_interpreter->ExecuteOneLineWithReturn(command_stream.GetData(),
+        if (ExecuteOneLineWithReturn(command_stream.GetData(),
                                                          ScriptInterpreterPython::eScriptReturnTypeInt, &refcount) && refcount > 0)
         {
             error.SetErrorString("module already imported");
@@ -1907,7 +1807,7 @@
         // now actually do the import
         command_stream.Clear();
         command_stream.Printf("import %s",basename.c_str());
-        bool import_retval = python_interpreter->ExecuteOneLine(command_stream.GetData(), NULL);
+        bool import_retval = ExecuteOneLine(command_stream.GetData(), NULL);
         if (!import_retval)
         {
             error.SetErrorString("Python import statement failed");
@@ -1916,7 +1816,7 @@
         
         // call __lldb_module_init(debugger,dict)
         if (!g_swig_call_module_init (basename,
-                                        python_interpreter->m_dictionary_name.c_str(),
+                                        m_dictionary_name.c_str(),
                                         debugger_sp))
         {
             error.SetErrorString("calling __lldb_module_init failed");
@@ -1944,20 +1844,16 @@
         return false;
     }
     
-    ScriptInterpreterPython *python_interpreter = this;
-
     lldb::DebuggerSP debugger_sp = m_interpreter.GetDebugger().GetSP();
     
     bool ret_val;
     
     std::string err_msg;
     
-    FILE *tmp_fh = (python_interpreter->m_dbg_stdout ? python_interpreter->m_dbg_stdout : stdout);
-    
     {
-        Locker py_lock(python_interpreter, tmp_fh);
+        Locker py_lock(this);
         ret_val = g_swig_call_command       (impl_function,
-                                             python_interpreter->m_dictionary_name.c_str(),
+                                             m_dictionary_name.c_str(),
                                              debugger_sp,
                                              args,
                                              err_msg,



From johnny.chen at apple.com  Mon Oct 24 13:11:16 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Mon, 24 Oct 2011 18:11:16 -0000
Subject: [Lldb-commits] [lldb] r142823 -
 /lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py
Message-ID: <20111024181117.04D03312800A@llvm.org>

Author: johnny
Date: Mon Oct 24 13:11:16 2011
New Revision: 142823

URL: http://llvm.org/viewvc/llvm-project?rev=142823&view=rev
Log:
Removed the @expectedFailure decorators from test cases.  They have been fixed with the r142717 check-in.

Modified:
    lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py

Modified: lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py?rev=142823&r1=142822&r2=142823&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py (original)
+++ lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py Mon Oct 24 13:11:16 2011
@@ -18,17 +18,13 @@
         self.line = line_number('main.cpp',
                                 '// Please test these expressions while stopped at this line:')
 
-    # rdar://problem/9471744 test failure: ./dotest.py -C clang -v -w -t -p CallStdString
-    @unittest2.expectedFailure
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
         """Test calling std::String member function."""
         self.buildDsym()
         self.call_function()
 
-    # rdar://problem/9471744 test failure: ./dotest.py -C clang -v -w -t -p CallStdString
-    @unittest2.expectedFailure
-    def test_with_dwarf_(self):
+    def test_with_dwarf(self):
         """Test calling std::String member function."""
         self.buildDsym()
         self.call_function()
@@ -47,6 +43,8 @@
         self.expect("print str",
             substrs = ['Hello world'])
 
+        # Should be fixed with r142717.
+        #
         # rdar://problem/9471744 test failure: ./dotest.py -C clang -v -w -t -p CallStdString
         # runCmd: print str.c_str()
         # runCmd failed!



From johnny.chen at apple.com  Mon Oct 24 13:24:54 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Mon, 24 Oct 2011 18:24:54 -0000
Subject: [Lldb-commits] [lldb] r142825 -
 /lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
Message-ID: <20111024182454.7735F312800A@llvm.org>

Author: johnny
Date: Mon Oct 24 13:24:54 2011
New Revision: 142825

URL: http://llvm.org/viewvc/llvm-project?rev=142825&view=rev
Log:
Fix test regressions due to the addition of 'display' alias to the top level commands, which conflicts
with the original 'dis' -> 'disassemble' unique expansion.  Change it to 'disass' now.

Modified:
    lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py

Modified: lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py?rev=142825&r1=142824&r2=142825&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py (original)
+++ lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py Mon Oct 24 13:24:54 2011
@@ -131,7 +131,7 @@
 
         # ARCH, if not specified, defaults to x86_64.
         if self.getArchitecture() in ["", 'x86_64', 'i386']:
-            self.expect("dis -f",
+            self.expect("disass -f",
                         startstr = "a.out`sum(int, int)",
                         substrs = [' push',
                                    ' mov',



From jingham at apple.com  Mon Oct 24 13:36:33 2011
From: jingham at apple.com (Jim Ingham)
Date: Mon, 24 Oct 2011 18:36:33 -0000
Subject: [Lldb-commits] [lldb] r142833 -
	/lldb/trunk/source/Commands/CommandObjectTarget.cpp
Message-ID: <20111024183633.AC858312800A@llvm.org>

Author: jingham
Date: Mon Oct 24 13:36:33 2011
New Revision: 142833

URL: http://llvm.org/viewvc/llvm-project?rev=142833&view=rev
Log:
Add a "-a" option to "image list" to show the image at a given address.

Modified:
    lldb/trunk/source/Commands/CommandObjectTarget.cpp

Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectTarget.cpp?rev=142833&r1=142832&r2=142833&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Mon Oct 24 13:36:33 2011
@@ -2617,7 +2617,9 @@
         
         CommandOptions (CommandInterpreter &interpreter) :
             Options(interpreter),
-            m_format_array()
+            m_use_global_module_list (false),
+            m_format_array(),
+            m_module_addr (LLDB_INVALID_ADDRESS)
         {
         }
         
@@ -2634,6 +2636,16 @@
             {
                 m_use_global_module_list = true;
             }
+            else if (short_option == 'a')
+            {
+                bool success;
+                m_module_addr = Args::StringToAddress(option_arg, LLDB_INVALID_ADDRESS, &success);
+                if (!success)
+                {
+                    Error error;
+                    error.SetErrorStringWithFormat("Invalid address: \"%s\".", option_arg);
+                }
+            }
             else
             {
                 uint32_t width = 0;
@@ -2650,6 +2662,7 @@
         {
             m_format_array.clear();
             m_use_global_module_list = false;
+            m_module_addr = LLDB_INVALID_ADDRESS;
         }
         
         const OptionDefinition*
@@ -2666,6 +2679,7 @@
         typedef std::vector< std::pair<char, uint32_t> > FormatWidthCollection;
         FormatWidthCollection m_format_array;
         bool m_use_global_module_list;
+        lldb::addr_t m_module_addr;
     };
     
     CommandObjectTargetModulesList (CommandInterpreter &interpreter) :
@@ -2712,6 +2726,42 @@
             // Dump all sections for all modules images
             uint32_t num_modules = 0;
             Mutex::Locker locker;
+            
+            Stream &strm = result.GetOutputStream();
+            
+            if (m_options.m_module_addr != LLDB_INVALID_ADDRESS)
+            {
+                if (target)
+                {
+                    Address module_address;
+                    if (module_address.SetLoadAddress(m_options.m_module_addr, target))
+                    {
+                        Module *module = module_address.GetModule();
+                        if (module)
+                        {
+                            PrintModule (strm, module);
+                            result.SetStatus (eReturnStatusSuccessFinishResult);
+                        }
+                        else
+                        {
+                            result.AppendError ("Couldn't find module matching address: 0x%llx.", m_options.m_module_addr);
+                            result.SetStatus (eReturnStatusFailed);
+                        }
+                    }
+                    else
+                    {
+                        result.AppendError ("Couldn't find module containing address: 0x%llx.", m_options.m_module_addr);
+                        result.SetStatus (eReturnStatusFailed);
+                    }
+                }
+                else
+                {
+                    result.AppendError ("Can only look up modules by address with a valid target.");
+                    result.SetStatus (eReturnStatusFailed);
+                }
+                return result.Succeeded();
+            }
+            
             if (use_global_module_list)
             {
                 locker.Reset (Module::GetAllocationModuleCollectionMutex().GetMutex());
@@ -2721,9 +2771,7 @@
                 num_modules = target->GetImages().GetSize();
 
             if (num_modules > 0)
-            {
-                Stream &strm = result.GetOutputStream();
-                
+            {                
                 for (uint32_t image_idx = 0; image_idx<num_modules; ++image_idx)
                 {
                     ModuleSP module_sp;
@@ -2738,109 +2786,10 @@
                         module_sp = target->GetImages().GetModuleAtIndex(image_idx);
                         module = module_sp.get();
                     }
-
+                    
                     strm.Printf("[%3u] ", image_idx);
+                    PrintModule (strm, module);
 
-                    bool dump_object_name = false;
-                    if (m_options.m_format_array.empty())
-                    {
-                        DumpFullpath(strm, &module->GetFileSpec(), 0);
-                        dump_object_name = true;
-                    }
-                    else
-                    {
-                        const size_t num_entries = m_options.m_format_array.size();
-                        for (size_t i=0; i<num_entries; ++i)
-                        {
-                            if (i > 0)
-                                strm.PutChar(' ');
-                            char format_char = m_options.m_format_array[i].first;
-                            uint32_t width = m_options.m_format_array[i].second;
-                            switch (format_char)
-                            {
-                                case 'a':
-                                    DumpModuleArchitecture (strm, module, false, width);
-                                    break;
-                                    
-                                case 't':
-                                    DumpModuleArchitecture (strm, module, true, width);
-                                    break;
-                                    
-                                case 'f':
-                                    DumpFullpath (strm, &module->GetFileSpec(), width);
-                                    dump_object_name = true;
-                                    break;
-                                    
-                                case 'd':
-                                    DumpDirectory (strm, &module->GetFileSpec(), width);
-                                    break;
-                                    
-                                case 'b':
-                                    DumpBasename (strm, &module->GetFileSpec(), width);
-                                    dump_object_name = true;
-                                    break;
-                                    
-                                case 'r':
-                                    {
-                                        uint32_t ref_count = 0;
-                                        if (module_sp)
-                                        {
-                                            // Take one away to make sure we don't count our local "module_sp"
-                                            ref_count = module_sp.use_count() - 1;
-                                        }
-                                        if (width)
-                                            strm.Printf("{%*u}", width, ref_count);
-                                        else
-                                            strm.Printf("{%u}", ref_count);
-                                    }
-                                    break;
-
-                                case 's':
-                                case 'S':
-                                    {
-                                        SymbolVendor *symbol_vendor = module->GetSymbolVendor();
-                                        if (symbol_vendor)
-                                        {
-                                            SymbolFile *symbol_file = symbol_vendor->GetSymbolFile();
-                                            if (symbol_file)
-                                            {
-                                                if (format_char == 'S')
-                                                    DumpBasename(strm, &symbol_file->GetObjectFile()->GetFileSpec(), width);
-                                                else
-                                                    DumpFullpath (strm, &symbol_file->GetObjectFile()->GetFileSpec(), width);
-                                                dump_object_name = true;
-                                                break;
-                                            }
-                                        }
-                                        strm.Printf("%.*s", width, "<NONE>");
-                                    }
-                                    break;
-                                    
-                                case 'm':
-                                    module->GetModificationTime().Dump(&strm, width);
-                                    break;
-
-                                case 'p':
-                                    strm.Printf("%p", module);
-                                    break;
-
-                                case 'u':
-                                    DumpModuleUUID(strm, module);
-                                    break;
-                                    
-                                default:
-                                    break;
-                            }
-                            
-                        }
-                    }
-                    if (dump_object_name)
-                    {
-                        const char *object_name = module->GetObjectName().GetCString();
-                        if (object_name)
-                            strm.Printf ("(%s)", object_name);
-                    }
-                    strm.EOL();
                 }
                 result.SetStatus (eReturnStatusSuccessFinishResult);
             }
@@ -2857,14 +2806,122 @@
         return result.Succeeded();
     }
 protected:
-    
+
+    void
+    PrintModule (Stream &strm, Module *module)
+    {
+
+        bool dump_object_name = false;
+        if (m_options.m_format_array.empty())
+        {
+            DumpFullpath(strm, &module->GetFileSpec(), 0);
+            dump_object_name = true;
+        }
+        else
+        {
+            const size_t num_entries = m_options.m_format_array.size();
+            for (size_t i=0; i<num_entries; ++i)
+            {
+                if (i > 0)
+                    strm.PutChar(' ');
+                char format_char = m_options.m_format_array[i].first;
+                uint32_t width = m_options.m_format_array[i].second;
+                switch (format_char)
+                {
+                    case 'A':
+                        DumpModuleArchitecture (strm, module, false, width);
+                        break;
+                        
+                    case 't':
+                        DumpModuleArchitecture (strm, module, true, width);
+                        break;
+                        
+                    case 'f':
+                        DumpFullpath (strm, &module->GetFileSpec(), width);
+                        dump_object_name = true;
+                        break;
+                        
+                    case 'd':
+                        DumpDirectory (strm, &module->GetFileSpec(), width);
+                        break;
+                        
+                    case 'b':
+                        DumpBasename (strm, &module->GetFileSpec(), width);
+                        dump_object_name = true;
+                        break;
+                        
+                    case 'r':
+                        {
+                            uint32_t ref_count = 0;
+                            ModuleSP module_sp (module);
+                            if (module_sp)
+                            {
+                                // Take one away to make sure we don't count our local "module_sp"
+                                ref_count = module_sp.use_count() - 1;
+                            }
+                            if (width)
+                                strm.Printf("{%*u}", width, ref_count);
+                            else
+                                strm.Printf("{%u}", ref_count);
+                        }
+                        break;
+
+                    case 's':
+                    case 'S':
+                        {
+                            SymbolVendor *symbol_vendor = module->GetSymbolVendor();
+                            if (symbol_vendor)
+                            {
+                                SymbolFile *symbol_file = symbol_vendor->GetSymbolFile();
+                                if (symbol_file)
+                                {
+                                    if (format_char == 'S')
+                                        DumpBasename(strm, &symbol_file->GetObjectFile()->GetFileSpec(), width);
+                                    else
+                                        DumpFullpath (strm, &symbol_file->GetObjectFile()->GetFileSpec(), width);
+                                    dump_object_name = true;
+                                    break;
+                                }
+                            }
+                            strm.Printf("%.*s", width, "<NONE>");
+                        }
+                        break;
+                        
+                    case 'm':
+                        module->GetModificationTime().Dump(&strm, width);
+                        break;
+
+                    case 'p':
+                        strm.Printf("%p", module);
+                        break;
+
+                    case 'u':
+                        DumpModuleUUID(strm, module);
+                        break;
+                        
+                    default:
+                        break;
+                }
+                
+            }
+            if (dump_object_name)
+            {
+                const char *object_name = module->GetObjectName().GetCString();
+                if (object_name)
+                    strm.Printf ("(%s)", object_name);
+            }
+        }
+        strm.EOL();
+    }
+        
     CommandOptions m_options;
 };
 
 OptionDefinition
 CommandObjectTargetModulesList::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "arch",       'a', optional_argument, NULL, 0, eArgTypeWidth,   "Display the architecture when listing images."},
+    { LLDB_OPT_SET_1, false, "address",    'a', required_argument, NULL, 0, eArgTypeAddress, "Display the image at this address."},
+    { LLDB_OPT_SET_1, false, "arch",       'A', optional_argument, NULL, 0, eArgTypeWidth,   "Display the architecture when listing images."},
     { LLDB_OPT_SET_1, false, "triple",     't', optional_argument, NULL, 0, eArgTypeWidth,   "Display the triple when listing images."},
     { LLDB_OPT_SET_1, false, "uuid",       'u', no_argument,       NULL, 0, eArgTypeNone,    "Display the UUID when listing images."},
     { LLDB_OPT_SET_1, false, "fullpath",   'f', optional_argument, NULL, 0, eArgTypeWidth,   "Display the fullpath to the image object file."},



From jingham at apple.com  Mon Oct 24 13:37:00 2011
From: jingham at apple.com (Jim Ingham)
Date: Mon, 24 Oct 2011 18:37:00 -0000
Subject: [Lldb-commits] [lldb] r142834 - in /lldb/trunk:
 source/Interpreter/CommandInterpreter.cpp
 test/functionalities/abbreviation/TestAbbreviations.py
Message-ID: <20111024183700.C6C4A312800A@llvm.org>

Author: jingham
Date: Mon Oct 24 13:37:00 2011
New Revision: 142834

URL: http://llvm.org/viewvc/llvm-project?rev=142834&view=rev
Log:
Add "di" and "dis" aliases to "disassemble" so they will win over "display".

Modified:
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp
    lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py

Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=142834&r1=142833&r2=142834&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Mon Oct 24 13:37:00 2011
@@ -177,6 +177,16 @@
     cmd_obj_sp = GetCommandSPExact ("_display", false);
     if (cmd_obj_sp)
         AddAlias ("display", cmd_obj_sp);
+        
+    cmd_obj_sp = GetCommandSPExact ("disassemble", false);
+    if (cmd_obj_sp)
+        AddAlias ("dis", cmd_obj_sp);
+
+    cmd_obj_sp = GetCommandSPExact ("disassemble", false);
+    if (cmd_obj_sp)
+        AddAlias ("di", cmd_obj_sp);
+
+
 
     cmd_obj_sp = GetCommandSPExact ("_undisplay", false);
     if (cmd_obj_sp)

Modified: lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py?rev=142834&r1=142833&r2=142834&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py (original)
+++ lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py Mon Oct 24 13:37:00 2011
@@ -131,7 +131,7 @@
 
         # ARCH, if not specified, defaults to x86_64.
         if self.getArchitecture() in ["", 'x86_64', 'i386']:
-            self.expect("disass -f",
+            self.expect("dis -f",
                         startstr = "a.out`sum(int, int)",
                         substrs = [' push',
                                    ' mov',



From johnny.chen at apple.com  Mon Oct 24 15:06:24 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Mon, 24 Oct 2011 20:06:24 -0000
Subject: [Lldb-commits] [lldb] r142839 -
 /lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
Message-ID: <20111024200624.289D4312800A@llvm.org>

Author: johnny
Date: Mon Oct 24 15:06:23 2011
New Revision: 142839

URL: http://llvm.org/viewvc/llvm-project?rev=142839&view=rev
Log:
Add two new @expectedFailure decorators.

rdar://problem/10334911

Modified:
    lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py?rev=142839&r1=142838&r2=142839&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py Mon Oct 24 15:06:23 2011
@@ -11,12 +11,16 @@
 
     mydir = os.path.join("functionalities", "data-formatter", "data-formatter-python-synth")
 
+    #rdar://problem/10334911
+    @unittest2.expectedFailure
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
         """Test data formatter commands."""
         self.buildDsym()
         self.data_formatter_commands()
 
+    #rdar://problem/10334911
+    @unittest2.expectedFailure
     def test_with_dwarf_and_run_command(self):
         """Test data formatter commands."""
         self.buildDwarf()



From johnny.chen at apple.com  Mon Oct 24 17:03:01 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Mon, 24 Oct 2011 22:03:01 -0000
Subject: [Lldb-commits] [lldb] r142857 -
 /lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py
Message-ID: <20111024220301.88F13312800A@llvm.org>

Author: johnny
Date: Mon Oct 24 17:03:01 2011
New Revision: 142857

URL: http://llvm.org/viewvc/llvm-project?rev=142857&view=rev
Log:
Test some lldb command abbreviations to make sure the common short spellings of
many commands remain available even after we add/delte commands in the future.

Added:
    lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py

Added: lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py?rev=142857&view=auto
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py (added)
+++ lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py Mon Oct 24 17:03:01 2011
@@ -0,0 +1,63 @@
+"""
+Test some lldb command abbreviations to make sure the common short spellings of
+many commands remain available even after we add/delte commands in the future.
+"""
+
+import os, time
+import unittest2
+import lldb
+from lldbtest import *
+
+class CommonShortSpellingsTestCase(TestBase):
+    
+    mydir = os.path.join("functionalities", "abbreviation")
+
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    def test_with_dsym (self):
+        self.buildDsym ()
+        self.run_abbrevs2 ()
+
+    def test_with_dwarf (self):
+        self.buildDwarf ()
+        self.run_abbrevs2 ()
+
+    def run_abbrevs2 (self):
+        exe = os.path.join (os.getcwd(), "a.out")
+        self.expect("fil " + exe,
+                    patterns = [ "Current executable set to .*a.out.*" ])
+
+        # br s -> breakpoint set
+        self.expect("br s -n sum",
+            startstr = "Breakpoint created: 1: name = 'sum', locations = 1")
+
+        # disp -> display
+        self.expect("disp a",
+            startstr = "target stop-hook add -o")
+        self.expect("disp b",
+            startstr = "target stop-hook add -o")
+
+        # di/dis -> disassemble
+        self.expect("help di",
+            substrs = ["disassemble"])
+        self.expect("help dis",
+            substrs = ["disassemble"])
+
+        # ta st a -> target stop-hook add
+        self.expect("help ta st a",
+            substrs = ["target stop-hook add"])
+
+        # fr v -> frame variable
+        self.expect("help fr v",
+            substrs = ["frame variable"])
+
+        # ta st li -> target stop-hook list
+        self.expect("ta st li",
+            substrs = ["Hook: 1", "Hook: 2"])
+
+
+if __name__ == '__main__':
+    import atexit
+    lldb.SBDebugger.Initialize()
+    atexit.register(lambda: lldb.SBDebugger.Terminate())
+    unittest2.main()
+



From johnny.chen at apple.com  Mon Oct 24 17:06:48 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Mon, 24 Oct 2011 22:06:48 -0000
Subject: [Lldb-commits] [lldb] r142858 -
 /lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py
Message-ID: <20111024220648.AA161312800A@llvm.org>

Author: johnny
Date: Mon Oct 24 17:06:48 2011
New Revision: 142858

URL: http://llvm.org/viewvc/llvm-project?rev=142858&view=rev
Log:
Minor change.

Modified:
    lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py

Modified: lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py?rev=142858&r1=142857&r2=142858&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py (original)
+++ lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py Mon Oct 24 17:06:48 2011
@@ -23,7 +23,7 @@
 
     def run_abbrevs2 (self):
         exe = os.path.join (os.getcwd(), "a.out")
-        self.expect("fil " + exe,
+        self.expect("file " + exe,
                     patterns = [ "Current executable set to .*a.out.*" ])
 
         # br s -> breakpoint set



From johnny.chen at apple.com  Mon Oct 24 18:01:06 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Mon, 24 Oct 2011 23:01:06 -0000
Subject: [Lldb-commits] [lldb] r142868 - in /lldb/trunk:
 source/Target/Target.cpp
 test/functionalities/abbreviation/TestAbbreviations.py
Message-ID: <20111024230107.051A5312800A@llvm.org>

Author: johnny
Date: Mon Oct 24 18:01:06 2011
New Revision: 142868

URL: http://llvm.org/viewvc/llvm-project?rev=142868&view=rev
Log:
Add more context information to the stop-hook mechanism by displaying the stop-hook
command in the '- Hook id' header.  This should improve readbility of the 'display'
command if, for example, we have issued 'display a' and 'display b' which turn into
"target stop-hook add -o 'expr -- a'" and "target stop-hook add -o 'expr -- b'".

Plus some minor change in TestAbbreviations.py to conditionalize the platform-specific
checkings of the "image list" output.

Modified:
    lldb/trunk/source/Target/Target.cpp
    lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py

Modified: lldb/trunk/source/Target/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=142868&r1=142867&r2=142868&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Mon Oct 24 18:01:06 2011
@@ -1736,7 +1736,13 @@
                 }
                 if (print_hook_header && !any_thread_matched)
                 {
-                    result.AppendMessageWithFormat("\n- Hook %llu\n", cur_hook_sp->GetID());
+                    const char *cmd = (cur_hook_sp->GetCommands().GetSize() == 1 ?
+                                       cur_hook_sp->GetCommands().GetStringAtIndex(0) :
+                                       NULL);
+                    if (cmd)
+                        result.AppendMessageWithFormat("\n- Hook %llu (%s)\n", cur_hook_sp->GetID(), cmd);
+                    else
+                        result.AppendMessageWithFormat("\n- Hook %llu\n", cur_hook_sp->GetID());
                     any_thread_matched = true;
                 }
                 

Modified: lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py?rev=142868&r1=142867&r2=142868&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py (original)
+++ lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py Mon Oct 24 18:01:06 2011
@@ -151,12 +151,13 @@
         self.expect("i d symt",
                     patterns = ["Dumping symbol table for [0-9]+ modules."])
 
-        self.expect("i li",
-                    substrs = [ 'a.out',
-                                '/usr/lib/dyld',
-                                '/usr/lib/libstdc++',
-                                '/usr/lib/libSystem.B.dylib',
-                                '/usr/lib/system/libmathCommon.A.dylib'])
+        if sys.platform.startswith("darwin"):
+            self.expect("i li",
+                        substrs = [ 'a.out',
+                                    '/usr/lib/dyld',
+                                    '/usr/lib/libstdc++',
+                                    '/usr/lib/libSystem.B.dylib',
+                                    '/usr/lib/system/libmathCommon.A.dylib'])
 
 
 if __name__ == '__main__':



From johnny.chen at apple.com  Mon Oct 24 18:18:17 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Mon, 24 Oct 2011 23:18:17 -0000
Subject: [Lldb-commits] [lldb] r142874 - /lldb/trunk/test/bench-history
Message-ID: <20111024231817.D2B39312800A@llvm.org>

Author: johnny
Date: Mon Oct 24 18:18:17 2011
New Revision: 142874

URL: http://llvm.org/viewvc/llvm-project?rev=142874&view=rev
Log:
Add a bench-history file to keep track of simple bench results.

Added:
    lldb/trunk/test/bench-history

Added: lldb/trunk/test/bench-history
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/bench-history?rev=142874&view=auto
==============================================================================
--- lldb/trunk/test/bench-history (added)
+++ lldb/trunk/test/bench-history Mon Oct 24 18:18:17 2011
@@ -0,0 +1,29 @@
+config: MacBook Pro (10.7.2)
+        2.8 GHz Intel Core 2 Duo
+        4 GB 1067 MHz DDR3
+
+r142707 (Oct 21, 2011):
+[17:45:55] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.104274 (Laps: 30, Total Elapsed Time: 3.128214)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.102216 (Laps: 30, Total Elapsed Time: 3.066470)
+lldb frame variable benchmark: Avg: 1.649162 (Laps: 20, Total Elapsed Time: 32.983245)
+lldb stepping benchmark: Avg: 0.104409 (Laps: 50, Total Elapsed Time: 5.220461)
+lldb expr cmd benchmark: Avg: 0.206774 (Laps: 25, Total Elapsed Time: 5.169350)
+lldb disassembly benchmark: Avg: 0.089086 (Laps: 10, Total Elapsed Time: 0.890859)
+
+r142868 (Oct 24, 2011):
+[15:53:34] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.105384 (Laps: 30, Total Elapsed Time: 3.161530)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.102334 (Laps: 30, Total Elapsed Time: 3.070012)
+lldb frame variable benchmark: Avg: 1.661701 (Laps: 20, Total Elapsed Time: 33.234026)
+lldb stepping benchmark: Avg: 0.107101 (Laps: 50, Total Elapsed Time: 5.355043)
+lldb expr cmd benchmark: Avg: 0.209475 (Laps: 25, Total Elapsed Time: 5.236863)
+lldb disassembly benchmark: Avg: 0.005543 (Laps: 10, Total Elapsed Time: 0.055426)
+[16:09:20] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.103826 (Laps: 30, Total Elapsed Time: 3.114768)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.102312 (Laps: 30, Total Elapsed Time: 3.069371)
+lldb frame variable benchmark: Avg: 1.602898 (Laps: 20, Total Elapsed Time: 32.057950)
+lldb stepping benchmark: Avg: 0.104091 (Laps: 50, Total Elapsed Time: 5.204557)
+lldb expr cmd benchmark: Avg: 0.207095 (Laps: 25, Total Elapsed Time: 5.177363)
+lldb disassembly benchmark: Avg: 0.001531 (Laps: 10, Total Elapsed Time: 0.015311)
+



From gclayton at apple.com  Mon Oct 24 19:36:27 2011
From: gclayton at apple.com (Greg Clayton)
Date: Tue, 25 Oct 2011 00:36:27 -0000
Subject: [Lldb-commits] [lldb] r142888 - in /lldb/trunk:
 include/lldb/Interpreter/CommandInterpreter.h
 source/Interpreter/CommandInterpreter.cpp
Message-ID: <20111025003627.4A81D312800A@llvm.org>

Author: gclayton
Date: Mon Oct 24 19:36:27 2011
New Revision: 142888

URL: http://llvm.org/viewvc/llvm-project?rev=142888&view=rev
Log:
Simplified the CommandInterpreter::StripFirstWord logic by making it a static
function and having it not require both a bool and a quote char to fill in.
We intend to get rid of this functionality when we rewrite the command 
interpreter for streams eventually, but not for now.


Modified:
    lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp

Modified: lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h?rev=142888&r1=142887&r2=142888&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h (original)
+++ lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h Mon Oct 24 19:36:27 2011
@@ -129,12 +129,6 @@
     AddOrReplaceAliasOptions (const char *alias_name, 
                               OptionArgVectorSP &option_arg_vector_sp);
 
-    bool
-    StripFirstWord (std::string &command_string, 
-                    std::string &next_word,
-                    bool &was_quoted,
-                    char &quote_char);
-
     void
     BuildAliasResult (const char *alias_name, 
                       std::string &raw_input_string, 

Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=142888&r1=142887&r2=142888&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Mon Oct 24 19:36:27 2011
@@ -878,62 +878,70 @@
     return cmd_obj;
 }
 
-bool
-CommandInterpreter::StripFirstWord (std::string &command_string, std::string &word, bool &was_quoted, char &quote_char)
+static const char *k_white_space = " \t\v";
+
+static void
+StripLeadingSpaces (std::string &s)
 {
-    std::string white_space (" \t\v");
-    size_t start;
-    size_t end;
-    
-    start = command_string.find_first_not_of (white_space);
-    if (start != std::string::npos)
-    {
-        size_t len = command_string.size() - start;
-        if (len >= 2
-                && ((command_string[start] == '\'') || (command_string[start] == '"')))
-        {
-            was_quoted = true;
-            quote_char = command_string[start];
-            std::string quote_string = command_string.substr (start, 1);
-            start = start + 1;
-            end = command_string.find (quote_string, start);
-            if (end != std::string::npos)
-            {
-                word = command_string.substr (start, end - start);
-                if (end + 1 < len)
-                    command_string = command_string.substr (end+1);
-                else
-                    command_string.erase ();
-                size_t pos = command_string.find_first_not_of (white_space);
-                if ((pos != 0) && (pos != std::string::npos))
-                    command_string = command_string.substr (pos);
+    if (!s.empty())
+    {
+        size_t pos = s.find_first_not_of (k_white_space);
+        if (pos == std::string::npos)
+            s.clear();
+        else if (pos == 0)
+            return;
+        s.erase (0, pos);
+    }
+}
+
+static bool
+StripFirstWord (std::string &command_string, std::string &word, char &quote_char)
+{
+    word.clear();
+    StripLeadingSpaces (command_string);
+
+    bool result = false;
+    quote_char = '\0';
+    
+    if (!command_string.empty())
+    {
+        const char first_char = command_string[0];
+        if (first_char == '\'' || first_char == '"')
+        {
+            quote_char = first_char;
+            const size_t end_quote_pos = command_string.find (quote_char, 1);
+            if (end_quote_pos == std::string::npos)
+            {
+                word.swap (command_string);
+                command_string.erase ();
             }
             else
             {
-                word = command_string.substr (start - 1);
-                command_string.erase ();
+                word = command_string.substr (1, end_quote_pos - 1);
+                if (end_quote_pos + 1 < command_string.size())
+                    command_string.erase (0, command_string.find_first_not_of (k_white_space, end_quote_pos + 1));
+                else
+                    command_string.erase ();
             }
         }
         else
         {
-            end = command_string.find_first_of (white_space, start);
-            if (end != std::string::npos)
+            const size_t first_space_pos = command_string.find_first_of (k_white_space);
+            if (first_space_pos == std::string::npos)
             {
-                word = command_string.substr (start, end - start);
-                command_string = command_string.substr (end);
-                size_t pos = command_string.find_first_not_of (white_space);
-                if ((pos != 0) && (pos != std::string::npos))
-                    command_string = command_string.substr (pos);
+                word.swap (command_string);
+                command_string.erase();
             }
             else
             {
-                word = command_string.substr (start);
-                command_string.erase();
+                word = command_string.substr (0, first_space_pos);
+                command_string.erase(0,command_string.find_first_not_of (k_white_space, first_space_pos));
             }
         }
-
+        result = true;
     }
-    return true;
+
+    return result;
 }
 
 void
@@ -1236,9 +1244,8 @@
     size_t actual_cmd_name_len = 0;
     while (!done)
     {
-        bool was_quoted = false;
         char quote_char = '\0';
-        StripFirstWord (command_string, next_word, was_quoted, quote_char);
+        StripFirstWord (command_string, next_word, quote_char);
         if (!cmd_obj && AliasExists (next_word.c_str())) 
         {
             std::string alias_result;
@@ -1276,13 +1283,8 @@
             }
             else
             {
-                if (was_quoted)
-                {
-                    if (quote_char == '"')
-                        revised_command_line.Printf (" \"%s\"", next_word.c_str());
-                    else
-                        revised_command_line.Printf (" '%s'", next_word.c_str());
-                }
+                if (quote_char)
+                    revised_command_line.Printf (" %c%s%c", quote_char, next_word.c_str(), quote_char);
                 else
                     revised_command_line.Printf (" %s", next_word.c_str());
                 done = true;
@@ -1290,13 +1292,8 @@
         }
         else
         {
-            if (was_quoted)
-            {
-                if (quote_char == '"')
-                    revised_command_line.Printf (" \"%s\"", next_word.c_str());
-                else
-                    revised_command_line.Printf (" '%s'", next_word.c_str());
-            }
+            if (quote_char)
+                revised_command_line.Printf (" %c%s%c", quote_char, next_word.c_str(), quote_char);
             else
                 revised_command_line.Printf (" %s", next_word.c_str());
             done = true;



From gclayton at apple.com  Mon Oct 24 20:25:35 2011
From: gclayton at apple.com (Greg Clayton)
Date: Tue, 25 Oct 2011 01:25:35 -0000
Subject: [Lldb-commits] [lldb] r142897 -
 /lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
Message-ID: <20111025012535.4D97D312800A@llvm.org>

Author: gclayton
Date: Mon Oct 24 20:25:35 2011
New Revision: 142897

URL: http://llvm.org/viewvc/llvm-project?rev=142897&view=rev
Log:
<rdar://problem/10335756>

Fixed an issue where bad DWARF from clang would get recycled from DWARF back
into types and cause clang to assert and die, killing the lldb binary, when
it tried to used the type in an expression.


Modified:
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp?rev=142897&r1=142896&r2=142897&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Mon Oct 24 20:25:35 2011
@@ -1348,8 +1348,27 @@
                         }
                     }
                     
-                    // FIXME: Make Clang ignore Objective-C accessibility for expressions
+                    // Clang has a DWARF generation bug where sometimes it 
+                    // represents fields that are references with bad byte size
+                    // and bit size/offset information such as:
+                    //
+                    //  DW_AT_byte_size( 0x00 )
+                    //  DW_AT_bit_size( 0x40 )
+                    //  DW_AT_bit_offset( 0xffffffffffffffc0 )
+                    //
+                    // So check the bit offset to make sure it is sane, and if 
+                    // the values are not sane, remove them. If we don't do this
+                    // then we will end up with a crash if we try to use this 
+                    // type in an expression when clang becomes unhappy with its
+                    // recycled debug info.
                     
+                    if (bit_offset > 128)
+                    {
+                        bit_size = 0;
+                        bit_offset = 0;
+                    }
+
+                    // FIXME: Make Clang ignore Objective-C accessibility for expressions
                     if (class_language == eLanguageTypeObjC ||
                         class_language == eLanguageTypeObjC_plus_plus)
                         accessibility = eAccessNone; 



From jmolenda at apple.com  Mon Oct 24 20:28:31 2011
From: jmolenda at apple.com (Jason Molenda)
Date: Tue, 25 Oct 2011 01:28:31 -0000
Subject: [Lldb-commits] [lldb] r142898 - /lldb/trunk/www/lldb-gdb.html
Message-ID: <20111025012831.6F434312800A@llvm.org>

Author: jmolenda
Date: Mon Oct 24 20:28:31 2011
New Revision: 142898

URL: http://llvm.org/viewvc/llvm-project?rev=142898&view=rev
Log:
Add examples of shortest-possible lldb commands where appropriate.
Add new "Examining Variables" section.
Updated a few command entries to match current lldb behavior.

Modified:
    lldb/trunk/www/lldb-gdb.html

Modified: lldb/trunk/www/lldb-gdb.html
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/www/lldb-gdb.html?rev=142898&r1=142897&r2=142898&view=diff
==============================================================================
--- lldb/trunk/www/lldb-gdb.html (original)
+++ lldb/trunk/www/lldb-gdb.html Mon Oct 24 20:28:31 2011
@@ -10,27 +10,28 @@
     <div class="www_title">
       The <strong>LLDB</strong> Debugger
     </div>
-    
+
 <div id="container">
-	<div id="content">
+    <div id="content">
          <!--#include virtual="sidebar.incl"-->
-		<div id="middle">
-			<div class="post">
-				<h1 class ="postheader">LLDB to GDB Command Map</h1>
-    			<div class="post">
-
-              	    <p>Below is a table of LLDB commands with the GDB counterparts.
-              	        The built in GDB compatability aliases in GDB are also
-              	        listed.</p>
+        <div id="middle">
+            <div class="post">
+
+                <h1 class ="postheader">LLDB to GDB Command Map</h1>
+                <div class="post">
+
+                    <p>Below is a table of LLDB commands with the GDB counterparts.
+                        The built in GDB compatability aliases in GDB are also
+                        listed.</p>
                 </div>
-            	<div class="postfooter"></div>
+                <div class="postfooter"></div>
 
-				<h1 class ="postheader">Execution Commands</h1>
-    			<div class="post">
+                <h1 class ="postheader">Execution Commands</h1>
+                <div class="post">
 
                     <p>
 
-              	    <table class="stats" width="620" cellspacing="0">
+                    <table class="stats" width="620" cellspacing="0">
                     <tr>
                         <td class="hed" width="50%">LLDB</td>
                         <td class="hed" width="50%">GDB</td>
@@ -48,11 +49,10 @@
                         </td>
                     </tr>
 
-                    
+
                     <tr><td class="header" colspan="2">Launch a process with arguments <code>&lt;args&gt;</code>.</td></tr>
                         <td class="content">
                             <b>(lldb)</b> process launch -- &lt;args&gt;<br>
-                            <b>(lldb)</b> run -- &lt;args&gt;<br>
                             <b>(lldb)</b> r &lt;args&gt;
                         </td>
                         <td class="content">
@@ -81,7 +81,7 @@
                     <tr><td class="header" colspan="2">Launch a process with arguments in new terminal window (Mac OS X only).</td></tr>
                         <td class="content">
                             <b>(lldb)</b> process launch --tty -- &lt;args&gt;<br>
-                            <b>(lldb)</b> process launch -t -- &lt;args&gt;<br>
+                            <b>(lldb)</b> pro la -t -- &lt;args&gt;<br>
                         </td>
                         <td class="content">
                         </td>
@@ -90,7 +90,7 @@
                     <tr><td class="header" colspan="2">Launch a process with arguments in existing terminal <cope>/dev/ttys006</code> (Mac OS X only).</td></tr>
                         <td class="content">
                             <b>(lldb)</b> process launch --tty=/dev/ttys006 -- &lt;args&gt;<br>
-                            <b>(lldb)</b> process launch -t/dev/ttys006 -- &lt;args&gt;<br>
+                            <b>(lldb)</b> pro la -t/dev/ttys006 -- &lt;args&gt;<br>
                         </td>
                         <td class="content">
                         </td>
@@ -111,7 +111,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> process attach --name a.out<br>
-                            <b>(lldb)</b> process attach -n a.out
+                            <b>(lldb)</b> pro at -n a.out
                         </td>
                         <td class="content">
                             <b>(gdb)</b> attach a.out
@@ -122,7 +122,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> process attach --name a.out --waitfor<br>
-                            <b>(lldb)</b> process attach -n a.out -w
+                            <b>(lldb)</b> pro at -n a.out -w
                         </td>
                         <td class="content">
                             <b>(gdb)</b> attach -waitfor a.out
@@ -191,33 +191,6 @@
                         </td>
                     </tr>
 
-                    <tr><td class="header" colspan="2">Display a the variable "argc" and "argv" everytime you stop.</td></tr>
-                    <tr>
-                        <td class="content">
-                            <b>(lldb)</b> target stop-hook add --one-liner "frame variable argc argv"<br>
-                            <b>(lldb)</b> ta st a -o "fr v argc argv"<br>
-                        </td>
-                        <td class="content">
-                            <b>(gdb)</b> display argc<br>
-                            <b>(gdb)</b> display argv<br>
-                        </td>
-                    </tr>
-
-                    <tr><td class="header" colspan="2">Display a the variable "argc" and "argv" only when you stop in the function named <b>main</b>.</td></tr>
-                    <tr>
-                        <td class="content" colspan="2">
-                            <b>(lldb)</b> target stop-hook add --name main --one-liner "frame variable argc argv"<br>
-                            <b>(lldb)</b> ta st a -n main -o "fr v argc argv"<br>
-                        </td>
-                    </tr>
-
-                    <tr><td class="header" colspan="2">Display the variable "*this" only when you stop in c class named <b>MyClass</b>.</td></tr>
-                    <tr>
-                        <td class="content" colspan="2">
-                            <b>(lldb)</b> target stop-hook add --classname MyClass --one-liner "frame variable *this"<br>
-                        </td>
-                    </tr>
-
                     <tr><td class="header" colspan="2">Backtrace and disassemble every time you stop.</td></tr>
                     <tr>
                         <td class="content" colspan="2">
@@ -233,14 +206,14 @@
                     </table>
                     <p>
                 </div>
-        		<div class="postfooter"></div>
+                <div class="postfooter"></div>
 
-				<h1 class ="postheader">Breakpoint Commands</h1>
-    			<div class="post">
+                <h1 class ="postheader">Breakpoint Commands</h1>
+                <div class="post">
 
                     <p>
 
-              	    <table class="stats" width="620" cellspacing="0">
+                    <table class="stats" width="620" cellspacing="0">
                     <tr>
                         <td class="hed" width="50%">LLDB</td>
                         <td class="hed" width="50%">GDB</td>
@@ -254,7 +227,7 @@
                             <b>(lldb)</b> b main
                         </td>
                         <td class="content">
-                            <b>(lldb)</b> break main
+                            <b>(gdb)</b> break main
                         </td>
                     </tr>
 
@@ -262,11 +235,11 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> breakpoint set --file test.c --line 12<br>
-                            <b>(lldb)</b> breakpoint set -f test.c -l 12<br>
+                            <b>(lldb)</b> br s -f test.c -l 12<br>
                             <b>(lldb)</b> b test.c:12
                         </td>
                         <td class="content">
-                            <b>(lldb)</b> break test.c:12
+                            <b>(gdb)</b> break test.c:12
                         </td>
                     </tr>
 
@@ -274,10 +247,10 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> breakpoint set --method main<br>
-                            <b>(lldb)</b> breakpoint set -M main<br>
+                            <b>(lldb)</b> br s -M main<br>
                         </td>
                         <td class="content">
-                            <b>(lldb)</b> break main<br>
+                            <b>(gdb)</b> break main<br>
                             <i>(Hope that there are no C funtions named <b>main</b>)</i>.
                         </td>
                     </tr>
@@ -286,10 +259,10 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> breakpoint set --selector count<br>
-                            <b>(lldb)</b> breakpoint set -S count<br>
+                            <b>(lldb)</b> br s -S count<br>
                         </td>
                         <td class="content">
-                            <b>(lldb)</b> break count<br>
+                            <b>(gdb)</b> break count<br>
                             <i>(Hope that there are no C or C++ funtions named <b>count</b>)</i>.
                         </td>
                     </tr>
@@ -297,18 +270,18 @@
                     </table>
                     <p>
                 </div>
-        		<div class="postfooter"></div>
 
-				<h1 class ="postheader">Examining Thread State</h1>
-    			<div class="post">
+            <div class="postfooter"></div>
+
+            <h1 class ="postheader">Examining Variables</h1>
+                <div class="post">
                     <p>
-              	    <table class="stats" width="620" cellspacing="0">
+                    <table class="stats" width="620" cellspacing="0">
                     <tr>
                         <td class="hed" width="50%">LLDB</td>
                         <td class="hed" width="50%">GDB</td>
                     </tr>
 
-
                     <tr><td class="header" colspan="2">Show the arguments and local variables for the current frame.</td></tr>
                     <tr>
                         <td class="content">
@@ -321,6 +294,106 @@
                         </td>
                     </tr>
 
+                    <tr><td class="header" colspan="2">Show the local variables for the current frame.</td></tr>
+                    <tr>
+                        <td class="content">
+                            <b>(lldb)</b> frame variable --no-args<br>
+                            <b>(lldb)</b> fr v -a<br>
+                        </td>
+                        <td class="content">
+                            <b>(gdb)</b> info locals<br>
+                        </td>
+                    </tr>
+
+                    <tr><td class="header" colspan="2">Show the contents of local variable "bar".</td></tr>
+                    <tr>
+                        <td class="content">
+                            <b>(lldb)</b> frame variable bar <br>
+                            <b>(lldb)</b> fr v bar <br>
+                            <b>(lldb)</b> p bar <br>
+                        </td>
+                        <td class="content">
+                            <b>(gdb)</b> p bar<br>
+                        </td>
+                    </tr>
+
+                    <tr><td class="header" colspan="2">Show the contents of local variable "bar" formatted as hex.</td></tr>
+                    <tr>
+                        <td class="content">
+                            <b>(lldb)</b> frame variable --format x bar <br>
+                            <b>(lldb)</b> fr v -f x bar <br>
+                        </td>
+                        <td class="content">
+                            <b>(gdb)</b> p/x bar<br>
+                        </td>
+                    </tr>
+
+                    <tr><td class="header" colspan="2">Show the contents of global variable "baz".</td></tr>
+                    <tr>
+                        <td class="content">
+                            <b>(lldb)</b> target variable baz <br>
+                            <b>(lldb)</b> ta v baz <br>
+                        </td>
+                        <td class="content">
+                            <b>(gdb)</b> p baz<br>
+                        </td>
+                    </tr>
+
+                    <tr><td class="header" colspan="2">Show the global/static variables defined in the current source file.</td></tr>
+                    <tr>
+                        <td class="content">
+                            <b>(lldb)</b> target variable <br>
+                            <b>(lldb)</b> ta v <br>
+                        </td>
+                        <td class="content">
+                            n/a<br>
+                        </td>
+                    </tr>
+
+                    <tr><td class="header" colspan="2">Display a the variable "argc" and "argv" everytime you stop.</td></tr>
+                    <tr>
+                        <td class="content">
+                            <b>(lldb)</b> target stop-hook add --one-liner "frame variable argc argv"<br>
+                            <b>(lldb)</b> ta st a -o "fr v argc argv"<br>
+                            <b>(lldb)</b> display argc<br>
+                            <b>(lldb)</b> display argv<br>
+                        </td>
+                        <td class="content">
+                            <b>(gdb)</b> display argc<br>
+                            <b>(gdb)</b> display argv<br>
+                        </td>
+                    </tr>
+
+                    <tr><td class="header" colspan="2">Display a the variable "argc" and "argv" only when you stop in the function named <b>main</b>.</td></tr>
+                    <tr>
+                        <td class="content" colspan="2">
+                            <b>(lldb)</b> target stop-hook add --name main --one-liner "frame variable argc argv"<br>
+                            <b>(lldb)</b> ta st a -n main -o "fr v argc argv"<br>
+                        </td>
+                    </tr>
+
+                    <tr><td class="header" colspan="2">Display the variable "*this" only when you stop in c class named <b>MyClass</b>.</td></tr>
+                    <tr>
+                        <td class="content" colspan="2">
+                            <b>(lldb)</b> target stop-hook add --classname MyClass --one-liner "frame variable *this"<br>
+                            <b>(lldb)</b> ta st a -c MyClass -o "fr v *this"<br>
+                        </td>
+                    </tr>
+
+                    </table>
+                    <p>
+                </div>
+
+            <h1 class ="postheader">Examining Thread State</h1>
+                <div class="post">
+                    <p>
+                    <table class="stats" width="620" cellspacing="0">
+                    <tr>
+                        <td class="hed" width="50%">LLDB</td>
+                        <td class="hed" width="50%">GDB</td>
+                    </tr>
+
+
                     <tr><td class="header" colspan="2">Show the stack backtrace for the current thread.</td></tr>
                     <tr>
                         <td class="content">
@@ -369,7 +442,7 @@
                         <td class="content">
                             <b>(lldb)</b> down<br>
                             <b>(lldb)</b> frame select --relative=-1<br>
-                            <b>(lldb)</b> frame select -r-1<br>
+                            <b>(lldb)</b> fr s -r-1<br>
                         </td>
                         <td class="content">
                             <b>(gdb)</b> down
@@ -380,10 +453,10 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> frame select --relative 2<br>
-                            <b>(lldb)</b> frame select -r2<br>
+                            <b>(lldb)</b> fr s -r2<br>
                             <br>
                             <b>(lldb)</b> frame select --relative -3<br>
-                            <b>(lldb)</b> frame select -r-3<br>
+                            <b>(lldb)</b> fr s -r-3<br>
                         </td>
                         <td class="content">
                             <b>(gdb)</b> up 2<br>
@@ -401,12 +474,12 @@
                         </td>
                     </tr>
 
-                    <tr><td class="header" colspan="2">Show the general purpose registers for the current thread formatted as <b>unsigned decimal</b>. LLDB tries to use
-                         the same format characters as <b>printf</b> when possible.</td></tr>
+                    <tr><td class="header" colspan="2">Show the general purpose registers for the current thread formatted as <b>signed decimal</b>. LLDB tries to use
+                         the same format characters as <b>printf(3)</b> when possible.  Type "help format" to see the full list of format specifiers.</td></tr>
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> register read --format i<br>
-                            <b>(lldb)</b> register read -f i<br>
+                            <b>(lldb)</b> re r -f i<br>
                         </td>
                         <td class="content">
                         </td>
@@ -416,7 +489,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> register read --all<br>
-                            <b>(lldb)</b> register read -a<br>
+                            <b>(lldb)</b> re r -a<br>
                         </td>
                         <td class="content">
                             <b>(gdb)</b> info all-registers<br>
@@ -437,7 +510,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> register read --format binary rax<br>
-                            <b>(lldb)</b> register read -f b rax<br>
+                            <b>(lldb)</b> re r -f b rax<br>
                         </td>
                         <td class="content">
                             <b>(gdb)</b> p/t $rax<br>
@@ -448,7 +521,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> memory read --size 4 --format x --count 4 0xbffff3c0<br>
-                            <b>(lldb)</b> memory read -s4 -fx -c4 0xbffff3c0<br>
+                            <b>(lldb)</b> me r -s4 -fx -c4 0xbffff3c0<br>
                             <b>(lldb)</b> x -s4 -fx -c4 0xbffff3c0<br>
                         </td>
                         <td class="content">
@@ -460,7 +533,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> memory read --outfile /tmp/mem.txt --count 512 0xbffff3c0<br>
-                            <b>(lldb)</b> memory read -o/tmp/mem.txt -c512 0xbffff3c0<br>
+                            <b>(lldb)</b> me r -o/tmp/mem.txt -c512 0xbffff3c0<br>
                         </td>
                         <td class="content">
                           <b>(gdb)</b> set logging on<br>
@@ -474,7 +547,7 @@
                     <tr>
                         <td class="content"colspan=2>
                             <b>(lldb)</b> memory read --outfile /tmp/mem.bin --binary  0x1000 0x1200<br>
-                            <b>(lldb)</b> memory read -o /tmp/mem.bin -b 0x1000 0x1200<br>
+                            <b>(lldb)</b> me r -o /tmp/mem.bin -b 0x1000 0x1200<br>
                         </td>
                     </tr>
 
@@ -482,7 +555,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> disassemble --frame<br>
-                            <b>(lldb)</b> disassemble -f
+                            <b>(lldb)</b> di -f
                         </td>
                         <td class="content">
                             <b>(gdb)</b> disassemble
@@ -493,7 +566,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> disassemble --name main<br>
-                            <b>(lldb)</b> disassemble -n main
+                            <b>(lldb)</b> di -n main
                         </td>
                         <td class="content">
                             <b>(gdb)</b> disassemble main
@@ -504,7 +577,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> disassemble --start-address  0x1eb8 --end-address 0x1ec3<br>
-                            <b>(lldb)</b> disassemble -s 0x1eb8 -e 0x1ec3<br>
+                            <b>(lldb)</b> di -s 0x1eb8 -e 0x1ec3<br>
                         </td>
                         <td class="content">
                             <b>(gdb)</b> disassemble 0x1eb8 0x1ec3
@@ -515,7 +588,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> disassemble --start-address  0x1eb8 --count 20<br>
-                            <b>(lldb)</b> disassemble -s 0x1eb8 -c 20<br>
+                            <b>(lldb)</b> di -s 0x1eb8 -c 20<br>
                         </td>
                         <td class="content">
                             <b>(gdb)</b> x/20i 0x1eb8
@@ -526,7 +599,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> disassemble --frame --mixed<br>
-                            <b>(lldb)</b> disassemble -f -m
+                            <b>(lldb)</b> di -f -m
                         </td>
                         <td class="content">
                             n/a
@@ -537,7 +610,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> disassemble --frame --bytes<br>
-                            <b>(lldb)</b> disassemble -f -b
+                            <b>(lldb)</b> di -f -b
                         </td>
                         <td class="content">
                             n/a
@@ -548,7 +621,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> disassemble --line<br>
-                            <b>(lldb)</b> disassemble -l
+                            <b>(lldb)</b> di -l
                         </td>
                         <td class="content">
                             n/a
@@ -558,14 +631,14 @@
                     </table>
                     <p>
                 </div>
-        		<div class="postfooter"></div>
+                <div class="postfooter"></div>
 
-				<h1 class ="postheader">Executable and Shared Library Query Commands</h1>
-    			<div class="post">
+                <h1 class ="postheader">Executable and Shared Library Query Commands</h1>
+                <div class="post">
 
                     <p>
 
-              	    <table class="stats" width="620" cellspacing="0">
+                    <table class="stats" width="620" cellspacing="0">
                     <tr>
                         <td class="hed" width="50%">LLDB</td>
                         <td class="hed" width="50%">GDB</td>
@@ -586,7 +659,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> image lookup --address 0x1ec4<br>
-                            <b>(lldb)</b> image lookup -a 0x1ec4<br>
+                            <b>(lldb)</b> im loo -a 0x1ec4<br>
                         </td>
                         <td class="content">
                             <b>(gdb)</b> info symbol 0x1ec4<br>
@@ -597,7 +670,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> image lookup --address 0x1ec4 a.out<br>
-                            <b>(lldb)</b> image lookup -a 0x1ec4 a.out<br>
+                            <b>(lldb)</b> im loo -a 0x1ec4 a.out<br>
                         </td>
                         <td class="content">
                         </td>
@@ -607,7 +680,7 @@
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> image lookup --type Point<br>
-                            <b>(lldb)</b> image lookup -t Point<br>
+                            <b>(lldb)</b> im loo -t Point<br>
                         </td>
                         <td class="content">
                             <b>(lldb)</b> ptype Point<br>
@@ -654,14 +727,14 @@
                     </table>
                     <p>
                 </div>
-        		<div class="postfooter"></div>
+                <div class="postfooter"></div>
 
                 <p>
 
-    			
+
             </div>
-      	</div>
-	</div>
+        </div>
+    </div>
 </div>
 </body>
 </html>



From jmolenda at apple.com  Mon Oct 24 20:28:56 2011
From: jmolenda at apple.com (Jason Molenda)
Date: Tue, 25 Oct 2011 01:28:56 -0000
Subject: [Lldb-commits] [lldb] r142900 - /lldb/trunk/www/lldb-gdb.html
Message-ID: <20111025012856.371FF312800A@llvm.org>

Author: jmolenda
Date: Mon Oct 24 20:28:56 2011
New Revision: 142900

URL: http://llvm.org/viewvc/llvm-project?rev=142900&view=rev
Log:
typeo

Modified:
    lldb/trunk/www/lldb-gdb.html

Modified: lldb/trunk/www/lldb-gdb.html
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/www/lldb-gdb.html?rev=142900&r1=142899&r2=142900&view=diff
==============================================================================
--- lldb/trunk/www/lldb-gdb.html (original)
+++ lldb/trunk/www/lldb-gdb.html Mon Oct 24 20:28:56 2011
@@ -350,7 +350,7 @@
                         </td>
                     </tr>
 
-                    <tr><td class="header" colspan="2">Display a the variable "argc" and "argv" everytime you stop.</td></tr>
+                    <tr><td class="header" colspan="2">Display a the variable "argc" and "argv" every time you stop.</td></tr>
                     <tr>
                         <td class="content">
                             <b>(lldb)</b> target stop-hook add --one-liner "frame variable argc argv"<br>



From jmolenda at apple.com  Mon Oct 24 21:11:20 2011
From: jmolenda at apple.com (Jason Molenda)
Date: Tue, 25 Oct 2011 02:11:20 -0000
Subject: [Lldb-commits] [lldb] r142902 -
	/lldb/trunk/source/Interpreter/CommandInterpreter.cpp
Message-ID: <20111025021120.EB829312800A@llvm.org>

Author: jmolenda
Date: Mon Oct 24 21:11:20 2011
New Revision: 142902

URL: http://llvm.org/viewvc/llvm-project?rev=142902&view=rev
Log:
Prefix display/undisplay regexp command alises with "_regexp" as per the
style of the other regexp command aliases.

Modified:
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp

Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=142902&r1=142901&r2=142902&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Mon Oct 24 21:11:20 2011
@@ -174,7 +174,7 @@
     if (cmd_obj_sp)
         AddAlias ("down", cmd_obj_sp);
 
-    cmd_obj_sp = GetCommandSPExact ("_display", false);
+    cmd_obj_sp = GetCommandSPExact ("_regexp-display", false);
     if (cmd_obj_sp)
         AddAlias ("display", cmd_obj_sp);
         
@@ -188,7 +188,7 @@
 
 
 
-    cmd_obj_sp = GetCommandSPExact ("_undisplay", false);
+    cmd_obj_sp = GetCommandSPExact ("_regexp-undisplay", false);
     if (cmd_obj_sp)
         AddAlias ("undisplay", cmd_obj_sp);
 
@@ -348,9 +348,9 @@
 
     std::auto_ptr<CommandObjectRegexCommand>
     display_regex_cmd_ap(new CommandObjectRegexCommand (*this,
-                                                   "_display",
+                                                   "_regexp-display",
                                                    "Add an expression evaluation stop-hook.",
-                                                   "_display expression", 2));
+                                                   "_regexp-display expression", 2));
     if (display_regex_cmd_ap.get())
     {
         if (display_regex_cmd_ap->AddRegexCommand("^(.+)$", "target stop-hook add -o \"expr -- %1\""))
@@ -362,9 +362,9 @@
 
     std::auto_ptr<CommandObjectRegexCommand>
     undisplay_regex_cmd_ap(new CommandObjectRegexCommand (*this,
-                                                   "_undisplay",
+                                                   "_regexp-undisplay",
                                                    "Remove an expression evaluation stop-hook.",
-                                                   "_undisplay stop-hook-number", 2));
+                                                   "_regexp-undisplay stop-hook-number", 2));
     if (undisplay_regex_cmd_ap.get())
     {
         if (undisplay_regex_cmd_ap->AddRegexCommand("^([0-9]+)$", "target stop-hook delete %1"))



From gclayton at apple.com  Tue Oct 25 01:44:01 2011
From: gclayton at apple.com (Greg Clayton)
Date: Tue, 25 Oct 2011 06:44:01 -0000
Subject: [Lldb-commits] [lldb] r142911 - in /lldb/trunk:
 include/lldb/Interpreter/ lldb.xcodeproj/ source/Commands/
 source/Interpreter/
Message-ID: <20111025064401.8361E312800A@llvm.org>

Author: gclayton
Date: Tue Oct 25 01:44:01 2011
New Revision: 142911

URL: http://llvm.org/viewvc/llvm-project?rev=142911&view=rev
Log:
Updated all commands that use a "--format" / "-f" options to use the new
OptionGroupFormat. Updated OptionGroupFormat to be able to also use the
"--size" and "--count" options. Commands that use a OptionGroupFormat instance
can choose which of the options they want by initializing OptionGroupFormat
accordingly. Clients can either get only the "--format", "--format" + "--size",
or "--format" + "--size" + "--count". This is in preparation for upcoming
chnages where there are alternate ways (GDB format specification) to set a
format. 


Modified:
    lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h
    lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h
    lldb/trunk/include/lldb/Interpreter/OptionGroupVariable.h
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/source/Commands/CommandObjectExpression.cpp
    lldb/trunk/source/Commands/CommandObjectExpression.h
    lldb/trunk/source/Commands/CommandObjectFrame.cpp
    lldb/trunk/source/Commands/CommandObjectMemory.cpp
    lldb/trunk/source/Commands/CommandObjectRegister.cpp
    lldb/trunk/source/Commands/CommandObjectTarget.cpp
    lldb/trunk/source/Commands/CommandObjectType.cpp
    lldb/trunk/source/Commands/CommandObjectType.h
    lldb/trunk/source/Interpreter/NamedOptionValue.cpp
    lldb/trunk/source/Interpreter/OptionGroupFormat.cpp
    lldb/trunk/source/Interpreter/OptionGroupVariable.cpp

Modified: lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h (original)
+++ lldb/trunk/include/lldb/Interpreter/NamedOptionValue.h Tue Oct 25 01:44:01 2011
@@ -729,16 +729,10 @@
     class OptionValueFormat : public OptionValue
     {
     public:
-        OptionValueFormat (lldb::Format current_value = lldb::eFormatDefault, 
-                           lldb::Format default_value = lldb::eFormatDefault,
-                           uint32_t current_byte_size = 0,
-                           uint32_t default_byte_size = 0,
-                           bool byte_size_prefix_ok = false) :
+        OptionValueFormat (lldb::Format current_value, 
+                           lldb::Format default_value) :
             m_current_value (current_value),
-            m_default_value (default_value),
-            m_current_byte_size (current_byte_size),
-            m_default_byte_size (default_byte_size),
-            m_byte_size_prefix_ok (byte_size_prefix_ok)
+            m_default_value (default_value)
         {
         }
         
@@ -799,36 +793,9 @@
             m_default_value = value;
         }
         
-        uint32_t 
-        GetCurrentByteSize () const
-        {
-            return m_current_byte_size;
-        }
-
-        uint32_t 
-        GetDefaultByteSize () const
-        {
-            return m_default_byte_size;
-        }
-        
-        void
-        SetCurrentByteSize (uint32_t byte_size)
-        {
-            m_current_byte_size = byte_size;
-        }
-        
-        void
-        SetDefaultByteSize (uint32_t byte_size)
-        {
-            m_default_byte_size = byte_size;
-        }
-
     protected:
         lldb::Format m_current_value;
         lldb::Format m_default_value;
-        uint32_t m_current_byte_size;
-        uint32_t m_default_byte_size;
-        bool m_byte_size_prefix_ok;
     };
     
     

Modified: lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h (original)
+++ lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h Tue Oct 25 01:44:01 2011
@@ -26,10 +26,13 @@
 class OptionGroupFormat : public OptionGroup
 {
 public:
+    static const uint32_t OPTION_GROUP_FORMAT = LLDB_OPT_SET_1;
+    static const uint32_t OPTION_GROUP_SIZE   = LLDB_OPT_SET_2;
+    static const uint32_t OPTION_GROUP_COUNT  = LLDB_OPT_SET_3;
     
     OptionGroupFormat (lldb::Format default_format, 
-                       uint32_t default_byte_size,
-                       bool byte_size_prefix_ok);
+                       uint64_t default_byte_size = UINT64_MAX,  // Pass UINT64_MAX to disable the "--size" option
+                       uint64_t default_count = UINT64_MAX);     // Pass UINT64_MAX to disable the "--count" option
     
     virtual
     ~OptionGroupFormat ();
@@ -55,15 +58,48 @@
         return m_format.GetCurrentValue();
     }
 
-    uint32_t
-    GetByteSize() const
+    OptionValueFormat &
+    GetFormatValue()
     {
-        return m_format.GetCurrentByteSize();
+        return m_format;
     }
     
+    const OptionValueFormat &
+    GetFormatValue() const
+    {
+        return m_format;
+    }
+    
+    OptionValueUInt64  &
+    GetByteSizeValue()
+    {
+        return m_byte_size;
+    }
+
+    const OptionValueUInt64  &
+    GetByteSizeValue() const 
+    {
+        return m_byte_size;
+    }
+
+    OptionValueUInt64  &
+    GetCountValue()
+    {
+        return m_count;
+    }
+
+    const OptionValueUInt64  &
+    GetCountValue() const
+    {
+        return m_count;
+    }
+    
+
 protected:
 
     OptionValueFormat m_format;
+    OptionValueUInt64 m_byte_size;
+    OptionValueUInt64 m_count;
 };
 
 } // namespace lldb_private

Modified: lldb/trunk/include/lldb/Interpreter/OptionGroupVariable.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionGroupVariable.h?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/OptionGroupVariable.h (original)
+++ lldb/trunk/include/lldb/Interpreter/OptionGroupVariable.h Tue Oct 25 01:44:01 2011
@@ -52,7 +52,6 @@
              use_regex:1,
              show_scope:1,
              show_decl:1;
-        lldb::Format format;
         std::string summary;
 
     private:

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Oct 25 01:44:01 2011
@@ -3577,7 +3577,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (

Modified: lldb/trunk/source/Commands/CommandObjectExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectExpression.cpp?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectExpression.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectExpression.cpp Tue Oct 25 01:44:01 2011
@@ -37,11 +37,9 @@
 using namespace lldb;
 using namespace lldb_private;
 
-CommandObjectExpression::CommandOptions::CommandOptions (CommandInterpreter &interpreter) :
-    Options(interpreter)
+CommandObjectExpression::CommandOptions::CommandOptions () :
+    OptionGroup()
 {
-    // Keep only one place to reset the values to their defaults
-    OptionParsingStarting();
 }
 
 
@@ -49,12 +47,29 @@
 {
 }
 
+OptionDefinition
+CommandObjectExpression::CommandOptions::g_option_table[] =
+{
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "dynamic-value",      'd', required_argument, NULL, 0, eArgTypeBoolean,    "Upcast the value resulting from the expression to its dynamic type if available."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "unwind-on-error",    'u', required_argument, NULL, 0, eArgTypeBoolean,    "Clean up program state if the expression causes a crash, breakpoint hit or signal."},
+    { LLDB_OPT_SET_2                 , false, "object-description", 'o', no_argument,       NULL, 0, eArgTypeNone,       "Print the object description of the value resulting from the expression."},
+};
+
+
+uint32_t
+CommandObjectExpression::CommandOptions::GetNumDefinitions ()
+{
+    return sizeof(g_option_table)/sizeof(OptionDefinition);
+}
+
 Error
-CommandObjectExpression::CommandOptions::SetOptionValue (uint32_t option_idx, const char *option_arg)
+CommandObjectExpression::CommandOptions::SetOptionValue (CommandInterpreter &interpreter,
+                                                         uint32_t option_idx,
+                                                         const char *option_arg)
 {
     Error error;
 
-    char short_option = (char) m_getopt_table[option_idx].val;
+    const char short_option = (char) g_option_table[option_idx].short_option;
 
     switch (short_option)
     {
@@ -65,14 +80,6 @@
       //}
       //break;
 
-    case 'g':
-        debug = true;
-        break;
-
-    case 'f':
-        error = Args::StringToFormat(option_arg, format, NULL);
-        break;
-        
     case 'o':
         print_object = true;
         break;
@@ -111,13 +118,10 @@
 }
 
 void
-CommandObjectExpression::CommandOptions::OptionParsingStarting ()
+CommandObjectExpression::CommandOptions::OptionParsingStarting (CommandInterpreter &interpreter)
 {
-    //language.Clear();
-    debug = false;
-    format = eFormatDefault;
-    print_object = false;
     use_dynamic = eLazyBoolCalculate;
+    print_object = false;
     unwind_on_error = true;
     show_types = true;
     show_summary = true;
@@ -134,7 +138,9 @@
                    "expression",
                    "Evaluate a C/ObjC/C++ expression in the current program context, using variables currently in scope.",
                    NULL),
-    m_options (interpreter),
+    m_option_group (interpreter),
+    m_format_options (eFormatDefault),
+    m_command_options (),
     m_expr_line_count (0),
     m_expr_lines ()
 {
@@ -157,6 +163,11 @@
 
     // Push the data for the first argument into the m_arguments vector.
     m_arguments.push_back (arg);
+    
+    // Add the "--format" and "--count" options to group 1 and 3
+    m_option_group.Append (&m_format_options, OptionGroupFormat::OPTION_GROUP_FORMAT, LLDB_OPT_SET_1);
+    m_option_group.Append (&m_command_options);
+    m_option_group.Finalize();
 }
 
 CommandObjectExpression::~CommandObjectExpression ()
@@ -166,7 +177,7 @@
 Options *
 CommandObjectExpression::GetOptions ()
 {
-    return &m_options;
+    return &m_option_group;
 }
 
 
@@ -281,7 +292,7 @@
         bool keep_in_memory = true;
         lldb::DynamicValueType use_dynamic;
         // If use dynamic is not set, get it from the target:
-        switch (m_options.use_dynamic)
+        switch (m_command_options.use_dynamic)
         {
         case eLazyBoolCalculate:
             use_dynamic = target->GetPreferDynamicValue();
@@ -297,12 +308,12 @@
         exe_results = target->EvaluateExpression (expr, 
                                                   m_exe_ctx.GetFramePtr(),
                                                   eExecutionPolicyOnlyWhenNeeded,
-                                                  m_options.unwind_on_error,
+                                                  m_command_options.unwind_on_error,
                                                   keep_in_memory, 
                                                   use_dynamic, 
                                                   result_valobj_sp);
         
-        if (exe_results == eExecutionInterrupted && !m_options.unwind_on_error)
+        if (exe_results == eExecutionInterrupted && !m_command_options.unwind_on_error)
         {
             uint32_t start_frame = 0;
             uint32_t num_frames = 1;
@@ -334,8 +345,9 @@
         {
             if (result_valobj_sp->GetError().Success())
             {
-                if (m_options.format != eFormatDefault)
-                    result_valobj_sp->SetFormat (m_options.format);
+                Format format = m_format_options.GetFormat();
+                if (format != eFormatDefault)
+                    result_valobj_sp->SetFormat (format);
 
                 ValueObject::DumpValueObject (*(output_stream),
                                               result_valobj_sp.get(),   // Variable object to dump
@@ -343,9 +355,9 @@
                                               0,                        // Pointer depth to traverse (zero means stop at pointers)
                                               0,                        // Current depth, this is the top most, so zero...
                                               UINT32_MAX,               // Max depth to go when dumping concrete types, dump everything...
-                                              m_options.show_types,     // Show types when dumping?
+                                              m_command_options.show_types,     // Show types when dumping?
                                               false,                    // Show locations of variables, no since this is a host address which we don't care to see
-                                              m_options.print_object,   // Print the objective C object?
+                                              m_command_options.print_object,   // Print the objective C object?
                                               use_dynamic,
                                               true,                     // Use synthetic children if available
                                               true,                     // Scope is already checked. Const results are always in scope.
@@ -406,7 +418,7 @@
 {
     m_exe_ctx = m_interpreter.GetExecutionContext();
 
-    m_options.NotifyOptionParsingStarting();
+    m_option_group.NotifyOptionParsingStarting();
 
     const char * expr = NULL;
 
@@ -471,7 +483,7 @@
             if (!ParseOptions (args, result))
                 return false;
             
-            Error error (m_options.NotifyOptionParsingFinished());
+            Error error (m_option_group.NotifyOptionParsingFinished());
             if (error.Fail())
             {
                 result.AppendError (error.AsCString());
@@ -491,16 +503,3 @@
     return false;
 }
 
-OptionDefinition
-CommandObjectExpression::CommandOptions::g_option_table[] =
-{
-//{ LLDB_OPT_SET_ALL, false, "language",   'l', required_argument, NULL, 0, "[c|c++|objc|objc++]",          "Sets the language to use when parsing the expression."},
-//{ LLDB_OPT_SET_1, false, "format",     'f', required_argument, NULL, 0, "[ [bool|b] | [bin] | [char|c] | [oct|o] | [dec|i|d|u] | [hex|x] | [float|f] | [cstr|s] ]",  "Specify the format that the expression output should use."},
-{ LLDB_OPT_SET_1,   false, "format",             'f', required_argument, NULL, 0, eArgTypeExprFormat, "Specify the format that the expression output should use."},
-{ LLDB_OPT_SET_2,   false, "object-description", 'o', no_argument,       NULL, 0, eArgTypeNone,       "Print the object description of the value resulting from the expression."},
-{ LLDB_OPT_SET_2,   false, "dynamic-value",      'd', required_argument, NULL, 0, eArgTypeBoolean,    "Upcast the value resulting from the expression to its dynamic type if available."},
-{ LLDB_OPT_SET_ALL, false, "unwind-on-error",    'u', required_argument, NULL, 0, eArgTypeBoolean,    "Clean up program state if the expression causes a crash, breakpoint hit or signal."},
-{ LLDB_OPT_SET_ALL, false, "debug",              'g', no_argument,       NULL, 0, eArgTypeNone,       "Enable verbose debug logging of the expression parsing and evaluation."},
-{ 0,                false, NULL,                 0,   0,                 NULL, 0, eArgTypeNone,       NULL }
-};
-

Modified: lldb/trunk/source/Commands/CommandObjectExpression.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectExpression.h?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectExpression.h (original)
+++ lldb/trunk/source/Commands/CommandObjectExpression.h Tue Oct 25 01:44:01 2011
@@ -15,8 +15,7 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Interpreter/CommandObject.h"
-#include "lldb/Interpreter/Options.h"
-#include "lldb/Core/Language.h"
+#include "lldb/Interpreter/OptionGroupFormat.h"
 #include "lldb/Target/ExecutionContext.h"
 
 namespace lldb_private {
@@ -25,31 +24,32 @@
 {
 public:
 
-    class CommandOptions : public Options
+    class CommandOptions : public OptionGroup
     {
     public:
 
-        CommandOptions (CommandInterpreter &interpreter);
+        CommandOptions ();
 
         virtual
         ~CommandOptions ();
 
-        virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg);
-
-        void
-        OptionParsingStarting ();
-
-        const OptionDefinition*
+        virtual uint32_t
+        GetNumDefinitions ();
+        
+        virtual const OptionDefinition*
         GetDefinitions ();
+        
+        virtual Error
+        SetOptionValue (CommandInterpreter &interpreter,
+                        uint32_t option_idx,
+                        const char *option_value);
+        
+        virtual void
+        OptionParsingStarting (CommandInterpreter &interpreter);
 
         // Options table: Required for subclasses of Options.
 
         static OptionDefinition g_option_table[];
-        //Language  language;
-        lldb::Encoding  encoding;
-        lldb::Format    format;
-        bool        debug;
         bool        print_object;
         LazyBool    use_dynamic;
         bool        unwind_on_error;
@@ -93,7 +93,9 @@
                         Stream *error_stream,
                         CommandReturnObject *result = NULL);
 
-    CommandOptions m_options;
+    OptionGroupOptions m_option_group;
+    OptionGroupFormat m_format_options;
+    CommandOptions m_command_options;
     ExecutionContext m_exe_ctx;
     uint32_t m_expr_line_count;
     std::string m_expr_lines; // Multi-line expression support

Modified: lldb/trunk/source/Commands/CommandObjectFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectFrame.cpp?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectFrame.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectFrame.cpp Tue Oct 25 01:44:01 2011
@@ -29,6 +29,7 @@
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Interpreter/Options.h"
+#include "lldb/Interpreter/OptionGroupFormat.h"
 #include "lldb/Interpreter/OptionGroupValueObjectDisplay.h"
 #include "lldb/Interpreter/OptionGroupVariable.h"
 #include "lldb/Interpreter/OptionGroupWatchpoint.h"
@@ -336,6 +337,7 @@
                        eFlagProcessMustBeLaunched | eFlagProcessMustBePaused),
         m_option_group (interpreter),
         m_option_variable(true), // Include the frame specific options by passing "true"
+        m_option_format (eFormatDefault),
         m_option_watchpoint(),
         m_varobj_options()
     {
@@ -353,6 +355,7 @@
         m_arguments.push_back (arg);
         
         m_option_group.Append (&m_option_variable, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
+        m_option_group.Append (&m_option_format, OptionGroupFormat::OPTION_GROUP_FORMAT, LLDB_OPT_SET_1);
         m_option_group.Append (&m_option_watchpoint, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Append (&m_varobj_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Finalize();
@@ -440,6 +443,9 @@
                 // Things have checked out ok...
                 // m_option_watchpoint.watch_type specifies the type of watching.
             }
+            
+            const Format format = m_option_format.GetFormat();
+
             if (command.GetArgumentCount() > 0)
             {
                 VariableList regex_var_list;
@@ -470,8 +476,8 @@
                                         valobj_sp = frame->GetValueObjectForFrameVariable (var_sp, m_varobj_options.use_dynamic);
                                         if (valobj_sp)
                                         {
-                                            if (m_option_variable.format != eFormatDefault)
-                                                valobj_sp->SetFormat (m_option_variable.format);
+                                            if (format != eFormatDefault)
+                                                valobj_sp->SetFormat (format);
                                             
                                             if (m_option_variable.show_decl && var_sp->GetDeclaration ().GetFile())
                                             {
@@ -515,8 +521,8 @@
                                                                               error);
                         if (valobj_sp)
                         {
-                            if (m_option_variable.format != eFormatDefault)
-                                valobj_sp->SetFormat (m_option_variable.format);
+                            if (format != eFormatDefault)
+                                valobj_sp->SetFormat (format);
                             if (m_option_variable.show_decl && var_sp && var_sp->GetDeclaration ().GetFile())
                             {
                                 var_sp->GetDeclaration ().DumpStopContext (&s, false);
@@ -633,8 +639,8 @@
                                                                                m_varobj_options.use_dynamic);
                             if (valobj_sp)
                             {
-                                if (m_option_variable.format != eFormatDefault)
-                                    valobj_sp->SetFormat (m_option_variable.format);
+                                if (format != eFormatDefault)
+                                    valobj_sp->SetFormat (format);
 
                                 // When dumping all variables, don't print any variables
                                 // that are not in scope to avoid extra unneeded output
@@ -673,6 +679,7 @@
 
     OptionGroupOptions m_option_group;
     OptionGroupVariable m_option_variable;
+    OptionGroupFormat m_option_format;
     OptionGroupWatchpoint m_option_watchpoint;
     OptionGroupValueObjectDisplay m_varobj_options;
 };

Modified: lldb/trunk/source/Commands/CommandObjectMemory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectMemory.cpp?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectMemory.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectMemory.cpp Tue Oct 25 01:44:01 2011
@@ -35,10 +35,6 @@
 static OptionDefinition
 g_option_table[] =
 {
-    { LLDB_OPT_SET_1|
-      LLDB_OPT_SET_2, false, "size"         ,'s', required_argument, NULL, 0, eArgTypeByteSize      ,"The size in bytes to use when displaying with the selected format."},
-    { LLDB_OPT_SET_1|
-      LLDB_OPT_SET_3, false, "count"        ,'c', required_argument, NULL, 0, eArgTypeCount         ,"The number of total items to display."},
     { LLDB_OPT_SET_1, false, "num-per-line" ,'l', required_argument, NULL, 0, eArgTypeNumberPerLine ,"The number of items per line to display."},
     { LLDB_OPT_SET_2, false, "binary"       ,'b', no_argument      , NULL, 0, eArgTypeNone          ,"If true, memory will be saved as binary. If false, the memory is saved save as an ASCII dump that uses the format, size, count and number per line settings."},
     { LLDB_OPT_SET_3, true , "view-as"      ,'t', required_argument, NULL, 0, eArgTypeNone          ,"The name of a type to view memory as."},
@@ -51,8 +47,6 @@
 public:
 
     OptionGroupReadMemory () :
-        m_byte_size (1,1),
-        m_count (8,8),
         m_num_per_line (1,1),
         m_output_as_binary (false),
         m_view_as_type()
@@ -92,19 +86,7 @@
                 if (m_num_per_line.GetCurrentValue() == 0)
                     error.SetErrorStringWithFormat("Invalid value for --num-per-line option '%s'. Must be positive integer value.\n", option_arg);
                 break;
-                
-            case 'c':
-                error = m_count.SetValueFromCString (option_arg);
-                if (m_count.GetCurrentValue() == 0)
-                    error.SetErrorStringWithFormat("Invalid value for --count option '%s'. Must be positive integer value.\n", option_arg);
-                break;
-                
-            case 's':
-                error = m_byte_size.SetValueFromCString (option_arg);
-                if (m_byte_size.GetCurrentValue() == 0)
-                    error.SetErrorStringWithFormat("Invalid value for --size option '%s'. Must be positive integer value.\n", option_arg);
-                break;
-                
+
             case 'b':
                 m_output_as_binary = true;
                 break;
@@ -123,22 +105,22 @@
     virtual void
     OptionParsingStarting (CommandInterpreter &interpreter)
     {
-        m_byte_size.Clear();
-        m_count.Clear();
         m_num_per_line.Clear();
         m_output_as_binary = false;
         m_view_as_type.Clear();
     }
     
     Error
-    FinalizeSettings (Target *target, const OptionGroupFormat& format_options)
+    FinalizeSettings (Target *target, OptionGroupFormat& format_options)
     {
         Error error;
-        bool byte_size_option_set = m_byte_size.OptionWasSet();
+        OptionValueUInt64 &byte_size_value = format_options.GetByteSizeValue();
+        OptionValueUInt64 &count_value = format_options.GetCountValue();
+        bool byte_size_option_set = byte_size_value.OptionWasSet();
         const bool num_per_line_option_set = m_num_per_line.OptionWasSet();
-        const bool count_option_set = m_count.OptionWasSet();
+        const bool count_option_set = format_options.GetCountValue().OptionWasSet();
         
-        uint32_t format_byte_size = format_options.GetByteSize();
+        uint32_t format_byte_size = byte_size_value.GetCurrentValue();
         if (byte_size_option_set)
         {
             if (format_byte_size > 0)
@@ -152,7 +134,7 @@
             if (format_byte_size != 0)
             {
                 byte_size_option_set = true;
-                m_byte_size = format_byte_size;
+                byte_size_value = format_byte_size;
             }
         }
     
@@ -163,22 +145,22 @@
                 
             case eFormatBoolean:
                 if (!byte_size_option_set)
-                    m_byte_size = 1;
+                    byte_size_value = 1;
                 if (!num_per_line_option_set)
                     m_num_per_line = 1;
                 if (!count_option_set)
-                    m_count = 8;
+                    format_options.GetCountValue() = 8;
                 break;
                 
             case eFormatCString:
                 break;
                 
             case eFormatPointer:
-                m_byte_size = target->GetArchitecture().GetAddressByteSize();
+                byte_size_value = target->GetArchitecture().GetAddressByteSize();
                 if (!num_per_line_option_set)
                     m_num_per_line = 4;
                 if (!count_option_set)
-                    m_count = 8;
+                    format_options.GetCountValue() = 8;
                 break;
                 
             case eFormatBinary:
@@ -190,51 +172,51 @@
             case eFormatUnicode32:
             case eFormatUnsigned:
                 if (!byte_size_option_set)
-                    m_byte_size = 4;
+                    byte_size_value = 4;
                 if (!num_per_line_option_set)
                     m_num_per_line = 1;
                 if (!count_option_set)
-                    m_count = 8;
+                    format_options.GetCountValue() = 8;
                 break;
                 
             case eFormatBytes:
             case eFormatBytesWithASCII:
-                if (m_byte_size.OptionWasSet())
+                if (byte_size_value.OptionWasSet())
                 {
-                    if (m_byte_size > 1)
+                    if (byte_size_value > 1)
                         error.SetErrorString ("use --count option to specify an end address to display a number of bytes");
                 }
                 else
-                    m_byte_size = 1;
+                    byte_size_value = 1;
                 if (!num_per_line_option_set)
                     m_num_per_line = 16;
                 if (!count_option_set)
-                    m_count = 32;
+                    format_options.GetCountValue() = 32;
                 break;
             case eFormatCharArray:
             case eFormatChar:
             case eFormatCharPrintable:
                 if (!byte_size_option_set)
-                    m_byte_size = 1;
+                    byte_size_value = 1;
                 if (!num_per_line_option_set)
                     m_num_per_line = 32;
                 if (!count_option_set)
-                    m_count = 64;
+                    format_options.GetCountValue() = 64;
                 break;
             case eFormatComplex:
                 if (!byte_size_option_set)
-                    m_byte_size = 8;
+                    byte_size_value = 8;
                 if (!num_per_line_option_set)
                     m_num_per_line = 1;
                 if (!count_option_set)
-                    m_count = 8;
+                    format_options.GetCountValue() = 8;
                 break;
             case eFormatHex:
                 if (!byte_size_option_set)
-                    m_byte_size = 4;
+                    byte_size_value = 4;
                 if (!num_per_line_option_set)
                 {
-                    switch (m_byte_size)
+                    switch (byte_size_value)
                     {
                         case 1:
                         case 2:
@@ -252,7 +234,7 @@
                     }
                 }
                 if (!count_option_set)
-                    m_count = 8;
+                    count_value = 8;
                 break;
                 
             case eFormatVectorOfChar:
@@ -268,18 +250,16 @@
             case eFormatVectorOfFloat64:
             case eFormatVectorOfUInt128:
                 if (!byte_size_option_set)
-                    m_byte_size = 128;
+                    byte_size_value = 128;
                 if (!num_per_line_option_set)
                     m_num_per_line = 1;
                 if (!count_option_set)
-                    m_count = 4;
+                    count_value = 4;
                 break;
         }
         return error;
     }
 
-    OptionValueUInt64 m_byte_size;
-    OptionValueUInt64 m_count;
     OptionValueUInt64 m_num_per_line;
     bool m_output_as_binary;
     OptionValueString m_view_as_type;
@@ -301,7 +281,7 @@
                        NULL,
                        eFlagProcessMustBePaused),
         m_option_group (interpreter),
-        m_format_options (eFormatBytesWithASCII, 0, true),
+        m_format_options (eFormatBytesWithASCII, 1, 8),
         m_memory_options (),
         m_outfile_options (),
         m_varobj_options()
@@ -329,7 +309,14 @@
         m_arguments.push_back (arg1);
         m_arguments.push_back (arg2);
         
-        m_option_group.Append (&m_format_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1 | LLDB_OPT_SET_3);
+        // Add the "--format" and "--count" options to group 1 and 3
+        m_option_group.Append (&m_format_options, 
+                               OptionGroupFormat::OPTION_GROUP_FORMAT | OptionGroupFormat::OPTION_GROUP_COUNT, 
+                               LLDB_OPT_SET_1 | LLDB_OPT_SET_3);
+        // Add the "--size" option to group 1 and 2
+        m_option_group.Append (&m_format_options, 
+                               OptionGroupFormat::OPTION_GROUP_SIZE, 
+                               LLDB_OPT_SET_1 | LLDB_OPT_SET_2);
         m_option_group.Append (&m_memory_options);
         m_option_group.Append (&m_outfile_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1 | LLDB_OPT_SET_2 | LLDB_OPT_SET_3);
         m_option_group.Append (&m_varobj_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_3);
@@ -491,9 +478,9 @@
                 --pointer_count;
             }
 
-            m_memory_options.m_byte_size = (clang_ast_type.GetClangTypeBitWidth () + 7) / 8;
+            m_format_options.GetByteSizeValue() = (clang_ast_type.GetClangTypeBitWidth () + 7) / 8;
             
-            if (m_memory_options.m_byte_size == 0)
+            if (m_format_options.GetByteSizeValue() == 0)
             {
                 result.AppendErrorWithFormat ("unable to get the byte size of the type '%s'\n", 
                                               view_as_type_cstr);
@@ -501,8 +488,8 @@
                 return false;
             }
             
-            if (!m_memory_options.m_count.OptionWasSet())
-                m_memory_options.m_count = 1;
+            if (!m_format_options.GetCountValue().OptionWasSet())
+                m_format_options.GetCountValue() = 1;
         }
         else
         {
@@ -517,8 +504,8 @@
             return false;
         }
 
-        size_t item_count = m_memory_options.m_count.GetCurrentValue();
-        const size_t item_byte_size = m_memory_options.m_byte_size;
+        size_t item_count = m_format_options.GetCountValue().GetCurrentValue();
+        const size_t item_byte_size = m_format_options.GetByteSizeValue().GetCurrentValue();
         const size_t num_per_line = m_memory_options.m_num_per_line.GetCurrentValue();
 
         size_t total_byte_size = item_count * item_byte_size;
@@ -549,7 +536,7 @@
                 result.SetStatus(eReturnStatusFailed);
                 return false;
             }
-            else if (m_memory_options.m_count.OptionWasSet())
+            else if (m_format_options.GetCountValue().OptionWasSet())
             {
                 result.AppendErrorWithFormat("specify either the end address (0x%llx) or the count (--count %lu), not both.\n", end_addr, item_count);
                 result.SetStatus(eReturnStatusFailed);
@@ -708,6 +695,15 @@
 
 };
 
+
+OptionDefinition
+g_memory_write_option_table[] =
+{
+{ LLDB_OPT_SET_1, true,  "infile", 'i', required_argument, NULL, 0, eArgTypeFilename, "Write memory using the contents of a file."},
+{ LLDB_OPT_SET_1, false, "offset", 'o', required_argument, NULL, 0, eArgTypeOffset,   "Start writng bytes from an offset within the input file."},
+};
+
+
 //----------------------------------------------------------------------
 // Write memory to the inferior process
 //----------------------------------------------------------------------
@@ -715,86 +711,75 @@
 {
 public:
 
-    class CommandOptions : public Options
+    class OptionGroupWriteMemory : public OptionGroup
     {
     public:
-        CommandOptions (CommandInterpreter &interpreter) :
-            Options(interpreter)
+        OptionGroupWriteMemory () :
+            OptionGroup()
         {
-            OptionParsingStarting();
         }
 
         virtual
-        ~CommandOptions ()
+        ~OptionGroupWriteMemory ()
         {
         }
 
+        virtual uint32_t
+        GetNumDefinitions ()
+        {
+            return sizeof (g_memory_write_option_table) / sizeof (OptionDefinition);
+        }
+        
+        virtual const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_memory_write_option_table;
+        }
+        
         virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        SetOptionValue (CommandInterpreter &interpreter,
+                        uint32_t option_idx,
+                        const char *option_arg)
         {
             Error error;
-            char short_option = (char) m_getopt_table[option_idx].val;
+            char short_option = (char) g_memory_write_option_table[option_idx].short_option;
+            
             switch (short_option)
             {
-            case 'f':
-                error = Args::StringToFormat (option_arg, m_format, &m_byte_size);
-                break;
-
-            case 's':
-                m_byte_size = Args::StringToUInt32 (option_arg, 0);
-                if (m_byte_size == 0)
-                    error.SetErrorStringWithFormat("Invalid value for --size option '%s'.  Must be positive integer value.\n", option_arg);
-                break;
-
-            case 'i':
-                m_infile.SetFile (option_arg, true);
-                if (!m_infile.Exists())
-                {
-                    m_infile.Clear();
-                    error.SetErrorStringWithFormat("Input file does not exist: '%s'\n", option_arg);
-                }
-                break;
-            
-            case 'o':
-                {
-                    bool success;
-                    m_infile_offset = Args::StringToUInt64(option_arg, 0, 0, &success);
-                    if (!success)
+                case 'i':
+                    m_infile.SetFile (option_arg, true);
+                    if (!m_infile.Exists())
                     {
-                        error.SetErrorStringWithFormat("Invalid offset string '%s'\n", option_arg);
+                        m_infile.Clear();
+                        error.SetErrorStringWithFormat("Input file does not exist: '%s'\n", option_arg);
                     }
-                }
-                break;
-
-            default:
-                error.SetErrorStringWithFormat("Unrecognized short option '%c'\n", short_option);
-                break;
+                    break;
+                    
+                case 'o':
+                    {
+                        bool success;
+                        m_infile_offset = Args::StringToUInt64(option_arg, 0, 0, &success);
+                        if (!success)
+                        {
+                            error.SetErrorStringWithFormat("Invalid offset string '%s'\n", option_arg);
+                        }
+                    }
+                    break;
+                    
+                default:
+                    error.SetErrorStringWithFormat("Unrecognized short option '%c'.\n", short_option);
+                    break;
             }
             return error;
         }
-
-        void
-        OptionParsingStarting ()
+        
+        virtual void
+        OptionParsingStarting (CommandInterpreter &interpreter)
         {
-            m_format = eFormatBytes;
-            m_byte_size = 1;
             m_infile.Clear();
             m_infile_offset = 0;
         }
 
-        const OptionDefinition*
-        GetDefinitions ()
-        {
-            return g_option_table;
-        }
-
-        // Options table: Required for subclasses of Options.
-
-        static OptionDefinition g_option_table[];
-
-        // Instance variables to hold the values for command options.
-        lldb::Format m_format;
-        uint32_t m_byte_size;
         FileSpec m_infile;
         off_t m_infile_offset;
     };
@@ -806,7 +791,9 @@
                        //"memory write [<cmd-options>] <addr> [value1 value2 ...]",
                        NULL,
                        eFlagProcessMustBeLaunched),
-        m_options (interpreter)
+        m_option_group (interpreter),
+        m_format_options (eFormatBytes, 1, UINT64_MAX),
+        m_memory_options ()
     {
         CommandArgumentEntry arg1;
         CommandArgumentEntry arg2;
@@ -830,6 +817,12 @@
         // Push the data for the first argument into the m_arguments vector.
         m_arguments.push_back (arg1);
         m_arguments.push_back (arg2);
+        
+        m_option_group.Append (&m_format_options, OptionGroupFormat::OPTION_GROUP_FORMAT, LLDB_OPT_SET_1);
+        m_option_group.Append (&m_format_options, OptionGroupFormat::OPTION_GROUP_SIZE  , LLDB_OPT_SET_1|LLDB_OPT_SET_2);
+        m_option_group.Append (&m_memory_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_2);
+        m_option_group.Finalize();
+
     }
 
     virtual
@@ -840,7 +833,7 @@
     Options *
     GetOptions ()
     {
-        return &m_options;
+        return &m_option_group;
     }
 
     bool
@@ -884,7 +877,7 @@
 
         const size_t argc = command.GetArgumentCount();
 
-        if (m_options.m_infile)
+        if (m_memory_options.m_infile)
         {
             if (argc < 1)
             {
@@ -904,7 +897,8 @@
                              process->GetTarget().GetArchitecture().GetAddressByteSize(),
                              process->GetTarget().GetArchitecture().GetByteOrder());
 
-        size_t item_byte_size = m_options.m_byte_size;
+        OptionValueUInt64 &byte_size_value = m_format_options.GetByteSizeValue();
+        size_t item_byte_size = byte_size_value.GetCurrentValue();
 
         lldb::addr_t addr = Args::StringToUInt64(command.GetArgumentAtIndex(0), LLDB_INVALID_ADDRESS, 0);
 
@@ -915,12 +909,12 @@
             return false;
         }
         
-        if (m_options.m_infile)
+        if (m_memory_options.m_infile)
         {
             size_t length = SIZE_MAX;
-            if (m_options.m_byte_size > 0)
-                length = m_options.m_byte_size;
-            lldb::DataBufferSP data_sp (m_options.m_infile.ReadFileContents (m_options.m_infile_offset, length));
+            if (item_byte_size > 0)
+                length = item_byte_size;
+            lldb::DataBufferSP data_sp (m_memory_options.m_infile.ReadFileContents (m_memory_options.m_infile_offset, length));
             if (data_sp)
             {
                 length = data_sp->GetByteSize();
@@ -955,9 +949,9 @@
             }
             return result.Succeeded();
         }
-        else if (m_options.m_byte_size == 0)
+        else if (item_byte_size == 0)
         {
-            if (m_options.m_format == eFormatPointer)
+            if (m_format_options.GetFormat() == eFormatPointer)
                 item_byte_size = buffer.GetAddressByteSize();
             else
                 item_byte_size = 1;
@@ -973,7 +967,7 @@
         {
             const char *value_str = command.GetArgumentAtIndex(i);
 
-            switch (m_options.m_format)
+            switch (m_format_options.GetFormat())
             {
             case kNumFormats:
             case eFormatFloat:  // TODO: add support for floats soon
@@ -1058,7 +1052,7 @@
                 {
                     size_t len = strlen (value_str);
                     // Include the NULL for C strings...
-                    if (m_options.m_format == eFormatCString)
+                    if (m_format_options.GetFormat() == eFormatCString)
                         ++len;
                     Error error;
                     if (process->WriteMemory (addr, value_str, len, error) == len)
@@ -1143,24 +1137,12 @@
     }
 
 protected:
-    CommandOptions m_options;
-};
-
-#define SET1 LLDB_OPT_SET_1
-#define SET2 LLDB_OPT_SET_2
-
-OptionDefinition
-CommandObjectMemoryWrite::CommandOptions::g_option_table[] =
-{
-{ SET1       , false, "format", 'f', required_argument, NULL, 0, eArgTypeFormat,   "The format value types that will be decoded and written to memory."},
-{ SET1 | SET2, false, "size",   's', required_argument, NULL, 0, eArgTypeByteSize, "The size in bytes of the values to write to memory."},
-{        SET2, true,  "infile", 'i', required_argument, NULL, 0, eArgTypeFilename, "Write memory using the contents of a file."},
-{        SET2, false, "offset", 'o', required_argument, NULL, 0, eArgTypeOffset,   "Start writng bytes from an offset within the input file."},
-{ 0          , false, NULL    ,  0 , 0                , NULL, 0, eArgTypeNone,     NULL }
+    
+    OptionGroupOptions m_option_group;
+    OptionGroupFormat m_format_options;
+    OptionGroupWriteMemory m_memory_options;
 };
 
-#undef SET1
-#undef SET2
 
 //-------------------------------------------------------------------------
 // CommandObjectMemory

Modified: lldb/trunk/source/Commands/CommandObjectRegister.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectRegister.cpp?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectRegister.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectRegister.cpp Tue Oct 25 01:44:01 2011
@@ -22,6 +22,7 @@
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Interpreter/NamedOptionValue.h"
 #include "lldb/Interpreter/Options.h"
+#include "lldb/Interpreter/OptionGroupFormat.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
@@ -43,7 +44,9 @@
                        //"register read [<reg-name1> [<reg-name2> [...]]]",
                        NULL,
                        eFlagProcessMustBeLaunched | eFlagProcessMustBePaused),
-        m_options (interpreter)
+        m_option_group (interpreter),
+        m_format_options (eFormatDefault),
+        m_command_options ()
     {
         CommandArgumentEntry arg;
         CommandArgumentData register_arg;
@@ -57,6 +60,12 @@
         
         // Push the data for the first argument into the m_arguments vector.
         m_arguments.push_back (arg);
+
+        // Add the "--format"
+        m_option_group.Append (&m_format_options, OptionGroupFormat::OPTION_GROUP_FORMAT, LLDB_OPT_SET_ALL);
+        m_option_group.Append (&m_command_options);
+        m_option_group.Finalize();
+
     }
 
     virtual
@@ -67,7 +76,7 @@
     Options *
     GetOptions ()
     {
-        return &m_options;
+        return &m_option_group;
     }
 
     bool
@@ -83,15 +92,10 @@
             if (reg_ctx->ReadRegister (reg_info, reg_value))
             {
                 strm.Indent ();
-                Format format;
-                if (m_options.format == eFormatDefault)
-                    format = reg_info->format;
-                else
-                    format = m_options.format;
 
-                bool prefix_with_altname = m_options.alternate_name;
+                bool prefix_with_altname = m_command_options.alternate_name;
                 bool prefix_with_name = !prefix_with_altname;
-                reg_value.Dump(&strm, reg_info, prefix_with_name, prefix_with_altname, m_options.format);
+                reg_value.Dump(&strm, reg_info, prefix_with_name, prefix_with_altname, m_format_options.GetFormat());
                 if (((reg_info->encoding == eEncodingUint) || (reg_info->encoding == eEncodingSint)) && 
                     (reg_info->byte_size == reg_ctx->GetThread().GetProcess().GetAddressByteSize()))
                 {
@@ -165,12 +169,12 @@
                 uint32_t set_idx;
                 
                 uint32_t num_register_sets = 1;
-                const uint32_t set_array_size = m_options.set_indexes.GetSize();
+                const uint32_t set_array_size = m_command_options.set_indexes.GetSize();
                 if (set_array_size > 0)
                 {
                     for (uint32_t i=0; i<set_array_size; ++i)
                     {
-                        set_idx = m_options.set_indexes[i]->GetUInt64Value (UINT32_MAX, NULL);
+                        set_idx = m_command_options.set_indexes[i]->GetUInt64Value (UINT32_MAX, NULL);
                         if (set_idx != UINT32_MAX)
                         {
                             if (!DumpRegisterSet (exe_ctx, strm, reg_ctx, set_idx))
@@ -190,7 +194,7 @@
                 }
                 else
                 {
-                    if (m_options.dump_all_sets)
+                    if (m_command_options.dump_all_sets)
                         num_register_sets = reg_ctx->GetRegisterSetCount();
 
                     for (set_idx = 0; set_idx < num_register_sets; ++set_idx)
@@ -201,12 +205,12 @@
             }
             else
             {
-                if (m_options.dump_all_sets)
+                if (m_command_options.dump_all_sets)
                 {
                     result.AppendError ("the --all option can't be used when registers names are supplied as arguments\n");
                     result.SetStatus (eReturnStatusFailed);
                 }
-                else if (m_options.set_indexes.GetSize() > 0)
+                else if (m_command_options.set_indexes.GetSize() > 0)
                 {
                     result.AppendError ("the --set <set> option can't be used when registers names are supplied as arguments\n");
                     result.SetStatus (eReturnStatusFailed);
@@ -239,17 +243,15 @@
         return result.Succeeded();
     }
 
-protected:
-    class CommandOptions : public Options
+    class CommandOptions : public OptionGroup
     {
     public:
-        CommandOptions (CommandInterpreter &interpreter) :
-            Options(interpreter),
+        CommandOptions () :
+            OptionGroup(),
             set_indexes (OptionValue::ConvertTypeToMask (OptionValue::eTypeUInt64)),
             dump_all_sets (false, false), // Initial and default values are false
             alternate_name (false, false)
         {
-            OptionParsingStarting();
         }
         
         virtual
@@ -257,20 +259,36 @@
         {
         }
         
+        
+        virtual uint32_t
+        GetNumDefinitions ();
+
+        virtual const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+        
+        virtual void
+        OptionParsingStarting (CommandInterpreter &interpreter)
+        {
+            set_indexes.Clear();
+            dump_all_sets.Clear();
+            alternate_name.Clear();
+        }
+
         virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        SetOptionValue (CommandInterpreter &interpreter,
+                        uint32_t option_idx,
+                        const char *option_value)
         {
             Error error;
-            char short_option = (char) m_getopt_table[option_idx].val;
+            const char short_option = (char) g_option_table[option_idx].short_option;
             switch (short_option)
             {
-                case 'f':
-                    error = Args::StringToFormat (option_arg, format, NULL);
-                    break;
-
                 case 's':
                     {
-                        OptionValueSP value_sp (OptionValueUInt64::Create (option_arg, error));
+                        OptionValueSP value_sp (OptionValueUInt64::Create (option_value, error));
                         if (value_sp)
                             set_indexes.AppendValue (value_sp);
                     }
@@ -299,45 +317,34 @@
             return error;
         }
         
-        void
-        OptionParsingStarting ()
-        {
-            format = eFormatDefault;
-            set_indexes.Clear();
-            dump_all_sets.Clear();
-            alternate_name.Clear();
-        }
-        
-        const OptionDefinition*
-        GetDefinitions ()
-        {
-            return g_option_table;
-        }
-        
         // Options table: Required for subclasses of Options.
         
-        static OptionDefinition g_option_table[];
+        static const OptionDefinition g_option_table[];
         
         // Instance variables to hold the values for command options.
-        lldb::Format format;
         OptionValueArray set_indexes;
         OptionValueBoolean dump_all_sets;
         OptionValueBoolean alternate_name;
     };
 
-    CommandOptions m_options;
+    OptionGroupOptions m_option_group;
+    OptionGroupFormat m_format_options;
+    CommandOptions m_command_options;
 };
 
 OptionDefinition
 CommandObjectRegisterRead::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "format"   , 'f', required_argument, NULL, 0, eArgTypeExprFormat, "Specify the format to use when dumping register values."},
     { LLDB_OPT_SET_ALL, false, "alternate", 'A', no_argument      , NULL, 0, eArgTypeNone      , "Display register names using the alternate register name if there is one."},
     { LLDB_OPT_SET_1  , false, "set"      , 's', required_argument, NULL, 0, eArgTypeIndex     , "Specify which register sets to dump by index."},
     { LLDB_OPT_SET_2  , false, "all"      , 'a', no_argument      , NULL, 0, eArgTypeNone      , "Show all register sets."},
-    { 0, false, NULL, 0, 0, NULL, NULL, eArgTypeNone, NULL }
 };
 
+uint32_t
+CommandObjectRegisterRead::CommandOptions::GetNumDefinitions ()
+{
+    return sizeof(g_option_table)/sizeof(OptionDefinition);
+}
 
 
 //----------------------------------------------------------------------
@@ -350,7 +357,6 @@
         CommandObject (interpreter,
                        "register write",
                        "Modify a single register value.",
-                       //"register write <reg-name> <value>",
                        NULL,
                        eFlagProcessMustBeLaunched | eFlagProcessMustBePaused)
     {

Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectTarget.cpp?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Tue Oct 25 01:44:01 2011
@@ -28,6 +28,7 @@
 #include "lldb/Interpreter/OptionGroupArchitecture.h"
 #include "lldb/Interpreter/OptionGroupBoolean.h"
 #include "lldb/Interpreter/OptionGroupFile.h"
+#include "lldb/Interpreter/OptionGroupFormat.h"
 #include "lldb/Interpreter/OptionGroupVariable.h"
 #include "lldb/Interpreter/OptionGroupPlatform.h"
 #include "lldb/Interpreter/OptionGroupUInt64.h"
@@ -504,6 +505,7 @@
                        0),
         m_option_group (interpreter),
         m_option_variable (false), // Don't include frame options
+        m_option_format (eFormatDefault),
         m_option_compile_units    (LLDB_OPT_SET_1, false, "file", 'f', 0, eArgTypePath, "A basename or fullpath to a file that contains global variables. This option can be specified multiple times."),
         m_option_shared_libraries (LLDB_OPT_SET_1, false, "shlib",'s', 0, eArgTypePath, "A basename or fullpath to a shared library to use in the search for global variables. This option can be specified multiple times."),
         m_varobj_options()
@@ -523,6 +525,7 @@
         
         m_option_group.Append (&m_varobj_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Append (&m_option_variable, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
+        m_option_group.Append (&m_option_format, OptionGroupFormat::OPTION_GROUP_FORMAT, LLDB_OPT_SET_1);
         m_option_group.Append (&m_option_compile_units, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);   
         m_option_group.Append (&m_option_shared_libraries, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);   
         m_option_group.Finalize();
@@ -549,9 +552,6 @@
                .SetOmitSummaryDepth(m_varobj_options.no_summary_depth)
                .SetIgnoreCap(m_varobj_options.ignore_cap);
                 
-        if (m_option_variable.format != eFormatDefault)
-            valobj_sp->SetFormat (m_option_variable.format);
-        
         switch (var_sp->GetScope())
         {
             case eValueTypeVariableGlobal:
@@ -586,7 +586,7 @@
                 s.PutCString (": ");
         }
         
-        const Format format = m_option_variable.format;
+        const Format format = m_option_format.GetFormat();
         if (format != eFormatDefault)
             valobj_sp->SetFormat (format);
         
@@ -765,6 +765,7 @@
 protected:
     OptionGroupOptions m_option_group;
     OptionGroupVariable m_option_variable;
+    OptionGroupFormat m_option_format;
     OptionGroupFileList m_option_compile_units;
     OptionGroupFileList m_option_shared_libraries;
     OptionGroupValueObjectDisplay m_varobj_options;

Modified: lldb/trunk/source/Commands/CommandObjectType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectType.cpp?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectType.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectType.cpp Tue Oct 25 01:44:01 2011
@@ -26,15 +26,189 @@
 #include "lldb/Interpreter/CommandObject.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Interpreter/Options.h"
+#include "lldb/Interpreter/OptionGroupFormat.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
-//-------------------------------------------------------------------------
-// CommandObjectTypeFormatAdd
-//-------------------------------------------------------------------------
 
-class CommandObjectTypeFormatAdd : public CommandObject
+class ScriptAddOptions
+{
+    
+public:
+    
+    bool m_skip_pointers;
+    bool m_skip_references;
+    bool m_cascade;
+    StringList m_target_types;
+    StringList m_user_source;
+    
+    bool m_no_children;
+    bool m_no_value;
+    bool m_one_liner;
+    bool m_regex;
+    
+    ConstString* m_name;
+    
+    std::string m_category;
+    
+    ScriptAddOptions(bool sptr,
+                     bool sref,
+                     bool casc,
+                     bool noch,
+                     bool novl,
+                     bool onel,
+                     bool regx,
+                     ConstString* name,
+                     std::string catg) :
+    m_skip_pointers(sptr),
+    m_skip_references(sref),
+    m_cascade(casc),
+    m_target_types(),
+    m_user_source(),
+    m_no_children(noch),
+    m_no_value(novl),
+    m_one_liner(onel),
+    m_regex(regx),
+    m_name(name),
+    m_category(catg)
+    {
+    }
+    
+    typedef lldb::SharedPtr<ScriptAddOptions>::Type SharedPointer;
+    
+};
+
+class SynthAddOptions
+{
+    
+public:
+    
+    bool m_skip_pointers;
+    bool m_skip_references;
+    bool m_cascade;
+    bool m_regex;
+    StringList m_user_source;
+    StringList m_target_types;
+    
+    std::string m_category;
+    
+    SynthAddOptions(bool sptr,
+                    bool sref,
+                    bool casc,
+                    bool regx,
+                    std::string catg) :
+    m_skip_pointers(sptr),
+    m_skip_references(sref),
+    m_cascade(casc),
+    m_regex(regx),
+    m_user_source(),
+    m_target_types(),
+    m_category(catg)
+    {
+    }
+    
+    typedef lldb::SharedPtr<SynthAddOptions>::Type SharedPointer;
+    
+};
+
+
+
+class CommandObjectTypeSummaryAdd : public CommandObject
+{
+    
+private:
+    
+    class CommandOptions : public Options
+    {
+    public:
+        
+        CommandOptions (CommandInterpreter &interpreter) :
+        Options (interpreter)
+        {
+        }
+        
+        virtual
+        ~CommandOptions (){}
+        
+        virtual Error
+        SetOptionValue (uint32_t option_idx, const char *option_arg);
+        
+        void
+        OptionParsingStarting ();
+        
+        const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+        
+        // Options table: Required for subclasses of Options.
+        
+        static OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        bool m_cascade;
+        bool m_no_children;
+        bool m_no_value;
+        bool m_one_liner;
+        bool m_skip_references;
+        bool m_skip_pointers;
+        bool m_regex;
+        std::string m_format_string;
+        ConstString* m_name;
+        std::string m_python_script;
+        std::string m_python_function;
+        bool m_is_add_script;
+        std::string m_category;
+    };
+    
+    CommandOptions m_options;
+    
+    virtual Options *
+    GetOptions ()
+    {
+        return &m_options;
+    }
+    
+    void
+    CollectPythonScript(ScriptAddOptions *options,
+                        CommandReturnObject &result);
+    
+    bool
+    Execute_ScriptSummary (Args& command, CommandReturnObject &result);
+    
+    bool
+    Execute_StringSummary (Args& command, CommandReturnObject &result);
+    
+public:
+    
+    enum SummaryFormatType
+    {
+        eRegularSummary,
+        eRegexSummary,
+        eNamedSummary
+    };
+    
+    CommandObjectTypeSummaryAdd (CommandInterpreter &interpreter);
+    
+    ~CommandObjectTypeSummaryAdd ()
+    {
+    }
+    
+    bool
+    Execute (Args& command, CommandReturnObject &result);
+    
+    static bool
+    AddSummary(const ConstString& type_name,
+               lldb::SummaryFormatSP entry,
+               SummaryFormatType type,
+               std::string category,
+               Error* error = NULL);
+};
+
+class CommandObjectTypeSynthAdd : public CommandObject
 {
     
 private:
@@ -65,8 +239,12 @@
                     if (!success)
                         error.SetErrorStringWithFormat("Invalid value for cascade: %s.\n", option_arg);
                     break;
-                case 'f':
-                    error = Args::StringToFormat(option_arg, m_format, NULL);
+                case 'P':
+                    handwrite_python = true;
+                    break;
+                case 'l':
+                    m_class_name = std::string(option_arg);
+                    is_class_based = true;
                     break;
                 case 'p':
                     m_skip_pointers = true;
@@ -74,6 +252,12 @@
                 case 'r':
                     m_skip_references = true;
                     break;
+                case 'w':
+                    m_category = std::string(option_arg);
+                    break;
+                case 'x':
+                    m_regex = true;
+                    break;
                 default:
                     error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
                     break;
@@ -86,9 +270,13 @@
         OptionParsingStarting ()
         {
             m_cascade = true;
-            m_format = eFormatInvalid;
+            m_class_name = "";
             m_skip_pointers = false;
             m_skip_references = false;
+            m_category = "default";
+            is_class_based = false;
+            handwrite_python = false;
+            m_regex = false;
         }
         
         const OptionDefinition*
@@ -104,9 +292,18 @@
         // Instance variables to hold the values for command options.
         
         bool m_cascade;
-        lldb::Format m_format;
         bool m_skip_references;
         bool m_skip_pointers;
+        std::string m_class_name;
+        bool m_input_python;
+        std::string m_category;
+        
+        bool is_class_based;
+        
+        bool handwrite_python;
+        
+        bool m_regex;
+        
     };
     
     CommandOptions m_options;
@@ -117,12 +314,139 @@
         return &m_options;
     }
     
+    void
+    CollectPythonScript (SynthAddOptions *options,
+                         CommandReturnObject &result);    
+    bool
+    Execute_HandwritePython (Args& command, CommandReturnObject &result);    
+    
+    bool
+    Execute_PythonClass (Args& command, CommandReturnObject &result);
+    
+    bool
+    Execute (Args& command, CommandReturnObject &result);
+    
+public:
+    
+    enum SynthFormatType
+    {
+        eRegularSynth,
+        eRegexSynth
+    };
+    
+    CommandObjectTypeSynthAdd (CommandInterpreter &interpreter);
+    
+    ~CommandObjectTypeSynthAdd ()
+    {
+    }
+    
+    static bool
+    AddSynth(const ConstString& type_name,
+             lldb::SyntheticChildrenSP entry,
+             SynthFormatType type,
+             std::string category_name,
+             Error* error);
+};
+
+//-------------------------------------------------------------------------
+// CommandObjectTypeFormatAdd
+//-------------------------------------------------------------------------
+
+class CommandObjectTypeFormatAdd : public CommandObject
+{
+    
+private:
+    
+    class CommandOptions : public OptionGroup
+    {
+    public:
+        
+        CommandOptions () :
+            OptionGroup()
+        {
+        }
+        
+        virtual
+        ~CommandOptions ()
+        {
+        }
+        
+        virtual uint32_t
+        GetNumDefinitions ();
+        
+        virtual const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+        
+        virtual void
+        OptionParsingStarting (CommandInterpreter &interpreter)
+        {
+            m_cascade = true;
+            m_skip_pointers = false;
+            m_skip_references = false;
+        }
+        virtual Error
+        SetOptionValue (CommandInterpreter &interpreter,
+                        uint32_t option_idx,
+                        const char *option_value)
+        {
+            Error error;
+            const char short_option = (char) g_option_table[option_idx].short_option;
+            bool success;
+            
+            switch (short_option)
+            {
+                case 'C':
+                    m_cascade = Args::StringToBoolean(option_value, true, &success);
+                    if (!success)
+                        error.SetErrorStringWithFormat("Invalid value for cascade: %s.\n", option_value);
+                    break;
+                case 'p':
+                    m_skip_pointers = true;
+                    break;
+                case 'r':
+                    m_skip_references = true;
+                    break;
+                default:
+                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    break;
+            }
+            
+            return error;
+        }
+        
+        // Options table: Required for subclasses of Options.
+        
+        static OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        bool m_cascade;
+        bool m_skip_references;
+        bool m_skip_pointers;
+    };
+    
+    OptionGroupOptions m_option_group;
+    OptionGroupFormat m_format_options;
+    CommandOptions m_command_options;
+    
+    virtual Options *
+    GetOptions ()
+    {
+        return &m_option_group;
+    }
+    
 public:
     CommandObjectTypeFormatAdd (CommandInterpreter &interpreter) :
     CommandObject (interpreter,
                    "type format add",
                    "Add a new formatting style for a type.",
-                   NULL), m_options (interpreter)
+                   NULL), 
+        m_option_group (interpreter),
+        m_format_options (eFormatInvalid),
+        m_command_options ()
     {
         CommandArgumentEntry type_arg;
         CommandArgumentData type_style_arg;
@@ -161,6 +485,12 @@
                     "which now prints all floats and float&s as hexadecimal, but does not format float*s\n"
                     "and does not change the default display for Afloat and Bfloat objects.\n"
                     );
+    
+        // Add the "--format" to all options groups
+        m_option_group.Append (&m_format_options, OptionGroupFormat::OPTION_GROUP_FORMAT, LLDB_OPT_SET_ALL);
+        m_option_group.Append (&m_command_options);
+        m_option_group.Finalize();
+
     }
     
     ~CommandObjectTypeFormatAdd ()
@@ -179,7 +509,8 @@
             return false;
         }
         
-        if (m_options.m_format == eFormatInvalid)
+        const Format format = m_format_options.GetFormat();
+        if (format == eFormatInvalid)
         {
             result.AppendErrorWithFormat ("%s needs a valid format.\n", m_cmd_name.c_str());
             result.SetStatus(eReturnStatusFailed);
@@ -188,10 +519,10 @@
         
         ValueFormatSP entry;
         
-        entry.reset(new ValueFormat(m_options.m_format,
-                                    m_options.m_cascade,
-                                    m_options.m_skip_pointers,
-                                    m_options.m_skip_references));
+        entry.reset(new ValueFormat(format,
+                                    m_command_options.m_cascade,
+                                    m_command_options.m_skip_pointers,
+                                    m_command_options.m_skip_references));
 
         // now I have a valid format, let's add it to every type
         
@@ -218,13 +549,18 @@
 CommandObjectTypeFormatAdd::CommandOptions::g_option_table[] =
 {
     { LLDB_OPT_SET_ALL, false, "cascade", 'C', required_argument, NULL, 0, eArgTypeBoolean,    "If true, cascade to derived typedefs."},
-    { LLDB_OPT_SET_ALL, false, "format", 'f', required_argument, NULL, 0, eArgTypeFormat,    "The format to use to display this type."},
     { LLDB_OPT_SET_ALL, false, "skip-pointers", 'p', no_argument, NULL, 0, eArgTypeNone,         "Don't use this format for pointers-to-type objects."},
     { LLDB_OPT_SET_ALL, false, "skip-references", 'r', no_argument, NULL, 0, eArgTypeNone,         "Don't use this format for references-to-type objects."},
-    { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
 
+uint32_t
+CommandObjectTypeFormatAdd::CommandOptions::GetNumDefinitions ()
+{
+    return sizeof(g_option_table) / sizeof (OptionDefinition);
+}
+
+
 //-------------------------------------------------------------------------
 // CommandObjectTypeFormatDelete
 //-------------------------------------------------------------------------

Modified: lldb/trunk/source/Commands/CommandObjectType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectType.h?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectType.h (original)
+++ lldb/trunk/source/Commands/CommandObjectType.h Tue Oct 25 01:44:01 2011
@@ -23,87 +23,6 @@
 
 namespace lldb_private {
 
-class ScriptAddOptions
-{
-    
-public:
-    
-    bool m_skip_pointers;
-    bool m_skip_references;
-    bool m_cascade;
-    StringList m_target_types;
-    StringList m_user_source;
-    
-    bool m_no_children;
-    bool m_no_value;
-    bool m_one_liner;
-    bool m_regex;
-    
-    ConstString* m_name;
-    
-    std::string m_category;
-    
-    ScriptAddOptions(bool sptr,
-                     bool sref,
-                     bool casc,
-                     bool noch,
-                     bool novl,
-                     bool onel,
-                     bool regx,
-                     ConstString* name,
-                     std::string catg) :
-    m_skip_pointers(sptr),
-    m_skip_references(sref),
-    m_cascade(casc),
-    m_target_types(),
-    m_user_source(),
-    m_no_children(noch),
-    m_no_value(novl),
-    m_one_liner(onel),
-    m_regex(regx),
-    m_name(name),
-    m_category(catg)
-    {
-    }
-    
-    typedef lldb::SharedPtr<ScriptAddOptions>::Type SharedPointer;
-    
-};
-    
-class SynthAddOptions
-{
-    
-public:
-    
-    bool m_skip_pointers;
-    bool m_skip_references;
-    bool m_cascade;
-    bool m_regex;
-    StringList m_user_source;
-    StringList m_target_types;
-
-    std::string m_category;
-    
-    SynthAddOptions(bool sptr,
-                     bool sref,
-                     bool casc,
-                     bool regx,
-                     std::string catg) :
-    m_skip_pointers(sptr),
-    m_skip_references(sref),
-    m_cascade(casc),
-    m_regex(regx),
-    m_user_source(),
-    m_target_types(),
-    m_category(catg)
-    {
-    }
-    
-    typedef lldb::SharedPtr<SynthAddOptions>::Type SharedPointer;
-    
-};
-
-    
 class CommandObjectType : public CommandObjectMultiword
 {
 public:
@@ -113,239 +32,6 @@
     ~CommandObjectType ();
 };
 
-class CommandObjectTypeSummaryAdd : public CommandObject
-{
-    
-private:
-    
-    class CommandOptions : public Options
-    {
-    public:
-        
-        CommandOptions (CommandInterpreter &interpreter) :
-        Options (interpreter)
-        {
-        }
-        
-        virtual
-        ~CommandOptions (){}
-        
-        virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg);
-        
-        void
-        OptionParsingStarting ();
-        
-        const OptionDefinition*
-        GetDefinitions ()
-        {
-            return g_option_table;
-        }
-        
-        // Options table: Required for subclasses of Options.
-        
-        static OptionDefinition g_option_table[];
-        
-        // Instance variables to hold the values for command options.
-        
-        bool m_cascade;
-        bool m_no_children;
-        bool m_no_value;
-        bool m_one_liner;
-        bool m_skip_references;
-        bool m_skip_pointers;
-        bool m_regex;
-        std::string m_format_string;
-        ConstString* m_name;
-        std::string m_python_script;
-        std::string m_python_function;
-        bool m_is_add_script;
-        std::string m_category;
-    };
-    
-    CommandOptions m_options;
-    
-    virtual Options *
-    GetOptions ()
-    {
-        return &m_options;
-    }
-    
-    void
-    CollectPythonScript(ScriptAddOptions *options,
-                        CommandReturnObject &result);
-    
-    bool
-    Execute_ScriptSummary (Args& command, CommandReturnObject &result);
-
-    bool
-    Execute_StringSummary (Args& command, CommandReturnObject &result);
-    
-public:
-    
-    enum SummaryFormatType
-    {
-        eRegularSummary,
-        eRegexSummary,
-        eNamedSummary
-    };
-
-    CommandObjectTypeSummaryAdd (CommandInterpreter &interpreter);
-    
-    ~CommandObjectTypeSummaryAdd ()
-    {
-    }
-    
-    bool
-    Execute (Args& command, CommandReturnObject &result);
-    
-    static bool
-    AddSummary(const ConstString& type_name,
-               lldb::SummaryFormatSP entry,
-               SummaryFormatType type,
-               std::string category,
-               Error* error = NULL);
-};
-    
-class CommandObjectTypeSynthAdd : public CommandObject
-{
-    
-private:
-    
-    class CommandOptions : public Options
-    {
-    public:
-        
-        CommandOptions (CommandInterpreter &interpreter) :
-        Options (interpreter)
-        {
-        }
-        
-        virtual
-        ~CommandOptions (){}
-        
-        virtual Error
-        SetOptionValue (uint32_t option_idx, const char *option_arg)
-        {
-            Error error;
-            char short_option = (char) m_getopt_table[option_idx].val;
-            bool success;
-            
-            switch (short_option)
-            {
-                case 'C':
-                    m_cascade = Args::StringToBoolean(option_arg, true, &success);
-                    if (!success)
-                        error.SetErrorStringWithFormat("Invalid value for cascade: %s.\n", option_arg);
-                    break;
-                case 'P':
-                    handwrite_python = true;
-                    break;
-                case 'l':
-                    m_class_name = std::string(option_arg);
-                    is_class_based = true;
-                    break;
-                case 'p':
-                    m_skip_pointers = true;
-                    break;
-                case 'r':
-                    m_skip_references = true;
-                    break;
-                case 'w':
-                    m_category = std::string(option_arg);
-                    break;
-                case 'x':
-                    m_regex = true;
-                    break;
-                default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
-                    break;
-            }
-            
-            return error;
-        }
-        
-        void
-        OptionParsingStarting ()
-        {
-            m_cascade = true;
-            m_class_name = "";
-            m_skip_pointers = false;
-            m_skip_references = false;
-            m_category = "default";
-            is_class_based = false;
-            handwrite_python = false;
-            m_regex = false;
-        }
-        
-        const OptionDefinition*
-        GetDefinitions ()
-        {
-            return g_option_table;
-        }
-        
-        // Options table: Required for subclasses of Options.
-        
-        static OptionDefinition g_option_table[];
-        
-        // Instance variables to hold the values for command options.
-        
-        bool m_cascade;
-        bool m_skip_references;
-        bool m_skip_pointers;
-        std::string m_class_name;
-        bool m_input_python;
-        std::string m_category;
-        
-        bool is_class_based;
-        
-        bool handwrite_python;
-                
-        bool m_regex;
-        
-    };
-    
-    CommandOptions m_options;
-    
-    virtual Options *
-    GetOptions ()
-    {
-        return &m_options;
-    }
-    
-    void
-    CollectPythonScript (SynthAddOptions *options,
-                         CommandReturnObject &result);    
-    bool
-    Execute_HandwritePython (Args& command, CommandReturnObject &result);    
-
-    bool
-    Execute_PythonClass (Args& command, CommandReturnObject &result);
-    
-    bool
-    Execute (Args& command, CommandReturnObject &result);
-    
-public:
-    
-    enum SynthFormatType
-    {
-        eRegularSynth,
-        eRegexSynth
-    };
-    
-    CommandObjectTypeSynthAdd (CommandInterpreter &interpreter);
-    
-    ~CommandObjectTypeSynthAdd ()
-    {
-    }
-    
-    static bool
-    AddSynth(const ConstString& type_name,
-             lldb::SyntheticChildrenSP entry,
-             SynthFormatType type,
-             std::string category_name,
-             Error* error);
-};
 
 } // namespace lldb_private
 

Modified: lldb/trunk/source/Interpreter/NamedOptionValue.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/NamedOptionValue.cpp?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/NamedOptionValue.cpp (original)
+++ lldb/trunk/source/Interpreter/NamedOptionValue.cpp Tue Oct 25 01:44:01 2011
@@ -368,14 +368,11 @@
 OptionValueFormat::SetValueFromCString (const char *value_cstr)
 {
     Format new_format;
-    uint32_t new_byte_size = UINT32_MAX;
-    Error error (Args::StringToFormat(value_cstr, new_format, m_byte_size_prefix_ok ? &new_byte_size : NULL));
+    Error error (Args::StringToFormat (value_cstr, new_format, NULL));
     if (error.Success())
     {
         m_value_was_set = true;
         m_current_value = new_format;
-        if (new_byte_size != UINT32_MAX)
-            m_current_byte_size = new_byte_size;
     }
     return error;
 }

Modified: lldb/trunk/source/Interpreter/OptionGroupFormat.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupFormat.cpp?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupFormat.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupFormat.cpp Tue Oct 25 01:44:01 2011
@@ -18,14 +18,12 @@
 using namespace lldb;
 using namespace lldb_private;
 
-OptionGroupFormat::OptionGroupFormat(lldb::Format default_format,
-                                     uint32_t default_byte_size,
-                                     bool byte_size_prefix_ok) :
-    m_format (default_format, 
-              default_format,
-              default_byte_size,
-              default_byte_size,
-              byte_size_prefix_ok)
+OptionGroupFormat::OptionGroupFormat (lldb::Format default_format,
+                                      uint64_t default_byte_size,
+                                      uint64_t default_count) :
+    m_format (default_format, default_format),
+    m_byte_size (default_byte_size, default_byte_size),
+    m_count (default_count, default_count)
 {
 }
 
@@ -36,13 +34,22 @@
 static OptionDefinition 
 g_option_table[] =
 {
-    { LLDB_OPT_SET_1 , false, "format", 'f', required_argument, NULL, 0, eArgTypeFormat , "Specify a format to be used for display."},
+{ LLDB_OPT_SET_1, false, "format",'f', required_argument, NULL, 0, eArgTypeFormat  , "Specify a format to be used for display."},
+{ LLDB_OPT_SET_2, false, "size"  ,'s', required_argument, NULL, 0, eArgTypeByteSize, "The size in bytes to use when displaying with the selected format."},
+{ LLDB_OPT_SET_3, false, "count" ,'c', required_argument, NULL, 0, eArgTypeCount   , "The number of total items to display."},
 };
 
 uint32_t
 OptionGroupFormat::GetNumDefinitions ()
 {
-    return arraysize(g_option_table);
+    if (m_byte_size.GetDefaultValue() < UINT64_MAX)
+    {
+        if (m_count.GetDefaultValue() < UINT64_MAX)
+            return 3;
+        else
+            return 2;
+    }
+    return 1;
 }
 
 const OptionDefinition *
@@ -65,6 +72,32 @@
             error = m_format.SetValueFromCString (option_arg);
             break;
 
+        case 'c':
+            if (m_count.GetDefaultValue() == 0)
+            {
+                error.SetErrorString ("--count option is disabled");
+            }
+            else
+            {
+                error = m_count.SetValueFromCString (option_arg);
+                if (m_count.GetCurrentValue() == 0)
+                    error.SetErrorStringWithFormat("invalid --count option value '%s'", option_arg);
+            }
+            break;
+            
+        case 's':
+            if (m_byte_size.GetDefaultValue() == 0)
+            {
+                error.SetErrorString ("--size option is disabled");
+            }
+            else
+            {
+                error = m_byte_size.SetValueFromCString (option_arg);
+                if (m_byte_size.GetCurrentValue() == 0)
+                    error.SetErrorStringWithFormat("invalid --size option value '%s'", option_arg);
+            }
+            break;
+
         default:
             error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
             break;
@@ -77,5 +110,6 @@
 OptionGroupFormat::OptionParsingStarting (CommandInterpreter &interpreter)
 {
     m_format.Clear();
+    m_byte_size.Clear();
+    m_count.Clear();
 }
-

Modified: lldb/trunk/source/Interpreter/OptionGroupVariable.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupVariable.cpp?rev=142911&r1=142910&r2=142911&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupVariable.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupVariable.cpp Tue Oct 25 01:44:01 2011
@@ -28,7 +28,6 @@
     { LLDB_OPT_SET_1, false, "no-locals",       'l', no_argument,       NULL, 0, eArgTypeNone,    "Omit local variables."},
     { LLDB_OPT_SET_1, false, "show-globals",    'g', no_argument,       NULL, 0, eArgTypeNone,    "Show the current frame source file global and static variables."},
     { LLDB_OPT_SET_1, false, "show-declaration",'c', no_argument,       NULL, 0, eArgTypeNone,    "Show variable declaration information (source file and line where the variable was declared)."},
-    { LLDB_OPT_SET_1, false, "format",          'f', required_argument, NULL, 0, eArgTypeExprFormat,  "Specify the format that the variable output should use."},
     { LLDB_OPT_SET_1, false, "regex",           'r', no_argument,       NULL, 0, eArgTypeRegularExpression,    "The <variable-name> argument for name lookups are regular expressions."},
     { LLDB_OPT_SET_1, false, "scope",           's', no_argument,       NULL, 0, eArgTypeNone,    "Show variable scope (argument, local, global, static)."},
     { LLDB_OPT_SET_1, false, "summary",         'y', required_argument, NULL, 0, eArgTypeName,  "Specify the summary that the variable output should use."},
@@ -61,7 +60,6 @@
         case 'l':   show_locals  = false; break;
         case 'g':   show_globals = true;  break;
         case 'c':   show_decl    = true;  break;
-        case 'f':   error = Args::StringToFormat(option_arg, format, NULL); break;
         case 's':
             show_scope = true;
             break;
@@ -83,7 +81,6 @@
     show_locals   = true;   // Frame option only
     show_globals  = false;  // Frame option only
     show_decl     = false;
-    format        = lldb::eFormatDefault;
     use_regex     = false;
     show_scope    = false;
     summary       = "";



From dragos.tatulea at gmail.com  Tue Oct 25 10:06:27 2011
From: dragos.tatulea at gmail.com (Dragos Tatulea)
Date: Tue, 25 Oct 2011 18:06:27 +0300
Subject: [Lldb-commits] declare
 CommandObjectRegisterRead::CommandOptions::g_option_table as const to fix
 Linux build
Message-ID: <CAL5OrN6RaU_9DJZ4MCybuO+-wrn-R4sY3kNBKzu1ZrZXZJ_JQA@mail.gmail.com>

Hi,

Please check out the attached patch that fixes (once again!) the Linux
build.

Thanks,
Dragos
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/lldb-commits/attachments/20111025/9a03ce5e/attachment.html 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: lldb_fix_g_option_table.patch
Type: text/x-patch
Size: 590 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/lldb-commits/attachments/20111025/9a03ce5e/attachment.bin 

From johnny.chen at apple.com  Tue Oct 25 12:58:16 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Tue, 25 Oct 2011 17:58:16 -0000
Subject: [Lldb-commits] [lldb] r142932 -
	/lldb/trunk/source/Commands/CommandObjectRegister.cpp
Message-ID: <20111025175816.46F8B312800A@llvm.org>

Author: johnny
Date: Tue Oct 25 12:58:16 2011
New Revision: 142932

URL: http://llvm.org/viewvc/llvm-project?rev=142932&view=rev
Log:
Patch from Dragos to fix Linux build!

Modified:
    lldb/trunk/source/Commands/CommandObjectRegister.cpp

Modified: lldb/trunk/source/Commands/CommandObjectRegister.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectRegister.cpp?rev=142932&r1=142931&r2=142932&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectRegister.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectRegister.cpp Tue Oct 25 12:58:16 2011
@@ -332,7 +332,7 @@
     CommandOptions m_command_options;
 };
 
-OptionDefinition
+const OptionDefinition
 CommandObjectRegisterRead::CommandOptions::g_option_table[] =
 {
     { LLDB_OPT_SET_ALL, false, "alternate", 'A', no_argument      , NULL, 0, eArgTypeNone      , "Display register names using the alternate register name if there is one."},



From scallanan at apple.com  Tue Oct 25 13:02:05 2011
From: scallanan at apple.com (Sean Callanan)
Date: Tue, 25 Oct 2011 18:02:05 -0000
Subject: [Lldb-commits] [lldb] r142933 -
	/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
Message-ID: <20111025180205.63002312800A@llvm.org>

Author: spyffe
Date: Tue Oct 25 13:02:05 2011
New Revision: 142933

URL: http://llvm.org/viewvc/llvm-project?rev=142933&view=rev
Log:
Fixed our handling of const functions, compensating
for debug information that occasionally gets the
const-ness of member functions wrong.  We used to
demangle the name, add "const," and remangle it; now
we handle the mangled name directly, which is more
robust.

Modified:
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=142933&r1=142932&r2=142933&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Tue Oct 25 13:02:05 2011
@@ -674,22 +674,17 @@
         // We occasionally get debug information in which a const function is reported 
         // as non-const, so the mangled name is wrong.  This is a hack to compensate.
         
-        Mangled mangled(name.GetCString(), true);
-        
-        ConstString demangled_name = mangled.GetDemangledName();
-        
-        if (strlen(demangled_name.GetCString()))
+        if (!strncmp(name.GetCString(), "_ZN", 3) &&
+            strncmp(name.GetCString(), "_ZNK", 4))
         {
-            std::string const_name_scratch(demangled_name.GetCString());
-            
-            const_name_scratch.append(" const");
-            
-            ConstString const_name(const_name_scratch.c_str());
-                        
-            FindCodeSymbolInContext(name, m_parser_vars->m_sym_ctx, sc_list);
+            std::string fixed_scratch("_ZNK");
+            fixed_scratch.append(name.GetCString() + 3);
+            ConstString fixed_name(fixed_scratch.c_str());
             
             if (log)
-                log->Printf("Found %d results with const name %s", sc_list.GetSize(), const_name.GetCString());
+                log->Printf("Failed to find symbols given non-const name %s; trying %s", name.GetCString(), fixed_name.GetCString());
+            
+            FindCodeSymbolInContext(fixed_name, m_parser_vars->m_sym_ctx, sc_list);
         }
     }
     



From johnny.chen at apple.com  Tue Oct 25 13:06:13 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Tue, 25 Oct 2011 11:06:13 -0700
Subject: [Lldb-commits] declare
 CommandObjectRegisterRead::CommandOptions::g_option_table as const to fix
 Linux build
In-Reply-To: <CAL5OrN6RaU_9DJZ4MCybuO+-wrn-R4sY3kNBKzu1ZrZXZJ_JQA@mail.gmail.com>
References: <CAL5OrN6RaU_9DJZ4MCybuO+-wrn-R4sY3kNBKzu1ZrZXZJ_JQA@mail.gmail.com>
Message-ID: <6AFCC1B9-4562-4E28-A044-24283FE389FB@apple.com>

Hi Dragos,

Checked in as http://llvm.org/viewvc/llvm-project?rev=142932&view=rev.
Thanks!

On Oct 25, 2011, at 8:06 AM, Dragos Tatulea wrote:

> Hi,
> 
> Please check out the attached patch that fixes (once again!) the Linux build.
> 
> Thanks,
> Dragos
> <lldb_fix_g_option_table.patch>_______________________________________________
> lldb-commits mailing list
> lldb-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/lldb-commits/attachments/20111025/96da1da1/attachment.html 

From scallanan at apple.com  Tue Oct 25 13:36:40 2011
From: scallanan at apple.com (Sean Callanan)
Date: Tue, 25 Oct 2011 18:36:40 -0000
Subject: [Lldb-commits] [lldb] r142936 - in /lldb/trunk:
 include/lldb/Expression/ClangExpressionDeclMap.h
 include/lldb/Expression/IRForTarget.h
 source/Expression/ClangExpressionDeclMap.cpp
 source/Expression/IRForTarget.cpp
Message-ID: <20111025183640.915BB312800A@llvm.org>

Author: spyffe
Date: Tue Oct 25 13:36:40 2011
New Revision: 142936

URL: http://llvm.org/viewvc/llvm-project?rev=142936&view=rev
Log:
Improved handling of static data in the expression
parser.  Now expression like the following work as
expected:

-
(lldb) expr struct { int a; int b; } $blah = { 10, 20 }
<no result>
(lldb) expr $blah
(<anonymous struct at Parse:6:5>) $blah = {
  (int) a = 10
  (int) b = 20
}
-

Now the IRForTarget subsystem knows how to handle
static initializers of various composite types.

Also removed an unnecessary parameter from
ClangExpressionDeclMap::GetFunctionInfo.

Modified:
    lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
    lldb/trunk/include/lldb/Expression/IRForTarget.h
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
    lldb/trunk/source/Expression/IRForTarget.cpp

Modified: lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h?rev=142936&r1=142935&r2=142936&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h Tue Oct 25 13:36:40 2011
@@ -293,10 +293,6 @@
     ///     The parsed Decl for the Function, as generated by ClangASTSource
     ///     on ClangExpressionDeclMap's behalf.
     ///
-    /// @param[out] value
-    ///     A pointer to the address where a Value for the function's address
-    ///     can be stored.  IRForTarget typically places a ConstantExpr here.
-    ///
     /// @param[out] ptr
     ///     The absolute address of the function in the target.
     ///
@@ -305,7 +301,6 @@
     //------------------------------------------------------------------
     bool 
     GetFunctionInfo (const clang::NamedDecl *decl, 
-                     llvm::Value**& value, 
                      uint64_t &ptr);
     
     //------------------------------------------------------------------

Modified: lldb/trunk/include/lldb/Expression/IRForTarget.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/IRForTarget.h?rev=142936&r1=142935&r2=142936&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/IRForTarget.h (original)
+++ lldb/trunk/include/lldb/Expression/IRForTarget.h Tue Oct 25 13:36:40 2011
@@ -27,6 +27,7 @@
     class Instruction;
     class Module;
     class StoreInst;
+    class TargetData;
     class Type;
     class Value;
 }
@@ -432,6 +433,34 @@
     //------------------------------------------------------------------
     
     //------------------------------------------------------------------
+    /// Write an initializer to a memory array of assumed sufficient
+    /// size.
+    ///
+    /// @param[in] data
+    ///     A pointer to the data to write to.
+    ///
+    /// @param[in] initializer
+    ///     The initializer itself.
+    ///
+    /// @return
+    ///     True on success; false otherwise
+    //------------------------------------------------------------------
+    bool
+    MaterializeInitializer (uint8_t *data, llvm::Constant *initializer);
+    
+    //------------------------------------------------------------------
+    /// Move an internal variable into the static allocation section.
+    ///
+    /// @param[in] global_variable
+    ///     The variable.
+    ///
+    /// @return
+    ///     True on success; false otherwise
+    //------------------------------------------------------------------
+    bool
+    MaterializeInternalVariable (llvm::GlobalVariable *global_variable);
+    
+    //------------------------------------------------------------------
     /// Handle a single externally-defined variable
     ///
     /// @param[in] value
@@ -578,6 +607,7 @@
     lldb_private::ConstString               m_result_name;              ///< The name of the result variable ($0, $1, ...)
     lldb_private::TypeFromParser            m_result_type;              ///< The type of the result variable.
     llvm::Module                           *m_module;                   ///< The module being processed, or NULL if that has not been determined yet.
+    std::auto_ptr<llvm::TargetData>         m_target_data;              ///< The target data for the module being processed, or NULL if there is no module.
     lldb_private::ClangExpressionDeclMap   *m_decl_map;                 ///< The DeclMap containing the Decls 
     StaticDataAllocator                    *m_data_allocator;           ///< If non-NULL, the allocator to use for constant strings
     llvm::Constant                         *m_CFStringCreateWithBytes;  ///< The address of the function CFStringCreateWithBytes, cast to the appropriate function pointer type

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=142936&r1=142935&r2=142936&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Tue Oct 25 13:36:40 2011
@@ -612,7 +612,6 @@
 ClangExpressionDeclMap::GetFunctionInfo 
 (
     const NamedDecl *decl, 
-    llvm::Value**& value, 
     uint64_t &ptr
 )
 {
@@ -624,7 +623,6 @@
     // We know m_parser_vars is valid since we searched for the variable by
     // its NamedDecl
     
-    value = &entity_sp->m_parser_vars->m_llvm_value;
     ptr = entity_sp->m_parser_vars->m_lldb_value->GetScalar().ULongLong();
     
     return true;

Modified: lldb/trunk/source/Expression/IRForTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRForTarget.cpp?rev=142936&r1=142935&r2=142936&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRForTarget.cpp (original)
+++ lldb/trunk/source/Expression/IRForTarget.cpp Tue Oct 25 13:36:40 2011
@@ -218,11 +218,10 @@
     // Find the address of the function.
     
     clang::NamedDecl *fun_decl = DeclForGlobal (fun);
-    Value **fun_value_ptr = NULL;
     
     if (fun_decl)
     {
-        if (!m_decl_map->GetFunctionInfo (fun_decl, fun_value_ptr, fun_addr)) 
+        if (!m_decl_map->GetFunctionInfo (fun_decl, fun_addr)) 
         {
             lldb_private::ConstString alternate_mangling_const_str;
             bool found_it = m_decl_map->GetFunctionAddress (name, fun_addr);
@@ -242,8 +241,6 @@
             
             if (!found_it)
             {
-                fun_value_ptr = NULL;
-
                 if (log)
                 {
                     if (alternate_mangling_const_str)
@@ -1407,6 +1404,96 @@
     return true;
 }
 
+bool
+IRForTarget::MaterializeInitializer (uint8_t *data, Constant *initializer)
+{
+    if (!initializer)
+        return true;
+    
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+
+    if (log && log->GetVerbose())
+        log->Printf("  MaterializeInitializer(%p, %s)", data, PrintValue(initializer).c_str());
+    
+    Type *initializer_type = initializer->getType();
+    
+    if (ConstantInt *int_initializer = dyn_cast<ConstantInt>(initializer))
+    {
+        memcpy (data, int_initializer->getValue().getRawData(), m_target_data->getTypeStoreSize(initializer_type));
+        return true;
+    }
+    else if (ConstantArray *array_initializer = dyn_cast<ConstantArray>(initializer))
+    {
+        if (array_initializer->isString())
+        {
+            std::string array_initializer_string = array_initializer->getAsString();
+            memcpy (data, array_initializer_string.c_str(), m_target_data->getTypeStoreSize(initializer_type));
+        }
+        else
+        {
+            ArrayType *array_initializer_type = array_initializer->getType();
+            Type *array_element_type = array_initializer_type->getElementType();
+                        
+            size_t element_size = m_target_data->getTypeAllocSize(array_element_type);
+            
+            for (int i = 0; i < array_initializer->getNumOperands(); ++i)
+            {
+                if (!MaterializeInitializer(data + (i * element_size), array_initializer->getOperand(i)))
+                    return false;
+            }
+        }
+        return true;
+    }
+    else if (ConstantStruct *struct_initializer = dyn_cast<ConstantStruct>(initializer))
+    {
+        StructType *struct_initializer_type = struct_initializer->getType();
+        const StructLayout *struct_layout = m_target_data->getStructLayout(struct_initializer_type);
+
+        for (int i = 0;
+             i < struct_initializer->getNumOperands();
+             ++i)
+        {
+            if (!MaterializeInitializer(data + struct_layout->getElementOffset(i), struct_initializer->getOperand(i)))
+                return false;
+        }
+        return true;
+    }
+    return false;
+}
+
+bool
+IRForTarget::MaterializeInternalVariable (GlobalVariable *global_variable)
+{
+    if (GlobalVariable::isExternalLinkage(global_variable->getLinkage()))
+        return false;
+    
+    uint64_t offset = m_data_allocator->GetStream().GetSize();
+    
+    llvm::Type *variable_type = global_variable->getType();
+    
+    Constant *initializer = global_variable->getInitializer();
+    
+    llvm::Type *initializer_type = initializer->getType();
+    
+    size_t size = m_target_data->getTypeAllocSize(initializer_type);
+    
+    lldb_private::DataBufferHeap data(size, '\0');
+    
+    if (initializer)
+        if (!MaterializeInitializer(data.GetBytes(), initializer))
+            return false;
+    
+    m_data_allocator->GetStream().Write(data.GetBytes(), data.GetByteSize());
+    
+    Constant *new_pointer = BuildRelocation(variable_type, offset);
+        
+    global_variable->replaceAllUsesWith(new_pointer);
+
+    global_variable->eraseFromParent();
+    
+    return true;
+}
+
 // This function does not report errors; its callers are responsible.
 bool 
 IRForTarget::MaybeHandleVariable (Value *llvm_value_ptr)
@@ -1431,6 +1518,9 @@
     }
     else if (GlobalVariable *global_variable = dyn_cast<GlobalVariable>(llvm_value_ptr))
     {
+        if (!GlobalValue::isExternalLinkage(global_variable->getLinkage()))
+            return MaterializeInternalVariable(global_variable);
+        
         clang::NamedDecl *named_decl = DeclForGlobal(global_variable);
         
         if (!named_decl)
@@ -2211,42 +2301,47 @@
         }
             
         if (log)
-            log->Printf("  \"%s\" [\"%s\"] (\"%s\") placed at %lld",
-                        value->getName().str().c_str(),
+            log->Printf("  \"%s\" (\"%s\") placed at %lld",
                         name.GetCString(),
-                        PrintValue(value, true).c_str(),
+                        decl->getNameAsString().c_str(),
                         offset);
         
         ConstantInt *offset_int(ConstantInt::get(offset_type, offset, true));
         GetElementPtrInst *get_element_ptr = GetElementPtrInst::Create(argument, offset_int, "", FirstEntryInstruction);
                 
-        Value *replacement = NULL;
-        
-        // Per the comment at ASTResultSynthesizer::SynthesizeBodyResult, in cases where the result
-        // variable is an rvalue, we have to synthesize a dereference of the appropriate structure
-        // entry in order to produce the static variable that the AST thinks it is accessing.
-        if (name == m_result_name && !m_result_is_pointer)
+        if (value)
         {
-            BitCastInst *bit_cast = new BitCastInst(get_element_ptr, value->getType()->getPointerTo(), "", FirstEntryInstruction);
-        
-            LoadInst *load = new LoadInst(bit_cast, "", FirstEntryInstruction);
+            Value *replacement = NULL;
             
-            replacement = load;
-        }
-        else
-        {
-            BitCastInst *bit_cast = new BitCastInst(get_element_ptr, value->getType(), "", FirstEntryInstruction);
-
-            replacement = bit_cast;
-        }
+            if (log)
+                log->Printf("    Replacing [%s]", PrintValue(value).c_str());
             
-        if (Constant *constant = dyn_cast<Constant>(value))
-            UnfoldConstant(constant, replacement, FirstEntryInstruction);
-        else
-            value->replaceAllUsesWith(replacement);
-        
-        if (GlobalVariable *var = dyn_cast<GlobalVariable>(value))
-            var->eraseFromParent();
+            // Per the comment at ASTResultSynthesizer::SynthesizeBodyResult, in cases where the result
+            // variable is an rvalue, we have to synthesize a dereference of the appropriate structure
+            // entry in order to produce the static variable that the AST thinks it is accessing.
+            if (name == m_result_name && !m_result_is_pointer)
+            {
+                BitCastInst *bit_cast = new BitCastInst(get_element_ptr, value->getType()->getPointerTo(), "", FirstEntryInstruction);
+                
+                LoadInst *load = new LoadInst(bit_cast, "", FirstEntryInstruction);
+                
+                replacement = load;
+            }
+            else
+            {
+                BitCastInst *bit_cast = new BitCastInst(get_element_ptr, value->getType(), "", FirstEntryInstruction);
+                
+                replacement = bit_cast;
+            }
+            
+            if (Constant *constant = dyn_cast<Constant>(value))
+                UnfoldConstant(constant, replacement, FirstEntryInstruction);
+            else
+                value->replaceAllUsesWith(replacement);
+            
+            if (GlobalVariable *var = dyn_cast<GlobalVariable>(value))
+                var->eraseFromParent();
+        }
     }
     
     if (log)
@@ -2321,6 +2416,7 @@
     lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
     
     m_module = &llvm_module;
+    m_target_data.reset(new TargetData(m_module));
     
     Function* function = m_module->getFunction(StringRef(m_func_name.c_str()));
     
@@ -2343,6 +2439,18 @@
         return false;
     }
     
+    if (log)
+    {
+        std::string s;
+        raw_string_ostream oss(s);
+        
+        m_module->print(oss, NULL);
+        
+        oss.flush();
+        
+        log->Printf("Module as passed in to IRForTarget: \n\"%s\"", s.c_str());
+    }
+    
     llvm::Type *intptr_ty = Type::getInt8Ty(m_module->getContext());
     
     m_reloc_placeholder = new llvm::GlobalVariable((*m_module), 



From johnny.chen at apple.com  Tue Oct 25 15:08:03 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Tue, 25 Oct 2011 20:08:03 -0000
Subject: [Lldb-commits] [lldb] r142949 - in /lldb/trunk/test:
 benchmarks/turnaround/
 benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py dotest.py
Message-ID: <20111025200803.EBD27312800A@llvm.org>

Author: johnny
Date: Tue Oct 25 15:08:03 2011
New Revision: 142949

URL: http://llvm.org/viewvc/llvm-project?rev=142949&view=rev
Log:
Benchmark the turnaround time starting a debugger and run to the breakpoint with lldb vs. gdb.

An example (with /Developer/usr/bin/lldb vs. /usr/bin/gdb):

[13:05:04] johnny:/Volumes/data/lldb/svn/trunk/test $ ./dotest.py -v +b -n -p TestCompileRunToBreakpointTurnaround.py
1: test_run_lldb_then_gdb (TestCompileRunToBreakpointTurnaround.CompileRunToBreakpointBench)
   Benchmark turnaround time with lldb vs. gdb. ... 
lldb turnaround benchmark: Avg: 4.574600 (Laps: 3, Total Elapsed Time: 13.723799)
gdb turnaround benchmark: Avg: 7.966713 (Laps: 3, Total Elapsed Time: 23.900139)
lldb_avg/gdb_avg: 0.574214
ok

----------------------------------------------------------------------
Ran 1 test in 55.462s

OK

Added:
    lldb/trunk/test/benchmarks/turnaround/
    lldb/trunk/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
Modified:
    lldb/trunk/test/dotest.py

Added: lldb/trunk/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py?rev=142949&view=auto
==============================================================================
--- lldb/trunk/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py (added)
+++ lldb/trunk/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py Tue Oct 25 15:08:03 2011
@@ -0,0 +1,122 @@
+"""Benchmark the turnaround time starting a debugger and run to the breakpont with lldb vs. gdb."""
+
+import os, sys
+import unittest2
+import lldb
+import pexpect
+from lldbbench import *
+
+class CompileRunToBreakpointBench(BenchBase):
+
+    mydir = os.path.join("benchmarks", "turnaround")
+
+    def setUp(self):
+        BenchBase.setUp(self)
+        self.exe = self.lldbHere
+        self.function = 'Driver::MainLoop()'
+
+        self.count = lldb.bmIterationCount
+        if self.count <= 0:
+            self.count = 3
+
+        self.lldb_avg = None
+        self.gdb_avg = None
+
+    @benchmarks_test
+    def test_run_lldb_then_gdb(self):
+        """Benchmark turnaround time with lldb vs. gdb."""
+        print
+        self.run_lldb_turnaround(self.exe, self.function, self.count)
+        print "lldb turnaround benchmark:", self.stopwatch
+        self.run_gdb_turnaround(self.exe, self.function, self.count)
+        print "gdb turnaround benchmark:", self.stopwatch
+        print "lldb_avg/gdb_avg: %f" % (self.lldb_avg/self.gdb_avg)
+
+    def run_lldb_turnaround(self, exe, function, count):
+        def run_one_round():
+            prompt = self.child_prompt
+
+            # So that the child gets torn down after the test.
+            self.child = pexpect.spawn('%s %s %s' % (self.lldbExec, self.lldbOption, exe))
+            child = self.child
+
+            # Turn on logging for what the child sends back.
+            if self.TraceOn():
+                child.logfile_read = sys.stdout
+
+            child.expect_exact(prompt)
+            child.sendline('breakpoint set -F %s' % function)
+            child.expect_exact(prompt)
+            child.sendline('run')
+            child.expect_exact(prompt)
+
+        # Set self.child_prompt, which is "(lldb) ".
+        self.child_prompt = '(lldb) '
+        # Reset the stopwatch now.
+        self.stopwatch.reset()
+
+        for i in range(count + 1):
+            # Ignore the first invoke lldb and run to the breakpoint turnaround time.
+            if i == 0:
+                run_one_round()
+            else:
+                with self.stopwatch:
+                    run_one_round()
+
+            self.child.sendline('quit')
+            try:
+                self.child.expect(pexpect.EOF)
+            except:
+                pass
+
+        self.lldb_avg = self.stopwatch.avg()
+        self.child = None
+
+    def run_gdb_turnaround(self, exe, function, count):
+        def run_one_round():
+            prompt = self.child_prompt
+
+            # So that the child gets torn down after the test.
+            self.child = pexpect.spawn('gdb --nx %s' % exe)
+            child = self.child
+
+            # Turn on logging for what the child sends back.
+            if self.TraceOn():
+                child.logfile_read = sys.stdout
+
+            child.expect_exact(prompt)
+            child.sendline('break %s' % function)
+            child.expect_exact(prompt)
+            child.sendline('run')
+            child.expect_exact(prompt)
+
+        # Set self.child_prompt, which is "(gdb) ".
+        self.child_prompt = '(gdb) '
+        # Reset the stopwatch now.
+        self.stopwatch.reset()
+
+        for i in range(count+1):
+            # Ignore the first invoke lldb and run to the breakpoint turnaround time.
+            if i == 0:
+                run_one_round()
+            else:
+                with self.stopwatch:
+                    run_one_round()
+
+            self.child.sendline('quit')
+            self.child.expect_exact('The program is running.  Exit anyway?')
+            self.child.sendline('y')
+            try:
+                self.child.expect(pexpect.EOF)
+            except:
+                pass
+
+        self.gdb_avg = self.stopwatch.avg()
+        self.child = None
+
+
+if __name__ == '__main__':
+    import atexit
+    lldb.SBDebugger.Initialize()
+    atexit.register(lambda: lldb.SBDebugger.Terminate())
+    unittest2.main()

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=142949&r1=142948&r2=142949&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Tue Oct 25 15:08:03 2011
@@ -666,18 +666,16 @@
 
     if lldbHere:
         os.environ["LLDB_HERE"] = lldbHere
-        if not lldbExec:
-            lldbExec = lldbHere
-        os.environ["LLDB_BUILD_DIR"] = os.path.split(lldbExec)[0]
+        os.environ["LLDB_BUILD_DIR"] = os.path.split(lldbHere)[0]
         if not noHeaders:
             print "LLDB build dir:", os.environ["LLDB_BUILD_DIR"]
 
     # One last chance to locate the 'lldb' executable.
     if not lldbExec:
-        if lldbHere:
+        lldbExec = which('lldb')
+        if lldbHere and not lldbExec:
             lldbExec = lldbHere
-        else:
-            lldbExec = which('lldb')
+
 
     if not lldbExec:
         print "The 'lldb' executable cannot be located.  Some of the tests may not be run as a result."



From scallanan at apple.com  Tue Oct 25 15:36:57 2011
From: scallanan at apple.com (Sean Callanan)
Date: Tue, 25 Oct 2011 20:36:57 -0000
Subject: [Lldb-commits] [lldb] r142962 -
	/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
Message-ID: <20111025203657.6C2AE312800A@llvm.org>

Author: spyffe
Date: Tue Oct 25 15:36:57 2011
New Revision: 142962

URL: http://llvm.org/viewvc/llvm-project?rev=142962&view=rev
Log:
Fixed a problem where local variables conflict with
types of the same name.  If a local variable with the
given name is found (and we are not searching a
specific namespace) we stop right then and there and
report it.

Modified:
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=142962&r1=142961&r2=142962&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Tue Oct 25 15:36:57 2011
@@ -2443,6 +2443,7 @@
             {
                 AddOneVariable(context, var, current_id);
                 context.m_found.variable = true;
+                return;
             }
         }
         else if (target)



From johnny.chen at apple.com  Tue Oct 25 19:35:10 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Wed, 26 Oct 2011 00:35:10 -0000
Subject: [Lldb-commits] [lldb] r142993 -
	/lldb/trunk/test/benchmarks/startup/TestStartupDelays.py
Message-ID: <20111026003510.3ECFB312800A@llvm.org>

Author: johnny
Date: Tue Oct 25 19:35:10 2011
New Revision: 142993

URL: http://llvm.org/viewvc/llvm-project?rev=142993&view=rev
Log:
Add another metric for startup delay -- run to breakpoint, which measures the time from issuing
the run command till the first breakpoint hit.  Example:

 $ ./dotest.py -v +b -n -x '-F Driver::MainLoop()' -p TestStartupDelays.py
1: test_startup_delay (TestStartupDelays.StartupDelaysBench)
   Test start up delays creating a target and setting a breakpoint. ... 
lldb startup delay (create fresh target) benchmark: Avg: 0.124496 (Laps: 30, Total Elapsed Time: 3.734883)
lldb startup delay (set first breakpoint) benchmark: Avg: 0.220828 (Laps: 30, Total Elapsed Time: 6.624847)
lldb startup delay (run to breakpoint) benchmark: Avg: 0.478159 (Laps: 30, Total Elapsed Time: 14.344774)
ok

Modified:
    lldb/trunk/test/benchmarks/startup/TestStartupDelays.py

Modified: lldb/trunk/test/benchmarks/startup/TestStartupDelays.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/benchmarks/startup/TestStartupDelays.py?rev=142993&r1=142992&r2=142993&view=diff
==============================================================================
--- lldb/trunk/test/benchmarks/startup/TestStartupDelays.py (original)
+++ lldb/trunk/test/benchmarks/startup/TestStartupDelays.py Tue Oct 25 19:35:10 2011
@@ -15,6 +15,8 @@
         # Create self.stopwatch2 for measuring "set first breakpoint".
         # The default self.stopwatch is for "create fresh target".
         self.stopwatch2 = Stopwatch()
+        # Create self.stopwatch3 for measuring "run to breakpoint".
+        self.stopwatch3 = Stopwatch()
         if lldb.bmExecutable:
             self.exe = lldb.bmExecutable
         else:
@@ -35,6 +37,7 @@
         self.run_startup_delays_bench(self.exe, self.break_spec, self.count)
         print "lldb startup delay (create fresh target) benchmark:", self.stopwatch
         print "lldb startup delay (set first breakpoint) benchmark:", self.stopwatch2
+        print "lldb startup delay (run to breakpoint) benchmark:", self.stopwatch3
 
     def run_startup_delays_bench(self, exe, break_spec, count):
         # Set self.child_prompt, which is "(lldb) ".
@@ -63,6 +66,11 @@
                 child.sendline('breakpoint set %s' % break_spec)
                 child.expect_exact(prompt)
 
+            with self.stopwatch3:
+                # Run to the breakpoint just set.
+                child.sendline('run')
+                child.expect_exact(prompt)
+
             child.sendline('quit')
             try:
                 self.child.expect(pexpect.EOF)



From johnny.chen at apple.com  Tue Oct 25 19:44:40 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Wed, 26 Oct 2011 00:44:40 -0000
Subject: [Lldb-commits] [lldb] r142996 -
	/lldb/trunk/scripts/Python/interface/SBWatchpoint.i
Message-ID: <20111026004440.3CD46312800A@llvm.org>

Author: johnny
Date: Tue Oct 25 19:44:40 2011
New Revision: 142996

URL: http://llvm.org/viewvc/llvm-project?rev=142996&view=rev
Log:
Fix typo in the docstring.

Modified:
    lldb/trunk/scripts/Python/interface/SBWatchpoint.i

Modified: lldb/trunk/scripts/Python/interface/SBWatchpoint.i
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/interface/SBWatchpoint.i?rev=142996&r1=142995&r2=142996&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/interface/SBWatchpoint.i (original)
+++ lldb/trunk/scripts/Python/interface/SBWatchpoint.i Tue Oct 25 19:44:40 2011
@@ -15,8 +15,8 @@
 A watchpoint is determined by the address and the byte size that resulted in
 this particular instantiation.  Each watchpoint has its settable options.
 
-See also SBTarget.watchpoint_iter() for for example usage of iterating through
-the watchpoints of the target."
+See also SBTarget.watchpoint_iter() for example usage of iterating through the
+watchpoints of the target."
 ) SBWatchpoint;
 class SBWatchpoint
 {



From gclayton at apple.com  Tue Oct 25 19:56:27 2011
From: gclayton at apple.com (Greg Clayton)
Date: Wed, 26 Oct 2011 00:56:27 -0000
Subject: [Lldb-commits] [lldb] r142999 - in /lldb/trunk: include/lldb/
 include/lldb/Interpreter/ source/API/ source/Commands/ source/Core/
 source/Host/common/ source/Interpreter/ source/Plugins/Platform/gdb-server/
 source/Plugins/Process/gdb-remote/ source/Target/
Message-ID: <20111026005628.17AB5312800A@llvm.org>

Author: gclayton
Date: Tue Oct 25 19:56:27 2011
New Revision: 142999

URL: http://llvm.org/viewvc/llvm-project?rev=142999&view=rev
Log:
Cleaned up many error codes. For any who is filling in error strings into
lldb_private::Error objects the rules are:
- short strings that don't start with a capitol letter unless the name is a
  class or anything else that is always capitolized
- no trailing newline character
- should be one line if possible

Implemented a first pass at adding "--gdb-format" support to anything that
accepts format with optional size/count.


Modified:
    lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h
    lldb/trunk/include/lldb/lldb-enumerations.h
    lldb/trunk/source/API/SBThread.cpp
    lldb/trunk/source/Commands/CommandObjectArgs.cpp
    lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp
    lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp
    lldb/trunk/source/Commands/CommandObjectCommands.cpp
    lldb/trunk/source/Commands/CommandObjectDisassemble.cpp
    lldb/trunk/source/Commands/CommandObjectExpression.cpp
    lldb/trunk/source/Commands/CommandObjectFrame.cpp
    lldb/trunk/source/Commands/CommandObjectHelp.h
    lldb/trunk/source/Commands/CommandObjectLog.cpp
    lldb/trunk/source/Commands/CommandObjectMemory.cpp
    lldb/trunk/source/Commands/CommandObjectProcess.cpp
    lldb/trunk/source/Commands/CommandObjectRegister.cpp
    lldb/trunk/source/Commands/CommandObjectSettings.cpp
    lldb/trunk/source/Commands/CommandObjectSource.cpp
    lldb/trunk/source/Commands/CommandObjectTarget.cpp
    lldb/trunk/source/Commands/CommandObjectThread.cpp
    lldb/trunk/source/Commands/CommandObjectType.cpp
    lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp
    lldb/trunk/source/Core/Debugger.cpp
    lldb/trunk/source/Core/ModuleList.cpp
    lldb/trunk/source/Core/RegisterValue.cpp
    lldb/trunk/source/Core/Scalar.cpp
    lldb/trunk/source/Core/UserSettingsController.cpp
    lldb/trunk/source/Core/ValueObjectChild.cpp
    lldb/trunk/source/Host/common/File.cpp
    lldb/trunk/source/Interpreter/Args.cpp
    lldb/trunk/source/Interpreter/CommandObject.cpp
    lldb/trunk/source/Interpreter/NamedOptionValue.cpp
    lldb/trunk/source/Interpreter/OptionGroupArchitecture.cpp
    lldb/trunk/source/Interpreter/OptionGroupFormat.cpp
    lldb/trunk/source/Interpreter/OptionGroupOutputFile.cpp
    lldb/trunk/source/Interpreter/OptionGroupPlatform.cpp
    lldb/trunk/source/Interpreter/OptionGroupUUID.cpp
    lldb/trunk/source/Interpreter/OptionGroupValueObjectDisplay.cpp
    lldb/trunk/source/Interpreter/OptionGroupVariable.cpp
    lldb/trunk/source/Interpreter/OptionGroupWatchpoint.cpp
    lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
    lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
    lldb/trunk/source/Target/Process.cpp
    lldb/trunk/source/Target/Target.cpp
    lldb/trunk/source/Target/TargetList.cpp

Modified: lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h (original)
+++ lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h Tue Oct 25 19:56:27 2011
@@ -97,9 +97,17 @@
 
 protected:
 
+    lldb::Format
+    SetFormatUsingGDBFormatLetter (char format_letter);
+
+    uint32_t
+    SetByteSizeUsingGDBSizeLetter (char size_letter);
+
     OptionValueFormat m_format;
     OptionValueUInt64 m_byte_size;
     OptionValueUInt64 m_count;
+    char m_prev_gdb_format;
+    char m_prev_gdb_size;
 };
 
 } // namespace lldb_private

Modified: lldb/trunk/include/lldb/lldb-enumerations.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-enumerations.h?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-enumerations.h (original)
+++ lldb/trunk/include/lldb/lldb-enumerations.h Tue Oct 25 19:56:27 2011
@@ -361,6 +361,7 @@
         eArgTypeFrameIndex,
         eArgTypeFullName,
         eArgTypeFunctionName,
+        eArgTypeGDBFormat,
         eArgTypeIndex,
         eArgTypeLineNum,
         eArgTypeLogCategory,

Modified: lldb/trunk/source/API/SBThread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBThread.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/API/SBThread.cpp (original)
+++ lldb/trunk/source/API/SBThread.cpp Tue Oct 25 19:56:27 2011
@@ -732,7 +732,7 @@
                 sb_error.SetErrorStringWithFormat("No line entries for %s:%u", path, line);
             }
             else
-                sb_error.SetErrorString ("Step until target not in current function.\n");
+                sb_error.SetErrorString ("step until target not in current function");
         }
         else
         {

Modified: lldb/trunk/source/Commands/CommandObjectArgs.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectArgs.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectArgs.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectArgs.cpp Tue Oct 25 19:56:27 2011
@@ -58,7 +58,7 @@
     switch (short_option)
     {
         default:
-            error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+            error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
             break;
     }
     

Modified: lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp Tue Oct 25 19:56:27 2011
@@ -154,7 +154,7 @@
                 m_load_addr = Args::StringToUInt64(option_arg, LLDB_INVALID_ADDRESS, 16);
 
             if (m_load_addr == LLDB_INVALID_ADDRESS)
-                error.SetErrorStringWithFormat ("Invalid address string '%s'.\n", option_arg);
+                error.SetErrorStringWithFormat ("invalid address string '%s'", option_arg);
             break;
 
         case 'c':
@@ -211,14 +211,14 @@
         {
             m_ignore_count = Args::StringToUInt32(option_arg, UINT32_MAX, 0);
             if (m_ignore_count == UINT32_MAX)
-               error.SetErrorStringWithFormat ("Invalid ignore count '%s'.\n", option_arg);
+               error.SetErrorStringWithFormat ("invalid ignore count '%s'", option_arg);
         }
         break;
         case 't' :
         {
             m_thread_id = Args::StringToUInt64(option_arg, LLDB_INVALID_THREAD_ID, 0);
             if (m_thread_id == LLDB_INVALID_THREAD_ID)
-               error.SetErrorStringWithFormat ("Invalid thread id string '%s'.\n", option_arg);
+               error.SetErrorStringWithFormat ("invalid thread id string '%s'", option_arg);
         }
         break;
         case 'T':
@@ -231,12 +231,12 @@
         {
             m_thread_index = Args::StringToUInt32(option_arg, UINT32_MAX, 0);
             if (m_thread_id == UINT32_MAX)
-               error.SetErrorStringWithFormat ("Invalid thread index string '%s'.\n", option_arg);
+               error.SetErrorStringWithFormat ("invalid thread index string '%s'", option_arg);
             
         }
         break;
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 
@@ -689,7 +689,7 @@
             m_internal = true;
             break;
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 
@@ -1057,7 +1057,7 @@
             break;
 
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 
@@ -1369,7 +1369,7 @@
         {
             m_ignore_count = Args::StringToUInt32(option_arg, UINT32_MAX, 0);
             if (m_ignore_count == UINT32_MAX)
-               error.SetErrorStringWithFormat ("Invalid ignore count '%s'.\n", option_arg);
+               error.SetErrorStringWithFormat ("invalid ignore count '%s'", option_arg);
         }
         break;
         case 't' :
@@ -1383,7 +1383,7 @@
             {
                 m_thread_id = Args::StringToUInt64(option_arg, LLDB_INVALID_THREAD_ID, 0);
                 if (m_thread_id == LLDB_INVALID_THREAD_ID)
-                   error.SetErrorStringWithFormat ("Invalid thread id string '%s'.\n", option_arg);
+                   error.SetErrorStringWithFormat ("invalid thread id string '%s'", option_arg);
                 else
                     m_thread_id_passed = true;
             }
@@ -1414,14 +1414,14 @@
             {
                 m_thread_index = Args::StringToUInt32 (option_arg, UINT32_MAX, 0);
                 if (m_thread_id == UINT32_MAX)
-                   error.SetErrorStringWithFormat ("Invalid thread index string '%s'.\n", option_arg);
+                   error.SetErrorStringWithFormat ("invalid thread index string '%s'", option_arg);
                 else
                     m_thread_index_passed = true;
             }
         }
         break;
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 

Modified: lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp Tue Oct 25 19:56:27 2011
@@ -120,7 +120,7 @@
             bool success = false;
             m_stop_on_error = Args::StringToBoolean(option_arg, false, &success);
             if (!success)
-                error.SetErrorStringWithFormat("Invalid value for stop-on-error: \"%s\".\n", option_arg);
+                error.SetErrorStringWithFormat("invalid value for stop-on-error: \"%s\"", option_arg);
         }
         break;
 

Modified: lldb/trunk/source/Commands/CommandObjectCommands.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectCommands.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectCommands.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectCommands.cpp Tue Oct 25 19:56:27 2011
@@ -62,7 +62,7 @@
                 case 'c':
                     m_end_idx = Args::StringToUInt32(option_arg, UINT_MAX, 0, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid value for count: %s.\n", option_arg);
+                        error.SetErrorStringWithFormat("invalid value for count: %s", option_arg);
                     if (m_end_idx != 0)
                         m_end_idx--;
                     m_start_idx = 0;
@@ -70,15 +70,15 @@
                 case 'e':
                     m_end_idx = Args::StringToUInt32(option_arg, 0, 0, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid value for end index: %s.\n", option_arg);
+                        error.SetErrorStringWithFormat("invalid value for end index: %s", option_arg);
                     break;
                 case 's':
                     m_start_idx = Args::StringToUInt32(option_arg, 0, 0, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid value for start index: %s.\n", option_arg);
+                        error.SetErrorStringWithFormat("invalid value for start index: %s", option_arg);
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -188,15 +188,15 @@
                 case 'e':
                     m_stop_on_error = Args::StringToBoolean(option_arg, true, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid value for stop-on-error: %s.\n", option_arg);
+                        error.SetErrorStringWithFormat("invalid value for stop-on-error: %s", option_arg);
                     break;
                 case 'c':
                     m_stop_on_continue = Args::StringToBoolean(option_arg, true, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid value for stop-on-continue: %s.\n", option_arg);
+                        error.SetErrorStringWithFormat("invalid value for stop-on-continue: %s", option_arg);
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -478,7 +478,7 @@
         
         if (!cmd_obj)
         {
-            result.AppendErrorWithFormat ("Invalid command given to 'alias'. '%s' does not begin with a valid command."
+            result.AppendErrorWithFormat ("invalid command given to 'alias'. '%s' does not begin with a valid command."
                                           "  No alias created.", raw_command_string.c_str());
             result.SetStatus (eReturnStatusFailed);
             return false;
@@ -1008,7 +1008,7 @@
                      break;
 
                  default:
-                     error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                     error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                      break;
              }
              
@@ -1325,7 +1325,7 @@
                     m_funct_name = std::string(option_arg);
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             

Modified: lldb/trunk/source/Commands/CommandObjectDisassemble.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectDisassemble.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectDisassemble.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectDisassemble.cpp Tue Oct 25 19:56:27 2011
@@ -71,13 +71,13 @@
     case 'C':
         num_lines_context = Args::StringToUInt32(option_arg, 0, 0, &success);
         if (!success)
-            error.SetErrorStringWithFormat ("Invalid num context lines string: \"%s\".\n", option_arg);
+            error.SetErrorStringWithFormat ("invalid num context lines string: \"%s\"", option_arg);
         break;
 
     case 'c':
         num_instructions = Args::StringToUInt32(option_arg, 0, 0, &success);
         if (!success)
-            error.SetErrorStringWithFormat ("Invalid num of instructions string: \"%s\".\n", option_arg);
+            error.SetErrorStringWithFormat ("invalid num of instructions string: \"%s\"", option_arg);
         break;
 
     case 'b':
@@ -90,7 +90,7 @@
             start_addr = Args::StringToUInt64(option_arg, LLDB_INVALID_ADDRESS, 16);
 
         if (start_addr == LLDB_INVALID_ADDRESS)
-            error.SetErrorStringWithFormat ("Invalid start address string '%s'.\n", option_arg);
+            error.SetErrorStringWithFormat ("invalid start address string '%s'", option_arg);
         some_location_specified = true;
         break;
     case 'e':
@@ -99,7 +99,7 @@
             end_addr = Args::StringToUInt64(option_arg, LLDB_INVALID_ADDRESS, 16);
 
         if (end_addr == LLDB_INVALID_ADDRESS)
-            error.SetErrorStringWithFormat ("Invalid end address string '%s'.\n", option_arg);
+            error.SetErrorStringWithFormat ("invalid end address string '%s'", option_arg);
         break;
         some_location_specified = true;
     case 'n':
@@ -138,7 +138,7 @@
         break;
 
     default:
-        error.SetErrorStringWithFormat("Unrecognized short option '%c'.\n", short_option);
+        error.SetErrorStringWithFormat("unrecognized short option '%c'", short_option);
         break;
     }
 

Modified: lldb/trunk/source/Commands/CommandObjectExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectExpression.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectExpression.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectExpression.cpp Tue Oct 25 19:56:27 2011
@@ -76,7 +76,7 @@
       //case 'l':
       //if (language.SetLanguageFromCString (option_arg) == false)
       //{
-      //    error.SetErrorStringWithFormat("Invalid language option argument '%s'.\n", option_arg);
+      //    error.SetErrorStringWithFormat("invalid language option argument '%s'", option_arg);
       //}
       //break;
 
@@ -90,7 +90,7 @@
             bool result;
             result = Args::StringToBoolean(option_arg, true, &success);
             if (!success)
-                error.SetErrorStringWithFormat("Invalid dynamic value setting: \"%s\".\n", option_arg);
+                error.SetErrorStringWithFormat("invalid dynamic value setting: \"%s\"", option_arg);
             else
             {
                 if (result)
@@ -106,11 +106,11 @@
             bool success;
             unwind_on_error = Args::StringToBoolean(option_arg, true, &success);
             if (!success)
-                error.SetErrorStringWithFormat("Could not convert \"%s\" to a boolean value.", option_arg);
+                error.SetErrorStringWithFormat("could not convert \"%s\" to a boolean value.", option_arg);
             break;
         }
     default:
-        error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+        error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
         break;
     }
 

Modified: lldb/trunk/source/Commands/CommandObjectFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectFrame.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectFrame.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectFrame.cpp Tue Oct 25 19:56:27 2011
@@ -127,11 +127,11 @@
             case 'r':   
                 relative_frame_offset = Args::StringToSInt32 (option_arg, INT32_MIN, 0, &success);
                 if (!success)
-                    error.SetErrorStringWithFormat ("invalid frame offset argument '%s'.\n", option_arg);
+                    error.SetErrorStringWithFormat ("invalid frame offset argument '%s'", option_arg);
                 break;
 
             default:
-                error.SetErrorStringWithFormat ("Invalid short option character '%c'.\n", short_option);
+                error.SetErrorStringWithFormat ("invalid short option character '%c'", short_option);
                 break;
             }
 

Modified: lldb/trunk/source/Commands/CommandObjectHelp.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectHelp.h?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectHelp.h (original)
+++ lldb/trunk/source/Commands/CommandObjectHelp.h Tue Oct 25 19:56:27 2011
@@ -72,7 +72,7 @@
                     m_show_user_defined = false;
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             

Modified: lldb/trunk/source/Commands/CommandObjectLog.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectLog.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectLog.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectLog.cpp Tue Oct 25 19:56:27 2011
@@ -210,7 +210,7 @@
             case 'p':  log_options |= LLDB_LOG_OPTION_PREPEND_PROC_AND_THREAD;break;
             case 'n':  log_options |= LLDB_LOG_OPTION_PREPEND_THREAD_NAME;    break;
             default:
-                error.SetErrorStringWithFormat ("Unrecognized option '%c'\n", short_option);
+                error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                 break;
             }
 

Modified: lldb/trunk/source/Commands/CommandObjectMemory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectMemory.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectMemory.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectMemory.cpp Tue Oct 25 19:56:27 2011
@@ -84,7 +84,7 @@
             case 'l':
                 error = m_num_per_line.SetValueFromCString (option_arg);
                 if (m_num_per_line.GetCurrentValue() == 0)
-                    error.SetErrorStringWithFormat("Invalid value for --num-per-line option '%s'. Must be positive integer value.\n", option_arg);
+                    error.SetErrorStringWithFormat("invalid value for --num-per-line option '%s'", option_arg);
                 break;
 
             case 'b':
@@ -96,7 +96,7 @@
                 break;
                 
             default:
-                error.SetErrorStringWithFormat("Unrecognized short option '%c'.\n", short_option);
+                error.SetErrorStringWithFormat("unrecognized short option '%c'", short_option);
                 break;
         }
         return error;
@@ -116,28 +116,10 @@
         Error error;
         OptionValueUInt64 &byte_size_value = format_options.GetByteSizeValue();
         OptionValueUInt64 &count_value = format_options.GetCountValue();
-        bool byte_size_option_set = byte_size_value.OptionWasSet();
+        const bool byte_size_option_set = byte_size_value.OptionWasSet();
         const bool num_per_line_option_set = m_num_per_line.OptionWasSet();
         const bool count_option_set = format_options.GetCountValue().OptionWasSet();
         
-        uint32_t format_byte_size = byte_size_value.GetCurrentValue();
-        if (byte_size_option_set)
-        {
-            if (format_byte_size > 0)
-            {
-                error.SetErrorString("can't specify the byte size in both the '--size <num>' option and the '--format [<byte-size>]<format-char>' options.");
-                return error;
-            }
-        }
-        else
-        {
-            if (format_byte_size != 0)
-            {
-                byte_size_option_set = true;
-                byte_size_value = format_byte_size;
-            }
-        }
-    
         switch (format_options.GetFormat())
         {
             default:
@@ -181,7 +163,7 @@
                 
             case eFormatBytes:
             case eFormatBytesWithASCII:
-                if (byte_size_value.OptionWasSet())
+                if (byte_size_option_set)
                 {
                     if (byte_size_value > 1)
                         error.SetErrorString ("use --count option to specify an end address to display a number of bytes");
@@ -751,7 +733,7 @@
                     if (!m_infile.Exists())
                     {
                         m_infile.Clear();
-                        error.SetErrorStringWithFormat("Input file does not exist: '%s'\n", option_arg);
+                        error.SetErrorStringWithFormat("input file does not exist: '%s'", option_arg);
                     }
                     break;
                     
@@ -761,13 +743,13 @@
                         m_infile_offset = Args::StringToUInt64(option_arg, 0, 0, &success);
                         if (!success)
                         {
-                            error.SetErrorStringWithFormat("Invalid offset string '%s'\n", option_arg);
+                            error.SetErrorStringWithFormat("invalid offset string '%s'", option_arg);
                         }
                     }
                     break;
                     
                 default:
-                    error.SetErrorStringWithFormat("Unrecognized short option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat("unrecognized short option '%c'", short_option);
                     break;
             }
             return error;

Modified: lldb/trunk/source/Commands/CommandObjectProcess.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectProcess.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectProcess.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectProcess.cpp Tue Oct 25 19:56:27 2011
@@ -71,7 +71,7 @@
                     in_new_tty = true; 
                     break;
                 default:
-                    error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
                     break;
 
             }
@@ -442,7 +442,7 @@
                     pid = Args::StringToUInt32 (option_arg, LLDB_INVALID_PROCESS_ID, 0, &success);
                     if (!success || pid == LLDB_INVALID_PROCESS_ID)
                     {
-                        error.SetErrorStringWithFormat("Invalid process ID '%s'.\n", option_arg);
+                        error.SetErrorStringWithFormat("invalid process ID '%s'", option_arg);
                     }
                     break;
 
@@ -459,7 +459,7 @@
                     break;
 
                 default:
-                    error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
                     break;
             }
             return error;
@@ -976,7 +976,7 @@
                 break;
 
             default:
-                error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+                error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
                 break;
             }
             return error;
@@ -1541,7 +1541,7 @@
                     pass = option_arg;
                     break;
                 default:
-                    error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
                     break;
             }
             return error;

Modified: lldb/trunk/source/Commands/CommandObjectRegister.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectRegister.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectRegister.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectRegister.cpp Tue Oct 25 19:56:27 2011
@@ -311,7 +311,7 @@
                     break;
                     
                 default:
-                    error.SetErrorStringWithFormat("Unrecognized short option '%c'\n", short_option);
+                    error.SetErrorStringWithFormat("unrecognized short option '%c'", short_option);
                     break;
             }
             return error;

Modified: lldb/trunk/source/Commands/CommandObjectSettings.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectSettings.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectSettings.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectSettings.cpp Tue Oct 25 19:56:27 2011
@@ -265,7 +265,7 @@
             m_reset = true;
             break;
         default:
-            error.SetErrorStringWithFormat ("Unrecognized options '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized options '%c'", short_option);
             break;
     }
 

Modified: lldb/trunk/source/Commands/CommandObjectSource.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectSource.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectSource.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectSource.cpp Tue Oct 25 19:56:27 2011
@@ -57,7 +57,7 @@
             case 'l':
                 start_line = Args::StringToUInt32 (option_arg, 0);
                 if (start_line == 0)
-                    error.SetErrorStringWithFormat("Invalid line number: '%s'.\n", option_arg);
+                    error.SetErrorStringWithFormat("invalid line number: '%s'", option_arg);
                 break;
 
              case 'f':
@@ -65,7 +65,7 @@
                 break;
 
            default:
-                error.SetErrorStringWithFormat("Unrecognized short option '%c'.\n", short_option);
+                error.SetErrorStringWithFormat("unrecognized short option '%c'", short_option);
                 break;
             }
 
@@ -169,13 +169,13 @@
             case 'l':
                 start_line = Args::StringToUInt32 (option_arg, 0);
                 if (start_line == 0)
-                    error.SetErrorStringWithFormat("Invalid line number: '%s'.\n", option_arg);
+                    error.SetErrorStringWithFormat("invalid line number: '%s'", option_arg);
                 break;
 
             case 'c':
                 num_lines = Args::StringToUInt32 (option_arg, 0);
                 if (num_lines == 0)
-                    error.SetErrorStringWithFormat("Invalid line count: '%s'.\n", option_arg);
+                    error.SetErrorStringWithFormat("invalid line count: '%s'", option_arg);
                 break;
 
             case 'f':
@@ -194,7 +194,7 @@
                 show_bp_locs = true;
                 break;
            default:
-                error.SetErrorStringWithFormat("Unrecognized short option '%c'.\n", short_option);
+                error.SetErrorStringWithFormat("unrecognized short option '%c'", short_option);
                 break;
             }
 

Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectTarget.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Tue Oct 25 19:56:27 2011
@@ -1880,7 +1880,7 @@
                     break;
                     
                 default:
-                    error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
                     break;
                     
             }
@@ -2644,7 +2644,7 @@
                 if (!success)
                 {
                     Error error;
-                    error.SetErrorStringWithFormat("Invalid address: \"%s\".", option_arg);
+                    error.SetErrorStringWithFormat("invalid address: \"%s\"", option_arg);
                 }
             }
             else
@@ -2985,13 +2985,13 @@
                     m_type = eLookupTypeAddress;
                     m_addr = Args::StringToUInt64(option_arg, LLDB_INVALID_ADDRESS);
                     if (m_addr == LLDB_INVALID_ADDRESS)
-                        error.SetErrorStringWithFormat ("Invalid address string '%s'.\n", option_arg);
+                        error.SetErrorStringWithFormat ("invalid address string '%s'", option_arg);
                     break;
                     
                 case 'o':
                     m_offset = Args::StringToUInt64(option_arg, LLDB_INVALID_ADDRESS);
                     if (m_offset == LLDB_INVALID_ADDRESS)
-                        error.SetErrorStringWithFormat ("Invalid offset string '%s'.\n", option_arg);
+                        error.SetErrorStringWithFormat ("invalid offset string '%s'", option_arg);
                     break;
                     
                 case 's':
@@ -3011,9 +3011,9 @@
                 case 'l':
                     m_line_number = Args::StringToUInt32(option_arg, UINT32_MAX);
                     if (m_line_number == UINT32_MAX)
-                        error.SetErrorStringWithFormat ("Invalid line number string '%s'.\n", option_arg);
+                        error.SetErrorStringWithFormat ("invalid line number string '%s'", option_arg);
                     else if (m_line_number == 0)
-                        error.SetErrorString ("Zero is an invalid line number.");
+                        error.SetErrorString ("zero is an invalid line number");
                     m_type = eLookupTypeFileLine;
                     break;
                     
@@ -3434,7 +3434,7 @@
                     m_line_end = Args::StringToUInt32 (option_arg, UINT_MAX, 0, &success);
                     if (!success)
                     {
-                        error.SetErrorStringWithFormat ("Invalid end line number: \"%s\".", option_arg);
+                        error.SetErrorStringWithFormat ("invalid end line number: \"%s\"", option_arg);
                         break;
                     }
                     m_sym_ctx_specified = true;
@@ -3444,7 +3444,7 @@
                     m_line_start = Args::StringToUInt32 (option_arg, 0, 0, &success);
                     if (!success)
                     {
-                        error.SetErrorStringWithFormat ("Invalid start line number: \"%s\".", option_arg);
+                        error.SetErrorStringWithFormat ("invalid start line number: \"%s\"", option_arg);
                         break;
                     }
                     m_sym_ctx_specified = true;
@@ -3468,7 +3468,7 @@
                 {
                     m_thread_id = Args::StringToUInt64(option_arg, LLDB_INVALID_THREAD_ID, 0);
                     if (m_thread_id == LLDB_INVALID_THREAD_ID)
-                       error.SetErrorStringWithFormat ("Invalid thread id string '%s'.\n", option_arg);
+                       error.SetErrorStringWithFormat ("invalid thread id string '%s'", option_arg);
                     m_thread_specified = true;
                 }
                 break;
@@ -3484,7 +3484,7 @@
                 {
                     m_thread_index = Args::StringToUInt32(option_arg, UINT32_MAX, 0);
                     if (m_thread_id == UINT32_MAX)
-                       error.SetErrorStringWithFormat ("Invalid thread index string '%s'.\n", option_arg);
+                       error.SetErrorStringWithFormat ("invalid thread index string '%s'", option_arg);
                     m_thread_specified = true;
                 }
                 break;
@@ -3493,7 +3493,7 @@
                     m_one_liner = option_arg;
                 break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option %c.", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option %c.", short_option);
                 break;
             }
             return error;

Modified: lldb/trunk/source/Commands/CommandObjectThread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectThread.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectThread.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectThread.cpp Tue Oct 25 19:56:27 2011
@@ -75,7 +75,7 @@
                     bool success;
                     int32_t input_count =  Args::StringToSInt32 (option_arg, -1, 0, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid integer value for option '%c'.\n", short_option);
+                        error.SetErrorStringWithFormat("invalid integer value for option '%c'", short_option);
                     if (input_count < -1)
                         m_count = UINT32_MAX;
                     else
@@ -87,11 +87,11 @@
                     bool success;
                     m_start =  Args::StringToUInt32 (option_arg, 0, 0, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid integer value for option '%c'.\n", short_option);
+                        error.SetErrorStringWithFormat("invalid integer value for option '%c'", short_option);
                 }
                 break;
                 default:
-                    error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
                     break;
 
             }
@@ -301,7 +301,7 @@
                     bool success;
                     m_avoid_no_debug =  Args::StringToBoolean (option_arg, true, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid boolean value for option '%c'.\n", short_option);
+                        error.SetErrorStringWithFormat("invalid boolean value for option '%c'", short_option);
                 }
                 break;
             
@@ -320,7 +320,7 @@
                 break;
 
             default:
-                error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+                error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
                 break;
 
             }
@@ -426,7 +426,7 @@
                 uint32_t step_thread_idx = Args::StringToUInt32 (thread_idx_cstr, LLDB_INVALID_INDEX32);
                 if (step_thread_idx == LLDB_INVALID_INDEX32)
                 {
-                    result.AppendErrorWithFormat ("Invalid thread index '%s'.\n", thread_idx_cstr);
+                    result.AppendErrorWithFormat ("invalid thread index '%s'.\n", thread_idx_cstr);
                     result.SetStatus (eReturnStatusFailed);
                     return false;
                 }
@@ -789,7 +789,7 @@
                     m_thread_idx = Args::StringToUInt32 (option_arg, LLDB_INVALID_INDEX32);
                     if (m_thread_idx == LLDB_INVALID_INDEX32)
                     {
-                        error.SetErrorStringWithFormat ("Invalid thread index '%s'.\n", option_arg);
+                        error.SetErrorStringWithFormat ("invalid thread index '%s'", option_arg);
                     }
                 }
                 break;
@@ -798,7 +798,7 @@
                     m_frame_idx = Args::StringToUInt32 (option_arg, LLDB_INVALID_FRAME_ID);
                     if (m_frame_idx == LLDB_INVALID_FRAME_ID)
                     {
-                        error.SetErrorStringWithFormat ("Invalid frame index '%s'.\n", option_arg);
+                        error.SetErrorStringWithFormat ("invalid frame index '%s'", option_arg);
                     }
                 }
                 break;
@@ -817,7 +817,7 @@
                 }
                 break;
                 default:
-                    error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
                     break;
 
             }
@@ -922,7 +922,7 @@
             line_number = Args::StringToUInt32 (command.GetArgumentAtIndex(0), UINT32_MAX);
             if (line_number == UINT32_MAX)
             {
-                result.AppendErrorWithFormat ("Invalid line number: '%s'.\n", command.GetArgumentAtIndex(0));
+                result.AppendErrorWithFormat ("invalid line number: '%s'.\n", command.GetArgumentAtIndex(0));
                 result.SetStatus (eReturnStatusFailed);
                 return false;
             }
@@ -1142,7 +1142,7 @@
         Thread *new_thread = process->GetThreadList().FindThreadByIndexID(index_id).get();
         if (new_thread == NULL)
         {
-            result.AppendErrorWithFormat ("Invalid thread #%s.\n", command.GetArgumentAtIndex(0));
+            result.AppendErrorWithFormat ("invalid thread #%s.\n", command.GetArgumentAtIndex(0));
             result.SetStatus (eReturnStatusFailed);
             return false;
         }

Modified: lldb/trunk/source/Commands/CommandObjectType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectType.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectType.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectType.cpp Tue Oct 25 19:56:27 2011
@@ -237,7 +237,7 @@
                 case 'C':
                     m_cascade = Args::StringToBoolean(option_arg, true, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid value for cascade: %s.\n", option_arg);
+                        error.SetErrorStringWithFormat("invalid value for cascade: %s", option_arg);
                     break;
                 case 'P':
                     handwrite_python = true;
@@ -259,7 +259,7 @@
                     m_regex = true;
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -401,7 +401,7 @@
                 case 'C':
                     m_cascade = Args::StringToBoolean(option_value, true, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid value for cascade: %s.\n", option_value);
+                        error.SetErrorStringWithFormat("invalid value for cascade: %s", option_value);
                     break;
                 case 'p':
                     m_skip_pointers = true;
@@ -410,7 +410,7 @@
                     m_skip_references = true;
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -937,7 +937,7 @@
         case 'C':
             m_cascade = Args::StringToBoolean(option_arg, true, &success);
             if (!success)
-                error.SetErrorStringWithFormat("Invalid value for cascade: %s.\n", option_arg);
+                error.SetErrorStringWithFormat("invalid value for cascade: %s", option_arg);
             break;
         case 'e':
             m_no_children = false;
@@ -978,7 +978,7 @@
             m_category = std::string(option_arg);
             break;
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
     
@@ -1469,7 +1469,7 @@
                     m_category = std::string(option_arg);
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -1627,7 +1627,7 @@
                     m_delete_all = true;
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -1769,7 +1769,7 @@
                     m_category_regex = std::string(option_arg);
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -2290,7 +2290,7 @@
                     m_category_regex = std::string(option_arg);
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -2500,7 +2500,7 @@
                     m_category_regex = std::string(option_arg);
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -2698,7 +2698,7 @@
                     m_category = std::string(option_arg);
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -2860,7 +2860,7 @@
                     m_category = std::string(option_arg);
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -3020,7 +3020,7 @@
                     m_delete_all = true;
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -3146,7 +3146,7 @@
                     m_delete_all = true;
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             
@@ -3642,7 +3642,7 @@
                 case 'C':
                     m_cascade = Args::StringToBoolean(option_arg, true, &success);
                     if (!success)
-                        error.SetErrorStringWithFormat("Invalid value for cascade: %s.\n", option_arg);
+                        error.SetErrorStringWithFormat("invalid value for cascade: %s", option_arg);
                     break;
                 case 'c':
                     m_expr_paths.push_back(option_arg);
@@ -3661,7 +3661,7 @@
                     m_regex = true;
                     break;
                 default:
-                    error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
             }
             

Modified: lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp Tue Oct 25 19:56:27 2011
@@ -231,7 +231,7 @@
             m_level = lldb::eDescriptionLevelVerbose;
             break;
         default:
-            error.SetErrorStringWithFormat("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat("unrecognized option '%c'", short_option);
             break;
     }
 
@@ -601,11 +601,11 @@
         {
             m_ignore_count = Args::StringToUInt32(option_arg, UINT32_MAX, 0);
             if (m_ignore_count == UINT32_MAX)
-               error.SetErrorStringWithFormat ("Invalid ignore count '%s'.\n", option_arg);
+               error.SetErrorStringWithFormat ("invalid ignore count '%s'", option_arg);
         }
         break;
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 
@@ -741,7 +741,7 @@
             m_condition_passed = true;
             break;
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 

Modified: lldb/trunk/source/Core/Debugger.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Debugger.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Core/Debugger.cpp (original)
+++ lldb/trunk/source/Core/Debugger.cpp Tue Oct 25 19:56:27 2011
@@ -2160,7 +2160,7 @@
     // Verify we have a value string.
     if (value == NULL || value[0] == '\0')
     {
-        err.SetErrorString ("Missing value. Can't set terminal width without a value.\n");
+        err.SetErrorString ("missing value, can't set terminal width without a value");
     }
     else
     {
@@ -2172,10 +2172,10 @@
             if (width >= 10 && width <= 1024)
                 valid = true;
             else
-                err.SetErrorString ("Invalid term-width value; value must be between 10 and 1024.\n");
+                err.SetErrorString ("invalid term-width value; value must be between 10 and 1024");
         }
         else
-            err.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string.\n", value);
+            err.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string", value);
     }
 
     return valid;

Modified: lldb/trunk/source/Core/ModuleList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ModuleList.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Core/ModuleList.cpp (original)
+++ lldb/trunk/source/Core/ModuleList.cpp Tue Oct 25 19:56:27 2011
@@ -866,14 +866,14 @@
                 if (arch.IsValid())
                 {
                     if (uuid_cstr[0])
-                        error.SetErrorStringWithFormat("'%s' does not contain the %s architecture and UUID %s.\n", path, arch.GetArchitectureName(), uuid_cstr);
+                        error.SetErrorStringWithFormat("'%s' does not contain the %s architecture and UUID %s", path, arch.GetArchitectureName(), uuid_cstr);
                     else
-                        error.SetErrorStringWithFormat("'%s' does not contain the %s architecture.\n", path, arch.GetArchitectureName());
+                        error.SetErrorStringWithFormat("'%s' does not contain the %s architecture.", path, arch.GetArchitectureName());
                 }
             }
             else
             {
-                error.SetErrorStringWithFormat("'%s' does not exist.\n", path);
+                error.SetErrorStringWithFormat("'%s' does not exist", path);
             }
             return error;
         }
@@ -930,9 +930,9 @@
                 if (file_spec)
                 {
                     if (arch.IsValid())
-                        error.SetErrorStringWithFormat("Unable to open %s architecture in '%s'.\n", arch.GetArchitectureName(), path);
+                        error.SetErrorStringWithFormat("unable to open %s architecture in '%s'", arch.GetArchitectureName(), path);
                     else
-                        error.SetErrorStringWithFormat("Unable to open '%s'.\n", path);
+                        error.SetErrorStringWithFormat("unable to open '%s'", path);
                 }
                 else
                 {
@@ -942,9 +942,9 @@
                         uuid_cstr[0] = '\0';
 
                     if (uuid_cstr[0])
-                        error.SetErrorStringWithFormat("Cannot locate a module for UUID '%s'.\n", uuid_cstr);
+                        error.SetErrorStringWithFormat("cannot locate a module for UUID '%s'", uuid_cstr);
                     else
-                        error.SetErrorStringWithFormat("Cannot locate a module.\n");
+                        error.SetErrorStringWithFormat("cannot locate a module");
                 }
             }
         }

Modified: lldb/trunk/source/Core/RegisterValue.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/RegisterValue.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Core/RegisterValue.cpp (original)
+++ lldb/trunk/source/Core/RegisterValue.cpp Tue Oct 25 19:56:27 2011
@@ -392,18 +392,18 @@
             {
                 uint64_t uval64 = Args::StringToUInt64(value_str, UINT64_MAX, 0, &success);
                 if (!success)
-                    error.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string value.\n", value_str);
+                    error.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string value", value_str);
                 else if (!Args::UInt64ValueIsValidForByteSize (uval64, byte_size))
-                    error.SetErrorStringWithFormat ("Value 0x%llx is too large to fit in a %u byte unsigned integer value.\n", uval64, byte_size);
+                    error.SetErrorStringWithFormat ("value 0x%llx is too large to fit in a %u byte unsigned integer value", uval64, byte_size);
                 else
                 {
                     if (!SetUInt (uval64, reg_info->byte_size))
-                        error.SetErrorStringWithFormat ("Unsupported unsigned integer byte size: %u.\n", byte_size);
+                        error.SetErrorStringWithFormat ("unsupported unsigned integer byte size: %u", byte_size);
                 }
             }
             else
             {
-                error.SetErrorStringWithFormat ("Unsupported unsigned integer byte size: %u.\n", byte_size);
+                error.SetErrorStringWithFormat ("unsupported unsigned integer byte size: %u", byte_size);
                 return error;
             }
             break;
@@ -413,18 +413,18 @@
             {
                 uint64_t sval64 = Args::StringToSInt64(value_str, INT64_MAX, 0, &success);
                 if (!success)
-                    error.SetErrorStringWithFormat ("'%s' is not a valid signed integer string value.\n", value_str);
+                    error.SetErrorStringWithFormat ("'%s' is not a valid signed integer string value", value_str);
                 else if (!Args::SInt64ValueIsValidForByteSize (sval64, byte_size))
-                    error.SetErrorStringWithFormat ("Value 0x%llx is too large to fit in a %u byte signed integer value.\n", sval64, byte_size);
+                    error.SetErrorStringWithFormat ("value 0x%llx is too large to fit in a %u byte signed integer value", sval64, byte_size);
                 else
                 {
                     if (!SetUInt (sval64, reg_info->byte_size))
-                        error.SetErrorStringWithFormat ("Unsupported signed integer byte size: %u.\n", byte_size);
+                        error.SetErrorStringWithFormat ("unsupported signed integer byte size: %u", byte_size);
                 }
             }
             else
             {
-                error.SetErrorStringWithFormat ("Unsupported signed integer byte size: %u.\n", byte_size);
+                error.SetErrorStringWithFormat ("unsupported signed integer byte size: %u", byte_size);
                 return error;
             }
             break;
@@ -435,31 +435,31 @@
                 if (::sscanf (value_str, "%f", &m_data.ieee_float) == 1)
                     m_type = eTypeFloat;
                 else
-                    error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str);
+                    error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str);
             }
             else if (byte_size == sizeof (double))
             {
                 if (::sscanf (value_str, "%lf", &m_data.ieee_double) == 1)
                     m_type = eTypeDouble;
                 else
-                    error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str);
+                    error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str);
             }
             else if (byte_size == sizeof (long double))
             {
                 if (::sscanf (value_str, "%Lf", &m_data.ieee_long_double) == 1)
                     m_type = eTypeLongDouble;
                 else
-                    error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str);
+                    error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str);
             }
             else
             {
-                error.SetErrorStringWithFormat ("Unsupported float byte size: %u.\n", byte_size);
+                error.SetErrorStringWithFormat ("unsupported float byte size: %u", byte_size);
                 return error;
             }
             break;
             
         case eEncodingVector:
-            error.SetErrorString ("Vector encoding unsupported.");
+            error.SetErrorString ("vector encoding unsupported.");
             break;
     }
     if (error.Fail())

Modified: lldb/trunk/source/Core/Scalar.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Scalar.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Core/Scalar.cpp (original)
+++ lldb/trunk/source/Core/Scalar.cpp Tue Oct 25 19:56:27 2011
@@ -1829,9 +1829,9 @@
         {
             uint64_t uval64 = Args::StringToUInt64(value_str, UINT64_MAX, 0, &success);
             if (!success)
-                error.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string value.\n", value_str);
+                error.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string value", value_str);
             else if (!UIntValueIsValidForSize (uval64, byte_size))
-                error.SetErrorStringWithFormat ("Value 0x%llx is too large to fit in a %u byte unsigned integer value.\n", uval64, byte_size);
+                error.SetErrorStringWithFormat ("value 0x%llx is too large to fit in a %u byte unsigned integer value", uval64, byte_size);
             else
             {
                 m_type = Scalar::GetValueTypeForUnsignedIntegerWithByteSize (byte_size);
@@ -1841,14 +1841,14 @@
                 case e_ulong:       m_data.ulong = uval64;      break;
                 case e_ulonglong:   m_data.ulonglong = uval64;  break;
                 default:
-                    error.SetErrorStringWithFormat ("Unsupported unsigned integer byte size: %u.\n", byte_size);
+                    error.SetErrorStringWithFormat ("unsupported unsigned integer byte size: %u", byte_size);
                     break;
                 }
             }
         }
         else
         {
-            error.SetErrorStringWithFormat ("Unsupported unsigned integer byte size: %u.\n", byte_size);
+            error.SetErrorStringWithFormat ("unsupported unsigned integer byte size: %u", byte_size);
             return error;
         }
         break;
@@ -1858,9 +1858,9 @@
         {
             uint64_t sval64 = Args::StringToSInt64(value_str, INT64_MAX, 0, &success);
             if (!success)
-                error.SetErrorStringWithFormat ("'%s' is not a valid signed integer string value.\n", value_str);
+                error.SetErrorStringWithFormat ("'%s' is not a valid signed integer string value", value_str);
             else if (!SIntValueIsValidForSize (sval64, byte_size))
-                error.SetErrorStringWithFormat ("Value 0x%llx is too large to fit in a %u byte signed integer value.\n", sval64, byte_size);
+                error.SetErrorStringWithFormat ("value 0x%llx is too large to fit in a %u byte signed integer value", sval64, byte_size);
             else
             {
                 m_type = Scalar::GetValueTypeForSignedIntegerWithByteSize (byte_size);
@@ -1870,14 +1870,14 @@
                 case e_slong:       m_data.slong = sval64;      break;
                 case e_slonglong:   m_data.slonglong = sval64;  break;
                 default:
-                    error.SetErrorStringWithFormat ("Unsupported signed integer byte size: %u.\n", byte_size);
+                    error.SetErrorStringWithFormat ("unsupported signed integer byte size: %u", byte_size);
                     break;
                 }
             }
         }
         else
         {
-            error.SetErrorStringWithFormat ("Unsupported signed integer byte size: %u.\n", byte_size);
+            error.SetErrorStringWithFormat ("unsupported signed integer byte size: %u", byte_size);
             return error;
         }
         break;
@@ -1888,31 +1888,31 @@
             if (::sscanf (value_str, "%f", &m_data.flt) == 1)
                 m_type = e_float;
             else
-                error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str);
+                error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str);
         }
         else if (byte_size == sizeof (double))
         {
             if (::sscanf (value_str, "%lf", &m_data.dbl) == 1)
                 m_type = e_double;
             else
-                error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str);
+                error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str);
         }
         else if (byte_size == sizeof (long double))
         {
             if (::sscanf (value_str, "%Lf", &m_data.ldbl) == 1)
                 m_type = e_long_double;
             else
-                error.SetErrorStringWithFormat ("'%s' is not a valid float string value.\n", value_str);
+                error.SetErrorStringWithFormat ("'%s' is not a valid float string value", value_str);
         }
         else
         {
-            error.SetErrorStringWithFormat ("Unsupported float byte size: %u.\n", byte_size);
+            error.SetErrorStringWithFormat ("unsupported float byte size: %u", byte_size);
             return error;
         }
         break;
 
     case eEncodingVector:
-        error.SetErrorString ("Vector encoding unsupported.");
+        error.SetErrorString ("vector encoding unsupported.");
         break;
     }
     if (error.Fail())

Modified: lldb/trunk/source/Core/UserSettingsController.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/UserSettingsController.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Core/UserSettingsController.cpp (original)
+++ lldb/trunk/source/Core/UserSettingsController.cpp Tue Oct 25 19:56:27 2011
@@ -285,7 +285,7 @@
 
     if (num_pieces < 1)
     {
-        err.SetErrorStringWithFormat ("'%s' is not a valid variable name; cannot assign value.\n", full_dot_name);
+        err.SetErrorStringWithFormat ("'%s' is not a valid variable name; cannot assign value", full_dot_name);
         return err;
     }
 
@@ -303,7 +303,7 @@
 
         if (num_pieces == 0)
         {
-            err.SetErrorString ("No variable name specified; cannot assign value.\n");
+            err.SetErrorString ("no variable name specified, cannot assign value");
             return err;
         }
         else if (num_pieces == 1)
@@ -337,7 +337,7 @@
                 entry = GetInstanceEntry (const_var_name);
                 if (entry == NULL)
                 {
-                    err.SetErrorStringWithFormat ("Unable to find variable '%s.%s'; cannot assign value.\n",
+                    err.SetErrorStringWithFormat ("unable to find variable '%s.%s', cannot assign value",
                                                   prefix.GetCString(), const_var_name.GetCString());
                     return err;
                 }
@@ -412,7 +412,7 @@
                 
                 if (names.GetArgumentCount() != 1)
                 {
-                    err.SetErrorStringWithFormat ("Invalid variable name format '%s'; cannot assign value.\n",
+                    err.SetErrorStringWithFormat ("invalid variable name format '%s', cannot assign value",
                                                   full_dot_name);
                     return err;
                 }
@@ -424,7 +424,7 @@
 
                 if (entry == NULL)
                 {
-                    err.SetErrorStringWithFormat ("Unknown instance variable '%s'; cannot assign value.\n",
+                    err.SetErrorStringWithFormat ("unknown instance variable '%s', cannot assign value",
                                                   const_var_name.GetCString());
                     return err;
                 }
@@ -513,7 +513,7 @@
                 }
                 if (!found)
                 {
-                    err.SetErrorStringWithFormat ("Unable to find variable '%s'; cannot assign value.\n", 
+                    err.SetErrorStringWithFormat ("unable to find variable '%s', cannot assign value", 
                                                   full_dot_name);
                     return err;
                 }
@@ -522,7 +522,7 @@
     }
     else
     {
-        err.SetErrorStringWithFormat ("'%s' is not a valid level name; was expecting '%s'. Cannot assign value.\n",
+        err.SetErrorStringWithFormat ("'%s' is not a valid level name; was expecting '%s', cannot assign value",
                                       prefix.GetCString(), m_settings.level_name.GetCString());
     }
 
@@ -553,7 +553,7 @@
     if ((prefix != m_settings.level_name)
         && (m_settings.level_name.GetLength () > 0))
     {
-        err.SetErrorString ("Invalid variable name");
+        err.SetErrorString ("invalid variable name");
         return value;
     }
 
@@ -638,7 +638,7 @@
                 }
             }
             else
-                err.SetErrorString ("Invalid variable name");
+                err.SetErrorString ("invalid variable name");
         }
     }
     else
@@ -647,7 +647,7 @@
         if ((global_entry == NULL)
             && (instance_entry == NULL))
         {
-            err.SetErrorString ("Invalid variable name");
+            err.SetErrorString ("invalid variable name");
         }
         else if (global_entry)
         {
@@ -1139,7 +1139,7 @@
         {
             std::string parent_prefix;
             usc_sp->BuildParentPrefix (parent_prefix);
-            err.SetErrorStringWithFormat ("Cannot find match for '%s.%s'\n", parent_prefix.c_str(), 
+            err.SetErrorStringWithFormat ("cannot find match for '%s.%s'", parent_prefix.c_str(), 
                                           prefix.GetCString());
             return;
         }
@@ -1227,7 +1227,7 @@
             {
                 std::string parent_prefix;
                 usc_sp->BuildParentPrefix (parent_prefix);
-                err.SetErrorStringWithFormat ("Cannot find match for '%s.%s'\n", parent_prefix.c_str(), search_name);
+                err.SetErrorStringWithFormat ("cannot find match for '%s.%s'", parent_prefix.c_str(), search_name);
                 return;
             }
         }
@@ -1266,7 +1266,7 @@
         {
             std::string parent_prefix;
             usc_sp->BuildParentPrefix (parent_prefix);
-            err.SetErrorStringWithFormat ("Cannot find match for '%s.%s'\n", parent_prefix.c_str(), search_name);
+            err.SetErrorStringWithFormat ("cannot find match for '%s.%s'", parent_prefix.c_str(), search_name);
             return;
         }
     }
@@ -1976,7 +1976,7 @@
 
     if (op == eVarSetOperationInvalid)
     {
-        err.SetErrorString ("Invalid 'settings ' subcommand operation.\n");  
+        err.SetErrorString ("invalid 'settings' subcommand operation");  
         return;
     }
 
@@ -1985,22 +1985,20 @@
         case eVarSetOperationInsertBefore:
         case eVarSetOperationInsertAfter:
             if (var_type != eSetVarTypeArray)
-                err.SetErrorString ("Invalid operation:  This operation can only be performed on array variables.\n");
+                err.SetErrorString ("invalid operation: this operation can only be performed on array variables");
             break;
         case eVarSetOperationReplace:
         case eVarSetOperationRemove:
             if ((var_type != eSetVarTypeArray)
                 && (var_type != eSetVarTypeDictionary))
-                err.SetErrorString ("Invalid operation:  This operation can only be performed on array or dictionary"
-                                    " variables.\n");
+                err.SetErrorString ("invalid operation: this operation can only be performed on array or dictionary variables");
             break;
         case eVarSetOperationAppend:
         case eVarSetOperationClear:
             if ((var_type != eSetVarTypeArray)
                 && (var_type != eSetVarTypeDictionary)
                 && (var_type != eSetVarTypeString))
-                err.SetErrorString ("Invalid operation:  This operation can only be performed on array, dictionary "
-                                    "or string variables.\n");
+                err.SetErrorString ("invalid operation: this operation can only be performed on array, dictionary or string variables");
             break;
         default:
             break;
@@ -2030,7 +2028,7 @@
     else if (op == eVarSetOperationClear)
         string_var.clear();
     else
-        err.SetErrorString ("Unrecognized operation. Cannot update value.\n");
+        err.SetErrorString ("unrecognized operation. Cannot update value");
 }
 
 Error
@@ -2053,7 +2051,7 @@
     }
     else
     {
-        error.SetErrorString ("Unrecognized operation. Cannot update value.\n");
+        error.SetErrorString ("unrecognized operation, cannot update value");
     }
     return error;
 }
@@ -2118,7 +2116,7 @@
     case eVarSetOperationAppend:
     case eVarSetOperationInvalid:
     default:
-        err.SetErrorString ("Invalid operation for Boolean variable.  Cannot update value.\n");
+        err.SetErrorString ("invalid operation for Boolean variable, cannot update value");
         break;
 
     case eVarSetOperationClear:
@@ -2132,9 +2130,9 @@
             
             
             if (value_cstr == NULL)
-                err.SetErrorStringWithFormat ("invalid boolean string value (NULL)\n");
+                err.SetErrorStringWithFormat ("invalid boolean string value (NULL)");
             else if (value_cstr[0] == '\0')
-                err.SetErrorStringWithFormat ("invalid boolean string value (empty)\n");
+                err.SetErrorStringWithFormat ("invalid boolean string value (empty)");
             else
             {
                 bool new_value = Args::StringToBoolean (value_cstr, false, &success);
@@ -2144,7 +2142,7 @@
                     bool_value = new_value;
                 }
                 else
-                    err.SetErrorStringWithFormat ("invalid boolean string value: '%s'\n", value_cstr);
+                    err.SetErrorStringWithFormat ("invalid boolean string value: '%s'", value_cstr);
             }
         }
         break;
@@ -2214,7 +2212,7 @@
             if (!isdigit (index_value[i]))
             {
                 valid_index = false;
-                err.SetErrorStringWithFormat ("'%s' is not a valid integer index. Cannot update array value.\n", 
+                err.SetErrorStringWithFormat ("'%s' is not a valid integer index, cannot update array value", 
                                               index_value);
             }
                 
@@ -2225,8 +2223,8 @@
             || index >= array_var.GetArgumentCount())
         {
             valid_index = false;
-            err.SetErrorStringWithFormat ("%d is outside the bounds of the specified array variable. "
-                                          "Cannot update array value.\n", index);
+            err.SetErrorStringWithFormat ("%d is outside the bounds of the specified array variable, "
+                                          "cannot update array value", index);
         }
     }
 
@@ -2270,7 +2268,7 @@
             array_var.Clear();
             break;
         default:
-            err.SetErrorString ("Unrecognized operation. Cannot update value.\n");
+            err.SetErrorString ("unrecognized operation, cannot update value");
             break;
     }
 }
@@ -2294,10 +2292,10 @@
                 if (pos != dictionary.end())
                     dictionary[key] = new_value;
                 else
-                    err.SetErrorStringWithFormat ("'%s' is not an existing key; cannot replace value.\n", index_value);
+                    err.SetErrorStringWithFormat ("'%s' is not an existing key; cannot replace value", index_value);
             }
             else
-                err.SetErrorString ("'settings replace' requires a key for dictionary variables. No key supplied.\n");
+                err.SetErrorString ("'settings replace' requires a key for dictionary variables, no key supplied");
             break;
         case eVarSetOperationRemove:
             if (index_value != NULL)
@@ -2306,7 +2304,7 @@
                 dictionary.erase (key);
             }
             else
-                err.SetErrorString ("'settings remove' requires a key for dictionary variables. No key supplied.\n");
+                err.SetErrorString ("'settings remove' requires a key for dictionary variables, no key supplied");
             break;
         case eVarSetOperationClear:
             dictionary.clear ();
@@ -2346,17 +2344,17 @@
                     }
                     else
                     {
-                        err.SetErrorString ("Invalid format for dictionary value.  Expected one of '[\"<key>\"]=<value>', '[<key>]=<value>', or '<key>=<value>'\n");
+                        err.SetErrorString ("invalid format for dictionary value, expected one of '[\"<key>\"]=<value>', '[<key>]=<value>', or '<key>=<value>'");
                     }
                 }
             }  
             break;
         case eVarSetOperationInsertBefore:
         case eVarSetOperationInsertAfter:
-            err.SetErrorString ("Specified operation cannot be performed on dictionary variables.\n");
+            err.SetErrorString ("specified operation cannot be performed on dictionary variables");
             break;
         default:
-            err.SetErrorString ("Unrecognized operation.\n");
+            err.SetErrorString ("unrecognized operation");
             break;
     }
 }

Modified: lldb/trunk/source/Core/ValueObjectChild.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectChild.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectChild.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectChild.cpp Tue Oct 25 19:56:27 2011
@@ -179,7 +179,7 @@
                     // extract the child value from within the parent data?
                     // Probably...
                 default:
-                    m_error.SetErrorString ("Parent has invalid value.");
+                    m_error.SetErrorString ("parent has invalid value.");
                     break;
                 }
             }
@@ -192,7 +192,7 @@
         }
         else
         {
-            m_error.SetErrorStringWithFormat("Parent failed to evaluate: %s.\n", parent->GetError().AsCString());
+            m_error.SetErrorStringWithFormat("parent failed to evaluate: %s", parent->GetError().AsCString());
         }
     }
     else

Modified: lldb/trunk/source/Host/common/File.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/File.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/File.cpp (original)
+++ lldb/trunk/source/Host/common/File.cpp Tue Oct 25 19:56:27 2011
@@ -276,7 +276,7 @@
     char proc[64];
     char path[PATH_MAX];
     if (::snprintf(proc, sizeof(proc), "/proc/self/fd/%d", GetDescriptor()) < 0)
-        error.SetErrorString ("Cannot resolve file descriptor\n");
+        error.SetErrorString ("cannot resolve file descriptor");
     else
     {
         ssize_t len;

Modified: lldb/trunk/source/Interpreter/Args.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/Args.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/Args.cpp (original)
+++ lldb/trunk/source/Interpreter/Args.cpp Tue Oct 25 19:56:27 2011
@@ -584,7 +584,7 @@
     struct option *long_options = options.GetLongOptions();
     if (long_options == NULL)
     {
-        error.SetErrorStringWithFormat("Invalid long options.\n");
+        error.SetErrorStringWithFormat("invalid long options");
         return error;
     }
 
@@ -620,7 +620,7 @@
         // Did we get an error?
         if (val == '?')
         {
-            error.SetErrorStringWithFormat("Unknown or ambiguous option.\n");
+            error.SetErrorStringWithFormat("unknown or ambiguous option");
             break;
         }
         // The option auto-set itself
@@ -651,7 +651,7 @@
         }
         else
         {
-            error.SetErrorStringWithFormat("Invalid option with value '%i'.\n", val);
+            error.SetErrorStringWithFormat("invalid option with value '%i'", val);
         }
         if (error.Fail())
             break;
@@ -940,7 +940,7 @@
     }
     else
     {
-        error.SetErrorStringWithFormat("%s option string.\n", s ? "empty" : "invalid");
+        error.SetErrorStringWithFormat("%s option string", s ? "empty" : "invalid");
     }
     return error;
 }

Modified: lldb/trunk/source/Interpreter/CommandObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandObject.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandObject.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandObject.cpp Tue Oct 25 19:56:27 2011
@@ -207,7 +207,7 @@
             if (error_cstr)
             {
                 // We got an error string, lets use that
-                result.GetErrorStream().PutCString(error_cstr);
+                result.AppendError(error_cstr);
             }
             else
             {
@@ -640,16 +640,47 @@
 static const char *
 BreakpointIDHelpTextCallback ()
 {
-    return "Breakpoint ID's consist major and minor numbers;  the major number corresponds to the single entity that was created with a 'breakpoint set' command; the minor numbers correspond to all the locations that were actually found/set based on the major breakpoint.  A full breakpoint ID might look like 3.14, meaning the 14th location set for the 3rd breakpoint.  You can specify all the locations of a breakpoint by just indicating the major breakpoint number. A valid breakpoint id consists either of just the major id number, or the major number, a dot, and the location number (e.g. 3 or 3.2 could both be valid breakpoint ids).";
+    return "Breakpoint ID's consist major and minor numbers;  the major number "
+    "corresponds to the single entity that was created with a 'breakpoint set' "
+    "command; the minor numbers correspond to all the locations that were actually "
+    "found/set based on the major breakpoint.  A full breakpoint ID might look like "
+    "3.14, meaning the 14th location set for the 3rd breakpoint.  You can specify "
+    "all the locations of a breakpoint by just indicating the major breakpoint "
+    "number. A valid breakpoint id consists either of just the major id number, "
+    "or the major number, a dot, and the location number (e.g. 3 or 3.2 could "
+    "both be valid breakpoint ids).";
 }
 
 static const char *
 BreakpointIDRangeHelpTextCallback ()
 {
-    return "A 'breakpoint id list' is a manner of specifying multiple breakpoints. This can be done  through several mechanisms.  The easiest way is to just enter a space-separated list of breakpoint ids.  To specify all the breakpoint locations under a major breakpoint, you can use the major breakpoint number followed by '.*', eg. '5.*' means all the locations under breakpoint 5.  You can also indicate a range of breakpoints by using <start-bp-id> - <end-bp-id>.  The start-bp-id and end-bp-id for a range can be any valid breakpoint ids.  It is not legal, however, to specify a range using specific locations that cross major breakpoint numbers.  I.e. 3.2 - 3.7 is legal; 2 - 5 is legal; but 3.2 - 4.4 is not legal.";
+    return "A 'breakpoint id list' is a manner of specifying multiple breakpoints. "
+    "This can be done  through several mechanisms.  The easiest way is to just "
+    "enter a space-separated list of breakpoint ids.  To specify all the "
+    "breakpoint locations under a major breakpoint, you can use the major "
+    "breakpoint number followed by '.*', eg. '5.*' means all the locations under "
+    "breakpoint 5.  You can also indicate a range of breakpoints by using "
+    "<start-bp-id> - <end-bp-id>.  The start-bp-id and end-bp-id for a range can "
+    "be any valid breakpoint ids.  It is not legal, however, to specify a range "
+    "using specific locations that cross major breakpoint numbers.  I.e. 3.2 - 3.7"
+    " is legal; 2 - 5 is legal; but 3.2 - 4.4 is not legal.";
 }
 
 static const char *
+GDBFormatHelpTextCallback ()
+{
+    return "A GDB format consists of a repeat count followed by a format letter "
+    "and a size letter.\n\nFormat letters are o (octal), x (hex), d (decimal), u"
+    " (unsigned decimal), t (binary), f (float), a (address), i (instruction), "
+    "c (char) and s (string), T (OSType), A (floating point values in hex).\n\n"
+    "Size letters are b (byte), h (halfword), w (word), g (giant, 8 bytes).\n\n"
+    "The specified number of objects of the specified size are printed "
+    "according to the format.\n\n"
+    "Defaults for format and size letters are those previously used. Default "
+    "count is 1.";
+} 
+
+static const char *
 FormatHelpTextCallback ()
 {
     
@@ -803,6 +834,7 @@
     { eArgTypeFrameIndex, "frame-index", CommandCompletions::eNoCompletion, { NULL, false }, "Index into a thread's list of frames." },
     { eArgTypeFullName, "fullname", CommandCompletions::eNoCompletion, { NULL, false }, "Help text goes here." },
     { eArgTypeFunctionName, "function-name", CommandCompletions::eNoCompletion, { NULL, false }, "The name of a function." },
+    { eArgTypeGDBFormat, "gdb-format", CommandCompletions::eNoCompletion, { GDBFormatHelpTextCallback, true }, NULL },
     { eArgTypeIndex, "index", CommandCompletions::eNoCompletion, { NULL, false }, "An index into a list." },
     { eArgTypeLineNum, "linenum", CommandCompletions::eNoCompletion, { NULL, false }, "Line number in a source file." },
     { eArgTypeLogCategory, "log-category", CommandCompletions::eNoCompletion, { NULL, false }, "The name of a category within a log channel, e.g. all (try \"log list\" to see a list of all channels and their categories." },

Modified: lldb/trunk/source/Interpreter/NamedOptionValue.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/NamedOptionValue.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/NamedOptionValue.cpp (original)
+++ lldb/trunk/source/Interpreter/NamedOptionValue.cpp Tue Oct 25 19:56:27 2011
@@ -189,11 +189,11 @@
     else
     {
         if (value_cstr == NULL)
-            error.SetErrorString ("invalid boolean string value: NULL\n");
+            error.SetErrorString ("invalid boolean string value: NULL");
         else if (value_cstr[0] == '\0')
-            error.SetErrorString ("invalid boolean string value <empty>\n");
+            error.SetErrorString ("invalid boolean string value <empty>");
         else
-            error.SetErrorStringWithFormat ("invalid boolean string value: '%s'\n", value_cstr);
+            error.SetErrorStringWithFormat ("invalid boolean string value: '%s'", value_cstr);
     }
     return error;
 }
@@ -221,7 +221,7 @@
     }
     else
     {
-        error.SetErrorStringWithFormat ("invalid int64_t string value: '%s'\n", value_cstr);
+        error.SetErrorStringWithFormat ("invalid int64_t string value: '%s'", value_cstr);
     }
     return error;
 }
@@ -260,7 +260,7 @@
     }
     else
     {
-        error.SetErrorStringWithFormat ("invalid uint64_t string value: '%s'\n", value_cstr);
+        error.SetErrorStringWithFormat ("invalid uint64_t string value: '%s'", value_cstr);
     }
     return error;
 }
@@ -396,7 +396,7 @@
 OptionValueArray::SetValueFromCString (const char *value_cstr)
 {
     Error error;
-    error.SetErrorStringWithFormat ("array option values don't yet support being set by string: '%s'\n", value_cstr);
+    error.SetErrorStringWithFormat ("array option values don't yet support being set by string: '%s'", value_cstr);
     return error;
 }
 
@@ -419,7 +419,7 @@
 OptionValueDictionary::SetValueFromCString (const char *value_cstr)
 {
     Error error;
-    error.SetErrorStringWithFormat ("dictionary option values don't yet support being set by string: '%s'\n", value_cstr);
+    error.SetErrorStringWithFormat ("dictionary option values don't yet support being set by string: '%s'", value_cstr);
     return error;
 }
 

Modified: lldb/trunk/source/Interpreter/OptionGroupArchitecture.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupArchitecture.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupArchitecture.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupArchitecture.cpp Tue Oct 25 19:56:27 2011
@@ -71,7 +71,7 @@
             break;
 
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 

Modified: lldb/trunk/source/Interpreter/OptionGroupFormat.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupFormat.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupFormat.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupFormat.cpp Tue Oct 25 19:56:27 2011
@@ -23,7 +23,9 @@
                                       uint64_t default_count) :
     m_format (default_format, default_format),
     m_byte_size (default_byte_size, default_byte_size),
-    m_count (default_count, default_count)
+    m_count (default_count, default_count),
+    m_prev_gdb_format('x'),
+    m_prev_gdb_size('w')
 {
 }
 
@@ -34,9 +36,12 @@
 static OptionDefinition 
 g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "format",'f', required_argument, NULL, 0, eArgTypeFormat  , "Specify a format to be used for display."},
-{ LLDB_OPT_SET_2, false, "size"  ,'s', required_argument, NULL, 0, eArgTypeByteSize, "The size in bytes to use when displaying with the selected format."},
-{ LLDB_OPT_SET_3, false, "count" ,'c', required_argument, NULL, 0, eArgTypeCount   , "The number of total items to display."},
+{ LLDB_OPT_SET_1, false, "format"    ,'f', required_argument, NULL, 0, eArgTypeFormat   , "Specify a format to be used for display."},
+{ LLDB_OPT_SET_1|
+  LLDB_OPT_SET_2|
+  LLDB_OPT_SET_3, false, "gdb-format",'G', required_argument, NULL, 0, eArgTypeGDBFormat, "Specify a format using a GDB format specifier string."},
+{ LLDB_OPT_SET_2, false, "size"      ,'s', required_argument, NULL, 0, eArgTypeByteSize , "The size in bytes to use when displaying with the selected format."},
+{ LLDB_OPT_SET_3, false, "count"     ,'c', required_argument, NULL, 0, eArgTypeCount    , "The number of total items to display."},
 };
 
 uint32_t
@@ -45,11 +50,11 @@
     if (m_byte_size.GetDefaultValue() < UINT64_MAX)
     {
         if (m_count.GetDefaultValue() < UINT64_MAX)
-            return 3;
+            return 4;
         else
-            return 2;
+            return 3;
     }
-    return 1;
+    return 2;
 }
 
 const OptionDefinition *
@@ -98,14 +103,159 @@
             }
             break;
 
+        case 'G':
+            {
+                char *end = NULL;
+                const char *gdb_format_cstr = option_arg; 
+                uint64_t count = 0;
+                if (::isdigit (gdb_format_cstr[0]))
+                {
+                    count = strtoull (gdb_format_cstr, &end, 0);
+
+                    if (option_arg != end)
+                        gdb_format_cstr = end;  // We have a valid count, advance the string position
+                    else
+                        count = 0;
+                }
+
+                Format format = SetFormatUsingGDBFormatLetter (gdb_format_cstr[0]);
+                if (format != eFormatInvalid)
+                    ++gdb_format_cstr;
+
+                uint32_t byte_size = SetByteSizeUsingGDBSizeLetter (gdb_format_cstr[0]);
+                if (byte_size == 0)
+                    ++gdb_format_cstr;
+                
+                // We the first character of the "gdb_format_cstr" is not the 
+                // NULL terminator, we didn't consume the entire string and 
+                // something is wrong. Also, if none of the format, size or count
+                // was specified correctly, then abort.
+                if (gdb_format_cstr[0] || (format == eFormatInvalid && byte_size == 0 && count == 0))
+                {
+                    // Nothing got set correctly
+                    error.SetErrorStringWithFormat ("invalid gdb format string '%s'", option_arg);
+                    return error;
+                }
+
+                // At least one of the format, size or count was set correctly.
+                // Anything that wasn't set correctly should be set to the
+                // previous default
+                if (format == eFormatInvalid)
+                    format = SetFormatUsingGDBFormatLetter (m_prev_gdb_format);
+                
+                const bool byte_size_enabled = m_byte_size.GetDefaultValue() < UINT64_MAX;
+                const bool count_enabled = m_count.GetDefaultValue() < UINT64_MAX;
+                if (byte_size_enabled)
+                {
+                    // Byte size is enabled
+                    if (byte_size == 0)
+                        byte_size = SetByteSizeUsingGDBSizeLetter (m_prev_gdb_size);
+                }
+                else
+                {
+                    // Byte size is disabled, make sure it wasn't specified
+                    if (byte_size > 0)
+                    {
+                        error.SetErrorString ("this command doesn't support specifying a byte size");
+                        return error;
+                    }
+                }
+
+                if (count_enabled)
+                {
+                    // Count is enabled and was not set, set it to the default
+                    if (count == 0)
+                        count = m_count.GetDefaultValue();
+                }
+                else
+                {
+                    // Count is disabled, make sure it wasn't specified
+                    if (count > 0)
+                    {
+                        error.SetErrorString ("this command doesn't support specifying a count");
+                        return error;
+                    }
+                }
+
+                m_format.SetCurrentValue (format);
+                m_format.SetOptionWasSet ();
+                if (byte_size_enabled)
+                {
+                    m_byte_size.SetCurrentValue (byte_size);
+                    m_byte_size.SetOptionWasSet ();
+                }
+                if (count_enabled)
+                {
+                    m_count.SetCurrentValue(count);
+                    m_count.SetOptionWasSet ();
+                }
+            }
+            break;
+
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 
     return error;
 }
 
+Format
+OptionGroupFormat::SetFormatUsingGDBFormatLetter (char format_letter)
+{
+    Format format = eFormatInvalid;
+    switch (format_letter)
+    {
+        case 'o': format = eFormatOctal;        break; 
+        case 'x': format = eFormatHex;          break;
+        case 'd': format = eFormatDecimal;      break;
+        case 'u': format = eFormatUnsigned;     break;
+        case 't': format = eFormatBinary;       break;
+        case 'f': format = eFormatFloat;        break;
+        case 'a': format = eFormatHex;          break; // TODO: add a new format: eFormatAddress
+        case 'i': format = eFormatHex;          break; // TODO: add a new format: eFormatInstruction
+        case 'c': format = eFormatChar;         break;
+        case 's': format = eFormatCString;      break;
+        case 'T': format = eFormatOSType;       break;
+        case 'A': format = eFormatHex;          break; // TODO: add a new format: eFormatHexFloat
+        default:  break;
+    }
+    if (format != eFormatInvalid)
+        m_prev_gdb_format = format_letter;
+    return format;
+}
+
+uint32_t
+OptionGroupFormat::SetByteSizeUsingGDBSizeLetter (char size_letter)
+{
+    uint32_t byte_size = 0;
+    switch (size_letter)
+    {
+        case 'b': // byte
+            byte_size = 1; 
+            break;
+
+        case 'h': // halfword
+            byte_size = 2;
+            break;
+
+        case 'w': // word
+            byte_size = 4;
+            break;
+
+        case 'g': // giant
+            byte_size = 8;
+            break;
+
+        default:
+            break;
+    }
+    if (byte_size)
+        m_prev_gdb_size = size_letter;
+    return byte_size;
+}
+
+
 void
 OptionGroupFormat::OptionParsingStarting (CommandInterpreter &interpreter)
 {

Modified: lldb/trunk/source/Interpreter/OptionGroupOutputFile.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupOutputFile.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupOutputFile.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupOutputFile.cpp Tue Oct 25 19:56:27 2011
@@ -66,7 +66,7 @@
             break;
 
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 

Modified: lldb/trunk/source/Interpreter/OptionGroupPlatform.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupPlatform.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupPlatform.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupPlatform.cpp Tue Oct 25 19:56:27 2011
@@ -119,7 +119,7 @@
             break;
 
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
     return error;

Modified: lldb/trunk/source/Interpreter/OptionGroupUUID.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupUUID.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupUUID.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupUUID.cpp Tue Oct 25 19:56:27 2011
@@ -62,7 +62,7 @@
             break;
 
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 

Modified: lldb/trunk/source/Interpreter/OptionGroupValueObjectDisplay.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupValueObjectDisplay.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupValueObjectDisplay.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupValueObjectDisplay.cpp Tue Oct 25 19:56:27 2011
@@ -88,13 +88,13 @@
         case 'D':
             max_depth = Args::StringToUInt32 (option_arg, UINT32_MAX, 0, &success);
             if (!success)
-                error.SetErrorStringWithFormat("Invalid max depth '%s'.\n", option_arg);
+                error.SetErrorStringWithFormat("invalid max depth '%s'", option_arg);
             break;
             
         case 'P':
             ptr_depth = Args::StringToUInt32 (option_arg, 0, 0, &success);
             if (!success)
-                error.SetErrorStringWithFormat("Invalid pointer depth '%s'.\n", option_arg);
+                error.SetErrorStringWithFormat("invalid pointer depth '%s'", option_arg);
             break;
             
         case 'Y':
@@ -102,7 +102,7 @@
             {
                 no_summary_depth = Args::StringToUInt32 (option_arg, 0, 0, &success);
                 if (!success)
-                    error.SetErrorStringWithFormat("Invalid pointer depth '%s'.\n", option_arg);
+                    error.SetErrorStringWithFormat("invalid pointer depth '%s'", option_arg);
             }
             else
                 no_summary_depth = 1;
@@ -111,10 +111,10 @@
         case 'S':
             use_synth = Args::StringToBoolean(option_arg, true, &success);
             if (!success)
-                error.SetErrorStringWithFormat("Invalid synthetic-type '%s'.\n", option_arg);
+                error.SetErrorStringWithFormat("invalid synthetic-type '%s'", option_arg);
             break;
         default:
-            error.SetErrorStringWithFormat ("Unrecognized option '%c'.\n", short_option);
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
             break;
     }
 

Modified: lldb/trunk/source/Interpreter/OptionGroupVariable.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupVariable.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupVariable.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupVariable.cpp Tue Oct 25 19:56:27 2011
@@ -67,7 +67,7 @@
             summary = std::string(option_arg);
             break;
         default:
-            error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+            error.SetErrorStringWithFormat("unrecognized short option '%c'", short_option);
             break;
     }
     

Modified: lldb/trunk/source/Interpreter/OptionGroupWatchpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupWatchpoint.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupWatchpoint.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupWatchpoint.cpp Tue Oct 25 19:56:27 2011
@@ -74,7 +74,7 @@
             break;
 
         default:
-            error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+            error.SetErrorStringWithFormat("unrecognized short option '%c'", short_option);
             break;
     }
     

Modified: lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp Tue Oct 25 19:56:27 2011
@@ -331,7 +331,7 @@
     }
     else
     {
-        error.SetErrorStringWithFormat("'A' packet returned an error: %i.\n", arg_packet_err);
+        error.SetErrorStringWithFormat("'A' packet returned an error: %i", arg_packet_err);
     }
     return error;
 }

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp Tue Oct 25 19:56:27 2011
@@ -526,7 +526,7 @@
     }
     else
     {
-        error.SetErrorStringWithFormat ("Unable to locate " DEBUGSERVER_BASENAME ".\n");
+        error.SetErrorStringWithFormat ("unable to locate " DEBUGSERVER_BASENAME );
     }
     return error;
 }

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=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Tue Oct 25 19:56:27 2011
@@ -563,7 +563,7 @@
             }
             else
             {
-                error.SetErrorStringWithFormat("'A' packet returned an error: %i.\n", arg_packet_err);
+                error.SetErrorStringWithFormat("'A' packet returned an error: %i", arg_packet_err);
             }
             
             m_gdb_comm.SetPacketTimeout (old_packet_timeout);
@@ -597,7 +597,7 @@
     {
         // Set our user ID to an invalid process ID.
         SetID(LLDB_INVALID_PROCESS_ID);
-        error.SetErrorStringWithFormat("Failed to get object file from '%s' for arch %s.\n", 
+        error.SetErrorStringWithFormat("failed to get object file from '%s' for arch %s", 
                                        module->GetFileSpec().GetFilename().AsCString(), 
                                        module->GetArchitecture().GetArchitectureName());
     }
@@ -2166,7 +2166,7 @@
         }
         else
         {
-            error.SetErrorStringWithFormat ("Unable to locate " DEBUGSERVER_BASENAME ".\n");
+            error.SetErrorStringWithFormat ("unable to locate " DEBUGSERVER_BASENAME);
         }
 
         if (m_debugserver_pid != LLDB_INVALID_PROCESS_ID)

Modified: lldb/trunk/source/Target/Process.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Target/Process.cpp (original)
+++ lldb/trunk/source/Target/Process.cpp Tue Oct 25 19:56:27 2011
@@ -420,7 +420,7 @@
             break;
 
         default:
-            error.SetErrorStringWithFormat("Invalid short option character '%c'.\n", short_option);
+            error.SetErrorStringWithFormat("unrecognized short option character '%c'", short_option);
             break;
             
     }
@@ -1481,7 +1481,7 @@
 
     if (bp_opcode_size == 0)
     {
-        error.SetErrorStringWithFormat ("Process::GetSoftwareBreakpointTrapOpcode() returned zero, unable to get breakpoint trap for address 0x%llx.\n", bp_addr);
+        error.SetErrorStringWithFormat ("Process::GetSoftwareBreakpointTrapOpcode() returned zero, unable to get breakpoint trap for address 0x%llx", bp_addr);
     }
     else
     {
@@ -1512,7 +1512,7 @@
                                          (uint64_t)bp_addr);
                     }
                     else
-                        error.SetErrorString("Failed to verify the breakpoint trap in memory.");
+                        error.SetErrorString("failed to verify the breakpoint trap in memory.");
                 }
                 else
                     error.SetErrorString("Unable to read memory to verify breakpoint trap.");
@@ -2161,7 +2161,7 @@
         }
         else
         {
-            error.SetErrorStringWithFormat("File doesn't exist: '%s'.\n", local_exec_file_path);
+            error.SetErrorStringWithFormat("file doesn't exist: '%s'", local_exec_file_path);
         }
     }
     return error;
@@ -2272,16 +2272,16 @@
             platform_sp->FindProcesses (match_info, process_infos);
             if (process_infos.GetSize() > 1)
             {
-                error.SetErrorStringWithFormat ("More than one process named %s\n", process_name);
+                error.SetErrorStringWithFormat ("more than one process named %s", process_name);
             }
             else if (process_infos.GetSize() == 0)
             {
-                error.SetErrorStringWithFormat ("Could not find a process named %s\n", process_name);
+                error.SetErrorStringWithFormat ("could not find a process named %s", process_name);
             }
         }
         else
         {        
-            error.SetErrorString ("Invalid platform");
+            error.SetErrorString ("invalid platform");
         }
     }
 

Modified: lldb/trunk/source/Target/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Tue Oct 25 19:56:27 2011
@@ -1022,12 +1022,12 @@
         if (load_addr == LLDB_INVALID_ADDRESS)
         {
             if (resolved_addr.GetModule() && resolved_addr.GetModule()->GetFileSpec())
-                error.SetErrorStringWithFormat("%s[0x%llx] can't be resolved, %s in not currently loaded.\n", 
+                error.SetErrorStringWithFormat("%s[0x%llx] can't be resolved, %s in not currently loaded", 
                                                resolved_addr.GetModule()->GetFileSpec().GetFilename().AsCString(), 
                                                resolved_addr.GetFileAddress(),
                                                resolved_addr.GetModule()->GetFileSpec().GetFilename().AsCString());
             else
-                error.SetErrorStringWithFormat("0x%llx can't be resolved.\n", resolved_addr.GetFileAddress());
+                error.SetErrorStringWithFormat("0x%llx can't be resolved", resolved_addr.GetFileAddress());
         }
         else
         {
@@ -1037,9 +1037,9 @@
                 if (error.Success())
                 {
                     if (bytes_read == 0)
-                        error.SetErrorStringWithFormat("Read memory from 0x%llx failed.\n", load_addr);
+                        error.SetErrorStringWithFormat("read memory from 0x%llx failed", load_addr);
                     else
-                        error.SetErrorStringWithFormat("Only %zu of %zu bytes were read from memory at 0x%llx.\n", bytes_read, dst_len, load_addr);
+                        error.SetErrorStringWithFormat("only %zu of %zu bytes were read from memory at 0x%llx", bytes_read, dst_len, load_addr);
                 }
             }
             if (bytes_read)
@@ -2115,7 +2115,7 @@
                     if (!m_expr_prefix_file.GetCurrentValue().Exists())
                     {
                         err.SetErrorToGenericError ();
-                        err.SetErrorStringWithFormat ("%s does not exist.\n", value);
+                        err.SetErrorStringWithFormat ("%s does not exist", value);
                         return;
                     }
             
@@ -2123,7 +2123,7 @@
             
                     if (!m_expr_prefix_contents_sp && m_expr_prefix_contents_sp->GetByteSize() == 0)
                     {
-                        err.SetErrorStringWithFormat ("Couldn't read data from '%s'\n", value);
+                        err.SetErrorStringWithFormat ("couldn't read data from '%s'", value);
                         m_expr_prefix_contents_sp.reset();
                     }
                 }

Modified: lldb/trunk/source/Target/TargetList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/TargetList.cpp?rev=142999&r1=142998&r2=142999&view=diff
==============================================================================
--- lldb/trunk/source/Target/TargetList.cpp (original)
+++ lldb/trunk/source/Target/TargetList.cpp Tue Oct 25 19:56:27 2011
@@ -79,7 +79,7 @@
         arch.SetTriple(triple_cstr, platform_sp.get());
         if (!arch.IsValid())
         {
-            error.SetErrorStringWithFormat("invalid triple '%s'\n", triple_cstr);
+            error.SetErrorStringWithFormat("invalid triple '%s'", triple_cstr);
             return error;
         }
     }



From scallanan at apple.com  Tue Oct 25 20:06:27 2011
From: scallanan at apple.com (Sean Callanan)
Date: Wed, 26 Oct 2011 01:06:27 -0000
Subject: [Lldb-commits] [lldb] r143000 - in /lldb/trunk:
 include/lldb/Symbol/VerifyDecl.h lldb.xcodeproj/project.pbxproj
 source/Symbol/ClangASTContext.cpp source/Symbol/VerifyDecl.cpp
Message-ID: <20111026010627.5E6BC312800A@llvm.org>

Author: spyffe
Date: Tue Oct 25 20:06:27 2011
New Revision: 143000

URL: http://llvm.org/viewvc/llvm-project?rev=143000&view=rev
Log:
Added VerifyDecl, a function that, when LLDB is
linked against a debug LLVM, runs a variety of
functions -- currently just one -- that verify
that the Decls we create are valid.

ClangASTContext now calls this verifier whenever
it adds a Decl to a DeclContext, and the verifier
checks that the AccessSpecifier is sane.

Added:
    lldb/trunk/include/lldb/Symbol/VerifyDecl.h
    lldb/trunk/source/Symbol/VerifyDecl.cpp
Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/source/Symbol/ClangASTContext.cpp

Added: lldb/trunk/include/lldb/Symbol/VerifyDecl.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/VerifyDecl.h?rev=143000&view=auto
==============================================================================
--- lldb/trunk/include/lldb/Symbol/VerifyDecl.h (added)
+++ lldb/trunk/include/lldb/Symbol/VerifyDecl.h Tue Oct 25 20:06:27 2011
@@ -0,0 +1,23 @@
+//===-- VerifyDecl.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_VariableList_h_
+#define lldb_VariableList_h_
+
+namespace clang
+{
+    class Decl;
+}
+
+namespace lldb_private
+{
+    void VerifyDecl (clang::Decl *decl);
+}
+
+#endif

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=143000&r1=142999&r2=143000&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Oct 25 20:06:27 2011
@@ -398,6 +398,7 @@
 		26F5C37510F3F61B009D5894 /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C37410F3F61B009D5894 /* libobjc.dylib */; };
 		26F5C39110F3FA26009D5894 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C39010F3FA26009D5894 /* CoreFoundation.framework */; };
 		26F73062139D8FDB00FD51C7 /* History.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F73061139D8FDB00FD51C7 /* History.cpp */; };
+		494260DA14579144003C1C78 /* VerifyDecl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 494260D914579144003C1C78 /* VerifyDecl.cpp */; };
 		496B015B1406DEB100F830D5 /* IRInterpreter.h in Headers */ = {isa = PBXBuildFile; fileRef = 496B015A1406DEB100F830D5 /* IRInterpreter.h */; };
 		49A1CAC51430E8DE00306AC9 /* ExpressionSourceCode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A1CAC31430E8BD00306AC9 /* ExpressionSourceCode.cpp */; };
 		49A71FE7141FFA5C00D59478 /* IRInterpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 496B01581406DE8900F830D5 /* IRInterpreter.cpp */; };
@@ -1153,6 +1154,8 @@
 		491193501226386000578B7F /* ASTStructExtractor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASTStructExtractor.cpp; path = source/Expression/ASTStructExtractor.cpp; sourceTree = "<group>"; };
 		49307AAD11DEA4D90081F992 /* IRForTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IRForTarget.cpp; path = source/Expression/IRForTarget.cpp; sourceTree = "<group>"; };
 		49307AB111DEA4F20081F992 /* IRForTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IRForTarget.h; path = include/lldb/Expression/IRForTarget.h; sourceTree = "<group>"; };
+		494260D7145790D5003C1C78 /* VerifyDecl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VerifyDecl.h; path = include/lldb/Symbol/VerifyDecl.h; sourceTree = "<group>"; };
+		494260D914579144003C1C78 /* VerifyDecl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VerifyDecl.cpp; path = source/Symbol/VerifyDecl.cpp; sourceTree = "<group>"; };
 		49445C2512245E3600C11A81 /* ClangExpressionParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClangExpressionParser.cpp; path = source/Expression/ClangExpressionParser.cpp; sourceTree = "<group>"; };
 		49445C2912245E5500C11A81 /* ClangExpressionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClangExpressionParser.h; path = include/lldb/Expression/ClangExpressionParser.h; sourceTree = "<group>"; };
 		49445E341225AB6A00C11A81 /* ClangUserExpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClangUserExpression.h; path = include/lldb/Expression/ClangUserExpression.h; sourceTree = "<group>"; };
@@ -2266,6 +2269,8 @@
 				26BC7F2210F1B8EC00F91463 /* Variable.cpp */,
 				26BC7C6810F1B6E900F91463 /* VariableList.h */,
 				26BC7F2310F1B8EC00F91463 /* VariableList.cpp */,
+				494260D7145790D5003C1C78 /* VerifyDecl.h */,
+				494260D914579144003C1C78 /* VerifyDecl.cpp */,
 			);
 			name = Symbol;
 			sourceTree = "<group>";
@@ -3505,6 +3510,7 @@
 				49A71FE8141FFACF00D59478 /* DataEncoder.cpp in Sources */,
 				B207C4931429607D00F36E4E /* CommandObjectWatchpoint.cpp in Sources */,
 				49A1CAC51430E8DE00306AC9 /* ExpressionSourceCode.cpp in Sources */,
+				494260DA14579144003C1C78 /* VerifyDecl.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=143000&r1=142999&r2=143000&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Tue Oct 25 20:06:27 2011
@@ -61,6 +61,7 @@
 #include "lldb/Core/Log.h"
 #include "lldb/Core/RegularExpression.h"
 #include "lldb/Expression/ASTDumper.h"
+#include "lldb/Symbol/VerifyDecl.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/ObjCLanguageRuntime.h"
@@ -1182,7 +1183,13 @@
                                                      NULL);
     
     if (class_template_decl)
+    {
         decl_ctx->addDecl (class_template_decl);
+        
+#ifdef LLDB_CONFIGURATION_DEBUG
+        VerifyDecl(class_template_decl);
+#endif
+    }
 
     return class_template_decl;
 }
@@ -1691,6 +1698,10 @@
     cxx_method_decl->setParams (ArrayRef<ParmVarDecl*>(params));
     
     cxx_record_decl->addDecl (cxx_method_decl);
+    
+#ifdef LLDB_CONFIGURATION_DEBUG
+    VerifyDecl(cxx_method_decl);
+#endif
 
 //    printf ("decl->isPolymorphic()             = %i\n", cxx_record_decl->isPolymorphic());
 //    printf ("decl->isAggregate()               = %i\n", cxx_record_decl->isAggregate());
@@ -1756,6 +1767,10 @@
             if (field)
             {
                 record_decl->addDecl(field);
+                
+#ifdef LLDB_CONFIGURATION_DEBUG
+                VerifyDecl(field);
+#endif
             }
         }
         else
@@ -2019,6 +2034,11 @@
                 if (field)
                 {
                     class_interface_decl->addDecl(field);
+                    
+#ifdef LLDB_CONFIGURATION_DEBUG
+                    VerifyDecl(field);
+#endif
+                    
                     return true;
                 }
             }
@@ -2191,6 +2211,9 @@
     
     class_interface_decl->addDecl (objc_method_decl);
 
+#ifdef LLDB_CONFIGURATION_DEBUG
+    VerifyDecl(objc_method_decl);
+#endif
 
     return objc_method_decl;
 }
@@ -4269,6 +4292,10 @@
         namespace_decl = NamespaceDecl::Create(*ast, decl_ctx, SourceLocation(), SourceLocation(), &identifier_info);
         
         decl_ctx->addDecl (namespace_decl);
+        
+#ifdef LLDB_CONFIGURATION_DEBUG
+        VerifyDecl(namespace_decl);
+#endif
     }
     return namespace_decl;
 }
@@ -4312,6 +4339,11 @@
     }
     if (func_decl)
         decl_ctx->addDecl (func_decl);
+    
+#ifdef LLDB_CONFIGURATION_DEBUG
+    VerifyDecl(func_decl);
+#endif
+    
     return func_decl;
 }
 
@@ -4579,6 +4611,11 @@
                 if (enumerator_decl)
                 {
                     enum_type->getDecl()->addDecl(enumerator_decl);
+                    
+#ifdef LLDB_CONFIGURATION_DEBUG
+                    VerifyDecl(enumerator_decl);
+#endif
+                    
                     return true;
                 }
             }

Added: lldb/trunk/source/Symbol/VerifyDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/VerifyDecl.cpp?rev=143000&view=auto
==============================================================================
--- lldb/trunk/source/Symbol/VerifyDecl.cpp (added)
+++ lldb/trunk/source/Symbol/VerifyDecl.cpp Tue Oct 25 20:06:27 2011
@@ -0,0 +1,16 @@
+//===-- VerifyDecl.cpp ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Symbol/VerifyDecl.h"
+#include "clang/AST/DeclBase.h"
+
+void lldb_private::VerifyDecl (clang::Decl *decl)
+{
+    decl->getAccess();
+}



From gclayton at apple.com  Tue Oct 25 22:31:36 2011
From: gclayton at apple.com (Greg Clayton)
Date: Wed, 26 Oct 2011 03:31:36 -0000
Subject: [Lldb-commits] [lldb] r143010 - in /lldb/trunk:
 include/lldb/Symbol/ClangASTContext.h
 source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
 source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
 source/Symbol/ClangASTContext.cpp
Message-ID: <20111026033136.923C9312800A@llvm.org>

Author: gclayton
Date: Tue Oct 25 22:31:36 2011
New Revision: 143010

URL: http://llvm.org/viewvc/llvm-project?rev=143010&view=rev
Log:
Fixed an issue where a class that resides inside another class wasn't getting
an access specifier set on it, causing an assertion to fire when building
with a Debug+Asserts build of clang.


Modified:
    lldb/trunk/include/lldb/Symbol/ClangASTContext.h
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
    lldb/trunk/source/Symbol/ClangASTContext.cpp

Modified: lldb/trunk/include/lldb/Symbol/ClangASTContext.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTContext.h?rev=143010&r1=143009&r2=143010&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTContext.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTContext.h Tue Oct 25 22:31:36 2011
@@ -241,9 +241,10 @@
     //------------------------------------------------------------------
 
     lldb::clang_type_t
-    CreateRecordType (const char *name,
+    CreateRecordType (clang::DeclContext *decl_ctx,
+                      lldb::AccessType access_type,
+                      const char *name,
                       int kind,
-                      clang::DeclContext *decl_ctx,
                       lldb::LanguageType language);
 
     static bool
@@ -327,6 +328,7 @@
 
     clang::ClassTemplateDecl *
     CreateClassTemplateDecl (clang::DeclContext *decl_ctx,
+                             lldb::AccessType access_type,
                              const char *class_name, 
                              int kind, 
                              const TemplateParameterInfos &infos);

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp?rev=143010&r1=143009&r2=143010&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Tue Oct 25 22:31:36 2011
@@ -1237,6 +1237,7 @@
 
 clang::ClassTemplateDecl *
 SymbolFileDWARF::ParseClassTemplateDecl (clang::DeclContext *decl_ctx,
+                                         lldb::AccessType access_type,
                                          const char *parent_name,
                                          int tag_decl_kind,
                                          const ClangASTContext::TemplateParameterInfos &template_param_infos)
@@ -1248,6 +1249,7 @@
         ClangASTContext &ast = GetClangASTContext();
 
         return ast.CreateClassTemplateDecl (decl_ctx,
+                                            access_type,
                                             template_basename.c_str(), 
                                             tag_decl_kind, 
                                             template_param_infos);
@@ -4042,12 +4044,22 @@
                     if (clang_type == NULL)
                     {
                         clang::DeclContext *decl_ctx = GetClangDeclContextContainingDIE (dwarf_cu, die, NULL);
+                        if (accessibility == eAccessNone && decl_ctx)
+                        {
+                            // Check the decl context that contains this class/struct/union.
+                            // If it is a class we must give it an accessability.
+                            const clang::Decl::Kind containing_decl_kind = decl_ctx->getDeclKind();
+                            if (DeclKindIsCXXClass (containing_decl_kind))
+                                accessibility = default_accessibility;
+                        }
+
                         if (type_name_cstr && strchr (type_name_cstr, '<'))
                         {
                             ClangASTContext::TemplateParameterInfos template_param_infos;
                             if (ParseTemplateParameterInfos (dwarf_cu, die, template_param_infos))
                             {
                                 clang::ClassTemplateDecl *class_template_decl = ParseClassTemplateDecl (decl_ctx,
+                                                                                                        accessibility,
                                                                                                         type_name_cstr,
                                                                                                         tag_decl_kind,
                                                                                                         template_param_infos);
@@ -4064,9 +4076,10 @@
                         if (!clang_type_was_created)
                         {
                             clang_type_was_created = true;
-                            clang_type = ast.CreateRecordType (type_name_cstr, 
+                            clang_type = ast.CreateRecordType (decl_ctx, 
+                                                               accessibility, 
+                                                               type_name_cstr, 
                                                                tag_decl_kind, 
-                                                               decl_ctx, 
                                                                class_language);
                         }
                     }

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h?rev=143010&r1=143009&r2=143010&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h Tue Oct 25 22:31:36 2011
@@ -448,6 +448,7 @@
 
     clang::ClassTemplateDecl *
     ParseClassTemplateDecl (clang::DeclContext *decl_ctx,
+                            lldb::AccessType access_type,
                             const char *parent_name,
                             int tag_decl_kind,
                             const lldb_private::ClangASTContext::TemplateParameterInfos &template_param_infos);

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=143010&r1=143009&r2=143010&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Tue Oct 25 22:31:36 2011
@@ -1068,7 +1068,7 @@
 #pragma mark Structure, Unions, Classes
 
 clang_type_t
-ClangASTContext::CreateRecordType (const char *name, int kind, DeclContext *decl_ctx, LanguageType language)
+ClangASTContext::CreateRecordType (DeclContext *decl_ctx, AccessType access_type, const char *name, int kind, LanguageType language)
 {
     ASTContext *ast = getASTContext();
     assert (ast != NULL);
@@ -1096,11 +1096,18 @@
                                                  SourceLocation(),
                                                  name && name[0] ? &ast->Idents.get(name) : NULL);
 
+    if (decl_ctx)
+    {
+        if (access_type != eAccessNone)
+            decl->setAccess (ConvertAccessTypeToAccessSpecifier (access_type));
+        decl_ctx->addDecl (decl);
+    }
     return ast->getTagDeclType(decl).getAsOpaquePtr();
 }
 
 ClassTemplateDecl *
 ClangASTContext::CreateClassTemplateDecl (DeclContext *decl_ctx,
+                                          lldb::AccessType access_type,
                                           const char *class_name, 
                                           int kind, 
                                           const TemplateParameterInfos &template_param_infos)
@@ -1184,6 +1191,8 @@
     
     if (class_template_decl)
     {
+        if (access_type != eAccessNone)
+            class_template_decl->setAccess (ConvertAccessTypeToAccessSpecifier (access_type));
         decl_ctx->addDecl (class_template_decl);
         
 #ifdef LLDB_CONFIGURATION_DEBUG



From gclayton at apple.com  Tue Oct 25 23:32:38 2011
From: gclayton at apple.com (Greg Clayton)
Date: Wed, 26 Oct 2011 04:32:38 -0000
Subject: [Lldb-commits] [lldb] r143015 - in /lldb/trunk:
 include/lldb/Interpreter/OptionGroupFormat.h
 include/lldb/Interpreter/OptionGroupOutputFile.h
 include/lldb/Interpreter/OptionGroupValueObjectDisplay.h
 source/Commands/CommandObjectMemory.cpp
 source/Interpreter/OptionGroupFormat.cpp
 source/Interpreter/OptionGroupValueObjectDisplay.cpp
Message-ID: <20111026043238.A11A2312800A@llvm.org>

Author: gclayton
Date: Tue Oct 25 23:32:38 2011
New Revision: 143015

URL: http://llvm.org/viewvc/llvm-project?rev=143015&view=rev
Log:
A simple fix for the GDB format strings so the byte size parameter gets
properly marked as valid.

Also modified the "memory read" command to be able to intelligently repeat
subsequent memory requests, so now you can do:

(lldb) memory read --format hex --count 32 0x1000

Then hit enter to keep viewing the memory that follows the last valid request.


Modified:
    lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h
    lldb/trunk/include/lldb/Interpreter/OptionGroupOutputFile.h
    lldb/trunk/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h
    lldb/trunk/source/Commands/CommandObjectMemory.cpp
    lldb/trunk/source/Interpreter/OptionGroupFormat.cpp
    lldb/trunk/source/Interpreter/OptionGroupValueObjectDisplay.cpp

Modified: lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h?rev=143015&r1=143014&r2=143015&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h (original)
+++ lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h Tue Oct 25 23:32:38 2011
@@ -94,6 +94,14 @@
         return m_count;
     }
     
+    
+    bool
+    AnyOptionWasSet () const
+    {
+        return m_format.OptionWasSet() ||
+               m_byte_size.OptionWasSet() ||
+               m_count.OptionWasSet();
+    }
 
 protected:
 

Modified: lldb/trunk/include/lldb/Interpreter/OptionGroupOutputFile.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionGroupOutputFile.h?rev=143015&r1=143014&r2=143015&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/OptionGroupOutputFile.h (original)
+++ lldb/trunk/include/lldb/Interpreter/OptionGroupOutputFile.h Tue Oct 25 23:32:38 2011
@@ -57,6 +57,12 @@
     {
         return m_append;
     }
+    
+    bool
+    AnyOptionWasSet () const
+    {
+        return m_file.OptionWasSet() || m_append.OptionWasSet();
+    }
 
 protected:
     OptionValueFileSpec m_file;

Modified: lldb/trunk/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h?rev=143015&r1=143014&r2=143015&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h (original)
+++ lldb/trunk/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h Tue Oct 25 23:32:38 2011
@@ -46,6 +46,21 @@
     virtual void
     OptionParsingStarting (CommandInterpreter &interpreter);
     
+    bool
+    AnyOptionWasSet () const
+    {
+        return show_types == true ||
+               no_summary_depth  != 0 ||
+               show_location == true ||
+               flat_output == true ||
+               use_objc == true ||
+               max_depth != UINT32_MAX ||
+               ptr_depth != 0 ||
+               use_synth == false ||
+               be_raw == true ||
+               ignore_cap == true;
+    }
+
     bool show_types;
     uint32_t no_summary_depth;
     bool show_location;

Modified: lldb/trunk/source/Commands/CommandObjectMemory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectMemory.cpp?rev=143015&r1=143014&r2=143015&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectMemory.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectMemory.cpp Tue Oct 25 23:32:38 2011
@@ -242,6 +242,14 @@
         return error;
     }
 
+    bool
+    AnyOptionWasSet () const
+    {
+        return m_num_per_line.OptionWasSet() ||
+               m_output_as_binary ||
+               m_view_as_type.OptionWasSet();
+    }
+    
     OptionValueUInt64 m_num_per_line;
     bool m_output_as_binary;
     OptionValueString m_view_as_type;
@@ -266,7 +274,13 @@
         m_format_options (eFormatBytesWithASCII, 1, 8),
         m_memory_options (),
         m_outfile_options (),
-        m_varobj_options()
+        m_varobj_options(),
+        m_next_addr(LLDB_INVALID_ADDRESS),
+        m_prev_byte_size(0),
+        m_prev_format_options (eFormatBytesWithASCII, 1, 8),
+        m_prev_memory_options (),
+        m_prev_outfile_options (),
+        m_prev_varobj_options()
     {
         CommandArgumentEntry arg1;
         CommandArgumentEntry arg2;
@@ -316,6 +330,11 @@
         return &m_option_group;
     }
 
+    virtual const char *GetRepeatCommand (Args &current_command_args, uint32_t index)
+    {
+        return m_cmd_name.c_str();
+    }
+
     virtual bool
     Execute (Args& command,
              CommandReturnObject &result)
@@ -331,7 +350,7 @@
         const size_t argc = command.GetArgumentCount();
 
         
-        if (argc == 0 || argc > 2)
+        if ((argc == 0 && m_next_addr == LLDB_INVALID_ADDRESS) || argc > 2)
         {
             result.AppendErrorWithFormat ("%s takes 1 or two args.\n", m_cmd_name.c_str());
             result.SetStatus(eReturnStatusFailed);
@@ -486,15 +505,39 @@
             return false;
         }
 
+        lldb::addr_t addr;
+        size_t total_byte_size = 0;
+        if (argc == 0)
+        {
+            // Use the last address and byte size and all options as they were
+            // if no options have been set
+            addr = m_next_addr;
+            total_byte_size = m_prev_byte_size;
+            if (!m_format_options.AnyOptionWasSet() && 
+                !m_memory_options.AnyOptionWasSet() &&
+                !m_outfile_options.AnyOptionWasSet() &&
+                !m_varobj_options.AnyOptionWasSet())
+            {
+                m_format_options = m_prev_format_options;
+                m_memory_options = m_prev_memory_options;
+                m_outfile_options = m_prev_outfile_options;
+                m_varobj_options = m_prev_varobj_options;
+            }
+        }
+
         size_t item_count = m_format_options.GetCountValue().GetCurrentValue();
         const size_t item_byte_size = m_format_options.GetByteSizeValue().GetCurrentValue();
         const size_t num_per_line = m_memory_options.m_num_per_line.GetCurrentValue();
 
-        size_t total_byte_size = item_count * item_byte_size;
         if (total_byte_size == 0)
-            total_byte_size = 32;
+        {
+            total_byte_size = item_count * item_byte_size;
+            if (total_byte_size == 0)
+                total_byte_size = 32;
+        }
 
-        lldb::addr_t addr = Args::StringToUInt64(command.GetArgumentAtIndex(0), LLDB_INVALID_ADDRESS, 0);
+        if (argc > 0)
+            addr = Args::StringToUInt64(command.GetArgumentAtIndex(0), LLDB_INVALID_ADDRESS, 0);
 
         if (addr == LLDB_INVALID_ADDRESS)
         {
@@ -546,6 +589,15 @@
             
             if (bytes_read < total_byte_size)
                 result.AppendWarningWithFormat("Not all bytes (%lu/%lu) were able to be read from 0x%llx.\n", bytes_read, total_byte_size, addr);
+            else
+            {
+                m_next_addr = addr + bytes_read;
+                m_prev_byte_size = bytes_read; 
+                m_prev_format_options = m_format_options;
+                m_prev_memory_options = m_memory_options;
+                m_prev_outfile_options = m_outfile_options;
+                m_prev_varobj_options = m_varobj_options;
+            }
         }
 
         StreamFile outfile_stream;
@@ -674,7 +726,12 @@
     OptionGroupReadMemory m_memory_options;
     OptionGroupOutputFile m_outfile_options;
     OptionGroupValueObjectDisplay m_varobj_options;
-
+    lldb::addr_t m_next_addr;
+    lldb::addr_t m_prev_byte_size; 
+    OptionGroupFormat m_prev_format_options;
+    OptionGroupReadMemory m_prev_memory_options;
+    OptionGroupOutputFile m_prev_outfile_options;
+    OptionGroupValueObjectDisplay m_prev_varobj_options;
 };
 
 

Modified: lldb/trunk/source/Interpreter/OptionGroupFormat.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupFormat.cpp?rev=143015&r1=143014&r2=143015&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupFormat.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupFormat.cpp Tue Oct 25 23:32:38 2011
@@ -123,7 +123,7 @@
                     ++gdb_format_cstr;
 
                 uint32_t byte_size = SetByteSizeUsingGDBSizeLetter (gdb_format_cstr[0]);
-                if (byte_size == 0)
+                if (byte_size > 0)
                     ++gdb_format_cstr;
                 
                 // We the first character of the "gdb_format_cstr" is not the 

Modified: lldb/trunk/source/Interpreter/OptionGroupValueObjectDisplay.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupValueObjectDisplay.cpp?rev=143015&r1=143014&r2=143015&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupValueObjectDisplay.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupValueObjectDisplay.cpp Tue Oct 25 23:32:38 2011
@@ -124,6 +124,7 @@
 void
 OptionGroupValueObjectDisplay::OptionParsingStarting (CommandInterpreter &interpreter)
 {
+    // If these defaults change, be sure to modify AnyOptionWasSet().
     show_types        = false;
     no_summary_depth  = 0;
     show_location     = false;



From scallanan at apple.com  Wed Oct 26 11:20:57 2011
From: scallanan at apple.com (Sean Callanan)
Date: Wed, 26 Oct 2011 16:20:57 -0000
Subject: [Lldb-commits] [lldb] r143029 -
	/lldb/trunk/include/lldb/Symbol/VerifyDecl.h
Message-ID: <20111026162057.AC6D6312800A@llvm.org>

Author: spyffe
Date: Wed Oct 26 11:20:57 2011
New Revision: 143029

URL: http://llvm.org/viewvc/llvm-project?rev=143029&view=rev
Log:
Fixed VerifyDecl to use shared forward declarations.

Modified:
    lldb/trunk/include/lldb/Symbol/VerifyDecl.h

Modified: lldb/trunk/include/lldb/Symbol/VerifyDecl.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/VerifyDecl.h?rev=143029&r1=143028&r2=143029&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/VerifyDecl.h (original)
+++ lldb/trunk/include/lldb/Symbol/VerifyDecl.h Wed Oct 26 11:20:57 2011
@@ -10,10 +10,7 @@
 #ifndef lldb_VariableList_h_
 #define lldb_VariableList_h_
 
-namespace clang
-{
-    class Decl;
-}
+#include "ClangForward.h"
 
 namespace lldb_private
 {



From scallanan at apple.com  Wed Oct 26 12:46:51 2011
From: scallanan at apple.com (Sean Callanan)
Date: Wed, 26 Oct 2011 17:46:51 -0000
Subject: [Lldb-commits] [lldb] r143036 - in /lldb/trunk:
 include/lldb/Symbol/ClangExternalASTSourceCallbacks.h
 source/Symbol/ClangASTContext.cpp
 source/Symbol/ClangExternalASTSourceCallbacks.cpp
Message-ID: <20111026174652.0F1A6312800A@llvm.org>

Author: spyffe
Date: Wed Oct 26 12:46:51 2011
New Revision: 143036

URL: http://llvm.org/viewvc/llvm-project?rev=143036&view=rev
Log:
Added a new #define, LLVM_NDEBUG_OFF, that should
be set if linking against an LLVM compiled with
NDEBUG off.  If it is set, we do not enable NDEBUG
in any place where we include LLVM headers.

Modified:
    lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h
    lldb/trunk/source/Symbol/ClangASTContext.cpp
    lldb/trunk/source/Symbol/ClangExternalASTSourceCallbacks.cpp

Modified: lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h?rev=143036&r1=143035&r2=143036&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h Wed Oct 26 12:46:51 2011
@@ -29,7 +29,7 @@
 // file. So we have to define NDEBUG when including clang headers to avoid any
 // mismatches. This is covered by rdar://problem/8691220
 
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !defined(LLVM_NDEBUG_OFF)
 #define LLDB_DEFINED_NDEBUG_FOR_CLANG
 #define NDEBUG
 // Need to include assert.h so it is as clang would expect it to be (disabled)

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=143036&r1=143035&r2=143036&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Wed Oct 26 12:46:51 2011
@@ -25,7 +25,7 @@
 // file. So we have to define NDEBUG when including clang headers to avoid any
 // mismatches. This is covered by rdar://problem/8691220
 
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !defined(LLVM_NDEBUG_OFF)
 #define LLDB_DEFINED_NDEBUG_FOR_CLANG
 #define NDEBUG
 // Need to include assert.h so it is as clang would expect it to be (disabled)

Modified: lldb/trunk/source/Symbol/ClangExternalASTSourceCallbacks.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangExternalASTSourceCallbacks.cpp?rev=143036&r1=143035&r2=143036&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangExternalASTSourceCallbacks.cpp (original)
+++ lldb/trunk/source/Symbol/ClangExternalASTSourceCallbacks.cpp Wed Oct 26 12:46:51 2011
@@ -23,7 +23,7 @@
 // file. So we have to define NDEBUG when including clang headers to avoid any
 // mismatches. This is covered by rdar://problem/8691220
 
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !defined(LLVM_NDEBUG_OFF)
 #define LLDB_DEFINED_NDEBUG_FOR_CLANG
 #define NDEBUG
 // Need to include assert.h so it is as clang would expect it to be (disabled)



From peter at pcc.me.uk  Wed Oct 26 12:55:48 2011
From: peter at pcc.me.uk (Peter Collingbourne)
Date: Wed, 26 Oct 2011 17:55:48 -0000
Subject: [Lldb-commits] [lldb] r143038 -
	/lldb/trunk/include/lldb/Symbol/VerifyDecl.h
Message-ID: <20111026175548.64B42312800A@llvm.org>

Author: pcc
Date: Wed Oct 26 12:55:48 2011
New Revision: 143038

URL: http://llvm.org/viewvc/llvm-project?rev=143038&view=rev
Log:
Use full path to ClangForward.h

Fixes Linux build.

Modified:
    lldb/trunk/include/lldb/Symbol/VerifyDecl.h

Modified: lldb/trunk/include/lldb/Symbol/VerifyDecl.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/VerifyDecl.h?rev=143038&r1=143037&r2=143038&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/VerifyDecl.h (original)
+++ lldb/trunk/include/lldb/Symbol/VerifyDecl.h Wed Oct 26 12:55:48 2011
@@ -10,7 +10,7 @@
 #ifndef lldb_VariableList_h_
 #define lldb_VariableList_h_
 
-#include "ClangForward.h"
+#include "lldb/Core/ClangForward.h"
 
 namespace lldb_private
 {



From gclayton at apple.com  Wed Oct 26 13:35:21 2011
From: gclayton at apple.com (Greg Clayton)
Date: Wed, 26 Oct 2011 18:35:21 -0000
Subject: [Lldb-commits] [lldb] r143043 -
	/lldb/trunk/source/Interpreter/CommandObject.cpp
Message-ID: <20111026183521.DEC9C312800A@llvm.org>

Author: gclayton
Date: Wed Oct 26 13:35:21 2011
New Revision: 143043

URL: http://llvm.org/viewvc/llvm-project?rev=143043&view=rev
Log:
Update the GDB format text to be a bit more clear.


Modified:
    lldb/trunk/source/Interpreter/CommandObject.cpp

Modified: lldb/trunk/source/Interpreter/CommandObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandObject.cpp?rev=143043&r1=143042&r2=143043&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandObject.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandObject.cpp Wed Oct 26 13:35:21 2011
@@ -669,15 +669,37 @@
 static const char *
 GDBFormatHelpTextCallback ()
 {
-    return "A GDB format consists of a repeat count followed by a format letter "
-    "and a size letter.\n\nFormat letters are o (octal), x (hex), d (decimal), u"
-    " (unsigned decimal), t (binary), f (float), a (address), i (instruction), "
-    "c (char) and s (string), T (OSType), A (floating point values in hex).\n\n"
-    "Size letters are b (byte), h (halfword), w (word), g (giant, 8 bytes).\n\n"
-    "The specified number of objects of the specified size are printed "
-    "according to the format.\n\n"
-    "Defaults for format and size letters are those previously used. Default "
-    "count is 1.";
+    return "A GDB format consists of a repeat count, a format letter and a size letter. "
+    "The repeat count is optional and defaults to 1. The format letter is optional "
+    "and defaults to the previous format that was used. The size letter is optional "
+    "and defaults to the previous size that was used.\n"
+    "\n"
+    "Format letters include:\n"
+    "o - octal\n"
+    "x - hexadecimal\n"
+    "d - decimal\n"
+    "u - unsigned decimal\n"
+    "t - binary\n"
+    "f - float\n"
+    "a - address\n"
+    "i - instruction\n"
+    "c - char\n"
+    "s - string\n"
+    "T - OSType\n"
+    "A - float as hex\n"
+    "\n"
+    "Size letters include:\n"
+    "b - 1 byte  (byte)\n"
+    "h - 2 bytes (halfword)\n"
+    "w - 4 bytes (word)\n"
+    "g - 8 bytes (giant)\n"
+    "\n"
+    "Example formats:\n"
+    "32xb - show 32 1 byte hexadecimal integer values\n"
+    "16xh - show 16 2 byte hexadecimal integer values\n"
+    "64   - show 64 2 byte hexadecimal integer values (format and size from the last format)\n"
+    "dw   - show 1 4 byte decimal integer value\n"
+    ;
 } 
 
 static const char *



From jingham at apple.com  Wed Oct 26 14:32:01 2011
From: jingham at apple.com (Jim Ingham)
Date: Wed, 26 Oct 2011 19:32:01 -0000
Subject: [Lldb-commits] [lldb] r143047 -
	/lldb/trunk/source/Commands/CommandObjectHelp.cpp
Message-ID: <20111026193201.BB579312800A@llvm.org>

Author: jingham
Date: Wed Oct 26 14:32:01 2011
New Revision: 143047

URL: http://llvm.org/viewvc/llvm-project?rev=143047&view=rev
Log:
When completing "help foo bar" if "foo" is not a real command, don't ask its NULL command object to complete the line.

Modified:
    lldb/trunk/source/Commands/CommandObjectHelp.cpp

Modified: lldb/trunk/source/Commands/CommandObjectHelp.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectHelp.cpp?rev=143047&r1=143046&r2=143047&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectHelp.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectHelp.cpp Wed Oct 26 14:32:01 2011
@@ -263,14 +263,31 @@
     else
     {
         CommandObject *cmd_obj = m_interpreter.GetCommandObject (input.GetArgumentAtIndex(0));
-        input.Shift();
-        cursor_index--;
-        return cmd_obj->HandleCompletion (input, 
-                                          cursor_index, 
-                                          cursor_char_position, 
-                                          match_start_point, 
-                                          max_return_elements, 
-                                          word_complete, 
-                                          matches);
+        
+        // The command that they are getting help on might be ambiguous, in which case we should complete that,
+        // otherwise complete with the command the user is getting help on...
+        
+        if (cmd_obj)
+        {
+            input.Shift();
+            cursor_index--;
+            return cmd_obj->HandleCompletion (input, 
+                                              cursor_index, 
+                                              cursor_char_position, 
+                                              match_start_point, 
+                                              max_return_elements, 
+                                              word_complete, 
+                                              matches);
+        }
+        else
+        {
+            return m_interpreter.HandleCompletionMatches (input, 
+                                                        cursor_index, 
+                                                        cursor_char_position, 
+                                                        match_start_point, 
+                                                        max_return_elements, 
+                                                        word_complete, 
+                                                        matches);
+        }
     }
 }



From gclayton at apple.com  Wed Oct 26 16:01:16 2011
From: gclayton at apple.com (Greg Clayton)
Date: Wed, 26 Oct 2011 21:01:16 -0000
Subject: [Lldb-commits] [lldb] r143056 -
	/lldb/trunk/source/Core/DataExtractor.cpp
Message-ID: <20111026210116.3A1B4312800A@llvm.org>

Author: gclayton
Date: Wed Oct 26 16:01:16 2011
New Revision: 143056

URL: http://llvm.org/viewvc/llvm-project?rev=143056&view=rev
Log:
Fixed the display of OSTypes (the four character codes).


Modified:
    lldb/trunk/source/Core/DataExtractor.cpp

Modified: lldb/trunk/source/Core/DataExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/DataExtractor.cpp?rev=143056&r1=143055&r2=143056&view=diff
==============================================================================
--- lldb/trunk/source/Core/DataExtractor.cpp (original)
+++ lldb/trunk/source/Core/DataExtractor.cpp Wed Oct 26 16:01:16 2011
@@ -1481,11 +1481,7 @@
                 s->PutChar('\'');
                 for (i=0; i<item_byte_size; ++i)
                 {
-                    uint8_t ch;
-                    if (i > 0)
-                        ch = (uint8_t)(uval64 >> ((item_byte_size - i - 1) * 8));
-                    else
-                        ch = (uint8_t)uval64;
+                    uint8_t ch = (uint8_t)(uval64 >> ((item_byte_size - i - 1) * 8));
                     if (isprint(ch))
                         s->Printf ("%c", ch);
                     else



From scallanan at apple.com  Wed Oct 26 16:20:01 2011
From: scallanan at apple.com (Sean Callanan)
Date: Wed, 26 Oct 2011 21:20:01 -0000
Subject: [Lldb-commits] [lldb] r143065 - in /lldb/trunk:
 include/lldb/Expression/ClangExpressionDeclMap.h
 source/Expression/ClangExpressionDeclMap.cpp
 source/Expression/IRInterpreter.cpp
Message-ID: <20111026212001.23D47312800A@llvm.org>

Author: spyffe
Date: Wed Oct 26 16:20:00 2011
New Revision: 143065

URL: http://llvm.org/viewvc/llvm-project?rev=143065&view=rev
Log:
Extended the IR interpreter to handle the variables
"_cmd", "this", and "self".  These variables are handled
differently from all other external variables used by
the expression.  Other variables are used indirectly
through the $__lldb_arg operand; only _cmd, this, and
self are passed directly through the ABI.

There are two modifications:

 - I added a function to ClangExpressionDeclMap that
   retrives the value of one of these variables by name;
   and

 - I made IRInterpreter fetch these values when needed,
   and ensured that the proper level of indirection is
   used.

Modified:
    lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
    lldb/trunk/source/Expression/IRInterpreter.cpp

Modified: lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h?rev=143065&r1=143064&r2=143065&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h Wed Oct 26 16:20:00 2011
@@ -441,6 +441,19 @@
     LookupDecl (clang::NamedDecl *decl);
     
     //------------------------------------------------------------------
+    /// [Used by IRInterpreter] Get the Value for "this", "self", or
+    ///   "_cmd".
+    ///
+    /// @param[in] name
+    ///     The name of the entity to be found.
+    ///
+    /// @return
+    ///     The value, or NULL.
+    //------------------------------------------------------------------
+    lldb_private::Value
+    GetSpecialValue (const ConstString &name);
+    
+    //------------------------------------------------------------------
     /// [Used by IRInterpreter] Returns true if the result is a
     ///   reference to data in the target, meaning it must be
     ///   dereferenced once more to get its data.

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=143065&r1=143064&r2=143065&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Wed Oct 26 16:20:00 2011
@@ -959,7 +959,12 @@
         if (!expr_var_sp->m_parser_vars.get() || !expr_var_sp->m_parser_vars->m_lldb_var)
             return Value();
         
-        return *GetVariableValue(exe_ctx, expr_var_sp->m_parser_vars->m_lldb_var, NULL);
+        std::auto_ptr<Value> value(GetVariableValue(exe_ctx, expr_var_sp->m_parser_vars->m_lldb_var, NULL));
+        
+        if (value.get())
+            return *value;
+        else
+            return Value();
     }
     else if (persistent_var_sp)
     {
@@ -969,7 +974,7 @@
             m_parser_vars->m_exe_ctx->GetProcessSP() &&
             m_parser_vars->m_exe_ctx->GetProcessSP()->IsAlive())
         {
-                return persistent_var_sp->m_live_sp->GetValue();
+            return persistent_var_sp->m_live_sp->GetValue();
         }
         else
         {
@@ -986,6 +991,39 @@
     }
 }
 
+Value
+ClangExpressionDeclMap::GetSpecialValue (const ConstString &name)
+{
+    assert(m_parser_vars.get());
+    
+    if (!m_parser_vars->m_exe_ctx)
+        return Value();
+
+    StackFrame *frame = m_parser_vars->m_exe_ctx->GetFramePtr();
+    
+    if (!frame)
+        return Value();
+    
+    VariableList *vars = frame->GetVariableList(false);
+    
+    if (!vars)
+        return Value();
+    
+    lldb::VariableSP var = vars->FindVariable(name);
+    
+    if (!var ||
+        !var->IsInScope(frame) || 
+        !var->LocationIsValidForFrame (frame))
+        return Value();
+    
+    std::auto_ptr<Value> value(GetVariableValue(*m_parser_vars->m_exe_ctx, var, NULL));
+    
+    if (value.get())
+        return *value;
+    else
+        return Value();
+}
+
 // Interface for CommandObjectExpression
 
 bool 
@@ -1535,8 +1573,8 @@
             Error allocate_error;
             
             mem = process->AllocateMemory(pvar_byte_size, 
-                                                  lldb::ePermissionsReadable | lldb::ePermissionsWritable, 
-                                                  allocate_error);
+                                          lldb::ePermissionsReadable | lldb::ePermissionsWritable, 
+                                          allocate_error);
             
             if (mem == LLDB_INVALID_ADDRESS)
             {
@@ -1577,9 +1615,9 @@
             // Now write the location of the area into the struct.
             Error write_error;
             if (!process->WriteScalarToMemory (addr, 
-                                                       var_sp->m_live_sp->GetValue().GetScalar(), 
-                                                       process->GetAddressByteSize(), 
-                                                       write_error))
+                                               var_sp->m_live_sp->GetValue().GetScalar(), 
+                                               process->GetAddressByteSize(), 
+                                               write_error))
             {
                 err.SetErrorStringWithFormat ("Couldn't write %s to the target: %s", var_sp->GetName().GetCString(), write_error.AsCString());
                 return false;

Modified: lldb/trunk/source/Expression/IRInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRInterpreter.cpp?rev=143065&r1=143064&r2=143065&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRInterpreter.cpp (original)
+++ lldb/trunk/source/Expression/IRInterpreter.cpp Wed Oct 26 16:20:00 2011
@@ -576,6 +576,12 @@
         
         const GlobalValue *global_value = dyn_cast<GlobalValue>(value);
         
+        // If the variable is indirected through the argument
+        // array then we need to build an extra level of indirection
+        // for it.  This is the default; only magic arguments like
+        // "this", "self", and "_cmd" are direct.
+        bool indirect_variable = true; 
+        
         // Attempt to resolve the value using the program's data.
         // If it is, the values to be created are:
         //
@@ -586,17 +592,40 @@
         //   resides.  This is an IR-level variable.
         do
         {
-            if (!global_value)
-                break;
-            
             lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+
+            lldb_private::Value resolved_value;
             
-            clang::NamedDecl *decl = IRForTarget::DeclForGlobal(global_value, &module);
-            
-            if (!decl)
-                break;
-            
-            lldb_private::Value resolved_value = m_decl_map.LookupDecl(decl);
+            if (global_value)
+            {            
+                clang::NamedDecl *decl = IRForTarget::DeclForGlobal(global_value, &module);
+
+                if (!decl)
+                    break;
+                
+                if (isa<clang::FunctionDecl>(decl))
+                {
+                    if (log)
+                        log->Printf("The interpreter does not handle function pointers at the moment");
+                    
+                    return Memory::Region();
+                }
+                
+                resolved_value = m_decl_map.LookupDecl(decl);
+            }
+            else
+            {
+                // Special-case "this", "self", and "_cmd"
+                
+                std::string name_str = value->getNameStr();
+                
+                if (name_str == "this" ||
+                    name_str == "self" ||
+                    name_str == "_cmd")
+                    resolved_value = m_decl_map.GetSpecialValue(lldb_private::ConstString(name_str.c_str()));
+                
+                indirect_variable = false;
+            }
             
             if (resolved_value.GetScalar().GetType() != lldb_private::Scalar::e_void)
             {
@@ -605,7 +634,10 @@
                     Memory::Region data_region = m_memory.Malloc(value->getType());
                     data_region.m_allocation->m_origin = resolved_value;
                     Memory::Region ref_region = m_memory.Malloc(value->getType());
-                    Memory::Region pointer_region = m_memory.Malloc(value->getType());
+                    Memory::Region pointer_region;
+                    
+                    if (indirect_variable)
+                        pointer_region = m_memory.Malloc(value->getType());
                     
                     if (!Cache(data_region.m_allocation, value->getType()))
                         return Memory::Region();
@@ -613,7 +645,7 @@
                     if (ref_region.IsInvalid())
                         return Memory::Region();
                     
-                    if (pointer_region.IsInvalid())
+                    if (pointer_region.IsInvalid() && indirect_variable)
                         return Memory::Region();
                     
                     DataEncoderSP ref_encoder = m_memory.GetEncoder(ref_region);
@@ -621,31 +653,35 @@
                     if (ref_encoder->PutAddress(0, data_region.m_base) == UINT32_MAX)
                         return Memory::Region();
                     
-                    DataEncoderSP pointer_encoder = m_memory.GetEncoder(pointer_region);
-                    
-                    if (pointer_encoder->PutAddress(0, ref_region.m_base) == UINT32_MAX)
-                        return Memory::Region();
-                    
-                    m_values[value] = pointer_region;
-                    return pointer_region;
-                }
-                else if (isa<clang::FunctionDecl>(decl))
-                {
-                    if (log)
-                        log->Printf("The interpreter does not handle function pointers at the moment");
-                    
-                    return Memory::Region();
+                    if (indirect_variable)
+                    {
+                        DataEncoderSP pointer_encoder = m_memory.GetEncoder(pointer_region);
+                        
+                        if (pointer_encoder->PutAddress(0, ref_region.m_base) == UINT32_MAX)
+                            return Memory::Region();
+                        
+                        m_values[value] = pointer_region;
+                        return pointer_region;
+                    }
+                    else
+                    {
+                        m_values[value] = ref_region;
+                        return ref_region;
+                    }
                 }
                 else
                 {
                     Memory::Region data_region = m_memory.Place(value->getType(), resolved_value.GetScalar().ULongLong(), resolved_value);
                     Memory::Region ref_region = m_memory.Malloc(value->getType());
-                    Memory::Region pointer_region = m_memory.Malloc(value->getType());
+                    Memory::Region pointer_region;
+                    
+                    if (indirect_variable)
+                        pointer_region = m_memory.Malloc(value->getType());
                            
                     if (ref_region.IsInvalid())
                         return Memory::Region();
                     
-                    if (pointer_region.IsInvalid())
+                    if (pointer_region.IsInvalid() && indirect_variable)
                         return Memory::Region();
                     
                     DataEncoderSP ref_encoder = m_memory.GetEncoder(ref_region);
@@ -653,23 +689,30 @@
                     if (ref_encoder->PutAddress(0, data_region.m_base) == UINT32_MAX)
                         return Memory::Region();
                     
-                    DataEncoderSP pointer_encoder = m_memory.GetEncoder(pointer_region);
-                    
-                    if (pointer_encoder->PutAddress(0, ref_region.m_base) == UINT32_MAX)
-                        return Memory::Region();
+                    if (indirect_variable)
+                    {
+                        DataEncoderSP pointer_encoder = m_memory.GetEncoder(pointer_region);
                     
-                    m_values[value] = pointer_region;
+                        if (pointer_encoder->PutAddress(0, ref_region.m_base) == UINT32_MAX)
+                            return Memory::Region();
+                        
+                        m_values[value] = pointer_region;
+                    }
                     
                     if (log)
                     {
-                        log->Printf("Made an allocation for %s", PrintValue(global_value).c_str());
+                        log->Printf("Made an allocation for %s", PrintValue(value).c_str());
                         log->Printf("  Data contents  : %s", m_memory.PrintData(data_region.m_base, data_region.m_extent).c_str());
                         log->Printf("  Data region    : %llx", (unsigned long long)data_region.m_base);
                         log->Printf("  Ref region     : %llx", (unsigned long long)ref_region.m_base);
-                        log->Printf("  Pointer region : %llx", (unsigned long long)pointer_region.m_base);
+                        if (indirect_variable)
+                            log->Printf("  Pointer region : %llx", (unsigned long long)pointer_region.m_base);
                     }
                     
-                    return pointer_region;
+                    if (indirect_variable)
+                        return pointer_region;
+                    else 
+                        return ref_region;
                 }
             }
         }



From johnny.chen at apple.com  Wed Oct 26 17:58:02 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Wed, 26 Oct 2011 22:58:02 -0000
Subject: [Lldb-commits] [lldb] r143075 - in /lldb/trunk/test: bench-history
 bench.py benchmarks/disassembly/TestDoAttachThenDisassembly.py
 benchmarks/startup/TestStartupDelays.py
 benchmarks/stepping/TestSteppingSpeed.py
Message-ID: <20111026225802.ADCCF312800A@llvm.org>

Author: johnny
Date: Wed Oct 26 17:58:02 2011
New Revision: 143075

URL: http://llvm.org/viewvc/llvm-project?rev=143075&view=rev
Log:
Establish a baseline for bench.py score by using a fixed lldb executable as the
inferior program for the lldb debugger to operate on.  The fixed lldb executable
corresponds to r142902.

Plus some minor modifications to the test benchmark to conform to way bench.py
is meant to be invoked.

Modified:
    lldb/trunk/test/bench-history
    lldb/trunk/test/bench.py
    lldb/trunk/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
    lldb/trunk/test/benchmarks/startup/TestStartupDelays.py
    lldb/trunk/test/benchmarks/stepping/TestSteppingSpeed.py

Modified: lldb/trunk/test/bench-history
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/bench-history?rev=143075&r1=143074&r2=143075&view=diff
==============================================================================
--- lldb/trunk/test/bench-history (original)
+++ lldb/trunk/test/bench-history Wed Oct 26 17:58:02 2011
@@ -27,3 +27,15 @@
 lldb expr cmd benchmark: Avg: 0.207095 (Laps: 25, Total Elapsed Time: 5.177363)
 lldb disassembly benchmark: Avg: 0.001531 (Laps: 10, Total Elapsed Time: 0.015311)
 
+r143065 (Oct 26, 2011):
+# Establish a baseline by using a fixed lldb executable as the inferior program
+# for the lldb debugger to operate on.  The fixed lldb executable corresponds to
+# r142902.
+[15:50:34] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py -e /Volumes/data/lldb/svn/regression/build/Debug/lldb -x '-F Driver::MainLoop()' 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.103774 (Laps: 30, Total Elapsed Time: 3.113226)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.102230 (Laps: 30, Total Elapsed Time: 3.066896)
+lldb startup delay (run to breakpoint) benchmark: Avg: 0.448635 (Laps: 30, Total Elapsed Time: 13.459048)
+lldb frame variable benchmark: Avg: 1.615647 (Laps: 20, Total Elapsed Time: 32.312934)
+lldb stepping benchmark: Avg: 0.138386 (Laps: 50, Total Elapsed Time: 6.919313)
+lldb expr cmd benchmark: Avg: 0.218967 (Laps: 25, Total Elapsed Time: 5.474171)
+lldb disassembly benchmark: Avg: 0.092677 (Laps: 10, Total Elapsed Time: 0.926766)

Modified: lldb/trunk/test/bench.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/bench.py?rev=143075&r1=143074&r2=143075&view=diff
==============================================================================
--- lldb/trunk/test/bench.py (original)
+++ lldb/trunk/test/bench.py Wed Oct 26 17:58:02 2011
@@ -9,36 +9,59 @@
 
 Use the following to get only the benchmark results in your terminal output:
 
-    ./bench.py 2>&1 | grep -P '^lldb.*benchmark:'
+    ./bench.py -e /Volumes/data/lldb/svn/regression/build/Debug/lldb -x '-F Driver::MainLoop()' 2>&1 | grep -P '^lldb.*benchmark:'
+
+See also bench-history.
 """
 
 import os, sys
 import re
+from optparse import OptionParser
 
 # dotest.py invocation with no '-e exe-path' uses lldb as the inferior program,
 # unless there is a mentioning of custom executable program.
 benches = [
-    # Measure startup delays creating a target and setting a breakpoint at main.
-    './dotest.py -v +b -n -p TestStartupDelays.py',
+    # Measure startup delays creating a target, setting a breakpoint, and run to breakpoint stop.
+    './dotest.py -v +b %E %X -n -p TestStartupDelays.py',
 
-    # Measure 'frame variable' response after stopping at Driver::MainLoop().
-    './dotest.py -v +b -x "-F Driver::MainLoop()" -n -p TestFrameVariableResponse.py',
+    # Measure 'frame variable' response after stopping at a breakpoint.
+    './dotest.py -v +b %E %X -n -p TestFrameVariableResponse.py',
 
-    # Measure stepping speed after stopping at Driver::MainLoop().
-    './dotest.py -v +b -x "-F Driver::MainLoop()" -n -p TestSteppingSpeed.py',
+    # Measure stepping speed after stopping at a breakpoint.
+    './dotest.py -v +b %E %X -n -p TestSteppingSpeed.py',
 
     # Measure expression cmd response with a simple custom executable program.
     './dotest.py +b -n -p TestExpressionCmd.py',
 
-    # Attach to a spawned lldb process then run disassembly benchmarks.
-    './dotest.py -v +b -n -p TestDoAttachThenDisassembly.py'
+    # Attach to a spawned process then run disassembly benchmarks.
+    './dotest.py -v +b -n %E -p TestDoAttachThenDisassembly.py'
 ]
 
 def main():
     """Read the items from 'benches' and run the command line one by one."""
+    parser = OptionParser(usage="""\
+%prog [options]
+Run the standard benchmarks defined in the list named 'benches'.\
+""")
+    parser.add_option('-e', '--executable',
+                      type='string', action='store',
+                      dest='exe',
+                      help='The target program launched by lldb.')
+    parser.add_option('-x', '--breakpoint-spec',
+                      type='string', action='store',
+                      dest='break_spec',
+                      help='The lldb breakpoint spec for the target program.')
+
+    # Parses the options, if any.
+    opts, args = parser.parse_args()
+                          
     print "Starting bench runner...."
 
-    for command in benches:
+    for item in benches:
+        command = item.replace('%E',
+                               '-e "%s"' % opts.exe if opts.exe else '')
+        command = command.replace('%X',
+                               '-x "%s"' % opts.break_spec if opts.break_spec else '')
         print "Running %s" % (command)
         os.system(command)
 

Modified: lldb/trunk/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py?rev=143075&r1=143074&r2=143075&view=diff
==============================================================================
--- lldb/trunk/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py (original)
+++ lldb/trunk/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py Wed Oct 26 17:58:02 2011
@@ -1,4 +1,6 @@
-"""Test lldb's disassemblt speed."""
+"""Test lldb's disassemblt speed.  This bench deliberately attaches to an lldb
+inferior and traverses the stack for thread0 to arrive at frame with function
+'MainLoop'.  It is important to specify an lldb executable as the inferior."""
 
 import os, sys
 import unittest2
@@ -12,20 +14,27 @@
 
     def setUp(self):
         BenchBase.setUp(self)
+        if lldb.bmExecutable:
+            self.exe = lldb.bmExecutable
+        else:
+            self.exe = self.lldbHere
+        self.count = lldb.bmIterationCount
+        if self.count <= 0:
+            self.count = 10
 
     @benchmarks_test
     def test_attach_then_disassembly(self):
         """Attach to a spawned lldb process then run disassembly benchmarks."""
         print
-        self.run_lldb_attach_then_disassembly(10)
+        self.run_lldb_attach_then_disassembly(self.exe, self.count)
         print "lldb disassembly benchmark:", self.stopwatch
 
-    def run_lldb_attach_then_disassembly(self, count):
-        target = self.dbg.CreateTarget(self.lldbHere)
+    def run_lldb_attach_then_disassembly(self, exe, count):
+        target = self.dbg.CreateTarget(exe)
 
         # Spawn a new process and don't display the stdout if not in TraceOn() mode.
         import subprocess
-        popen = subprocess.Popen([self.lldbHere, self.lldbOption],
+        popen = subprocess.Popen([exe, self.lldbOption],
                                  stdout = open(os.devnull, 'w') if not self.TraceOn() else None)
         if self.TraceOn():
             print "pid of spawned process: %d" % popen.pid

Modified: lldb/trunk/test/benchmarks/startup/TestStartupDelays.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/benchmarks/startup/TestStartupDelays.py?rev=143075&r1=143074&r2=143075&view=diff
==============================================================================
--- lldb/trunk/test/benchmarks/startup/TestStartupDelays.py (original)
+++ lldb/trunk/test/benchmarks/startup/TestStartupDelays.py Wed Oct 26 17:58:02 2011
@@ -1,4 +1,4 @@
-"""Test lldb's startup delays creating a target and setting a breakpoint."""
+"""Test lldb's startup delays creating a target, setting a breakpoint, and run to breakpoint stop."""
 
 import os, sys
 import unittest2
@@ -32,7 +32,7 @@
 
     @benchmarks_test
     def test_startup_delay(self):
-        """Test start up delays creating a target and setting a breakpoint."""
+        """Test start up delays creating a target, setting a breakpoint, and run to breakpoint stop."""
         print
         self.run_startup_delays_bench(self.exe, self.break_spec, self.count)
         print "lldb startup delay (create fresh target) benchmark:", self.stopwatch

Modified: lldb/trunk/test/benchmarks/stepping/TestSteppingSpeed.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/benchmarks/stepping/TestSteppingSpeed.py?rev=143075&r1=143074&r2=143075&view=diff
==============================================================================
--- lldb/trunk/test/benchmarks/stepping/TestSteppingSpeed.py (original)
+++ lldb/trunk/test/benchmarks/stepping/TestSteppingSpeed.py Wed Oct 26 17:58:02 2011
@@ -14,17 +14,12 @@
         BenchBase.setUp(self)
         if lldb.bmExecutable:
             self.exe = lldb.bmExecutable
-            bmExecutableDefauled = False
         else:
             self.exe = self.lldbHere
-            bmExecutableDefauled = True
         if lldb.bmBreakpointSpec:
             self.break_spec = lldb.bmBreakpointSpec
         else:
-            if bmExecutableDefauled:
-                self.break_spec = '-F Driver::MainLoop()'
-            else:
-                self.break_spec = '-n main'
+            self.break_spec = '-n main'
 
         self.count = lldb.bmIterationCount
         if self.count <= 0:



From scallanan at apple.com  Wed Oct 26 19:02:05 2011
From: scallanan at apple.com (Sean Callanan)
Date: Thu, 27 Oct 2011 00:02:05 -0000
Subject: [Lldb-commits] [lldb] r143083 - in /lldb/trunk/source:
 Expression/IRDynamicChecks.cpp
 Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
 Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
Message-ID: <20111027000205.5E358312800A@llvm.org>

Author: spyffe
Date: Wed Oct 26 19:02:05 2011
New Revision: 143083

URL: http://llvm.org/viewvc/llvm-project?rev=143083&view=rev
Log:
Added an extra parameter to the object-checker
functions in the Objective-C language runtime
that is set to the selector that is being passed
to the object.

Modified:
    lldb/trunk/source/Expression/IRDynamicChecks.cpp
    lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
    lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp

Modified: lldb/trunk/source/Expression/IRDynamicChecks.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRDynamicChecks.cpp?rev=143083&r1=143082&r2=143083&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRDynamicChecks.cpp (original)
+++ lldb/trunk/source/Expression/IRDynamicChecks.cpp Wed Oct 26 19:02:05 2011
@@ -275,6 +275,34 @@
         return ConstantExpr::getIntToPtr(fun_addr_int, fun_ptr_ty);
     }
     
+    //------------------------------------------------------------------
+    /// Build a function pointer for a function with signature 
+    /// void (*)(uint8_t*, uint8_t*) with a given address
+    ///
+    /// @param[in] start_address
+    ///     The address of the function.
+    ///
+    /// @return
+    ///     The function pointer, for use in a CallInst.
+    //------------------------------------------------------------------
+    llvm::Value *BuildObjectCheckerFunc(lldb::addr_t start_address)
+    {
+        IntegerType *intptr_ty = llvm::Type::getIntNTy(m_module.getContext(),
+                                                       (m_module.getPointerSize() == llvm::Module::Pointer64) ? 64 : 32);
+        
+        llvm::Type *param_array[2];
+        
+        param_array[0] = const_cast<llvm::PointerType*>(GetI8PtrTy());
+        param_array[1] = const_cast<llvm::PointerType*>(GetI8PtrTy());
+        
+        ArrayRef<llvm::Type*> params(param_array, 2);
+        
+        FunctionType *fun_ty = FunctionType::get(llvm::Type::getVoidTy(m_module.getContext()), params, true);
+        PointerType *fun_ptr_ty = PointerType::getUnqual(fun_ty);
+        Constant *fun_addr_int = ConstantInt::get(intptr_ty, start_address, false);
+        return ConstantExpr::getIntToPtr(fun_addr_int, fun_ptr_ty);
+    }
+    
     PointerType *GetI8PtrTy()
     {
         if (!m_i8ptr_ty)
@@ -386,14 +414,13 @@
             return false; // call_inst really shouldn't be NULL, because otherwise InspectInstruction wouldn't have registered it
         
         if (!m_objc_object_check_func)
-            m_objc_object_check_func = BuildPointerValidatorFunc(m_checker_functions.m_objc_object_check->StartAddress());
-        
-        llvm::Value *target_object = NULL;
+            m_objc_object_check_func = BuildObjectCheckerFunc(m_checker_functions.m_objc_object_check->StartAddress());
         
         // id objc_msgSend(id theReceiver, SEL theSelector, ...)
         
-        target_object = call_inst->getArgOperand(0);
-        
+        llvm::Value *target_object = call_inst->getArgOperand(0);;
+        llvm::Value *selector = call_inst->getArgOperand(1);
+                
         // Insert an instruction to cast the receiver id to int8_t*
         
         BitCastInst *bit_cast = new BitCastInst(target_object,
@@ -403,9 +430,10 @@
         
         // Insert an instruction to call the helper with the result
         
-        llvm::Value *arg_array[1];
+        llvm::Value *arg_array[2];
         
         arg_array[0] = bit_cast;
+        arg_array[1] = selector;
         
         ArrayRef<llvm::Value*> args(arg_array, 1);
         

Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp?rev=143083&r1=143082&r2=143083&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp Wed Oct 26 19:02:05 2011
@@ -147,7 +147,7 @@
                     "};                                                                     \n"
                     "                                                                       \n"
                     "extern \"C\" void                                                      \n"
-                    "%s(void *$__lldb_arg_obj)                                              \n"
+                    "%s(void *$__lldb_arg_obj, void *$__lldb_arg_selector)                  \n"
                     "{                                                                      \n"
                     "   struct __objc_object *obj = (struct __objc_object*)$__lldb_arg_obj; \n"
                     "   (int)strlen(obj->isa->name);                                        \n"

Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp?rev=143083&r1=143082&r2=143083&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp Wed Oct 26 19:02:05 2011
@@ -499,31 +499,31 @@
     {
         len = ::snprintf (check_function_code, 
                           sizeof(check_function_code),
-                          "extern \"C\" void *gdb_object_getClass(void *);    \n"
-                          "extern \"C\" void                                  \n"
-                          "%s(void *$__lldb_arg_obj)                          \n"
-                          "{                                                  \n"
-                          "   if ($__lldb_arg_obj == (void *)0)               \n"
-                          "       return; // nil is ok                        \n" 
-                          "   if (!gdb_object_getClass($__lldb_arg_obj))      \n"
-                          "       *((volatile int *)0) = 'ocgc';              \n"
-                          "}                                                  \n",
+                          "extern \"C\" void *gdb_object_getClass(void *);          \n"
+                          "extern \"C\" void                                        \n"
+                          "%s(void *$__lldb_arg_obj, void *$__lldb_arg_selector)    \n"
+                          "{                                                        \n"
+                          "   if ($__lldb_arg_obj == (void *)0)                     \n"
+                          "       return; // nil is ok                              \n" 
+                          "   if (!gdb_object_getClass($__lldb_arg_obj))            \n"
+                          "       *((volatile int *)0) = 'ocgc';                    \n"
+                          "}                                                        \n",
                           name);
     }
     else
     {
         len = ::snprintf (check_function_code, 
                           sizeof(check_function_code), 
-                          "extern \"C\" void *gdb_class_getClass(void *);       \n"
-                          "extern \"C\" void                                    \n"
-                          "%s(void *$__lldb_arg_obj)                            \n"
-                          "{                                                    \n"
-                          "   if ($__lldb_arg_obj == (void *)0)                 \n"
-                          "       return; // nil is ok                          \n" 
-                          "    void **$isa_ptr = (void **)$__lldb_arg_obj;      \n"
+                          "extern \"C\" void *gdb_class_getClass(void *);           \n"
+                          "extern \"C\" void                                        \n"
+                          "%s(void *$__lldb_arg_obj, void *$__lldb_arg_selector)    \n"
+                          "{                                                        \n"
+                          "   if ($__lldb_arg_obj == (void *)0)                     \n"
+                          "       return; // nil is ok                              \n" 
+                          "    void **$isa_ptr = (void **)$__lldb_arg_obj;          \n"
                           "    if (*$isa_ptr == (void *)0 || !gdb_class_getClass(*$isa_ptr)) \n"
-                          "       *((volatile int *)0) = 'ocgc';                \n"
-                          "}                                                    \n", 
+                          "       *((volatile int *)0) = 'ocgc';                    \n"
+                          "}                                                        \n", 
                           name);
     }
     



From johnny.chen at apple.com  Wed Oct 26 19:32:03 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Thu, 27 Oct 2011 00:32:03 -0000
Subject: [Lldb-commits] [lldb] r143087 - in /lldb/trunk/test: bench-history
	lldbbench.py
Message-ID: <20111027003203.E9439312800A@llvm.org>

Author: johnny
Date: Wed Oct 26 19:32:03 2011
New Revision: 143087

URL: http://llvm.org/viewvc/llvm-project?rev=143087&view=rev
Log:
Add display of min and max samples to Stopwatch's string representation.

Modified:
    lldb/trunk/test/bench-history
    lldb/trunk/test/lldbbench.py

Modified: lldb/trunk/test/bench-history
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/bench-history?rev=143087&r1=143086&r2=143087&view=diff
==============================================================================
--- lldb/trunk/test/bench-history (original)
+++ lldb/trunk/test/bench-history Wed Oct 26 19:32:03 2011
@@ -39,3 +39,13 @@
 lldb stepping benchmark: Avg: 0.138386 (Laps: 50, Total Elapsed Time: 6.919313)
 lldb expr cmd benchmark: Avg: 0.218967 (Laps: 25, Total Elapsed Time: 5.474171)
 lldb disassembly benchmark: Avg: 0.092677 (Laps: 10, Total Elapsed Time: 0.926766)
+
+# With patch to lldbbench.py to display min and max of samples.
+[17:27:09] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py -e /Volumes/data/lldb/svn/regression/build/Debug/lldb -x '-F Driver::MainLoop()' 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.103625 (Laps: 30, Total Elapsed Time: 3.108748, min=0.101225, max=0.136308)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.102321 (Laps: 30, Total Elapsed Time: 3.069623, min=0.101270, max=0.102824)
+lldb startup delay (run to breakpoint) benchmark: Avg: 0.445943 (Laps: 30, Total Elapsed Time: 13.378290, min=0.438535, max=0.475691)
+lldb frame variable benchmark: Avg: 1.612034 (Laps: 20, Total Elapsed Time: 32.240689, min=1.591328, max=1.649720)
+lldb stepping benchmark: Avg: 0.155064 (Laps: 50, Total Elapsed Time: 7.753182, min=0.101287, max=2.028978)
+lldb expr cmd benchmark: Avg: 0.206160 (Laps: 25, Total Elapsed Time: 5.154005, min=0.203282, max=0.224982)
+lldb disassembly benchmark: Avg: 0.032946 (Laps: 10, Total Elapsed Time: 0.329464, min=0.031380, max=0.039198)

Modified: lldb/trunk/test/lldbbench.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbbench.py?rev=143087&r1=143086&r2=143087&view=diff
==============================================================================
--- lldb/trunk/test/lldbbench.py (original)
+++ lldb/trunk/test/lldbbench.py Wed Oct 26 19:32:03 2011
@@ -1,4 +1,5 @@
 import time
+#import numpy
 from lldbtest import *
 
 class Stopwatch(object):
@@ -48,6 +49,7 @@
         self.__start__ = None
         self.__stop__ = None
         self.__elapsed__ = 0.0
+        self.__nums__ = []
 
     def __init__(self):
         self.reset()
@@ -66,6 +68,7 @@
             elapsed = self.__stop__ - self.__start__
             self.__total_elapsed__ += elapsed
             self.__laps__ += 1
+            self.__nums__.append(elapsed)
             self.__start__ = None # Reset __start__ to be None again.
         else:
             raise Exception("stop() called without first start()?")
@@ -78,10 +81,18 @@
         """Equal to total elapsed time divided by the number of laps."""
         return self.__total_elapsed__ / self.__laps__
 
+    #def sigma(self):
+    #    """Return the standard deviation of the available samples."""
+    #    if self.__laps__ <= 0:
+    #        return None
+    #    return numpy.std(self.__nums__)
+
     def __str__(self):
-        return "Avg: %f (Laps: %d, Total Elapsed Time: %f)" % (self.avg(),
-                                                               self.__laps__,
-                                                               self.__total_elapsed__)
+        return "Avg: %f (Laps: %d, Total Elapsed Time: %f, min=%f, max=%f)" % (self.avg(),
+                                                                               self.__laps__,
+                                                                               self.__total_elapsed__,
+                                                                               min(self.__nums__),
+                                                                               max(self.__nums__))
 
 class BenchBase(TestBase):
     """



From gclayton at apple.com  Wed Oct 26 20:33:27 2011
From: gclayton at apple.com (Greg Clayton)
Date: Thu, 27 Oct 2011 01:33:27 -0000
Subject: [Lldb-commits] [lldb] r143092 - /lldb/trunk/www/status.html
Message-ID: <20111027013327.83ACD312800A@llvm.org>

Author: gclayton
Date: Wed Oct 26 20:33:27 2011
New Revision: 143092

URL: http://llvm.org/viewvc/llvm-project?rev=143092&view=rev
Log:
Updated the grossly out of date status page.


Modified:
    lldb/trunk/www/status.html

Modified: lldb/trunk/www/status.html
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/www/status.html?rev=143092&r1=143091&r2=143092&view=diff
==============================================================================
--- lldb/trunk/www/status.html (original)
+++ lldb/trunk/www/status.html Wed Oct 26 20:33:27 2011
@@ -20,10 +20,16 @@
 				<h1 class ="postheader">Status</h1>
 				<div class="postcontent">
 
-				   <p>LLDB is in early development and supports basic debugging scenarios on
-				      Mac OS X. The public API has not been finalized, and different parts are
-				      at different levels of maturity.  We welcome any help fleshing out missing
-				      pieces and improving the code.</p>
+				   <p>LLDB has matured a lot in the last year and can be used for
+				      C, C++ and Objective C development for x86_64, i386 and ARM debugging.
+				      The entire public API is exposed though a framework on Mac OS X which
+				      is used by Xcode, the lldb command line tool, and can also be used by
+				      python. The entire public API is exposed through script bridging which
+				      allows LLDB to use an embedded python script interpreter, as well as 
+				      having a python module named "lldb" which can be used from python
+				      on the command line. This allows debug sessions to be scripted. It also
+				      allows powerful debugging actions to be created and attached to a variety
+				      of debugging workflows.</p>
 
 				   <p>What works well:</p>
 				   <ul>   
@@ -34,32 +40,16 @@
     				   <li>Symbol reading and object file introspection</li>
     				   <li>Script bridging</li>
     				   <li>Thread inspection and stepping</li>
-    				   <li>Disassembly of i386, x86-64, &amp; ARM/Thumb machine code, and
-    				       backtracing on i386 &amp; x86-64</li>
-    				   <li>The basic command line prompt system, shared library tracking,
-    				       source listings.</li>
-				   </ul>
-
-				   <p>What is still pretty new:</p>
-				   <ul>   
+    				   <li>Disassembly of i386, x86-64, &amp; ARM/Thumb machine code</li>
+    				   <li>Backtracing of i386, x86-64, &amp; ARM/Thumb machine code</li>
+    				   <li>libedit powers the command line prompt and input
+    				   <li>Objective-C 2.0 Support: Printing properties, synthetic properties,
+    				       Objective-C expressions, KVO, dynamic types, dot syntax, runtime data</li>
+    				   <li>C++ support: method access, template support, dynamic types</li>
     				   <li>The public API to the library</li>
     				   <li>Expression evaluation</li>
     				   <li>Objective-C support: stepping into/over, printing the description of
     				       an object ("po")</li>
-    				   <li>Breakpoint actions &amp; scripts</li>
-    				   <li>Attaching to existing processes</li>
-				   </ul>
-
-				   <p>What isn't there yet:</p>
-				   <ul>   
-    				   <li>Regression test suite</li>
-    				   <li>Operating system support hasn't been fully modularized yet</li>
-    				   <li><a href="http://clang.llvm.org/docs/LanguageExtensions.html#blocks">Blocks</a> support</li>
-    				   <li>Calling functions in expressions</li>
-    				   <li>Objective-C 2.0 Support: Printing properties, synthetic properties,
-    				       Objective-C expressions, KVO, dynamic types, dot syntax, runtime data</li>
-    				   <li>C++ support: Method access, handling demangled names, dynamic types</li>
-    				   <li>Exception support: Breaking by name, thrown object, thrower</li>
 				   </ul>
 				</div>
 				<div class="postfooter"></div>



From scallanan at apple.com  Wed Oct 26 21:06:03 2011
From: scallanan at apple.com (Sean Callanan)
Date: Thu, 27 Oct 2011 02:06:03 -0000
Subject: [Lldb-commits] [lldb] r143094 -
	/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
Message-ID: <20111027020603.A402A312800A@llvm.org>

Author: spyffe
Date: Wed Oct 26 21:06:03 2011
New Revision: 143094

URL: http://llvm.org/viewvc/llvm-project?rev=143094&view=rev
Log:
Disabled lookups for the Objective-C builtin type "id;"
the compiler should pick this type up automatically.

Modified:
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=143094&r1=143093&r2=143094&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Wed Oct 26 21:06:03 2011
@@ -2642,34 +2642,39 @@
                 }
             }
         }
-    }    
-    
-    TypeList types;
-    SymbolContext null_sc;
+    }
     
-    if (module_sp && namespace_decl)
-        module_sp->FindTypes(null_sc, name, &namespace_decl, true, 1, types);
-    else
-        target->GetImages().FindTypes (null_sc, name, true, 1, types);
+    static ConstString id_name("id");
     
-    if (types.GetSize())
+    if (name != id_name)
     {
-        TypeSP type_sp = types.GetTypeAtIndex(0);
+        TypeList types;
+        SymbolContext null_sc;
         
-        if (log)
+        if (module_sp && namespace_decl)
+            module_sp->FindTypes(null_sc, name, &namespace_decl, true, 1, types);
+        else
+            target->GetImages().FindTypes (null_sc, name, true, 1, types);
+        
+        if (types.GetSize())
         {
-            const char *name_string = type_sp->GetName().GetCString();
+            TypeSP type_sp = types.GetTypeAtIndex(0);
             
-            log->Printf("  FEVD[%u] Matching type found for \"%s\": %s", 
-                        current_id, 
-                        name.GetCString(), 
-                        (name_string ? name_string : "<anonymous>"));
-        }
+            if (log)
+            {
+                const char *name_string = type_sp->GetName().GetCString();
+                
+                log->Printf("  FEVD[%u] Matching type found for \"%s\": %s", 
+                            current_id, 
+                            name.GetCString(), 
+                            (name_string ? name_string : "<anonymous>"));
+            }
 
-        TypeFromUser user_type(type_sp->GetClangFullType(),
-                               type_sp->GetClangAST());
-            
-        AddOneType(context, user_type, current_id, false);
+            TypeFromUser user_type(type_sp->GetClangFullType(),
+                                   type_sp->GetClangAST());
+                
+            AddOneType(context, user_type, current_id, false);
+        }
     }
 }
 



From scallanan at apple.com  Wed Oct 26 21:10:28 2011
From: scallanan at apple.com (Sean Callanan)
Date: Thu, 27 Oct 2011 02:10:28 -0000
Subject: [Lldb-commits] [lldb] r143096 -
	/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
Message-ID: <20111027021028.ECE7A312800A@llvm.org>

Author: spyffe
Date: Wed Oct 26 21:10:28 2011
New Revision: 143096

URL: http://llvm.org/viewvc/llvm-project?rev=143096&view=rev
Log:
Liberalized the "id" check a little; now "id" can
be found in namespaces.

Modified:
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=143096&r1=143095&r2=143096&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Wed Oct 26 21:10:28 2011
@@ -2646,15 +2646,17 @@
     
     static ConstString id_name("id");
     
-    if (name != id_name)
+    do 
     {
         TypeList types;
         SymbolContext null_sc;
         
         if (module_sp && namespace_decl)
             module_sp->FindTypes(null_sc, name, &namespace_decl, true, 1, types);
-        else
+        else if(name != id_name)
             target->GetImages().FindTypes (null_sc, name, true, 1, types);
+        else
+            break;
         
         if (types.GetSize())
         {
@@ -2675,7 +2677,7 @@
                 
             AddOneType(context, user_type, current_id, false);
         }
-    }
+    } while(0);
 }
 
 clang::ExternalLoadResult



From gclayton at apple.com  Thu Oct 27 12:55:14 2011
From: gclayton at apple.com (Greg Clayton)
Date: Thu, 27 Oct 2011 17:55:14 -0000
Subject: [Lldb-commits] [lldb] r143114 - in /lldb/trunk: include/lldb/
 include/lldb/Core/ include/lldb/Interpreter/ include/lldb/Symbol/ source/
 source/Commands/ source/Core/ source/Interpreter/
 source/Plugins/ObjectFile/Mach-O/ source/Plugins/SymbolFile/DWARF/
 source/Symbol/ test/functionalities/data-formatter/data-formatter-advanced/
Message-ID: <20111027175514.C73C13128060@llvm.org>

Author: gclayton
Date: Thu Oct 27 12:55:14 2011
New Revision: 143114

URL: http://llvm.org/viewvc/llvm-project?rev=143114&view=rev
Log:
Added support for the new ".apple_objc" accelerator tables. These tables are
in the same hashed format as the ".apple_names", but they map objective C
class names to all of the methods and class functions. We need to do this 
because in the DWARF the methods for Objective C are never contained in the
class definition, they are scattered about at the translation unit level and
they don't even have attributes that say the are contained within the class
itself. 

Added 3 new formats which can be used to display data:

    eFormatAddressInfo
    eFormatHexFloat
    eFormatInstruction
    
eFormatAddressInfo describes an address such as function+offset and file+line,
or symbol + offset, or constant data (c string, 2, 4, 8, or 16 byte constants).
The format character for this is "A", the long format is "address".

eFormatHexFloat will print out the hex float format that compilers tend to use.
The format character for this is "X", the long format is "hex float".

eFormatInstruction will print out disassembly with bytes and it will use the
current target's architecture. The format character for this is "i" (which
used to be being used for the integer format, but the integer format also has
"d", so we gave the "i" format to disassembly), the long format is 
"instruction".

Mate the lldb::FormatterChoiceCriterion enumeration private as it should have
been from the start. It is very specialized and doesn't belong in the public 
API.


Modified:
    lldb/trunk/include/lldb/Core/DataExtractor.h
    lldb/trunk/include/lldb/Core/Disassembler.h
    lldb/trunk/include/lldb/Core/FormatNavigator.h
    lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h
    lldb/trunk/include/lldb/Symbol/ClangASTType.h
    lldb/trunk/include/lldb/lldb-enumerations.h
    lldb/trunk/include/lldb/lldb-private-enumerations.h
    lldb/trunk/source/Commands/CommandObjectExpression.cpp
    lldb/trunk/source/Commands/CommandObjectFrame.cpp
    lldb/trunk/source/Commands/CommandObjectMemory.cpp
    lldb/trunk/source/Commands/CommandObjectRegister.cpp
    lldb/trunk/source/Commands/CommandObjectTarget.cpp
    lldb/trunk/source/Core/DataExtractor.cpp
    lldb/trunk/source/Core/Disassembler.cpp
    lldb/trunk/source/Core/FormatManager.cpp
    lldb/trunk/source/Core/ValueObject.cpp
    lldb/trunk/source/Interpreter/OptionGroupFormat.cpp
    lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
    lldb/trunk/source/Symbol/ClangASTType.cpp
    lldb/trunk/source/Symbol/ObjectFile.cpp
    lldb/trunk/source/lldb.cpp
    lldb/trunk/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py

Modified: lldb/trunk/include/lldb/Core/DataExtractor.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/DataExtractor.h?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/DataExtractor.h (original)
+++ lldb/trunk/include/lldb/Core/DataExtractor.h Thu Oct 27 12:55:14 2011
@@ -274,15 +274,16 @@
     ///     The offset at which dumping ended.
     //------------------------------------------------------------------
     uint32_t
-    Dump(Stream *s,
-         uint32_t offset,
-         lldb::Format item_format,
-         uint32_t item_byte_size,
-         uint32_t item_count,
-         uint32_t num_per_line,
-         uint64_t base_addr,
-         uint32_t item_bit_size,
-         uint32_t item_bit_offset) const;
+    Dump (Stream *s,
+          uint32_t offset,
+          lldb::Format item_format,
+          uint32_t item_byte_size,
+          uint32_t item_count,
+          uint32_t num_per_line,
+          uint64_t base_addr,
+          uint32_t item_bit_size,
+          uint32_t item_bit_offset,
+          ExecutionContextScope *exe_scope = NULL) const;
 
     //------------------------------------------------------------------
     /// Dump a UUID value at \a offset.

Modified: lldb/trunk/include/lldb/Core/Disassembler.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Disassembler.h?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Disassembler.h (original)
+++ lldb/trunk/include/lldb/Core/Disassembler.h Thu Oct 27 12:55:14 2011
@@ -169,6 +169,12 @@
     void
     Append (lldb::InstructionSP &inst_sp);
 
+    void
+    Dump (Stream *s,
+          bool show_address,
+          bool show_bytes,
+          const ExecutionContext* exe_ctx);
+
 private:
     typedef std::vector<lldb::InstructionSP> collection;
     typedef collection::iterator iterator;
@@ -178,7 +184,7 @@
 };
 
 class PseudoInstruction : 
-    public lldb_private::Instruction
+    public Instruction
 {
 public:
 
@@ -188,11 +194,11 @@
      ~PseudoInstruction ();
      
     virtual void
-    Dump (lldb_private::Stream *s,
+    Dump (Stream *s,
           uint32_t max_opcode_byte_size,
           bool show_address,
           bool show_bytes,
-          const lldb_private::ExecutionContext* exe_ctx,
+          const ExecutionContext* exe_ctx,
           bool raw);
     
     virtual bool
@@ -217,8 +223,8 @@
     }
 
     virtual size_t
-    Decode (const lldb_private::Disassembler &disassembler,
-            const lldb_private::DataExtractor &data,
+    Decode (const Disassembler &disassembler,
+            const DataExtractor &data,
             uint32_t data_offset);
             
     void

Modified: lldb/trunk/include/lldb/Core/FormatNavigator.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatNavigator.h?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/FormatNavigator.h (original)
+++ lldb/trunk/include/lldb/Core/FormatNavigator.h Thu Oct 27 12:55:14 2011
@@ -25,7 +25,6 @@
 
 // Project includes
 #include "lldb/lldb-public.h"
-#include "lldb/lldb-enumerations.h"
 
 #include "lldb/Core/FormatClasses.h"
 #include "lldb/Core/Log.h"
@@ -262,7 +261,7 @@
         lldb::DynamicValueType use_dynamic,
         uint32_t* why = NULL)
     {
-        uint32_t value = lldb::eFormatterChoiceCriterionDirectChoice;
+        uint32_t value = lldb_private::eFormatterChoiceCriterionDirectChoice;
         clang::QualType type = clang::QualType::getFromOpaquePtr(valobj.GetClangType());
         bool ret = Get(valobj, type, entry, use_dynamic, value);
         if (ret)
@@ -423,7 +422,7 @@
         }
         if (Get_ObjC(valobj, parent, entry, reason))
         {
-            reason |= lldb::eFormatterChoiceCriterionNavigatedBaseClasses;
+            reason |= lldb_private::eFormatterChoiceCriterionNavigatedBaseClasses;
             return true;
         }
         return false;
@@ -468,7 +467,7 @@
             }
             else
             {
-                reason |= lldb::eFormatterChoiceCriterionStrippedBitField;
+                reason |= lldb_private::eFormatterChoiceCriterionStrippedBitField;
                 if (log)
                     log->Printf("no bitfield direct match");
             }
@@ -493,7 +492,7 @@
                 log->Printf("stripping reference");
             if (Get(valobj,type.getNonReferenceType(),entry, use_dynamic, reason) && !entry->m_skip_references)
             {
-                reason |= lldb::eFormatterChoiceCriterionStrippedPointerReference;
+                reason |= lldb_private::eFormatterChoiceCriterionStrippedPointerReference;
                 return true;
             }
         }
@@ -514,7 +513,7 @@
             {
                 if (Get_ObjC(valobj, runtime->GetISA(valobj), entry, reason))
                 {
-                    reason |= lldb::eFormatterChoiceCriterionDynamicObjCHierarchy;
+                    reason |= lldb_private::eFormatterChoiceCriterionDynamicObjCHierarchy;
                     return true;
                 }
             }
@@ -535,7 +534,7 @@
             clang::QualType pointee = typePtr->getPointeeType();
             if (Get(valobj, pointee, entry, use_dynamic, reason) && !entry->m_skip_pointers)
             {
-                reason |= lldb::eFormatterChoiceCriterionStrippedPointerReference;
+                reason |= lldb_private::eFormatterChoiceCriterionStrippedPointerReference;
                 return true;
             }
         }
@@ -557,7 +556,7 @@
                 {
                     if (Get_ObjC(valobj, runtime->GetISA(valobj), entry, reason))
                     {
-                        reason |= lldb::eFormatterChoiceCriterionDynamicObjCHierarchy;
+                        reason |= lldb_private::eFormatterChoiceCriterionDynamicObjCHierarchy;
                         return true;
                     }
                 }
@@ -576,7 +575,7 @@
                 return false;
             if (Get(*target, typePtr->getPointeeType(), entry, use_dynamic, reason) && !entry->m_skip_pointers)
             {
-                reason |= lldb::eFormatterChoiceCriterionStrippedPointerReference;
+                reason |= lldb_private::eFormatterChoiceCriterionStrippedPointerReference;
                 return true;
             }
         }
@@ -601,7 +600,7 @@
                         clang::QualType ivar_qual_type(ast->getObjCInterfaceType(superclass_interface_decl));
                         if (Get(valobj, ivar_qual_type, entry, use_dynamic, reason) && entry->m_cascades)
                         {
-                            reason |= lldb::eFormatterChoiceCriterionNavigatedBaseClasses;
+                            reason |= lldb_private::eFormatterChoiceCriterionNavigatedBaseClasses;
                             return true;
                         }
                     }
@@ -630,7 +629,7 @@
                         {
                             if ((Get(valobj, pos->getType(), entry, use_dynamic, reason)) && entry->m_cascades)
                             {
-                                reason |= lldb::eFormatterChoiceCriterionNavigatedBaseClasses;
+                                reason |= lldb_private::eFormatterChoiceCriterionNavigatedBaseClasses;
                                 return true;
                             }
                         }
@@ -644,7 +643,7 @@
                         {
                             if ((Get(valobj, pos->getType(), entry, use_dynamic, reason)) && entry->m_cascades)
                             {
-                                reason |= lldb::eFormatterChoiceCriterionNavigatedBaseClasses;
+                                reason |= lldb_private::eFormatterChoiceCriterionNavigatedBaseClasses;
                                 return true;
                             }
                         }
@@ -660,7 +659,7 @@
                 log->Printf("stripping typedef");
             if ((Get(valobj, type_tdef->getDecl()->getUnderlyingType(), entry, use_dynamic, reason)) && entry->m_cascades)
             {
-                reason |= lldb::eFormatterChoiceCriterionNavigatedTypedefs;
+                reason |= lldb_private::eFormatterChoiceCriterionNavigatedTypedefs;
                 return true;
             }
         }

Modified: lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h (original)
+++ lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h Thu Oct 27 12:55:14 2011
@@ -26,9 +26,10 @@
 class OptionGroupFormat : public OptionGroup
 {
 public:
-    static const uint32_t OPTION_GROUP_FORMAT = LLDB_OPT_SET_1;
-    static const uint32_t OPTION_GROUP_SIZE   = LLDB_OPT_SET_2;
-    static const uint32_t OPTION_GROUP_COUNT  = LLDB_OPT_SET_3;
+    static const uint32_t OPTION_GROUP_FORMAT   = LLDB_OPT_SET_1;
+    static const uint32_t OPTION_GROUP_GDB_FMT  = LLDB_OPT_SET_2;
+    static const uint32_t OPTION_GROUP_SIZE     = LLDB_OPT_SET_3;
+    static const uint32_t OPTION_GROUP_COUNT    = LLDB_OPT_SET_4;
     
     OptionGroupFormat (lldb::Format default_format, 
                        uint64_t default_byte_size = UINT64_MAX,  // Pass UINT64_MAX to disable the "--size" option

Modified: lldb/trunk/include/lldb/Symbol/ClangASTType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTType.h?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTType.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTType.h Thu Oct 27 12:55:14 2011
@@ -148,7 +148,8 @@
                    uint32_t data_offset,
                    size_t data_byte_size,
                    uint32_t bitfield_bit_size,
-                   uint32_t bitfield_bit_offset);
+                   uint32_t bitfield_bit_offset,
+                   ExecutionContextScope *exe_scope);
     
     
     static bool
@@ -160,7 +161,8 @@
                    uint32_t data_offset,
                    size_t data_byte_size,
                    uint32_t bitfield_bit_size,
-                   uint32_t bitfield_bit_offset);
+                   uint32_t bitfield_bit_offset,
+                   ExecutionContextScope *exe_scope);
 
     void
     DumpSummary (ExecutionContext *exe_ctx,

Modified: lldb/trunk/include/lldb/lldb-enumerations.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-enumerations.h?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-enumerations.h (original)
+++ lldb/trunk/include/lldb/lldb-enumerations.h Thu Oct 27 12:55:14 2011
@@ -117,8 +117,11 @@
         eFormatVectorOfFloat32,
         eFormatVectorOfFloat64,
         eFormatVectorOfUInt128,
-        eFormatComplexInteger,   // Integer complex type
-        eFormatCharArray,       // Print characters with no single quotes, used for character arrays that can contain non printable characters
+        eFormatComplexInteger,      // Integer complex type
+        eFormatCharArray,           // Print characters with no single quotes, used for character arrays that can contain non printable characters
+        eFormatAddressInfo,         // Describe what an address points to (func + offset with file/line, symbol + offset, data, etc)
+        eFormatHexFloat,            // ISO C99 hex float string
+        eFormatInstruction,         // Disassemble an opcode
         kNumFormats
     } Format;
 
@@ -479,6 +482,7 @@
         eSectionTypeDWARFAppleNames,
         eSectionTypeDWARFAppleTypes,
         eSectionTypeDWARFAppleNamespaces,
+        eSectionTypeDWARFAppleObjC,
         eSectionTypeEHFrame,
         eSectionTypeOther
         
@@ -507,20 +511,6 @@
         eFunctionNameTypeSelector   = (1u << 5)     // Find function by selector name (ObjC) names
     } FunctionNameType;
     
-    //----------------------------------------------------------------------
-    // Ways that the FormatManager picks a particular format for a type
-    //----------------------------------------------------------------------
-    typedef enum FormatterChoiceCriterion
-    {
-        eFormatterChoiceCriterionDirectChoice =                  0x00000000,
-        eFormatterChoiceCriterionStrippedPointerReference =      0x00000001,
-        eFormatterChoiceCriterionNavigatedTypedefs =             0x00000002,
-        eFormatterChoiceCriterionNavigatedBaseClasses =          0x00000004,
-        eFormatterChoiceCriterionRegularExpressionSummary =      0x00000008,
-        eFormatterChoiceCriterionRegularExpressionFilter =       0x00000008,
-        eFormatterChoiceCriterionDynamicObjCHierarchy =          0x00000010,
-        eFormatterChoiceCriterionStrippedBitField =              0x00000020
-    } FormatterChoiceCriterion;
     
     //----------------------------------------------------------------------
     // Basic types enumeration for the public API SBType::GetBasicType()

Modified: lldb/trunk/include/lldb/lldb-private-enumerations.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-private-enumerations.h?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-private-enumerations.h (original)
+++ lldb/trunk/include/lldb/lldb-private-enumerations.h Thu Oct 27 12:55:14 2011
@@ -222,7 +222,22 @@
     eExecutionPolicyNever,
     eExecutionPolicyAlways
 } ExecutionPolicy;
-    
+
+//----------------------------------------------------------------------
+// Ways that the FormatManager picks a particular format for a type
+//----------------------------------------------------------------------
+typedef enum FormatterChoiceCriterion
+{
+    eFormatterChoiceCriterionDirectChoice =                  0x00000000,
+    eFormatterChoiceCriterionStrippedPointerReference =      0x00000001,
+    eFormatterChoiceCriterionNavigatedTypedefs =             0x00000002,
+    eFormatterChoiceCriterionNavigatedBaseClasses =          0x00000004,
+    eFormatterChoiceCriterionRegularExpressionSummary =      0x00000008,
+    eFormatterChoiceCriterionRegularExpressionFilter =       0x00000008,
+    eFormatterChoiceCriterionDynamicObjCHierarchy =          0x00000010,
+    eFormatterChoiceCriterionStrippedBitField =              0x00000020
+} FormatterChoiceCriterion;
+
 } // namespace lldb
 
 

Modified: lldb/trunk/source/Commands/CommandObjectExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectExpression.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectExpression.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectExpression.cpp Thu Oct 27 12:55:14 2011
@@ -164,8 +164,8 @@
     // Push the data for the first argument into the m_arguments vector.
     m_arguments.push_back (arg);
     
-    // Add the "--format" and "--count" options to group 1 and 3
-    m_option_group.Append (&m_format_options, OptionGroupFormat::OPTION_GROUP_FORMAT, LLDB_OPT_SET_1);
+    // Add the "--format" and "--gdb-format"
+    m_option_group.Append (&m_format_options, OptionGroupFormat::OPTION_GROUP_FORMAT | OptionGroupFormat::OPTION_GROUP_GDB_FMT, LLDB_OPT_SET_1);
     m_option_group.Append (&m_command_options);
     m_option_group.Finalize();
 }

Modified: lldb/trunk/source/Commands/CommandObjectFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectFrame.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectFrame.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectFrame.cpp Thu Oct 27 12:55:14 2011
@@ -355,7 +355,7 @@
         m_arguments.push_back (arg);
         
         m_option_group.Append (&m_option_variable, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
-        m_option_group.Append (&m_option_format, OptionGroupFormat::OPTION_GROUP_FORMAT, LLDB_OPT_SET_1);
+        m_option_group.Append (&m_option_format, OptionGroupFormat::OPTION_GROUP_FORMAT | OptionGroupFormat::OPTION_GROUP_GDB_FMT, LLDB_OPT_SET_1);
         m_option_group.Append (&m_option_watchpoint, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Append (&m_varobj_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Finalize();

Modified: lldb/trunk/source/Commands/CommandObjectMemory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectMemory.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectMemory.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectMemory.cpp Thu Oct 27 12:55:14 2011
@@ -136,7 +136,21 @@
                 
             case eFormatCString:
                 break;
-                
+
+            case eFormatInstruction:
+                if (count_option_set)
+                    byte_size_value = target->GetArchitecture().GetMaximumOpcodeByteSize() * format_options.GetCountValue().GetCurrentValue();
+                m_num_per_line = 1;
+                break;
+
+            case eFormatAddressInfo:
+                if (!byte_size_option_set)
+                    byte_size_value = target->GetArchitecture().GetAddressByteSize();
+                m_num_per_line = 1;
+                if (!count_option_set)
+                    format_options.GetCountValue() = 8;
+                break;
+
             case eFormatPointer:
                 byte_size_value = target->GetArchitecture().GetAddressByteSize();
                 if (!num_per_line_option_set)
@@ -153,6 +167,7 @@
             case eFormatUnicode16:
             case eFormatUnicode32:
             case eFormatUnsigned:
+            case eFormatHexFloat:
                 if (!byte_size_option_set)
                     byte_size_value = 4;
                 if (!num_per_line_option_set)
@@ -160,7 +175,7 @@
                 if (!count_option_set)
                     format_options.GetCountValue() = 8;
                 break;
-                
+            
             case eFormatBytes:
             case eFormatBytesWithASCII:
                 if (byte_size_option_set)
@@ -309,6 +324,9 @@
         m_option_group.Append (&m_format_options, 
                                OptionGroupFormat::OPTION_GROUP_FORMAT | OptionGroupFormat::OPTION_GROUP_COUNT, 
                                LLDB_OPT_SET_1 | LLDB_OPT_SET_3);
+        m_option_group.Append (&m_format_options, 
+                               OptionGroupFormat::OPTION_GROUP_GDB_FMT, 
+                               LLDB_OPT_SET_1 | LLDB_OPT_SET_2 | LLDB_OPT_SET_3);
         // Add the "--size" option to group 1 and 2
         m_option_group.Append (&m_format_options, 
                                OptionGroupFormat::OPTION_GROUP_SIZE, 
@@ -653,6 +671,7 @@
         }
 
 
+        ExecutionContextScope *exe_scope = exe_ctx.GetBestExecutionContextScope();
         if (clang_ast_type.GetOpaqueQualType())
         {
             for (uint32_t i = 0; i<item_count; ++i)
@@ -661,7 +680,7 @@
                 Address address (NULL, item_addr);
                 StreamString name_strm;
                 name_strm.Printf ("0x%llx", item_addr);
-                ValueObjectSP valobj_sp (ValueObjectMemory::Create (exe_ctx.GetBestExecutionContextScope(), 
+                ValueObjectSP valobj_sp (ValueObjectMemory::Create (exe_scope, 
                                                                     name_strm.GetString().c_str(), 
                                                                     address, 
                                                                     clang_ast_type));
@@ -715,7 +734,8 @@
                    num_per_line,
                    addr,
                    0,
-                   0);
+                   0,
+                   exe_scope);
         output_stream->EOL();
         return true;
     }
@@ -1030,6 +1050,9 @@
             case eFormatVectorOfUInt128:
             case eFormatOSType:
             case eFormatComplexInteger:
+            case eFormatAddressInfo:
+            case eFormatHexFloat:
+            case eFormatInstruction:
                 result.AppendError("unsupported format for writing memory");
                 result.SetStatus(eReturnStatusFailed);
                 return false;

Modified: lldb/trunk/source/Commands/CommandObjectRegister.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectRegister.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectRegister.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectRegister.cpp Thu Oct 27 12:55:14 2011
@@ -62,7 +62,7 @@
         m_arguments.push_back (arg);
 
         // Add the "--format"
-        m_option_group.Append (&m_format_options, OptionGroupFormat::OPTION_GROUP_FORMAT, LLDB_OPT_SET_ALL);
+        m_option_group.Append (&m_format_options, OptionGroupFormat::OPTION_GROUP_FORMAT | OptionGroupFormat::OPTION_GROUP_GDB_FMT, LLDB_OPT_SET_ALL);
         m_option_group.Append (&m_command_options);
         m_option_group.Finalize();
 

Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectTarget.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Thu Oct 27 12:55:14 2011
@@ -525,7 +525,7 @@
         
         m_option_group.Append (&m_varobj_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Append (&m_option_variable, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
-        m_option_group.Append (&m_option_format, OptionGroupFormat::OPTION_GROUP_FORMAT, LLDB_OPT_SET_1);
+        m_option_group.Append (&m_option_format, OptionGroupFormat::OPTION_GROUP_FORMAT | OptionGroupFormat::OPTION_GROUP_GDB_FMT, LLDB_OPT_SET_1);
         m_option_group.Append (&m_option_compile_units, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);   
         m_option_group.Append (&m_option_shared_libraries, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);   
         m_option_group.Finalize();

Modified: lldb/trunk/source/Core/DataExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/DataExtractor.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Core/DataExtractor.cpp (original)
+++ lldb/trunk/source/Core/DataExtractor.cpp Thu Oct 27 12:55:14 2011
@@ -13,6 +13,7 @@
 #include <bitset>
 #include <string>
 
+#include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/APInt.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/Support/MathExtras.h"
@@ -20,12 +21,16 @@
 #include "lldb/Core/DataBufferHeap.h"
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/DataBuffer.h"
+#include "lldb/Core/Disassembler.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Stream.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Core/UUID.h"
 #include "lldb/Core/dwarf.h"
 #include "lldb/Host/Endian.h"
+#include "lldb/Target/ExecutionContext.h"
+#include "lldb/Target/ExecutionContextScope.h"
+#include "lldb/Target/Target.h"
 
 using namespace lldb;
 using namespace lldb_private;
@@ -1300,18 +1305,16 @@
 }
 
 uint32_t
-DataExtractor::Dump
-(
-    Stream *s,
-    uint32_t start_offset,
-    lldb::Format item_format,
-    uint32_t item_byte_size,
-    uint32_t item_count,
-    uint32_t num_per_line,
-    uint64_t base_addr,
-    uint32_t item_bit_size,     // If zero, this is not a bitfield value, if non-zero, the value is a bitfield
-    uint32_t item_bit_offset    // If "item_bit_size" is non-zero, this is the shift amount to apply to a bitfield
-) const
+DataExtractor::Dump (Stream *s,
+                     uint32_t start_offset,
+                     lldb::Format item_format,
+                     uint32_t item_byte_size,
+                     uint32_t item_count,
+                     uint32_t num_per_line,
+                     uint64_t base_addr,
+                     uint32_t item_bit_size,     // If zero, this is not a bitfield value, if non-zero, the value is a bitfield
+                     uint32_t item_bit_offset,    // If "item_bit_size" is non-zero, this is the shift amount to apply to a bitfield
+                     ExecutionContextScope *exe_scope) const
 {
     if (s == NULL)
         return start_offset;
@@ -1326,9 +1329,44 @@
             item_byte_size = s->GetAddressByteSize();
     }
     
-    if (item_format == eFormatOSType && item_byte_size > 8)
+    if (item_format == eFormatInstruction)
+    {
+        Target *target = NULL;
+        if (exe_scope)
+            target = exe_scope->CalculateTarget();
+        if (target)
+        {
+            DisassemblerSP disassembler_sp (Disassembler::FindPlugin(target->GetArchitecture(), NULL));
+            if (disassembler_sp)
+            {
+                lldb::addr_t addr = base_addr + start_offset;
+                lldb_private::Address so_addr;
+                if (!target->GetSectionLoadList().ResolveLoadAddress(addr, so_addr))
+                {
+                    so_addr.SetOffset(addr);
+                    so_addr.SetSection(NULL);
+                }
+
+                if (disassembler_sp->DecodeInstructions (so_addr, *this, start_offset, item_count, false))
+                {
+                    const bool show_address = base_addr != LLDB_INVALID_ADDRESS;
+                    const bool show_bytes = true;
+                    ExecutionContext exe_ctx;
+                    exe_scope->CalculateExecutionContext(exe_ctx);
+                    disassembler_sp->GetInstructionList().Dump (s,  show_address, show_bytes, &exe_ctx);
+                }
+            }
+        }
+        else
+            s->Printf ("invalid target");
+
+        return offset;
+    }
+
+    if ((item_format == eFormatOSType || item_format == eFormatAddressInfo) && item_byte_size > 8)
         item_format = eFormatHex;
 
+    
     for (offset = start_offset, line_start_offset = start_offset, count = 0; ValidOffset(offset) && count < item_count; ++count)
     {
         if ((count % num_per_line) == 0)
@@ -1624,6 +1662,51 @@
             s->Printf("0x%8.8x", GetU32 (&offset));
             break;
 
+        case eFormatAddressInfo:
+            {
+                addr_t addr = GetMaxU64Bitfield(&offset, item_byte_size, item_bit_size, item_bit_offset);
+                s->Printf("0x%*.*llx", 2 * item_byte_size, 2 * item_byte_size, addr);
+                if (exe_scope)
+                {
+                    Target *target = exe_scope->CalculateTarget();
+                    lldb_private::Address so_addr;
+                    if (target && target->GetSectionLoadList().ResolveLoadAddress(addr, so_addr))
+                    {
+                        s->PutChar(' ');
+                        so_addr.Dump (s, 
+                                      exe_scope, 
+                                      Address::DumpStyleResolvedDescription, 
+                                      Address::DumpStyleModuleWithFileAddress);
+                        break;
+                    }
+                }
+            }
+            break;
+
+        case eFormatHexFloat:
+            if (sizeof(float) == item_byte_size)
+            {
+                char float_cstr[256];
+                llvm::APFloat ap_float (GetFloat (&offset));
+                ap_float.convertToHexString (float_cstr, 0, false, llvm::APFloat::rmNearestTiesToEven);
+                s->Printf ("%s", float_cstr);
+                break;
+            }
+            else if (sizeof(double) == item_byte_size)
+            {
+                char float_cstr[256];
+                llvm::APFloat ap_float (GetDouble (&offset));
+                ap_float.convertToHexString (float_cstr, 0, false, llvm::APFloat::rmNearestTiesToEven);
+                s->Printf ("%s", float_cstr);
+                break;
+            }
+            else if (sizeof(long double) * 2 == item_byte_size)
+            {
+                s->Printf ("unsupported hex float byte size %u", item_byte_size);
+                return start_offset;
+            }
+            break;
+
 // please keep the single-item formats below in sync with FormatManager::GetSingleItemFormat
 // if you fail to do so, users will start getting different outputs depending on internal
 // implementation details they should not care about ||

Modified: lldb/trunk/source/Core/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Disassembler.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Core/Disassembler.cpp (original)
+++ lldb/trunk/source/Core/Disassembler.cpp Thu Oct 27 12:55:14 2011
@@ -834,6 +834,25 @@
 }
 
 void
+InstructionList::Dump (Stream *s,
+                       bool show_address,
+                       bool show_bytes,
+                       const ExecutionContext* exe_ctx)
+{
+    const uint32_t max_opcode_byte_size = GetMaxOpcocdeByteSize();
+    collection::const_iterator pos, begin, end;
+    for (begin = m_instructions.begin(), end = m_instructions.end(), pos = begin;
+         pos != end;
+         ++pos)
+    {
+        if (pos != begin)
+            s->EOL();
+        (*pos)->Dump(s, max_opcode_byte_size, show_address, show_bytes, exe_ctx, false);
+    }
+}
+
+
+void
 InstructionList::Clear()
 {
   m_instructions.clear();

Modified: lldb/trunk/source/Core/FormatManager.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/FormatManager.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Core/FormatManager.cpp (original)
+++ lldb/trunk/source/Core/FormatManager.cpp Thu Oct 27 12:55:14 2011
@@ -39,7 +39,7 @@
     { eFormatCharPrintable  , 'C'   , "printable character" },
     { eFormatComplexFloat   , 'F'   , "complex float"       },
     { eFormatCString        , 's'   , "c-string"            },
-    { eFormatDecimal        , 'i'   , "decimal"             },
+    { eFormatDecimal        , 'd'   , "decimal"             },
     { eFormatEnum           , 'E'   , "enumeration"         },
     { eFormatHex            , 'x'   , "hex"                 },
     { eFormatFloat          , 'f'   , "float"               },
@@ -62,7 +62,10 @@
     { eFormatVectorOfFloat64, '\0'  , "float64[]"           },
     { eFormatVectorOfUInt128, '\0'  , "uint128_t[]"         },
     { eFormatComplexInteger , 'I'   , "complex integer"     },
-    { eFormatCharArray      , 'a'   , "character array"     }
+    { eFormatCharArray      , 'a'   , "character array"     },
+    { eFormatAddressInfo    , 'A'   , "address"             },
+    { eFormatHexFloat       , 'X'   , "hex float"           },
+    { eFormatInstruction    , 'i'   , "instruction"         }
 };
 
 static uint32_t 
@@ -180,7 +183,7 @@
         return true;
     bool regex = GetRegexSummaryNavigator()->Get(valobj, entry, use_dynamic, reason);
     if (regex && reason)
-        *reason |= lldb::eFormatterChoiceCriterionRegularExpressionSummary;
+        *reason |= lldb_private::eFormatterChoiceCriterionRegularExpressionSummary;
     return regex;
 }
 
@@ -228,14 +231,14 @@
     if (pick_synth)
     {
         if (regex_synth && reason)
-            *reason |= lldb::eFormatterChoiceCriterionRegularExpressionFilter;
+            *reason |= lldb_private::eFormatterChoiceCriterionRegularExpressionFilter;
         entry = synth;
         return true;
     }
     else
     {
         if (regex_filter && reason)
-            *reason |= lldb::eFormatterChoiceCriterionRegularExpressionFilter;
+            *reason |= lldb_private::eFormatterChoiceCriterionRegularExpressionFilter;
         entry = filter;
         return true;
     }

Modified: lldb/trunk/source/Core/ValueObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObject.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObject.cpp (original)
+++ lldb/trunk/source/Core/ValueObject.cpp Thu Oct 27 12:55:14 2011
@@ -1048,7 +1048,8 @@
                                                              0,                        // Byte offset into "m_data"
                                                              GetByteSize(),            // Byte size of item in "m_data"
                                                              GetBitfieldBitSize(),     // Bitfield bit size
-                                                             GetBitfieldBitOffset()))  // Bitfield bit offset
+                                                             GetBitfieldBitOffset(),
+                                                             GetExecutionContextScope()))  // Bitfield bit offset
                                 m_value_str.swap(sstr.GetString());
                             else
                             {
@@ -1067,7 +1068,7 @@
                         if (reg_info)
                         {
                             StreamString reg_sstr;
-                            m_data.Dump(&reg_sstr, 0, reg_info->format, reg_info->byte_size, 1, UINT32_MAX, LLDB_INVALID_ADDRESS, 0, 0);
+                            m_data.Dump(&reg_sstr, 0, reg_info->format, reg_info->byte_size, 1, UINT32_MAX, LLDB_INVALID_ADDRESS, 0, 0, GetExecutionContextScope());
                             m_value_str.swap(reg_sstr.GetString());
                         }
                     }

Modified: lldb/trunk/source/Interpreter/OptionGroupFormat.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupFormat.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupFormat.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupFormat.cpp Thu Oct 27 12:55:14 2011
@@ -37,11 +37,9 @@
 g_option_table[] =
 {
 { LLDB_OPT_SET_1, false, "format"    ,'f', required_argument, NULL, 0, eArgTypeFormat   , "Specify a format to be used for display."},
-{ LLDB_OPT_SET_1|
-  LLDB_OPT_SET_2|
-  LLDB_OPT_SET_3, false, "gdb-format",'G', required_argument, NULL, 0, eArgTypeGDBFormat, "Specify a format using a GDB format specifier string."},
-{ LLDB_OPT_SET_2, false, "size"      ,'s', required_argument, NULL, 0, eArgTypeByteSize , "The size in bytes to use when displaying with the selected format."},
-{ LLDB_OPT_SET_3, false, "count"     ,'c', required_argument, NULL, 0, eArgTypeCount    , "The number of total items to display."},
+{ LLDB_OPT_SET_2, false, "gdb-format",'G', required_argument, NULL, 0, eArgTypeGDBFormat, "Specify a format using a GDB format specifier string."},
+{ LLDB_OPT_SET_3, false, "size"      ,'s', required_argument, NULL, 0, eArgTypeByteSize , "The size in bytes to use when displaying with the selected format."},
+{ LLDB_OPT_SET_4, false, "count"     ,'c', required_argument, NULL, 0, eArgTypeCount    , "The number of total items to display."},
 };
 
 uint32_t

Modified: lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Thu Oct 27 12:55:14 2011
@@ -233,32 +233,35 @@
                         return eAddressClassCode;
 
                     case eSectionTypeContainer:             return eAddressClassUnknown;
-                    case eSectionTypeData:                  return eAddressClassData;
-                    case eSectionTypeDataCString:           return eAddressClassData;
-                    case eSectionTypeDataCStringPointers:   return eAddressClassData;
-                    case eSectionTypeDataSymbolAddress:     return eAddressClassData;
-                    case eSectionTypeData4:                 return eAddressClassData;
-                    case eSectionTypeData8:                 return eAddressClassData;
-                    case eSectionTypeData16:                return eAddressClassData;
-                    case eSectionTypeDataPointers:          return eAddressClassData;
-                    case eSectionTypeZeroFill:              return eAddressClassData;
-                    case eSectionTypeDataObjCMessageRefs:   return eAddressClassData;
-                    case eSectionTypeDataObjCCFStrings:     return eAddressClassData;
-                    case eSectionTypeDebug:                 return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugAbbrev:      return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugAranges:     return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugFrame:       return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugInfo:        return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugLine:        return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugLoc:         return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugMacInfo:     return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugPubNames:    return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugPubTypes:    return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugRanges:      return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugStr:         return eAddressClassDebug;
-                    case eSectionTypeDWARFAppleNames:       return eAddressClassDebug;
-                    case eSectionTypeDWARFAppleTypes:       return eAddressClassDebug;
-                    case eSectionTypeDWARFAppleNamespaces:  return eAddressClassDebug;
+                    case eSectionTypeData:
+                    case eSectionTypeDataCString:
+                    case eSectionTypeDataCStringPointers:
+                    case eSectionTypeDataSymbolAddress:
+                    case eSectionTypeData4:
+                    case eSectionTypeData8:
+                    case eSectionTypeData16:
+                    case eSectionTypeDataPointers:
+                    case eSectionTypeZeroFill:
+                    case eSectionTypeDataObjCMessageRefs:
+                    case eSectionTypeDataObjCCFStrings:
+                        return eAddressClassData;
+                    case eSectionTypeDebug:
+                    case eSectionTypeDWARFDebugAbbrev:
+                    case eSectionTypeDWARFDebugAranges:
+                    case eSectionTypeDWARFDebugFrame:
+                    case eSectionTypeDWARFDebugInfo:
+                    case eSectionTypeDWARFDebugLine:
+                    case eSectionTypeDWARFDebugLoc:
+                    case eSectionTypeDWARFDebugMacInfo:
+                    case eSectionTypeDWARFDebugPubNames:
+                    case eSectionTypeDWARFDebugPubTypes:
+                    case eSectionTypeDWARFDebugRanges:
+                    case eSectionTypeDWARFDebugStr:
+                    case eSectionTypeDWARFAppleNames:
+                    case eSectionTypeDWARFAppleTypes:
+                    case eSectionTypeDWARFAppleNamespaces:
+                    case eSectionTypeDWARFAppleObjC:
+                        return eAddressClassDebug;
                     case eSectionTypeEHFrame:               return eAddressClassRuntime;
                     case eSectionTypeOther:                 return eAddressClassUnknown;
                     }
@@ -512,6 +515,7 @@
                         static ConstString g_sect_name_dwarf_apple_names ("__apple_names");
                         static ConstString g_sect_name_dwarf_apple_types ("__apple_types");
                         static ConstString g_sect_name_dwarf_apple_namespaces ("__apple_namespac");
+                        static ConstString g_sect_name_dwarf_apple_objc ("__apple_objc");
                         static ConstString g_sect_name_eh_frame ("__eh_frame");
                         static ConstString g_sect_name_DATA ("__DATA");
                         static ConstString g_sect_name_TEXT ("__TEXT");
@@ -546,6 +550,8 @@
                             sect_type = eSectionTypeDWARFAppleTypes;
                         else if (section_name == g_sect_name_dwarf_apple_namespaces)
                             sect_type = eSectionTypeDWARFAppleNamespaces;
+                        else if (section_name == g_sect_name_dwarf_apple_objc)
+                            sect_type = eSectionTypeDWARFAppleObjC;
                         else if (section_name == g_sect_name_objc_selrefs)
                             sect_type = eSectionTypeDataCStringPointers;
                         else if (section_name == g_sect_name_objc_msgrefs)

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Thu Oct 27 12:55:14 2011
@@ -184,6 +184,7 @@
     m_apple_names_ap (),
     m_apple_types_ap (),
     m_apple_namespaces_ap (),
+    m_apple_objc_ap (),
     m_function_basename_index(),
     m_function_fullname_index(),
     m_function_method_index(),
@@ -287,6 +288,15 @@
             m_apple_namespaces_ap.reset();
     }
 
+    get_apple_objc_data();
+    if (m_data_apple_objc.GetByteSize() > 0)
+    {
+        m_apple_objc_ap.reset (new DWARFMappedHash::MemoryTable (m_data_apple_objc, get_debug_str_data(), ".apple_objc"));
+        if (m_apple_objc_ap->IsValid())
+            m_using_apple_tables = true;
+        else
+            m_apple_objc_ap.reset();
+    }
 }
 
 bool
@@ -492,19 +502,25 @@
 const DataExtractor&
 SymbolFileDWARF::get_apple_names_data()
 {
-    return GetCachedSectionData (flagsGotDebugNamesData, eSectionTypeDWARFAppleNames, m_data_apple_names);
+    return GetCachedSectionData (flagsGotAppleNamesData, eSectionTypeDWARFAppleNames, m_data_apple_names);
 }
 
 const DataExtractor&
 SymbolFileDWARF::get_apple_types_data()
 {
-    return GetCachedSectionData (flagsGotDebugTypesData, eSectionTypeDWARFAppleTypes, m_data_apple_types);
+    return GetCachedSectionData (flagsGotAppleTypesData, eSectionTypeDWARFAppleTypes, m_data_apple_types);
 }
 
 const DataExtractor&
 SymbolFileDWARF::get_apple_namespaces_data()
 {
-    return GetCachedSectionData (flagsGotDebugNamespacesData, eSectionTypeDWARFAppleNamespaces, m_data_apple_namespaces);
+    return GetCachedSectionData (flagsGotAppleNamespacesData, eSectionTypeDWARFAppleNamespaces, m_data_apple_namespaces);
+}
+
+const DataExtractor&
+SymbolFileDWARF::get_apple_objc_data()
+{
+    return GetCachedSectionData (flagsGotAppleObjCData, eSectionTypeDWARFAppleObjC, m_data_apple_objc);
 }
 
 
@@ -1691,9 +1707,22 @@
                 if (!class_str.empty())
                 {
                 
-                    ConstString class_name (class_str.c_str());
                     DIEArray method_die_offsets;
-                    if (m_objc_class_selectors_index.Find (class_name, method_die_offsets))
+                    if (m_using_apple_tables)
+                    {
+                        if (m_apple_objc_ap.get())
+                            m_apple_objc_ap->FindByName(class_str.c_str(), method_die_offsets);
+                    }
+                    else
+                    {
+                        if (!m_indexed)
+                            Index ();
+                        
+                        ConstString class_name (class_str.c_str());
+                        m_objc_class_selectors_index.Find (class_name, method_die_offsets);
+                    }
+
+                    if (!method_die_offsets.empty())
                     {
                         DWARFDebugInfo* debug_info = DebugInfo();
 

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h Thu Oct 27 12:55:14 2011
@@ -170,6 +170,7 @@
     const lldb_private::DataExtractor&      get_apple_names_data ();
     const lldb_private::DataExtractor&      get_apple_types_data ();
     const lldb_private::DataExtractor&      get_apple_namespaces_data ();
+    const lldb_private::DataExtractor&      get_apple_objc_data ();
 
 
     DWARFDebugAbbrev*       DebugAbbrev();
@@ -251,9 +252,10 @@
         flagsGotDebugPubTypesData   = (1 << 8),
         flagsGotDebugRangesData     = (1 << 9),
         flagsGotDebugStrData        = (1 << 10),
-        flagsGotDebugNamesData      = (1 << 11),
-        flagsGotDebugTypesData      = (1 << 12),
-        flagsGotDebugNamespacesData = (1 << 13)
+        flagsGotAppleNamesData      = (1 << 11),
+        flagsGotAppleTypesData      = (1 << 12),
+        flagsGotAppleNamespacesData = (1 << 13),
+        flagsGotAppleObjCData       = (1 << 14)
     };
     
     bool                    NamespaceDeclMatchesThisSymbolFile (const lldb_private::ClangNamespaceDecl *namespace_decl);
@@ -474,6 +476,7 @@
     lldb_private::DataExtractor     m_data_apple_names;
     lldb_private::DataExtractor     m_data_apple_types;
     lldb_private::DataExtractor     m_data_apple_namespaces;
+    lldb_private::DataExtractor     m_data_apple_objc;
 
     // The auto_ptr items below are generated on demand if and when someone accesses
     // them through a non const version of this class.
@@ -483,6 +486,7 @@
     std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_names_ap;
     std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_types_ap;
     std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_namespaces_ap;
+    std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_objc_ap;
     NameToDIE                           m_function_basename_index;  // All concrete functions
     NameToDIE                           m_function_fullname_index;  // All concrete functions
     NameToDIE                           m_function_method_index;    // All inlined functions

Modified: lldb/trunk/source/Symbol/ClangASTType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTType.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTType.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTType.cpp Thu Oct 27 12:55:14 2011
@@ -937,16 +937,14 @@
 
 
 bool
-ClangASTType::DumpTypeValue
-(
-    Stream *s,
-    lldb::Format format,
-    const lldb_private::DataExtractor &data,
-    uint32_t byte_offset,
-    size_t byte_size,
-    uint32_t bitfield_bit_size,
-    uint32_t bitfield_bit_offset
-)
+ClangASTType::DumpTypeValue (Stream *s,
+                             lldb::Format format,
+                             const lldb_private::DataExtractor &data,
+                             uint32_t byte_offset,
+                             size_t byte_size,
+                             uint32_t bitfield_bit_size,
+                             uint32_t bitfield_bit_offset,
+                             ExecutionContextScope *exe_scope)
 {
     return DumpTypeValue (m_ast,
                           m_type,
@@ -956,23 +954,22 @@
                           byte_offset,
                           byte_size,
                           bitfield_bit_size,
-                          bitfield_bit_offset);
+                          bitfield_bit_offset,
+                          exe_scope);
 }
 
 
 bool
-ClangASTType::DumpTypeValue
-(
-    clang::ASTContext *ast_context,
-    clang_type_t clang_type,
-    Stream *s,
-    lldb::Format format,
-    const lldb_private::DataExtractor &data,
-    uint32_t byte_offset,
-    size_t byte_size,
-    uint32_t bitfield_bit_size,
-    uint32_t bitfield_bit_offset
-)
+ClangASTType::DumpTypeValue (clang::ASTContext *ast_context,
+                             clang_type_t clang_type,
+                             Stream *s,
+                             lldb::Format format,
+                             const lldb_private::DataExtractor &data,
+                             uint32_t byte_offset,
+                             size_t byte_size,
+                             uint32_t bitfield_bit_size,
+                             uint32_t bitfield_bit_offset,
+                             ExecutionContextScope *exe_scope)
 {
     clang::QualType qual_type(clang::QualType::getFromOpaquePtr(clang_type));
     if (ClangASTContext::IsAggregateType (clang_type))
@@ -1001,7 +998,8 @@
                                                     byte_offset,            // Offset into "data" where to grab value from
                                                     typedef_byte_size,      // Size of this type in bytes
                                                     bitfield_bit_size,      // Size in bits of a bitfield value, if zero don't treat as a bitfield
-                                                    bitfield_bit_offset);   // Offset in bits of a bitfield value if bitfield_bit_size != 0
+                                                    bitfield_bit_offset,    // Offset in bits of a bitfield value if bitfield_bit_size != 0
+                                                    exe_scope);
             }
             break;
 
@@ -1094,7 +1092,8 @@
                                   UINT32_MAX,
                                   LLDB_INVALID_ADDRESS,
                                   bitfield_bit_size,
-                                  bitfield_bit_offset);
+                                  bitfield_bit_offset,
+                                  exe_scope);
             }
             break;
         }

Modified: lldb/trunk/source/Symbol/ObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ObjectFile.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ObjectFile.cpp (original)
+++ lldb/trunk/source/Symbol/ObjectFile.cpp Thu Oct 27 12:55:14 2011
@@ -198,32 +198,35 @@
                     case eSectionTypeInvalid:               return eAddressClassUnknown;
                     case eSectionTypeCode:                  return eAddressClassCode;
                     case eSectionTypeContainer:             return eAddressClassUnknown;
-                    case eSectionTypeData:                  return eAddressClassData;
-                    case eSectionTypeDataCString:           return eAddressClassData;
-                    case eSectionTypeDataCStringPointers:   return eAddressClassData;
-                    case eSectionTypeDataSymbolAddress:     return eAddressClassData;
-                    case eSectionTypeData4:                 return eAddressClassData;
-                    case eSectionTypeData8:                 return eAddressClassData;
-                    case eSectionTypeData16:                return eAddressClassData;
-                    case eSectionTypeDataPointers:          return eAddressClassData;
-                    case eSectionTypeZeroFill:              return eAddressClassData;
-                    case eSectionTypeDataObjCMessageRefs:   return eAddressClassData;
-                    case eSectionTypeDataObjCCFStrings:     return eAddressClassData;
-                    case eSectionTypeDebug:                 return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugAbbrev:      return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugAranges:     return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugFrame:       return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugInfo:        return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugLine:        return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugLoc:         return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugMacInfo:     return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugPubNames:    return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugPubTypes:    return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugRanges:      return eAddressClassDebug;
-                    case eSectionTypeDWARFDebugStr:         return eAddressClassDebug;
-                    case eSectionTypeDWARFAppleNames:       return eAddressClassDebug;
-                    case eSectionTypeDWARFAppleTypes:       return eAddressClassDebug;
-                    case eSectionTypeDWARFAppleNamespaces:  return eAddressClassDebug;
+                    case eSectionTypeData:
+                    case eSectionTypeDataCString:
+                    case eSectionTypeDataCStringPointers:
+                    case eSectionTypeDataSymbolAddress:
+                    case eSectionTypeData4:
+                    case eSectionTypeData8:
+                    case eSectionTypeData16:
+                    case eSectionTypeDataPointers:
+                    case eSectionTypeZeroFill:
+                    case eSectionTypeDataObjCMessageRefs:
+                    case eSectionTypeDataObjCCFStrings:
+                        return eAddressClassData;
+                    case eSectionTypeDebug:
+                    case eSectionTypeDWARFDebugAbbrev:
+                    case eSectionTypeDWARFDebugAranges:
+                    case eSectionTypeDWARFDebugFrame:
+                    case eSectionTypeDWARFDebugInfo:
+                    case eSectionTypeDWARFDebugLine:
+                    case eSectionTypeDWARFDebugLoc:
+                    case eSectionTypeDWARFDebugMacInfo:
+                    case eSectionTypeDWARFDebugPubNames:
+                    case eSectionTypeDWARFDebugPubTypes:
+                    case eSectionTypeDWARFDebugRanges:
+                    case eSectionTypeDWARFDebugStr:
+                    case eSectionTypeDWARFAppleNames:
+                    case eSectionTypeDWARFAppleTypes:
+                    case eSectionTypeDWARFAppleNamespaces:
+                    case eSectionTypeDWARFAppleObjC:
+                        return eAddressClassDebug;
                     case eSectionTypeEHFrame:               return eAddressClassRuntime;
                     case eSectionTypeOther:                 return eAddressClassUnknown;
                     }

Modified: lldb/trunk/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/source/lldb.cpp (original)
+++ lldb/trunk/source/lldb.cpp Thu Oct 27 12:55:14 2011
@@ -262,6 +262,7 @@
     case eSectionTypeDWARFAppleNames: return "apple-names";
     case eSectionTypeDWARFAppleTypes: return "apple-types";
     case eSectionTypeDWARFAppleNamespaces: return "apple-namespaces";
+    case eSectionTypeDWARFAppleObjC: return "apple-objc";
     case eSectionTypeEHFrame: return "eh-frame";
     case eSectionTypeOther: return "regular";
     }

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py?rev=143114&r1=143113&r2=143114&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py Thu Oct 27 12:55:14 2011
@@ -175,7 +175,7 @@
         
         # check that we can format a variable in a summary even if a format is defined for its datatype
         self.runCmd("type format add -f hex int")
-        self.runCmd("type summary add --summary-string \"x=${var.x%i}\" Simple")
+        self.runCmd("type summary add --summary-string \"x=${var.x%d}\" Simple")
 
         self.expect("frame variable a_simple_object",
             substrs = ['x=3'])



From johnny.chen at apple.com  Thu Oct 27 13:27:53 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Thu, 27 Oct 2011 18:27:53 -0000
Subject: [Lldb-commits] [lldb] r143118 - in
 /lldb/trunk/test/functionalities/watchpoint:
 hello_watchpoint/TestMyFirstWatchpoint.py
 watchpoint_commands/TestWatchpointCommands.py
 watchpoint_commands/condition/TestWatchpointConditionCmd.py
Message-ID: <20111027182753.17DD23128060@llvm.org>

Author: johnny
Date: Thu Oct 27 13:27:52 2011
New Revision: 143118

URL: http://llvm.org/viewvc/llvm-project?rev=143118&view=rev
Log:
Undo r142549 and r142543 which temporarily relax the expected substrings for
watchpoint creation output due to wrong debug info from clang.  It has been
fixed.

Modified:
    lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py

Modified: lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py?rev=143118&r1=143117&r2=143118&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py Thu Oct 27 13:27:52 2011
@@ -60,8 +60,7 @@
         # There should be only one watchpoint hit (see main.c).
         self.expect("frame variable -w write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = w',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.

Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py?rev=143118&r1=143117&r2=143118&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py Thu Oct 27 13:27:52 2011
@@ -113,8 +113,7 @@
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.
@@ -170,8 +169,7 @@
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Delete the watchpoint immediately, but set auto-confirm to true first.
         self.runCmd("settings set auto-confirm true")
@@ -213,8 +211,7 @@
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Set the ignore count of the watchpoint immediately.
         self.expect("watchpoint ignore -i 2",
@@ -260,8 +257,7 @@
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.
@@ -320,8 +316,7 @@
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Immediately, we disable the watchpoint.  We won't be stopping due to a
         # watchpoint after this.

Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py?rev=143118&r1=143117&r2=143118&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py Thu Oct 27 13:27:52 2011
@@ -60,8 +60,7 @@
         # With a condition of 'global==5'.
         self.expect("frame variable -w write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = w',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         self.runCmd("watchpoint modify -c 'global==5'")
 



From johnny.chen at apple.com  Thu Oct 27 13:43:39 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Thu, 27 Oct 2011 18:43:39 -0000
Subject: [Lldb-commits] [lldb] r143121 - /lldb/trunk/test/bench-history
Message-ID: <20111027184339.597FC3128060@llvm.org>

Author: johnny
Date: Thu Oct 27 13:43:39 2011
New Revision: 143121

URL: http://llvm.org/viewvc/llvm-project?rev=143121&view=rev
Log:
Add bench history entries.

Modified:
    lldb/trunk/test/bench-history

Modified: lldb/trunk/test/bench-history
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/bench-history?rev=143121&r1=143120&r2=143121&view=diff
==============================================================================
--- lldb/trunk/test/bench-history (original)
+++ lldb/trunk/test/bench-history Thu Oct 27 13:43:39 2011
@@ -49,3 +49,24 @@
 lldb stepping benchmark: Avg: 0.155064 (Laps: 50, Total Elapsed Time: 7.753182, min=0.101287, max=2.028978)
 lldb expr cmd benchmark: Avg: 0.206160 (Laps: 25, Total Elapsed Time: 5.154005, min=0.203282, max=0.224982)
 lldb disassembly benchmark: Avg: 0.032946 (Laps: 10, Total Elapsed Time: 0.329464, min=0.031380, max=0.039198)
+
+r143118 (Oct 27, 2011):
+# No performance regression.
+[11:30:10] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py -e /Volumes/data/lldb/svn/regression/build/Debug/lldb -x '-F Driver::MainLoop()' 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.109056 (Laps: 30, Total Elapsed Time: 3.271690, min=0.101212, max=0.296496)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.102844 (Laps: 30, Total Elapsed Time: 3.085306, min=0.101028, max=0.112504)
+lldb startup delay (run to breakpoint) benchmark: Avg: 0.467196 (Laps: 30, Total Elapsed Time: 14.015870, min=0.430639, max=1.059366)
+lldb frame variable benchmark: Avg: 1.615098 (Laps: 20, Total Elapsed Time: 32.301958, min=1.599064, max=1.665124)
+lldb stepping benchmark: Avg: 0.158506 (Laps: 50, Total Elapsed Time: 7.925285, min=0.101469, max=1.724667)
+lldb expr cmd benchmark: Avg: 0.232584 (Laps: 25, Total Elapsed Time: 5.814609, min=0.202931, max=0.782470)
+lldb disassembly benchmark: Avg: 0.090124 (Laps: 10, Total Elapsed Time: 0.901241, min=0.087497, max=0.099313)
+[11:37:23] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py -e /Volumes/data/lldb/svn/regression/build/Debug/lldb -x '-F Driver::MainLoop()' 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.103782 (Laps: 30, Total Elapsed Time: 3.113456, min=0.101887, max=0.136767)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.102348 (Laps: 30, Total Elapsed Time: 3.070431, min=0.101648, max=0.102756)
+lldb startup delay (run to breakpoint) benchmark: Avg: 0.445628 (Laps: 30, Total Elapsed Time: 13.368829, min=0.438276, max=0.455466)
+lldb frame variable benchmark: Avg: 1.583635 (Laps: 20, Total Elapsed Time: 31.672710, min=0.133858, max=2.073698)
+lldb stepping benchmark: Avg: 0.157824 (Laps: 50, Total Elapsed Time: 7.891186, min=0.101352, max=2.172388)
+lldb expr cmd benchmark: Avg: 0.207600 (Laps: 25, Total Elapsed Time: 5.189992, min=0.203037, max=0.241189)
+lldb disassembly benchmark: Avg: 0.006725 (Laps: 10, Total Elapsed Time: 0.067249, min=0.002470, max=0.042690)
+
+



From scallanan at apple.com  Thu Oct 27 14:41:13 2011
From: scallanan at apple.com (Sean Callanan)
Date: Thu, 27 Oct 2011 19:41:13 -0000
Subject: [Lldb-commits] [lldb] r143137 - in /lldb/trunk:
 include/lldb/Expression/ClangExpressionVariable.h
 include/lldb/Symbol/ClangASTContext.h
 source/Expression/ClangExpressionDeclMap.cpp
 source/Symbol/ClangASTContext.cpp
Message-ID: <20111027194114.152193128060@llvm.org>

Author: spyffe
Date: Thu Oct 27 14:41:13 2011
New Revision: 143137

URL: http://llvm.org/viewvc/llvm-project?rev=143137&view=rev
Log:
Changed the way the expression parser handles variables
of reference types.  Previously, such variables were
materialized as references to those references, which
caused undesried behavior in Clang and was useless anyway
(the benefit of using references to variables is that it
allows expressions to modify variables in place, but for
references that's not required).

Now we just materialize the references directly, which
fixes a variety of expressions that use references.

Modified:
    lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h
    lldb/trunk/include/lldb/Symbol/ClangASTContext.h
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
    lldb/trunk/source/Symbol/ClangASTContext.cpp

Modified: lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h?rev=143137&r1=143136&r2=143137&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h Thu Oct 27 14:41:13 2011
@@ -224,7 +224,8 @@
         EVIsFreezeDried         = 1 << 3,   ///< This variable's authoritative version is in m_frozen_sp (for example, for statically-computed results)
         EVNeedsFreezeDry        = 1 << 4,   ///< Copy from m_live_sp to m_frozen_sp during dematerialization
         EVKeepInTarget          = 1 << 5,   ///< Keep the allocation after the expression is complete rather than freeze drying its contents and freeing it
-        EVUnknownType           = 1 << 6    ///< This is a symbol of unknown type, and the type must be resolved after parsing is complete
+        EVTypeIsReference       = 1 << 6,   ///< The original type of this variable is a reference, so materialize the value rather than the location
+        EVUnknownType           = 1 << 7    ///< This is a symbol of unknown type, and the type must be resolved after parsing is complete
     };
     
     uint16_t m_flags; // takes elements of Flags

Modified: lldb/trunk/include/lldb/Symbol/ClangASTContext.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTContext.h?rev=143137&r1=143136&r2=143137&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTContext.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTContext.h Thu Oct 27 14:41:13 2011
@@ -710,6 +710,9 @@
     IsPointerType (lldb::clang_type_t clang_type, lldb::clang_type_t *target_type = NULL);
 
     static bool
+    IsReferenceType (lldb::clang_type_t clang_type, lldb::clang_type_t *target_type = NULL);
+    
+    static bool
     IsPointerOrReferenceType (lldb::clang_type_t clang_type, lldb::clang_type_t *target_type = NULL);
     
     static bool

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=143137&r1=143136&r2=143137&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Thu Oct 27 14:41:13 2011
@@ -1663,6 +1663,8 @@
     VariableSP &var(expr_var->m_parser_vars->m_lldb_var);
     lldb_private::Symbol *sym(expr_var->m_parser_vars->m_lldb_sym);
     
+    bool is_reference(expr_var->m_flags & ClangExpressionVariable::EVTypeIsReference);
+    
     std::auto_ptr<lldb_private::Value> location_value;
 
     if (var)
@@ -1741,15 +1743,42 @@
             {
                 Error write_error;
 
-                if (!process->WriteScalarToMemory (addr, 
-                                                           location_value->GetScalar(), 
-                                                           process->GetAddressByteSize(), 
-                                                           write_error))
+                if (is_reference)
                 {
-                    err.SetErrorStringWithFormat ("Couldn't write %s to the target: %s", 
-                                                  name.GetCString(), 
-                                                  write_error.AsCString());
-                    return false;
+                    Error read_error;
+                    
+                    addr_t ref_value = process->ReadPointerFromMemory(location_value->GetScalar().ULongLong(), read_error);
+                    
+                    if (!read_error.Success())
+                    {
+                        err.SetErrorStringWithFormat ("Couldn't read reference to %s from the target: %s",
+                                                      name.GetCString(),
+                                                      read_error.AsCString());
+                        return false;
+                    }
+                    
+                    if (!process->WritePointerToMemory(addr,
+                                                       ref_value,
+                                                       write_error))
+                    {
+                        err.SetErrorStringWithFormat ("Couldn't write %s to the target: %s", 
+                                                      name.GetCString(), 
+                                                      write_error.AsCString());
+                        return false;
+                    }
+                }
+                else
+                {
+                    if (!process->WriteScalarToMemory (addr, 
+                                                       location_value->GetScalar(), 
+                                                       process->GetAddressByteSize(), 
+                                                       write_error))
+                    {
+                        err.SetErrorStringWithFormat ("Couldn't write %s to the target: %s", 
+                                                      name.GetCString(), 
+                                                      write_error.AsCString());
+                        return false;
+                    }
                 }
             }
         }
@@ -1792,6 +1821,9 @@
             
             if (dematerialize)
             {
+                if (is_reference)
+                    return true; // reference types don't need demateralizing
+                
                 // Get the location of the spare memory area out of the variable's live data.
                 
                 if (!expr_var->m_live_sp)
@@ -1839,14 +1871,45 @@
             }
             else
             {
+                Error write_error;
+                
+                RegisterValue reg_value;
+                
+                if (!reg_ctx->ReadRegister (reg_info, reg_value))
+                {
+                    err.SetErrorStringWithFormat ("Couldn't read %s from %s", 
+                                                  name.GetCString(), 
+                                                  reg_info->name);
+                    return false;
+                }
+
+                if (is_reference)
+                {
+                    write_error = reg_ctx->WriteRegisterValueToMemory(reg_info, 
+                                                                      addr,
+                                                                      process->GetAddressByteSize(), 
+                                                                      reg_value);
+                    
+                    if (!write_error.Success())
+                    {
+                        err.SetErrorStringWithFormat ("Couldn't write %s from register %s to the target: %s", 
+                                                      name.GetCString(),
+                                                      reg_info->name,
+                                                      write_error.AsCString());
+                        return false;
+                    }
+                    
+                    return true;
+                }
+
                 // Allocate a spare memory area to place the register's contents into.  This memory area will be pointed to by the slot in the
                 // struct.
                 
                 Error allocate_error;
                 
                 Scalar reg_addr (process->AllocateMemory (value_byte_size, 
-                                                                  lldb::ePermissionsReadable | lldb::ePermissionsWritable, 
-                                                                  allocate_error));
+                                                          lldb::ePermissionsReadable | lldb::ePermissionsWritable, 
+                                                          allocate_error));
                 
                 if (reg_addr.ULongLong() == LLDB_INVALID_ADDRESS)
                 {
@@ -1867,13 +1930,11 @@
                                                                       value_byte_size);
                 
                 // Now write the location of the area into the struct.
-                
-                Error write_error;
-                
+                                
                 if (!process->WriteScalarToMemory (addr, 
-                                                           reg_addr, 
-                                                           process->GetAddressByteSize(), 
-                                                           write_error))
+                                                   reg_addr, 
+                                                   process->GetAddressByteSize(), 
+                                                   write_error))
                 {
                     err.SetErrorStringWithFormat ("Couldn't write %s to the target: %s", 
                                                   name.GetCString(), 
@@ -1889,8 +1950,6 @@
                     return false;
                 }
 
-                RegisterValue reg_value;
-
                 if (!reg_ctx->ReadRegister (reg_info, reg_value))
                 {
                     err.SetErrorStringWithFormat ("Couldn't read %s from %s", 
@@ -2924,7 +2983,15 @@
     if (!var_location)
         return;
     
-    NamedDecl *var_decl = context.AddVarDecl(ClangASTContext::CreateLValueReferenceType(pt.GetASTContext(), pt.GetOpaqueQualType()));
+    NamedDecl *var_decl;
+    
+    bool is_reference = ClangASTContext::IsReferenceType(pt.GetOpaqueQualType());
+
+    if (is_reference)
+        var_decl = context.AddVarDecl(pt.GetOpaqueQualType());
+    else
+        var_decl = context.AddVarDecl(ClangASTContext::CreateLValueReferenceType(pt.GetASTContext(), pt.GetOpaqueQualType()));
+        
     std::string decl_name(context.m_decl_name.getAsString());
     ConstString entity_name(decl_name.c_str());
     ClangExpressionVariableSP entity(m_found_entities.CreateVariable (m_parser_vars->m_exe_ctx->GetBestExecutionContextScope (),
@@ -2940,6 +3007,9 @@
     entity->m_parser_vars->m_lldb_value  = var_location;
     entity->m_parser_vars->m_lldb_var    = var;
     
+    if (is_reference)
+        entity->m_flags |= ClangExpressionVariable::EVTypeIsReference;
+    
     if (log)
     {
         ASTDumper ast_dumper(var_decl);        

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=143137&r1=143136&r2=143137&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Thu Oct 27 14:41:13 2011
@@ -4964,6 +4964,35 @@
     return false;
 }
 
+bool
+ClangASTContext::IsReferenceType (clang_type_t clang_type, clang_type_t *target_type)
+{
+    if (clang_type == NULL)
+        return false;
+    
+    QualType qual_type (QualType::getFromOpaquePtr(clang_type));
+    const clang::Type::TypeClass type_class = qual_type->getTypeClass();
+
+    switch (type_class)
+    {
+    case clang::Type::LValueReference:
+        if (target_type)
+            *target_type = cast<LValueReferenceType>(qual_type)->desugar().getAsOpaquePtr();
+        return true;
+    case clang::Type::RValueReference:
+        if (target_type)
+            *target_type = cast<LValueReferenceType>(qual_type)->desugar().getAsOpaquePtr();
+        return true;
+    case clang::Type::Typedef:
+        return ClangASTContext::IsReferenceType (cast<TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr());
+    case clang::Type::Elaborated:
+        return ClangASTContext::IsReferenceType (cast<ElaboratedType>(qual_type)->getNamedType().getAsOpaquePtr());
+    default:
+        break;
+    }
+    
+    return false;
+}
 
 bool
 ClangASTContext::IsPointerOrReferenceType (clang_type_t clang_type, clang_type_t*target_type)



From scallanan at apple.com  Thu Oct 27 16:22:25 2011
From: scallanan at apple.com (Sean Callanan)
Date: Thu, 27 Oct 2011 21:22:25 -0000
Subject: [Lldb-commits] [lldb] r143147 - in /lldb/trunk:
 include/lldb/Host/Host.h source/Commands/CommandObjectExpression.cpp
 source/Host/common/Host.cpp
Message-ID: <20111027212225.B555B3128060@llvm.org>

Author: spyffe
Date: Thu Oct 27 16:22:25 2011
New Revision: 143147

URL: http://llvm.org/viewvc/llvm-project?rev=143147&view=rev
Log:
Added a function to the Host that gets a dummy target
for it, so that people who want to use LLDB as a
calculator can run simple expressions without needing
a target or process.

Modified:
    lldb/trunk/include/lldb/Host/Host.h
    lldb/trunk/source/Commands/CommandObjectExpression.cpp
    lldb/trunk/source/Host/common/Host.cpp

Modified: lldb/trunk/include/lldb/Host/Host.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/Host.h?rev=143147&r1=143146&r2=143147&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/Host.h (original)
+++ lldb/trunk/include/lldb/Host/Host.h Thu Oct 27 16:22:25 2011
@@ -355,6 +355,9 @@
     static Error
     LaunchProcess (ProcessLaunchInfo &launch_info);
     
+    static lldb::TargetSP
+    GetDummyTarget (Debugger &debugger);
+    
     static bool
     OpenFileInExternalEditor (const FileSpec &file_spec, 
                               uint32_t line_no);

Modified: lldb/trunk/source/Commands/CommandObjectExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectExpression.cpp?rev=143147&r1=143146&r2=143147&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectExpression.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectExpression.cpp Thu Oct 27 16:22:25 2011
@@ -283,6 +283,10 @@
 )
 {
     Target *target = m_exe_ctx.GetTargetPtr();
+    
+    if (!target)
+        target = Host::GetDummyTarget(m_interpreter.GetDebugger()).get();
+    
     if (target)
     {
         lldb::ValueObjectSP result_valobj_sp;

Modified: lldb/trunk/source/Host/common/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Host.cpp?rev=143147&r1=143146&r2=143147&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/Host.cpp (original)
+++ lldb/trunk/source/Host/common/Host.cpp Thu Oct 27 16:22:25 2011
@@ -10,6 +10,7 @@
 #include "lldb/Host/Host.h"
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/ConstString.h"
+#include "lldb/Core/Debugger.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/StreamString.h"
@@ -18,6 +19,7 @@
 #include "lldb/Host/FileSpec.h"
 #include "lldb/Host/Mutex.h"
 #include "lldb/Target/Process.h"
+#include "lldb/Target/TargetList.h"
 
 #include "llvm/Support/Host.h"
 #include "llvm/Support/MachO.h"
@@ -1165,6 +1167,24 @@
 }
 #endif
 
+lldb::TargetSP
+Host::GetDummyTarget (lldb_private::Debugger &debugger)
+{
+    static TargetSP dummy_target;
+    
+    if (!dummy_target)
+    {
+        Error err = debugger.GetTargetList().CreateTarget(debugger, 
+                                                          FileSpec(), 
+                                                          Host::GetTargetTriple().AsCString(), 
+                                                          false, 
+                                                          NULL, 
+                                                          dummy_target);
+    }
+    
+    return dummy_target;
+}
+
 #if !defined (__APPLE__)
 bool
 Host::OpenFileInExternalEditor (const FileSpec &file_spec, uint32_t line_no)



From echristo at apple.com  Thu Oct 27 16:31:42 2011
From: echristo at apple.com (Eric Christopher)
Date: Thu, 27 Oct 2011 14:31:42 -0700
Subject: [Lldb-commits] [lldb] r143147 - in /lldb/trunk:
 include/lldb/Host/Host.h source/Commands/CommandObjectExpression.cpp
 source/Host/common/Host.cpp
In-Reply-To: <20111027212225.B555B3128060@llvm.org>
References: <20111027212225.B555B3128060@llvm.org>
Message-ID: <5317F8E8-0FC1-4680-B0EF-6D425A05941B@apple.com>


On Oct 27, 2011, at 2:22 PM, Sean Callanan wrote:

> Added a function to the Host that gets a dummy target
> for it, so that people who want to use LLDB as a
> calculator can run simple expressions without needing
> a target or process.

Yay! Thanks :)

-eric
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/lldb-commits/attachments/20111027/54fd3f28/attachment.html 

From gclayton at apple.com  Thu Oct 27 17:04:16 2011
From: gclayton at apple.com (Greg Clayton)
Date: Thu, 27 Oct 2011 22:04:16 -0000
Subject: [Lldb-commits] [lldb] r143154 -
 /lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
Message-ID: <20111027220416.436893128060@llvm.org>

Author: gclayton
Date: Thu Oct 27 17:04:16 2011
New Revision: 143154

URL: http://llvm.org/viewvc/llvm-project?rev=143154&view=rev
Log:
<rdar://problem/10357230>

Fixed an issue where async packets were incurring a delay even though they
were sent correctly. We now properly broadcast the private run state being
resumed correctly. Also fixed logging to reflect what is happening.


Modified:
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp?rev=143154&r1=143153&r2=143154&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp Thu Oct 27 17:04:16 2011
@@ -290,6 +290,16 @@
                     // Make sure we wait until the continue packet has been sent again...
                     if (m_private_is_running.WaitForValueEqualTo (true, &timeout_time, &timed_out))
                     {
+                        if (log)
+                        {
+                            if (timed_out) 
+                                log->Printf ("async: timed out waiting for process to resume, but process was resumed");
+                            else
+                                log->Printf ("async: async packet sent");
+                        }
+                    }
+                    else
+                    {
                         if (log) 
                             log->Printf ("async: timed out waiting for process to resume");
                     }
@@ -379,7 +389,7 @@
             if (SendPacket(continue_packet.c_str(), continue_packet.size()) == 0)
                 state = eStateInvalid;
         
-            m_private_is_running.SetValue (true, eBroadcastNever);
+            m_private_is_running.SetValue (true, eBroadcastAlways);
         }
         
         got_stdout = false;



From scallanan at apple.com  Thu Oct 27 17:16:42 2011
From: scallanan at apple.com (Sean Callanan)
Date: Thu, 27 Oct 2011 22:16:42 -0000
Subject: [Lldb-commits] [lldb] r143156 -
 /lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
Message-ID: <20111027221642.7B5383128060@llvm.org>

Author: spyffe
Date: Thu Oct 27 17:16:42 2011
New Revision: 143156

URL: http://llvm.org/viewvc/llvm-project?rev=143156&view=rev
Log:
Fixed a leak in the LLVM disassembler where the
InstructionLLVM class dropped its instruction
handle on the floor instead of releasing it
correctly.

Modified:
    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp

Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp?rev=143156&r1=143155&r2=143156&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp (original)
+++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp Thu Oct 27 17:16:42 2011
@@ -80,12 +80,18 @@
                                   llvm::Triple::ArchType arch_type) :
     Instruction (addr, addr_class),
     m_disassembler (disassembler),
-    m_arch_type (arch_type)
+    m_arch_type (arch_type),
+    m_inst (NULL)
 {
 }
 
 InstructionLLVM::~InstructionLLVM()
 {
+    if (m_inst)
+    {
+        EDReleaseInst(m_inst);
+        m_inst = NULL;
+    }
 }
 
 static void



From johnny.chen at apple.com  Thu Oct 27 19:46:47 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 28 Oct 2011 00:46:47 -0000
Subject: [Lldb-commits] [lldb] r143169 -
	/lldb/trunk/test/benchmarks/expression/TestExpressionCmd.py
Message-ID: <20111028004647.4104A3128060@llvm.org>

Author: johnny
Date: Thu Oct 27 19:46:47 2011
New Revision: 143169

URL: http://llvm.org/viewvc/llvm-project?rev=143169&view=rev
Log:
This benchmark is meant to run the locally built 'lldb' binary, not the binary on the PATH env variable.

Modified:
    lldb/trunk/test/benchmarks/expression/TestExpressionCmd.py

Modified: lldb/trunk/test/benchmarks/expression/TestExpressionCmd.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/benchmarks/expression/TestExpressionCmd.py?rev=143169&r1=143168&r2=143169&view=diff
==============================================================================
--- lldb/trunk/test/benchmarks/expression/TestExpressionCmd.py (original)
+++ lldb/trunk/test/benchmarks/expression/TestExpressionCmd.py Thu Oct 27 19:46:47 2011
@@ -39,7 +39,7 @@
         self.stopwatch.reset()
         for i in range(count):
             # So that the child gets torn down after the test.
-            self.child = pexpect.spawn('%s %s %s' % (self.lldbExec, self.lldbOption, exe))
+            self.child = pexpect.spawn('%s %s %s' % (self.lldbHere, self.lldbOption, exe))
             child = self.child
 
             # Turn on logging for what the child sends back.



From johnny.chen at apple.com  Thu Oct 27 19:59:00 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 28 Oct 2011 00:59:00 -0000
Subject: [Lldb-commits] [lldb] r143170 - /lldb/trunk/test/dotest.py
Message-ID: <20111028005900.4D0E43128060@llvm.org>

Author: johnny
Date: Thu Oct 27 19:59:00 2011
New Revision: 143170

URL: http://llvm.org/viewvc/llvm-project?rev=143170&view=rev
Log:
Print out the version of the locally built 'lldb' binary, not the one found in your PATH env variable.

Modified:
    lldb/trunk/test/dotest.py

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=143170&r1=143169&r2=143170&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Thu Oct 27 19:59:00 2011
@@ -669,6 +669,7 @@
         os.environ["LLDB_BUILD_DIR"] = os.path.split(lldbHere)[0]
         if not noHeaders:
             print "LLDB build dir:", os.environ["LLDB_BUILD_DIR"]
+            os.system('%s -v' % lldbExec)
 
     # One last chance to locate the 'lldb' executable.
     if not lldbExec:
@@ -681,9 +682,7 @@
         print "The 'lldb' executable cannot be located.  Some of the tests may not be run as a result."
     else:
         os.environ["LLDB_EXEC"] = lldbExec
-        #print "The 'lldb' executable path is", lldbExec
-        if not noHeaders:
-            os.system('%s -v' % lldbExec)
+        #print "The 'lldb' from PATH env variable", lldbExec
     
     if os.path.isdir(os.path.join(base, '.svn')):
         pipe = subprocess.Popen(["svn", "info", base], stdout = subprocess.PIPE)



From johnny.chen at apple.com  Thu Oct 27 20:09:53 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 28 Oct 2011 01:09:53 -0000
Subject: [Lldb-commits] [lldb] r143173 - in
 /lldb/trunk/examples/customization/bin-utils: ./ binutils.py
Message-ID: <20111028010953.5F8C13128060@llvm.org>

Author: johnny
Date: Thu Oct 27 20:09:53 2011
New Revision: 143173

URL: http://llvm.org/viewvc/llvm-project?rev=143173&view=rev
Log:
Add a binutils.py which contains Python functions for displaying bit representation of numbers.

Added:
    lldb/trunk/examples/customization/bin-utils/
    lldb/trunk/examples/customization/bin-utils/binutils.py

Added: lldb/trunk/examples/customization/bin-utils/binutils.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/examples/customization/bin-utils/binutils.py?rev=143173&view=auto
==============================================================================
--- lldb/trunk/examples/customization/bin-utils/binutils.py (added)
+++ lldb/trunk/examples/customization/bin-utils/binutils.py Thu Oct 27 20:09:53 2011
@@ -0,0 +1,53 @@
+"Collection of tools for displaying bit representation of numbers."""
+
+def binary(n, width=None):
+    """
+    Return a list of (0|1)'s for the binary representation of n where n >= 0.
+    If you specify a width, it must be > 0, otherwise it is ignored.  The list
+    could be padded with 0 bits if width is specified.
+    """
+    l = []
+    if width and width <= 0:
+        width = None
+    while n > 0:
+        l.append(1 if n&1 else 0)
+        n = n >> 1
+
+    if width:
+        for i in range(width - len(l)):
+            l.append(0)
+
+    l.reverse()
+    return l
+
+def twos_complement(n, width):
+    """
+    Return a list of (0|1)'s for the binary representation of a width-bit two's
+    complement numeral system of an integer n which may be negative.
+    """
+    val = 2**(width-1)
+    if n >= 0:
+        if n > (val-1):
+            return None
+        # It is safe to represent n with width-bits.
+        return binary(n, width)
+
+    if n < 0:
+        if abs(n) > val:
+            return None
+        # It is safe to represent n (a negative int) with width-bits.
+        return binary(val*2 - abs(n))
+
+# print binary(0xABCD)
+# [1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1]
+# print binary(0x1F, 8)
+# [0, 0, 0, 1, 1, 1, 1, 1]
+# print twos_complement(-5, 4)
+# [1, 0, 1, 1]
+# print twos_complement(7, 4)
+# [0, 1, 1, 1]
+# print binary(7)
+# [1, 1, 1]
+# print twos_complement(-5, 64)
+# [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1]
+



From jingham at apple.com  Thu Oct 27 20:11:35 2011
From: jingham at apple.com (Jim Ingham)
Date: Fri, 28 Oct 2011 01:11:35 -0000
Subject: [Lldb-commits] [lldb] r143174 -
 /lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
Message-ID: <20111028011135.633FB3128060@llvm.org>

Author: jingham
Date: Thu Oct 27 20:11:35 2011
New Revision: 143174

URL: http://llvm.org/viewvc/llvm-project?rev=143174&view=rev
Log:
Fix up how we shut down the communication with debugserver so we don't rely on
debugserver being responsive to shut down.

Modified:
    lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

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=143174&r1=143173&r2=143174&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Thu Oct 27 20:11:35 2011
@@ -1511,9 +1511,6 @@
     // Sleep for one second to let the process get all detached...
     StopAsyncThread ();
 
-    m_gdb_comm.StopReadThread();
-    m_gdb_comm.Disconnect();    // Disconnect from the debug server.
-
     SetPrivateState (eStateDetached);
     ResumePrivateStateThread();
 
@@ -1532,13 +1529,7 @@
     // Interrupt if our inferior is running...
     if (m_gdb_comm.IsConnected())
     {
-        if (m_public_state.GetValue() == eStateAttaching)
-        {
-            // We are being asked to halt during an attach. We need to just close
-            // our file handle and debugserver will go away, and we can be done...
-            m_gdb_comm.Disconnect();
-        }
-        else
+        if (m_public_state.GetValue() != eStateAttaching)
         {
 
             StringExtractorGDBRemote response;
@@ -1561,9 +1552,7 @@
         }
     }
     StopAsyncThread ();
-    m_gdb_comm.StopReadThread();
     KillDebugserverProcess ();
-    m_gdb_comm.Disconnect();    // Disconnect from the debug server.
     return error;
 }
 
@@ -2294,6 +2283,9 @@
         log->Printf ("ProcessGDBRemote::%s ()", __FUNCTION__);
 
     m_async_broadcaster.BroadcastEvent (eBroadcastBitAsyncThreadShouldExit);
+    
+    //  This will shut down the async thread.
+    m_gdb_comm.Disconnect();    // Disconnect from the debug server.
 
     // Stop the stdio thread
     if (IS_VALID_LLDB_HOST_THREAD(m_async_thread))



From jingham at apple.com  Thu Oct 27 20:12:19 2011
From: jingham at apple.com (Jim Ingham)
Date: Fri, 28 Oct 2011 01:12:19 -0000
Subject: [Lldb-commits] [lldb] r143175 -
	/lldb/trunk/source/Target/StopInfo.cpp
Message-ID: <20111028011219.27FFE3128060@llvm.org>

Author: jingham
Date: Thu Oct 27 20:12:19 2011
New Revision: 143175

URL: http://llvm.org/viewvc/llvm-project?rev=143175&view=rev
Log:
Grab the address of the breakpoint site for the StopInfoBreakpoint so if
it gets deleted before GetDescription is called we still at least know
where it was.

Modified:
    lldb/trunk/source/Target/StopInfo.cpp

Modified: lldb/trunk/source/Target/StopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StopInfo.cpp?rev=143175&r1=143174&r2=143175&view=diff
==============================================================================
--- lldb/trunk/source/Target/StopInfo.cpp (original)
+++ lldb/trunk/source/Target/StopInfo.cpp Thu Oct 27 20:12:19 2011
@@ -72,8 +72,14 @@
         m_description(),
         m_should_stop (false),
         m_should_stop_is_valid (false),
-        m_should_perform_action (true)
+        m_should_perform_action (true),
+        m_address (LLDB_INVALID_ADDRESS)
     {
+        BreakpointSiteSP bp_site_sp (m_thread.GetProcess().GetBreakpointSiteList().FindByID (m_value));
+        if (bp_site_sp)
+        {
+          m_address = bp_site_sp->GetLoadAddress();
+        }
     }
     
     StopInfoBreakpoint (Thread &thread, break_id_t break_id, bool should_stop) :
@@ -81,8 +87,14 @@
         m_description(),
         m_should_stop (should_stop),
         m_should_stop_is_valid (true),
-        m_should_perform_action (true)
+        m_should_perform_action (true),
+        m_address (LLDB_INVALID_ADDRESS)
     {
+        BreakpointSiteSP bp_site_sp (m_thread.GetProcess().GetBreakpointSiteList().FindByID (m_value));
+        if (bp_site_sp)
+        {
+          m_address = bp_site_sp->GetLoadAddress();
+        }
     }
 
     virtual ~StopInfoBreakpoint ()
@@ -300,7 +312,10 @@
             else
             {
                 StreamString strm;
-                strm.Printf("breakpoint site %lli", m_value);
+                if (m_address == LLDB_INVALID_ADDRESS)
+                    strm.Printf("breakpoint site %lli which has been deleted - unknown address", m_value);
+                else
+                    strm.Printf("breakpoint site %lli which has been deleted - was at 0x%llx", m_value, m_address);
                 m_description.swap (strm.GetString());
             }
         }
@@ -313,6 +328,9 @@
     bool m_should_stop_is_valid;
     bool m_should_perform_action; // Since we are trying to preserve the "state" of the system even if we run functions
                                   // etc. behind the users backs, we need to make sure we only REALLY perform the action once.
+    lldb::addr_t m_address;       // We use this to capture the breakpoint site address when we create the StopInfo,
+                                  // in case somebody deletes it between the time the StopInfo is made and the
+                                  // description is asked for.
 };
 
 



From gclayton at apple.com  Thu Oct 27 20:24:12 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 28 Oct 2011 01:24:12 -0000
Subject: [Lldb-commits] [lldb] r143176 - in /lldb/trunk:
 source/Host/macosx/Host.mm tools/darwin-debug/darwin-debug.cpp
 tools/debugserver/source/MacOSX/MachProcess.cpp
Message-ID: <20111028012412.B2E393128060@llvm.org>

Author: gclayton
Date: Thu Oct 27 20:24:12 2011
New Revision: 143176

URL: http://llvm.org/viewvc/llvm-project?rev=143176&view=rev
Log:
Python does some bad things to the signal masks in the current process and 
then we spawn child processes (debugserver, etc) and those bad settings get 
inherited. We stop this from happening by correctly mucking with the posix
spawn attributes.


Modified:
    lldb/trunk/source/Host/macosx/Host.mm
    lldb/trunk/tools/darwin-debug/darwin-debug.cpp
    lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.cpp

Modified: lldb/trunk/source/Host/macosx/Host.mm
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Host.mm?rev=143176&r1=143175&r2=143176&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Host.mm (original)
+++ lldb/trunk/source/Host/macosx/Host.mm Thu Oct 27 20:24:12 2011
@@ -1210,7 +1210,14 @@
     // we return in the middle of this function.
     lldb_utility::CleanUp <posix_spawnattr_t *, int> posix_spawnattr_cleanup(&attr, posix_spawnattr_destroy);
     
-    short flags = 0;
+    sigset_t no_signals;
+    sigset_t all_signals;
+    sigemptyset (&no_signals);
+    sigfillset (&all_signals);
+    ::posix_spawnattr_setsigmask(&attr, &no_signals);
+    ::posix_spawnattr_setsigdefault(&attr, &all_signals);
+
+    short flags = POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK;
     if (launch_info.GetFlags().Test (eLaunchFlagExec))
         flags |= POSIX_SPAWN_SETEXEC;           // Darwin specific posix_spawn flag
 

Modified: lldb/trunk/tools/darwin-debug/darwin-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/darwin-debug/darwin-debug.cpp?rev=143176&r1=143175&r2=143176&view=diff
==============================================================================
--- lldb/trunk/tools/darwin-debug/darwin-debug.cpp (original)
+++ lldb/trunk/tools/darwin-debug/darwin-debug.cpp Thu Oct 27 20:24:12 2011
@@ -26,6 +26,7 @@
 
 #include <getopt.h>
 #include <mach/machine.h>
+#include <signal.h>
 #include <spawn.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -117,12 +118,19 @@
     // since we want this program to turn into the program we want to debug, 
     // and also have the new program start suspended (right at __dyld_start)
     // so we can debug it
-    short flags = POSIX_SPAWN_START_SUSPENDED | POSIX_SPAWN_SETEXEC;
+    short flags = POSIX_SPAWN_START_SUSPENDED | POSIX_SPAWN_SETEXEC | POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK;
 
     // Disable ASLR if we were asked to
     if (disable_aslr)
         flags |= _POSIX_SPAWN_DISABLE_ASLR;
     
+    sigset_t no_signals;
+    sigset_t all_signals;
+    sigemptyset (&no_signals);
+    sigfillset (&all_signals);
+    ::posix_spawnattr_setsigmask(&attr, &no_signals);
+    ::posix_spawnattr_setsigdefault(&attr, &all_signals);
+    
     // Set the flags we just made into our posix spawn attributes
     exit_with_errno (::posix_spawnattr_setflags (&attr, flags), "::posix_spawnattr_setflags (&attr, flags) error: ");
     

Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.cpp?rev=143176&r1=143175&r2=143176&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.cpp Thu Oct 27 20:24:12 2011
@@ -13,6 +13,7 @@
 
 #include "DNB.h"
 #include <mach/mach.h>
+#include <signal.h>
 #include <spawn.h>
 #include <sys/fcntl.h>
 #include <sys/types.h>
@@ -1653,10 +1654,17 @@
     if (err.Fail())
         return INVALID_NUB_PROCESS;
 
-    flags = POSIX_SPAWN_START_SUSPENDED;
+    flags = POSIX_SPAWN_START_SUSPENDED | POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK;
     if (disable_aslr)
         flags |= _POSIX_SPAWN_DISABLE_ASLR;
-    
+
+    sigset_t no_signals;
+    sigset_t all_signals;
+    sigemptyset (&no_signals);
+    sigfillset (&all_signals);
+    ::posix_spawnattr_setsigmask(&attr, &no_signals);
+    ::posix_spawnattr_setsigdefault(&attr, &all_signals);
+
     err.SetError( ::posix_spawnattr_setflags (&attr, flags), DNBError::POSIX);
     if (err.Fail() || DNBLogCheckLogBit(LOG_PROCESS))
         err.LogThreaded("::posix_spawnattr_setflags ( &attr, POSIX_SPAWN_START_SUSPENDED%s )", flags & _POSIX_SPAWN_DISABLE_ASLR ? " | _POSIX_SPAWN_DISABLE_ASLR" : "");



From gclayton at apple.com  Thu Oct 27 20:36:25 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 28 Oct 2011 01:36:25 -0000
Subject: [Lldb-commits] [lldb] r143178 - /lldb/tags/lldb-82/
Message-ID: <20111028013625.A755D3128060@llvm.org>

Author: gclayton
Date: Thu Oct 27 20:36:25 2011
New Revision: 143178

URL: http://llvm.org/viewvc/llvm-project?rev=143178&view=rev
Log:
lldb-82 tag.


Added:
    lldb/tags/lldb-82/
      - copied from r143177, lldb/trunk/


From gclayton at apple.com  Thu Oct 27 20:45:50 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 28 Oct 2011 01:45:50 -0000
Subject: [Lldb-commits] [lldb] r143180 - in /lldb/tags/lldb-82:
 lldb.xcodeproj/project.pbxproj resources/LLDB-Info.plist
 tools/debugserver/debugserver.xcodeproj/project.pbxproj
Message-ID: <20111028014550.A03CC3128060@llvm.org>

Author: gclayton
Date: Thu Oct 27 20:45:50 2011
New Revision: 143180

URL: http://llvm.org/viewvc/llvm-project?rev=143180&view=rev
Log:
Bumped Xcode project versions for lldb-82 and debugserver-147.


Modified:
    lldb/tags/lldb-82/lldb.xcodeproj/project.pbxproj
    lldb/tags/lldb-82/resources/LLDB-Info.plist
    lldb/tags/lldb-82/tools/debugserver/debugserver.xcodeproj/project.pbxproj

Modified: lldb/tags/lldb-82/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/tags/lldb-82/lldb.xcodeproj/project.pbxproj?rev=143180&r1=143179&r2=143180&view=diff
==============================================================================
--- lldb/tags/lldb-82/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/tags/lldb-82/lldb.xcodeproj/project.pbxproj Thu Oct 27 20:45:50 2011
@@ -3691,9 +3691,9 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 81;
+				DYLIB_CURRENT_VERSION = 82;
 				EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3741,10 +3741,10 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 81;
+				DYLIB_CURRENT_VERSION = 82;
 				EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3790,8 +3790,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
-				DYLIB_CURRENT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
+				DYLIB_CURRENT_VERSION = 82;
 				EXECUTABLE_EXTENSION = a;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3828,8 +3828,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
-				DYLIB_CURRENT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
+				DYLIB_CURRENT_VERSION = 82;
 				EXECUTABLE_EXTENSION = a;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3866,8 +3866,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
-				DYLIB_CURRENT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
+				DYLIB_CURRENT_VERSION = 82;
 				EXECUTABLE_EXTENSION = a;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3939,7 +3939,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -3968,10 +3968,10 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 81;
+				DYLIB_CURRENT_VERSION = 82;
 				EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4094,7 +4094,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -4124,7 +4124,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",

Modified: lldb/tags/lldb-82/resources/LLDB-Info.plist
URL: http://llvm.org/viewvc/llvm-project/lldb/tags/lldb-82/resources/LLDB-Info.plist?rev=143180&r1=143179&r2=143180&view=diff
==============================================================================
--- lldb/tags/lldb-82/resources/LLDB-Info.plist (original)
+++ lldb/tags/lldb-82/resources/LLDB-Info.plist Thu Oct 27 20:45:50 2011
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>81</string>
+	<string>82</string>
 	<key>CFBundleName</key>
 	<string>${EXECUTABLE_NAME}</string>
 </dict>

Modified: lldb/tags/lldb-82/tools/debugserver/debugserver.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/tags/lldb-82/tools/debugserver/debugserver.xcodeproj/project.pbxproj?rev=143180&r1=143179&r2=143180&view=diff
==============================================================================
--- lldb/tags/lldb-82/tools/debugserver/debugserver.xcodeproj/project.pbxproj (original)
+++ lldb/tags/lldb-82/tools/debugserver/debugserver.xcodeproj/project.pbxproj Thu Oct 27 20:45:50 2011
@@ -475,7 +475,7 @@
 					i386,
 				);
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				"GCC_VERSION[sdk=iphoneos*][arch=*]" = 4.2;
 				"GCC_VERSION[sdk=macosx*][arch=*]" = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -496,7 +496,7 @@
 					x86_64,
 					i386,
 				);
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				DEAD_CODE_STRIPPING = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -517,7 +517,7 @@
 					x86_64,
 					i386,
 				);
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				DEAD_CODE_STRIPPING = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -535,7 +535,7 @@
 			buildSettings = {
 				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
 				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (
@@ -575,7 +575,7 @@
 				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
 				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (
 					"$(SDKROOT)/System/Library/PrivateFrameworks",
@@ -615,7 +615,7 @@
 				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
 				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (



From scallanan at apple.com  Thu Oct 27 21:08:32 2011
From: scallanan at apple.com (Sean Callanan)
Date: Fri, 28 Oct 2011 02:08:32 -0000
Subject: [Lldb-commits] [lldb] r143181 - in /lldb/trunk/source:
 Expression/ClangExpressionDeclMap.cpp Symbol/ClangASTImporter.cpp
Message-ID: <20111028020832.D5F063128060@llvm.org>

Author: spyffe
Date: Thu Oct 27 21:08:32 2011
New Revision: 143181

URL: http://llvm.org/viewvc/llvm-project?rev=143181&view=rev
Log:
Added a bunch of logging to CompleteType for TagDecls
and ObjCInterfaceDecls.

Modified:
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
    lldb/trunk/source/Symbol/ClangASTImporter.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=143181&r1=143180&r2=143181&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Thu Oct 27 21:08:32 2011
@@ -2835,10 +2835,27 @@
 
 void
 ClangExpressionDeclMap::CompleteTagDecl (TagDecl *tag_decl)
-{    
+{
     assert (m_parser_vars.get());
-    
+
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+
+    if (log)
+    {
+        log->Printf("    [CompleteTagDecl] Completing a TagDecl named %s", tag_decl->getName().str().c_str());
+        log->Printf("      [CTD] Before:");
+        ASTDumper dumper((Decl*)tag_decl);
+        dumper.ToLog(log, "      [CTD] ");
+    }
+        
     m_parser_vars->GetASTImporter(&tag_decl->getASTContext())->CompleteTagDecl (tag_decl);
+
+    if (log)
+    {
+        log->Printf("      [CTD] After:");
+        ASTDumper dumper((Decl*)tag_decl);
+        dumper.ToLog(log, "      [CTD] ");
+    }
 }
 
 void
@@ -2846,7 +2863,25 @@
 {
     assert (m_parser_vars.get());
     
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+    
+    if (log)
+    {
+        log->Printf("    [CompleteObjCInterfaceDecl] Completing an ObjCInterfaceDecl named %s", interface_decl->getName().str().c_str());
+        log->Printf("      [COID] Before:");
+        ASTDumper dumper((Decl*)interface_decl);
+        dumper.ToLog(log, "      [COID] ");    
+    }
+    
     m_parser_vars->GetASTImporter(&interface_decl->getASTContext())->CompleteObjCInterfaceDecl (interface_decl);
+
+    if (log)
+    {
+        log->Printf("    [CompleteObjCInterfaceDecl] Completing an ObjCInterfaceDecl named %s", interface_decl->getName().str().c_str());
+        log->Printf("      [COID] After:");
+        ASTDumper dumper((Decl*)interface_decl);
+        dumper.ToLog(log, "      [COID] ");    
+    }
 }
 
 Value *

Modified: lldb/trunk/source/Symbol/ClangASTImporter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTImporter.cpp?rev=143181&r1=143180&r2=143181&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTImporter.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTImporter.cpp Thu Oct 27 21:08:32 2011
@@ -51,9 +51,6 @@
 ClangASTImporter::CompleteTagDecl (clang::TagDecl *decl)
 {
     lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-
-    if (log)
-        log->Printf("    [ClangASTImporter] Completing a TagDecl named %s", decl->getName().str().c_str());
     
     DeclOrigin decl_origin = GetDeclOrigin(decl);
     
@@ -76,9 +73,6 @@
 {
     lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
     
-    if (log)
-        log->Printf("    [ClangASTImporter] Completing an ObjCInterfaceDecl named %s", interface_decl->getName().str().c_str());
-    
     DeclOrigin decl_origin = GetDeclOrigin(interface_decl);
     
     if (!decl_origin.Valid())



From gclayton at apple.com  Fri Oct 28 11:41:16 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 28 Oct 2011 16:41:16 -0000
Subject: [Lldb-commits] [lldb] r143199 - in /lldb/trunk:
 lldb.xcodeproj/project.pbxproj resources/LLDB-Info.plist
 tools/debugserver/debugserver.xcodeproj/project.pbxproj
Message-ID: <20111028164116.7362E312800A@llvm.org>

Author: gclayton
Date: Fri Oct 28 11:41:16 2011
New Revision: 143199

URL: http://llvm.org/viewvc/llvm-project?rev=143199&view=rev
Log:
Bumping Xcode project version in mainline to match the latest build that was
submitted.


Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/resources/LLDB-Info.plist
    lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=143199&r1=143198&r2=143199&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Oct 28 11:41:16 2011
@@ -3691,9 +3691,9 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 81;
+				DYLIB_CURRENT_VERSION = 82;
 				EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3741,10 +3741,10 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 81;
+				DYLIB_CURRENT_VERSION = 82;
 				EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3790,8 +3790,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
-				DYLIB_CURRENT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
+				DYLIB_CURRENT_VERSION = 82;
 				EXECUTABLE_EXTENSION = a;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3828,8 +3828,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
-				DYLIB_CURRENT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
+				DYLIB_CURRENT_VERSION = 82;
 				EXECUTABLE_EXTENSION = a;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3866,8 +3866,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
-				DYLIB_CURRENT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
+				DYLIB_CURRENT_VERSION = 82;
 				EXECUTABLE_EXTENSION = a;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3939,7 +3939,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -3968,10 +3968,10 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 81;
+				DYLIB_CURRENT_VERSION = 82;
 				EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4094,7 +4094,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -4124,7 +4124,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 82;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",

Modified: lldb/trunk/resources/LLDB-Info.plist
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/resources/LLDB-Info.plist?rev=143199&r1=143198&r2=143199&view=diff
==============================================================================
--- lldb/trunk/resources/LLDB-Info.plist (original)
+++ lldb/trunk/resources/LLDB-Info.plist Fri Oct 28 11:41:16 2011
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>81</string>
+	<string>82</string>
 	<key>CFBundleName</key>
 	<string>${EXECUTABLE_NAME}</string>
 </dict>

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=143199&r1=143198&r2=143199&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj Fri Oct 28 11:41:16 2011
@@ -475,7 +475,7 @@
 					i386,
 				);
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				"GCC_VERSION[sdk=iphoneos*][arch=*]" = 4.2;
 				"GCC_VERSION[sdk=macosx*][arch=*]" = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -496,7 +496,7 @@
 					x86_64,
 					i386,
 				);
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				DEAD_CODE_STRIPPING = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -517,7 +517,7 @@
 					x86_64,
 					i386,
 				);
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				DEAD_CODE_STRIPPING = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -535,7 +535,7 @@
 			buildSettings = {
 				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
 				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (
@@ -575,7 +575,7 @@
 				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
 				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (
 					"$(SDKROOT)/System/Library/PrivateFrameworks",
@@ -615,7 +615,7 @@
 				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 146;
+				CURRENT_PROJECT_VERSION = 147;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
 				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (



From johnny.chen at apple.com  Fri Oct 28 12:56:02 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 28 Oct 2011 17:56:02 -0000
Subject: [Lldb-commits] [lldb] r143207 - /lldb/trunk/test/dotest.py
Message-ID: <20111028175602.D21DE312800A@llvm.org>

Author: johnny
Date: Fri Oct 28 12:56:02 2011
New Revision: 143207

URL: http://llvm.org/viewvc/llvm-project?rev=143207&view=rev
Log:
Fix a typo.

Modified:
    lldb/trunk/test/dotest.py

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=143207&r1=143206&r2=143207&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Fri Oct 28 12:56:02 2011
@@ -669,7 +669,7 @@
         os.environ["LLDB_BUILD_DIR"] = os.path.split(lldbHere)[0]
         if not noHeaders:
             print "LLDB build dir:", os.environ["LLDB_BUILD_DIR"]
-            os.system('%s -v' % lldbExec)
+            os.system('%s -v' % lldbHere)
 
     # One last chance to locate the 'lldb' executable.
     if not lldbExec:



From johnny.chen at apple.com  Fri Oct 28 13:21:00 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 28 Oct 2011 18:21:00 -0000
Subject: [Lldb-commits] [lldb] r143210 - /lldb/trunk/test/bench-history
Message-ID: <20111028182100.37499312800A@llvm.org>

Author: johnny
Date: Fri Oct 28 13:21:00 2011
New Revision: 143210

URL: http://llvm.org/viewvc/llvm-project?rev=143210&view=rev
Log:
Add bench entries.

Modified:
    lldb/trunk/test/bench-history

Modified: lldb/trunk/test/bench-history
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/bench-history?rev=143210&r1=143209&r2=143210&view=diff
==============================================================================
--- lldb/trunk/test/bench-history (original)
+++ lldb/trunk/test/bench-history Fri Oct 28 13:21:00 2011
@@ -69,4 +69,22 @@
 lldb expr cmd benchmark: Avg: 0.207600 (Laps: 25, Total Elapsed Time: 5.189992, min=0.203037, max=0.241189)
 lldb disassembly benchmark: Avg: 0.006725 (Laps: 10, Total Elapsed Time: 0.067249, min=0.002470, max=0.042690)
 
+r143199 (Oct 28, 2011):
+# No performance regression.
+[11:11:54] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py -e /Volumes/data/lldb/svn/regression/build/Debug/lldb -x '-F Driver::MainLoop()' 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.104717 (Laps: 30, Total Elapsed Time: 3.141521, min=0.101881, max=0.162480)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.116985 (Laps: 30, Total Elapsed Time: 3.509554, min=0.101890, max=0.537634)
+lldb startup delay (run to breakpoint) benchmark: Avg: 0.462864 (Laps: 30, Total Elapsed Time: 13.885922, min=0.434867, max=0.877184)
+lldb frame variable benchmark: Avg: 1.749605 (Laps: 20, Total Elapsed Time: 34.992090, min=1.604043, max=2.365440)
+lldb stepping benchmark: Avg: 0.147439 (Laps: 50, Total Elapsed Time: 7.371955, min=0.101088, max=2.360912)
+lldb expr cmd benchmark: Avg: 0.210252 (Laps: 25, Total Elapsed Time: 5.256302, min=0.202591, max=0.258185)
+lldb disassembly benchmark: Avg: 0.028243 (Laps: 10, Total Elapsed Time: 0.282434, min=0.027451, max=0.031222)
+[11:16:16] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py -e /Volumes/data/lldb/svn/regression/build/Debug/lldb -x '-F Driver::MainLoop()' 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.103913 (Laps: 30, Total Elapsed Time: 3.117384, min=0.101510, max=0.136605)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.102452 (Laps: 30, Total Elapsed Time: 3.073559, min=0.101508, max=0.105250)
+lldb startup delay (run to breakpoint) benchmark: Avg: 0.461532 (Laps: 30, Total Elapsed Time: 13.845950, min=0.436977, max=0.676502)
+lldb frame variable benchmark: Avg: 1.640990 (Laps: 20, Total Elapsed Time: 32.819801, min=1.583961, max=2.031209)
+lldb stepping benchmark: Avg: 0.104966 (Laps: 50, Total Elapsed Time: 5.248294, min=0.101296, max=0.240781)
+lldb expr cmd benchmark: Avg: 0.211872 (Laps: 25, Total Elapsed Time: 5.296811, min=0.203827, max=0.259524)
+lldb disassembly benchmark: Avg: 0.104108 (Laps: 10, Total Elapsed Time: 1.041076, min=0.089751, max=0.227173)
 



From gclayton at apple.com  Fri Oct 28 16:00:00 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 28 Oct 2011 21:00:00 -0000
Subject: [Lldb-commits] [lldb] r143225 - in
 /lldb/trunk/source/Plugins/SymbolFile/DWARF: DWARFCompileUnit.cpp
 SymbolFileDWARF.cpp
Message-ID: <20111028210000.48489312800A@llvm.org>

Author: gclayton
Date: Fri Oct 28 16:00:00 2011
New Revision: 143225

URL: http://llvm.org/viewvc/llvm-project?rev=143225&view=rev
Log:
Added support for the C++Ox "nullptr_t" type.


Modified:
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp?rev=143225&r1=143224&r2=143225&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp Fri Oct 28 16:00:00 2011
@@ -660,6 +660,7 @@
         case DW_TAG_typedef:
         case DW_TAG_namespace:
         case DW_TAG_variable:
+        case DW_TAG_unspecified_type:
             break;
             
         default:
@@ -889,6 +890,7 @@
         case DW_TAG_structure_type:
         case DW_TAG_union_type:
         case DW_TAG_typedef:
+        case DW_TAG_unspecified_type:
             if (name && is_declaration == false)
             {
                 types.Insert (ConstString(name), die.GetOffset());

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp?rev=143225&r1=143224&r2=143225&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Fri Oct 28 16:00:00 2011
@@ -3808,6 +3808,7 @@
             case DW_TAG_const_type:
             case DW_TAG_restrict_type:
             case DW_TAG_volatile_type:
+            case DW_TAG_unspecified_type:
                 {
                     // Set a bit that lets us know that we are currently parsing this
                     m_die_to_type[die] = DIE_IS_BEING_PARSED;
@@ -3861,6 +3862,15 @@
                     default:
                         break;
 
+                    case DW_TAG_unspecified_type:
+                        if (strcmp(type_name_cstr, "nullptr_t") == 0)
+                        {
+                            resolve_state = Type::eResolveStateFull;
+                            clang_type = ast.getASTContext()->NullPtrTy.getAsOpaquePtr();
+                            break;
+                        }
+                        // Fall through to base type below in case we can handle the type there...
+
                     case DW_TAG_base_type:
                         resolve_state = Type::eResolveStateFull;
                         clang_type = ast.GetBuiltinTypeForDWARFEncodingAndBitSize (type_name_cstr, 



From johnny.chen at apple.com  Fri Oct 28 16:23:58 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 28 Oct 2011 21:23:58 -0000
Subject: [Lldb-commits] [lldb] r143228 -
 /lldb/trunk/examples/customization/pwd-cd-and-system/utils.py
Message-ID: <20111028212358.F255D312800A@llvm.org>

Author: johnny
Date: Fri Oct 28 16:23:58 2011
New Revision: 143228

URL: http://llvm.org/viewvc/llvm-project?rev=143228&view=rev
Log:
Remove extra newline in the docstring.

Modified:
    lldb/trunk/examples/customization/pwd-cd-and-system/utils.py

Modified: lldb/trunk/examples/customization/pwd-cd-and-system/utils.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/examples/customization/pwd-cd-and-system/utils.py?rev=143228&r1=143227&r2=143228&view=diff
==============================================================================
--- lldb/trunk/examples/customization/pwd-cd-and-system/utils.py (original)
+++ lldb/trunk/examples/customization/pwd-cd-and-system/utils.py Fri Oct 28 16:23:58 2011
@@ -16,10 +16,8 @@
         cls._prev_dir_ = dir
 
 def chdir(debugger, args, result, dict):
-    """
-    Change the working directory, or cd to ${HOME}.
-    You can also issue 'cd -' to change to the previous working directory.    
-    """
+    """Change the working directory, or cd to ${HOME}.
+    You can also issue 'cd -' to change to the previous working directory."""
     new_dir = args.strip()
     if not new_dir:
         new_dir = os.path.expanduser('~')



From gclayton at apple.com  Fri Oct 28 16:38:01 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 28 Oct 2011 21:38:01 -0000
Subject: [Lldb-commits] [lldb] r143230 - in /lldb/trunk:
 include/lldb/Interpreter/CommandInterpreter.h
 source/Interpreter/CommandInterpreter.cpp
Message-ID: <20111028213801.570C6312800A@llvm.org>

Author: gclayton
Date: Fri Oct 28 16:38:01 2011
New Revision: 143230

URL: http://llvm.org/viewvc/llvm-project?rev=143230&view=rev
Log:
Added the ability to have GDB formats appended to any command so you can do
things like:

(lldb) x/32xb 0x1000

"x" is an alias to "memory read", so this will actually turn into:

(lldb) memory read --gdb-format=32xb 0x1000

This applies to all commands, so the GDB formats will work with "register read",
"frame variable", "target variable" and others. All commands that can accept
formats, counts and sizes have been modified to support the "--gdb-format"
option.



Modified:
    lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp

Modified: lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h?rev=143230&r1=143229&r2=143230&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h (original)
+++ lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h Fri Oct 28 16:38:01 2011
@@ -129,11 +129,10 @@
     AddOrReplaceAliasOptions (const char *alias_name, 
                               OptionArgVectorSP &option_arg_vector_sp);
 
-    void
+    CommandObject *
     BuildAliasResult (const char *alias_name, 
                       std::string &raw_input_string, 
                       std::string &alias_result, 
-                      CommandObject *&alias_cmd_obj, 
                       CommandReturnObject &result);
 
     bool

Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=143230&r1=143229&r2=143230&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Fri Oct 28 16:38:01 2011
@@ -644,7 +644,7 @@
         }
     }
     
-    if (options_string.size() > 0)
+    if (!options_string.empty())
     {
         if (cmd_obj_sp->WantsRawCommandString ())
             option_arg_vector->push_back (OptionArgPair ("<argument>",
@@ -779,7 +779,7 @@
 
     }
 
-    if (m_alias_dict.size() > 0 && ( (cmd_types & eCommandTypesAliases) == eCommandTypesAliases ))
+    if (!m_alias_dict.empty() && ( (cmd_types & eCommandTypesAliases) == eCommandTypesAliases ))
     {
         result.AppendMessage("The following is a list of your current command abbreviations "
                              "(see 'help command alias' for more info):");
@@ -801,7 +801,7 @@
         result.AppendMessage("");
     }
 
-    if (m_user_dict.size() > 0 && ( (cmd_types & eCommandTypesUserDef) == eCommandTypesUserDef ))
+    if (!m_user_dict.empty() && ( (cmd_types & eCommandTypesUserDef) == eCommandTypesUserDef ))
     {
         result.AppendMessage ("The following is a list of your current user-defined commands:");
         result.AppendMessage("");
@@ -879,7 +879,7 @@
 }
 
 static const char *k_white_space = " \t\v";
-
+static const char *k_valid_command_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
 static void
 StripLeadingSpaces (std::string &s)
 {
@@ -895,9 +895,10 @@
 }
 
 static bool
-StripFirstWord (std::string &command_string, std::string &word, char &quote_char)
+ExtractCommand (std::string &command_string, std::string &command, std::string &suffix, char &quote_char)
 {
-    word.clear();
+    command.clear();
+    suffix.clear();
     StripLeadingSpaces (command_string);
 
     bool result = false;
@@ -912,12 +913,12 @@
             const size_t end_quote_pos = command_string.find (quote_char, 1);
             if (end_quote_pos == std::string::npos)
             {
-                word.swap (command_string);
+                command.swap (command_string);
                 command_string.erase ();
             }
             else
             {
-                word = command_string.substr (1, end_quote_pos - 1);
+                command.assign (command_string, 1, end_quote_pos - 1);
                 if (end_quote_pos + 1 < command_string.size())
                     command_string.erase (0, command_string.find_first_not_of (k_white_space, end_quote_pos + 1));
                 else
@@ -929,25 +930,43 @@
             const size_t first_space_pos = command_string.find_first_of (k_white_space);
             if (first_space_pos == std::string::npos)
             {
-                word.swap (command_string);
+                command.swap (command_string);
                 command_string.erase();
             }
             else
             {
-                word = command_string.substr (0, first_space_pos);
-                command_string.erase(0,command_string.find_first_not_of (k_white_space, first_space_pos));
+                command.assign (command_string, 0, first_space_pos);
+                command_string.erase(0, command_string.find_first_not_of (k_white_space, first_space_pos));
             }
         }
         result = true;
     }
+    
+    
+    if (!command.empty())
+    {
+        // actual commands can't start with '-' or '_'
+        if (command[0] != '-' && command[0] != '_')
+        {
+            size_t pos = command.find_first_not_of(k_valid_command_chars);
+            if (pos > 0 && pos != std::string::npos)
+            {
+                suffix.assign (command.begin() + pos, command.end());
+                command.erase (pos);
+            }
+        }
+    }
 
     return result;
 }
 
-void
-CommandInterpreter::BuildAliasResult (const char *alias_name, std::string &raw_input_string, std::string &alias_result,
-                                      CommandObject *&alias_cmd_obj, CommandReturnObject &result)
+CommandObject *
+CommandInterpreter::BuildAliasResult (const char *alias_name, 
+                                      std::string &raw_input_string, 
+                                      std::string &alias_result,
+                                      CommandReturnObject &result)
 {
+    CommandObject *alias_cmd_obj = NULL;
     Args cmd_args (raw_input_string.c_str());
     alias_cmd_obj = GetCommandObject (alias_name);
     StreamString result_str;
@@ -992,7 +1011,7 @@
                             ("Not enough arguments provided; you need at least %d arguments to use this alias.\n",
                              index);
                             result.SetStatus (eReturnStatusFailed);
-                            return;
+                            return alias_cmd_obj;
                         }
                         else
                         {
@@ -1009,6 +1028,7 @@
         
         alias_result = result_str.GetData();
     }
+    return alias_cmd_obj;
 }
 
 Error
@@ -1135,7 +1155,6 @@
 
     bool done = false;
     CommandObject *cmd_obj = NULL;
-    std::string next_word;
     bool wants_raw_input = false;
     std::string command_string (command_line);
     std::string original_command_string (command_line);
@@ -1242,62 +1261,70 @@
 
     StreamString revised_command_line;
     size_t actual_cmd_name_len = 0;
+    std::string next_word;
     while (!done)
     {
         char quote_char = '\0';
-        StripFirstWord (command_string, next_word, quote_char);
-        if (!cmd_obj && AliasExists (next_word.c_str())) 
-        {
-            std::string alias_result;
-            BuildAliasResult (next_word.c_str(), command_string, alias_result, cmd_obj, result);
-            revised_command_line.Printf ("%s", alias_result.c_str());
-            if (cmd_obj)
-            {
-                wants_raw_input = cmd_obj->WantsRawCommandString ();
-                actual_cmd_name_len = strlen (cmd_obj->GetCommandName());
-            }
-        }
-        else if (!cmd_obj)
+        std::string suffix;
+        ExtractCommand (command_string, next_word, suffix, quote_char);
+        if (cmd_obj == NULL)
         {
-            cmd_obj = GetCommandObject (next_word.c_str());
-            if (cmd_obj)
+            if (AliasExists (next_word.c_str())) 
             {
-                actual_cmd_name_len += next_word.length();
-                revised_command_line.Printf ("%s", next_word.c_str());
-                wants_raw_input = cmd_obj->WantsRawCommandString ();
+                std::string alias_result;
+                cmd_obj = BuildAliasResult (next_word.c_str(), command_string, alias_result, result);
+                revised_command_line.Printf ("%s", alias_result.c_str());
+                if (cmd_obj)
+                {
+                    wants_raw_input = cmd_obj->WantsRawCommandString ();
+                    actual_cmd_name_len = strlen (cmd_obj->GetCommandName());
+                }
             }
             else
             {
-                revised_command_line.Printf ("%s", next_word.c_str());
+                cmd_obj = GetCommandObject (next_word.c_str());
+                if (cmd_obj)
+                {
+                    actual_cmd_name_len += next_word.length();
+                    revised_command_line.Printf ("%s", next_word.c_str());
+                    wants_raw_input = cmd_obj->WantsRawCommandString ();
+                }
+                else
+                {
+                    revised_command_line.Printf ("%s", next_word.c_str());
+                }
             }
         }
-        else if (cmd_obj->IsMultiwordObject ())
+        else
         {
-            CommandObject *sub_cmd_obj = ((CommandObjectMultiword *) cmd_obj)->GetSubcommandObject (next_word.c_str());
-            if (sub_cmd_obj)
+            if (cmd_obj->IsMultiwordObject ())
             {
-                actual_cmd_name_len += next_word.length() + 1;
-                revised_command_line.Printf (" %s", next_word.c_str());
-                cmd_obj = sub_cmd_obj;
-                wants_raw_input = cmd_obj->WantsRawCommandString ();
+                CommandObject *sub_cmd_obj = ((CommandObjectMultiword *) cmd_obj)->GetSubcommandObject (next_word.c_str());
+                if (sub_cmd_obj)
+                {
+                    actual_cmd_name_len += next_word.length() + 1;
+                    revised_command_line.Printf (" %s", next_word.c_str());
+                    cmd_obj = sub_cmd_obj;
+                    wants_raw_input = cmd_obj->WantsRawCommandString ();
+                }
+                else
+                {
+                    if (quote_char)
+                        revised_command_line.Printf (" %c%s%s%c", quote_char, next_word.c_str(), suffix.c_str(), quote_char);
+                    else
+                        revised_command_line.Printf (" %s%s", next_word.c_str(), suffix.c_str());
+                    done = true;
+                }
             }
             else
             {
                 if (quote_char)
-                    revised_command_line.Printf (" %c%s%c", quote_char, next_word.c_str(), quote_char);
+                    revised_command_line.Printf (" %c%s%s%c", quote_char, next_word.c_str(), suffix.c_str(), quote_char);
                 else
-                    revised_command_line.Printf (" %s", next_word.c_str());
+                    revised_command_line.Printf (" %s%s", next_word.c_str(), suffix.c_str());
                 done = true;
             }
         }
-        else
-        {
-            if (quote_char)
-                revised_command_line.Printf (" %c%s%c", quote_char, next_word.c_str(), quote_char);
-            else
-                revised_command_line.Printf (" %s", next_word.c_str());
-            done = true;
-        }
 
         if (cmd_obj == NULL)
         {
@@ -1306,13 +1333,39 @@
             return false;
         }
 
-        next_word.erase ();
+        if (cmd_obj->IsMultiwordObject ())
+        {
+            if (!suffix.empty())
+            {
+
+                result.AppendErrorWithFormat ("multi-word commands ('%s') can't have shorthand suffixes: '%s'\n", 
+                                              next_word.c_str(),
+                                              suffix.c_str());
+                result.SetStatus (eReturnStatusFailed);
+                return false;
+            }
+        }
+        else
+        {
+            // If we found a normal command, we are done
+            done = true;
+            if (!suffix.empty())
+            {
+                switch (suffix[0])
+                {
+                case '/':
+                    // GDB format suffixes
+                    revised_command_line.Printf (" --gdb-format=%s", suffix.c_str() + 1);
+                    break;
+                }
+            }
+        }
         if (command_string.length() == 0)
             done = true;
             
     }
 
-    if (command_string.size() > 0)
+    if (!command_string.empty())
         revised_command_line.Printf (" %s", command_string.c_str());
 
     // End of Phase 1.
@@ -1345,7 +1398,7 @@
                 m_repeat_command.assign(original_command_string.c_str());
             
             // Don't keep pushing the same command onto the history...
-            if (m_command_history.size() == 0 || m_command_history.back() != original_command_string) 
+            if (m_command_history.empty() || m_command_history.back() != original_command_string) 
                 m_command_history.push_back (original_command_string);
         }
         
@@ -2450,15 +2503,13 @@
 void
 CommandInterpreter::DumpHistory (Stream &stream, uint32_t start, uint32_t end) const
 {
-    size_t num_history_elements = m_command_history.size();
-    if (start > num_history_elements)
-        return;
-    for (uint32_t i = start; i < num_history_elements && i <= end; i++)
+    const size_t last_idx = std::min<size_t>(m_command_history.size(), end + 1);
+    for (size_t i = start; i < last_idx; i++)
     {
         if (!m_command_history[i].empty())
         {
             stream.Indent();
-            stream.Printf ("%4d: %s\n", i, m_command_history[i].c_str());
+            stream.Printf ("%4zu: %s\n", i, m_command_history[i].c_str());
         }
     }
 }



From gclayton at apple.com  Fri Oct 28 17:59:14 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 28 Oct 2011 22:59:14 -0000
Subject: [Lldb-commits] [lldb] r143244 - in
 /lldb/trunk/tools/debugserver/source: DNB.cpp DNBBreakpoint.cpp DNBLog.cpp
 DNBLog.h MacOSX/MachException.cpp MacOSX/MachException.h
 MacOSX/MachProcess.cpp MacOSX/MachTask.cpp MacOSX/MachThread.cpp
 MacOSX/i386/DNBArchImplI386.cpp MacOSX/x86_64/DNBArchImplX86_64.cpp
 RNBSocket.cpp debugserver.cpp
Message-ID: <20111028225914.810FD312800A@llvm.org>

Author: gclayton
Date: Fri Oct 28 17:59:14 2011
New Revision: 143244

URL: http://llvm.org/viewvc/llvm-project?rev=143244&view=rev
Log:
Enabled the "printf" attribute on all debugserver logging functions and fixed 
the ensuing mayhem.


Modified:
    lldb/trunk/tools/debugserver/source/DNB.cpp
    lldb/trunk/tools/debugserver/source/DNBBreakpoint.cpp
    lldb/trunk/tools/debugserver/source/DNBLog.cpp
    lldb/trunk/tools/debugserver/source/DNBLog.h
    lldb/trunk/tools/debugserver/source/MacOSX/MachException.cpp
    lldb/trunk/tools/debugserver/source/MacOSX/MachException.h
    lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.cpp
    lldb/trunk/tools/debugserver/source/MacOSX/MachTask.cpp
    lldb/trunk/tools/debugserver/source/MacOSX/MachThread.cpp
    lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
    lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
    lldb/trunk/tools/debugserver/source/RNBSocket.cpp
    lldb/trunk/tools/debugserver/source/debugserver.cpp

Modified: lldb/trunk/tools/debugserver/source/DNB.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DNB.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/DNB.cpp (original)
+++ lldb/trunk/tools/debugserver/source/DNB.cpp Fri Oct 28 17:59:14 2011
@@ -286,7 +286,7 @@
     }
     else if (num_matching_proc_infos > 1)
     {
-        DNBLogError ("error: %u processes match '%s':\n", num_matching_proc_infos, name);
+        DNBLogError ("error: %zu processes match '%s':\n", num_matching_proc_infos, name);
         size_t i;
         for (i=0; i<num_matching_proc_infos; ++i)
             DNBLogError ("%6u - %s\n", matching_proc_infos[i].kp_proc.p_pid, matching_proc_infos[i].kp_proc.p_comm);

Modified: lldb/trunk/tools/debugserver/source/DNBBreakpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DNBBreakpoint.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/DNBBreakpoint.cpp (original)
+++ lldb/trunk/tools/debugserver/source/DNBBreakpoint.cpp Fri Oct 28 17:59:14 2011
@@ -77,34 +77,34 @@
 {
     if (IsBreakpoint())
     {
-        DNBLog("DNBBreakpoint %u: tid = %4.4x  addr = %8.8p  state = %s  type = %s breakpoint  hw_index = %i  hit_count = %-4u  ignore_count = %-4u  callback = %8.8p baton = %8.8p",
-            m_breakID,
-            m_tid,
-            m_addr,
-            m_enabled ? "enabled " : "disabled",
-            IsHardware() ? "hardware" : "software",
-            GetHardwareIndex(),
-            GetHitCount(),
-            GetIgnoreCount(),
-            m_callback,
-            m_callback_baton);
+        DNBLog ("DNBBreakpoint %u: tid = %4.4x  addr = 0x%llx  state = %s  type = %s breakpoint  hw_index = %i  hit_count = %-4u  ignore_count = %-4u  callback = %p baton = %p",
+                m_breakID,
+                m_tid,
+                (uint64_t)m_addr,
+                m_enabled ? "enabled " : "disabled",
+                IsHardware() ? "hardware" : "software",
+                GetHardwareIndex(),
+                GetHitCount(),
+                GetIgnoreCount(),
+                m_callback,
+                m_callback_baton);
     }
     else
     {
-        DNBLog("DNBBreakpoint %u: tid = %4.4x  addr = %8.8p  size = %u  state = %s  type = %s watchpoint (%s%s)  hw_index = %i  hit_count = %-4u  ignore_count = %-4u  callback = %8.8p baton = %8.8p",
-            m_breakID,
-            m_tid,
-            m_addr,
-            m_byte_size,
-            m_enabled ? "enabled " : "disabled",
-            IsHardware() ? "hardware" : "software",
-            m_watch_read ? "r" : "",
-            m_watch_write ? "w" : "",
-            GetHardwareIndex(),
-            GetHitCount(),
-            GetIgnoreCount(),
-            m_callback,
-            m_callback_baton);
+        DNBLog ("DNBBreakpoint %u: tid = %4.4x  addr = 0x%llx  size = %zu  state = %s  type = %s watchpoint (%s%s)  hw_index = %i  hit_count = %-4u  ignore_count = %-4u  callback = %p baton = %p",
+                m_breakID,
+                m_tid,
+                (uint64_t)m_addr,
+                m_byte_size,
+                m_enabled ? "enabled " : "disabled",
+                IsHardware() ? "hardware" : "software",
+                m_watch_read ? "r" : "",
+                m_watch_write ? "w" : "",
+                GetHardwareIndex(),
+                GetHitCount(),
+                GetIgnoreCount(),
+                m_callback,
+                m_callback_baton);
     }
 }
 

Modified: lldb/trunk/tools/debugserver/source/DNBLog.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DNBLog.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/DNBLog.cpp (original)
+++ lldb/trunk/tools/debugserver/source/DNBLog.cpp Fri Oct 28 17:59:14 2011
@@ -185,7 +185,7 @@
                 timersub (&tv, &g_timeval, &delta);
             }
             g_timeval = tv;
-            _DNBLog (DNBLOG_FLAG_THREADED, "%u +%u.%06u sec [%4.4x/%4.4x]: %s", 
+            _DNBLog (DNBLOG_FLAG_THREADED, "%u +%lu.%06u sec [%4.4x/%4.4x]: %s", 
                      ++g_message_id, 
                      delta.tv_sec, 
                      delta.tv_usec,             
@@ -230,7 +230,7 @@
                 timersub (&tv, &g_timeval, &delta);
             }
             g_timeval = tv;
-            _DNBLog (DNBLOG_FLAG_THREADED, "%u +%u.%06u sec [%4.4x/%4.4x]: %s", 
+            _DNBLog (DNBLOG_FLAG_THREADED, "%u +%lu.%06u sec [%4.4x/%4.4x]: %s", 
                      ++g_message_id, 
                      delta.tv_sec, 
                      delta.tv_usec, 

Modified: lldb/trunk/tools/debugserver/source/DNBLog.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DNBLog.h?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/DNBLog.h (original)
+++ lldb/trunk/tools/debugserver/source/DNBLog.h Fri Oct 28 17:59:14 2011
@@ -36,16 +36,16 @@
 
 #define DNB_EXPORT __attribute__((visibility("default")))
 
-void        _DNBLog(uint32_t flags, const char *format, ...) DNB_EXPORT;
-void        _DNBLogDebug (const char *fmt, ...) DNB_EXPORT;
-void        _DNBLogDebugVerbose (const char *fmt, ...) DNB_EXPORT;
-void        _DNBLogThreaded (const char *fmt, ...) DNB_EXPORT;
-void        _DNBLogThreadedIf (uint32_t mask, const char *fmt, ...) DNB_EXPORT;
-void        _DNBLogError (const char *fmt, ...) DNB_EXPORT;
-void        _DNBLogFatalError (int err, const char *fmt, ...) DNB_EXPORT;
-void        _DNBLogVerbose (const char *fmt, ...) DNB_EXPORT;
-void        _DNBLogWarning (const char *fmt, ...) DNB_EXPORT;
-void        _DNBLogWarningVerbose (const char *fmt, ...) DNB_EXPORT;
+void        _DNBLog(uint32_t flags, const char *format, ...) __attribute__ ((format (printf, 2, 3))) DNB_EXPORT;
+void        _DNBLogDebug (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) DNB_EXPORT;
+void        _DNBLogDebugVerbose (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) DNB_EXPORT;
+void        _DNBLogThreaded (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) DNB_EXPORT;
+void        _DNBLogThreadedIf (uint32_t mask, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))) DNB_EXPORT;
+void        _DNBLogError (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) DNB_EXPORT;
+void        _DNBLogFatalError (int err, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))) DNB_EXPORT;
+void        _DNBLogVerbose (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) DNB_EXPORT;
+void        _DNBLogWarning (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) DNB_EXPORT;
+void        _DNBLogWarningVerbose (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) DNB_EXPORT;
 bool        DNBLogCheckLogBit (uint32_t bit) DNB_EXPORT;
 uint32_t    DNBLogSetLogMask (uint32_t mask) DNB_EXPORT;
 uint32_t    DNBLogGetLogMask () DNB_EXPORT;

Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachException.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachException.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachException.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachException.cpp Fri Oct 28 17:59:14 2011
@@ -95,12 +95,12 @@
 {
     if (DNBLogCheckLogBit(LOG_EXCEPTIONS))
     {
-        DNBLogThreaded("::%s ( exc_port = 0x%4.4x, exc_type = %d ( %s ), exc_data = " MACH_EXCEPTION_DATA_FMT_HEX ", exc_data_count = %d)",
-            __FUNCTION__,
-            exc_port,
-            exc_type, MachException::Name(exc_type),
-            exc_data,
-            exc_data_count);
+        DNBLogThreaded ("::%s ( exc_port = 0x%4.4x, exc_type = %d ( %s ), exc_data = 0x%llx, exc_data_count = %d)",
+                        __FUNCTION__,
+                        exc_port,
+                        exc_type, MachException::Name(exc_type),
+                        (uint64_t)exc_data,
+                        exc_data_count);
     }
     return KERN_FAILURE;
 }
@@ -125,15 +125,15 @@
     kern_return_t kret;
     if (DNBLogCheckLogBit(LOG_EXCEPTIONS))
     {
-        DNBLogThreaded("::%s ( exc_port = 0x%4.4x, thd_port = 0x%4.4x, tsk_port = 0x%4.4x, exc_type = %d ( %s ), exc_data[%d] = { " MACH_EXCEPTION_DATA_FMT_HEX ",  " MACH_EXCEPTION_DATA_FMT_HEX " })",
+        DNBLogThreaded("::%s ( exc_port = 0x%4.4x, thd_port = 0x%4.4x, tsk_port = 0x%4.4x, exc_type = %d ( %s ), exc_data[%d] = { 0x%llx, 0x%llx })",
             __FUNCTION__,
             exc_port,
             thread_port,
             task_port,
             exc_type, MachException::Name(exc_type),
             exc_data_count,
-            exc_data_count > 0 ? exc_data[0] : 0xBADDBADD,
-            exc_data_count > 1 ? exc_data[1] : 0xBADDBADD);
+            (uint64_t)(exc_data_count > 0 ? exc_data[0] : 0xBADDBADD),
+            (uint64_t)(exc_data_count > 1 ? exc_data[1] : 0xBADDBADD));
     }
     kret = mach_port_deallocate (mach_task_self (), task_port);
     kret = mach_port_deallocate (mach_task_self (), thread_port);
@@ -154,15 +154,15 @@
 {
     if (DNBLogCheckLogBit(LOG_EXCEPTIONS))
     {
-        DNBLogThreaded("::%s ( exc_port = 0x%4.4x, thd_port = 0x%4.4x, tsk_port = 0x%4.4x, exc_type = %d ( %s ), exc_data[%d] = { " MACH_EXCEPTION_DATA_FMT_HEX ",  " MACH_EXCEPTION_DATA_FMT_HEX " })",
-            __FUNCTION__,
-            exc_port,
-            thread_port,
-            task_port,
-            exc_type, MachException::Name(exc_type),
-            exc_data_count,
-            exc_data_count > 0 ? exc_data[0] : 0xBADDBADD,
-            exc_data_count > 1 ? exc_data[1] : 0xBADDBADD);
+        DNBLogThreaded ("::%s ( exc_port = 0x%4.4x, thd_port = 0x%4.4x, tsk_port = 0x%4.4x, exc_type = %d ( %s ), exc_data[%d] = { 0x%llx, 0x%llx })",
+                        __FUNCTION__,
+                        exc_port,
+                        thread_port,
+                        task_port,
+                        exc_type, MachException::Name(exc_type),
+                        exc_data_count,
+                        (uint64_t)(exc_data_count > 0 ? exc_data[0] : 0xBADDBADD),
+                        (uint64_t)(exc_data_count > 1 ? exc_data[1] : 0xBADDBADD));
     }
 
     g_message->task_port = task_port;
@@ -178,7 +178,7 @@
 MachException::Message::Dump() const
 {
     DNBLogThreadedIf(LOG_EXCEPTIONS,
-        "  exc_msg { bits = 0x%8.8lx size = 0x%8.8lx remote-port = 0x%8.8lx local-port = 0x%8.8lx reserved = 0x%8.8lx id = 0x%8.8lx } ",
+        "  exc_msg { bits = 0x%8.8x size = 0x%8.8x remote-port = 0x%8.8x local-port = 0x%8.8x reserved = 0x%8.8x id = 0x%8.8x } ",
         exc_msg.hdr.msgh_bits,
         exc_msg.hdr.msgh_size,
         exc_msg.hdr.msgh_remote_port,
@@ -187,7 +187,7 @@
         exc_msg.hdr.msgh_id);
 
     DNBLogThreadedIf(LOG_EXCEPTIONS,
-        "reply_msg { bits = 0x%8.8lx size = 0x%8.8lx remote-port = 0x%8.8lx local-port = 0x%8.8lx reserved = 0x%8.8lx id = 0x%8.8lx }",
+        "reply_msg { bits = 0x%8.8x size = 0x%8.8x remote-port = 0x%8.8x local-port = 0x%8.8x reserved = 0x%8.8x id = 0x%8.8x }",
         reply_msg.hdr.msgh_bits,
         reply_msg.hdr.msgh_size,
         reply_msg.hdr.msgh_remote_port,
@@ -237,7 +237,7 @@
             desc += snprintf(desc, end_desc - desc, " data[%zu] = {", stop_info->details.exception.data_count);
 
             for (idx = 0; desc < end_desc && idx < stop_info->details.exception.data_count; ++idx)
-                desc += snprintf(desc, end_desc - desc, MACH_EXCEPTION_DATA_FMT_MINHEX "%c", exc_data[idx], ((idx + 1 == stop_info->details.exception.data_count) ? '}' : ','));
+                desc += snprintf(desc, end_desc - desc, "0x%llx%c", (uint64_t)exc_data[idx], ((idx + 1 == stop_info->details.exception.data_count) ? '}' : ','));
         }
     }
 
@@ -275,19 +275,18 @@
     if (log_exceptions && ((options & MACH_RCV_TIMEOUT) == 0))
     {
         // Dump this log message if we have no timeout in case it never returns
-        DNBLogThreaded("::mach_msg ( msg->{bits = %#x, size = %u remote_port = %#x, local_port = %#x, reserved = 0x%x, id = 0x%x}, option = %#x, send_size = %u, rcv_size = %u, rcv_name = %#x, timeout = %u, notify = %#x)",
-                exc_msg.hdr.msgh_bits,
-                exc_msg.hdr.msgh_size,
-                exc_msg.hdr.msgh_remote_port,
-                exc_msg.hdr.msgh_local_port,
-                exc_msg.hdr.msgh_reserved,
-                exc_msg.hdr.msgh_id,
-                options,
-                0,
-                sizeof (exc_msg.data),
-                port,
-                mach_msg_timeout,
-                notify_port);
+        DNBLogThreaded ("::mach_msg ( msg->{bits = %#x, size = %u remote_port = %#x, local_port = %#x, reserved = 0x%x, id = 0x%x}, option = %#x, send_size = 0, rcv_size = %zu, rcv_name = %#x, timeout = %u, notify = %#x)",
+                        exc_msg.hdr.msgh_bits,
+                        exc_msg.hdr.msgh_size,
+                        exc_msg.hdr.msgh_remote_port,
+                        exc_msg.hdr.msgh_local_port,
+                        exc_msg.hdr.msgh_reserved,
+                        exc_msg.hdr.msgh_id,
+                        options,
+                        sizeof (exc_msg.data),
+                        port,
+                        mach_msg_timeout,
+                        notify_port);
     }
 
     err = ::mach_msg (&exc_msg.hdr,
@@ -461,7 +460,7 @@
         size_t idx;
         for (idx = 0; idx < exc_data_count; ++idx)
         {
-            DNBLogThreadedIf(LOG_EXCEPTIONS, "            exc_data[%u]: " MACH_EXCEPTION_DATA_FMT_HEX, idx, exc_data[idx]);
+            DNBLogThreadedIf(LOG_EXCEPTIONS, "            exc_data[%zu]: 0x%llx", idx, (uint64_t)exc_data[idx]);
         }
     }
 }

Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachException.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachException.h?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachException.h (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachException.h Fri Oct 28 17:59:14 2011
@@ -19,20 +19,6 @@
 #include <vector>
 #include "DNBConfig.h"
 
-#ifdef HAVE_64_BIT_MACH_EXCEPTIONS
-
-#define MACH_EXCEPTION_DATA_FMT_DEC "%lld"
-#define MACH_EXCEPTION_DATA_FMT_HEX "0x%16.16llx"
-#define MACH_EXCEPTION_DATA_FMT_MINHEX "0x%llx"
-
-#else
-
-#define MACH_EXCEPTION_DATA_FMT_DEC "%d"
-#define MACH_EXCEPTION_DATA_FMT_HEX "0x%8.8x"
-#define MACH_EXCEPTION_DATA_FMT_MINHEX "0x%x"
-
-#endif
-
 class MachProcess;
 class PThreadMutex;
 

Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.cpp Fri Oct 28 17:59:14 2011
@@ -343,7 +343,7 @@
     ::ptrace (PT_KILL, m_pid, 0, 0);
     DNBError err;
     err.SetErrorToErrno();
-    DNBLogThreadedIf(LOG_PROCESS, "MachProcess::Kill() DoSIGSTOP() ::ptrace (PT_KILL, pid=%u, 0, 0) => 0x%8.8x (%s)", err.Error(), err.AsString());
+    DNBLogThreadedIf(LOG_PROCESS, "MachProcess::Kill() DoSIGSTOP() ::ptrace (PT_KILL, pid=%u, 0, 0) => 0x%8.8x (%s)", m_pid, err.Error(), err.AsString());
     m_thread_actions = DNBThreadResumeActions (eStateRunning, 0);
     PrivateResume ();
     return true;
@@ -616,7 +616,7 @@
         MachException::Message::iterator end = m_exception_messages.end();
         for (pos = begin; pos != end; ++pos)
         {
-            DNBLogThreadedIf(LOG_EXCEPTIONS, "Replying to exception %d...", std::distance(begin, pos));
+            DNBLogThreadedIf(LOG_EXCEPTIONS, "Replying to exception %u...", (uint32_t)std::distance(begin, pos));
             int thread_reply_signal = 0;
 
             const DNBThreadResumeAction *action = m_thread_actions.GetActionForThread (pos->state.thread_port, false);
@@ -664,7 +664,7 @@
 nub_break_t
 MachProcess::CreateBreakpoint(nub_addr_t addr, nub_size_t length, bool hardware, thread_t tid)
 {
-    DNBLogThreadedIf(LOG_BREAKPOINTS, "MachProcess::CreateBreakpoint ( addr = 0x%8.8llx, length = %u, hardware = %i, tid = 0x%4.4x )", (uint64_t)addr, length, hardware, tid);
+    DNBLogThreadedIf(LOG_BREAKPOINTS, "MachProcess::CreateBreakpoint ( addr = 0x%8.8llx, length = %zu, hardware = %i, tid = 0x%4.4x )", (uint64_t)addr, length, hardware, tid);
     if (hardware && tid == INVALID_NUB_THREAD)
         tid = GetCurrentThread();
 
@@ -672,7 +672,7 @@
     nub_break_t breakID = m_breakpoints.Add(bp);
     if (EnableBreakpoint(breakID))
     {
-        DNBLogThreadedIf(LOG_BREAKPOINTS, "MachProcess::CreateBreakpoint ( addr = 0x%8.8llx, length = %u, tid = 0x%4.4x ) => %u", (uint64_t)addr, length, tid, breakID);
+        DNBLogThreadedIf(LOG_BREAKPOINTS, "MachProcess::CreateBreakpoint ( addr = 0x%8.8llx, length = %zu, tid = 0x%4.4x ) => %u", (uint64_t)addr, length, tid, breakID);
         return breakID;
     }
     else
@@ -686,7 +686,7 @@
 nub_watch_t
 MachProcess::CreateWatchpoint(nub_addr_t addr, nub_size_t length, uint32_t watch_flags, bool hardware, thread_t tid)
 {
-    DNBLogThreadedIf(LOG_WATCHPOINTS, "MachProcess::CreateWatchpoint ( addr = 0x%8.8llx, length = %u, flags = 0x%8.8x, hardware = %i, tid = 0x%4.4x )", (uint64_t)addr, length, watch_flags, hardware, tid);
+    DNBLogThreadedIf(LOG_WATCHPOINTS, "MachProcess::CreateWatchpoint ( addr = 0x%8.8llx, length = %zu, flags = 0x%8.8x, hardware = %i, tid = 0x%4.4x )", (uint64_t)addr, length, watch_flags, hardware, tid);
     if (hardware && tid == INVALID_NUB_THREAD)
         tid = GetCurrentThread();
 
@@ -696,12 +696,12 @@
     nub_watch_t watchID = m_watchpoints.Add(watch);
     if (EnableWatchpoint(watchID))
     {
-        DNBLogThreadedIf(LOG_WATCHPOINTS, "MachProcess::CreateWatchpoint ( addr = 0x%8.8llx, length = %u, tid = 0x%x) => %u", (uint64_t)addr, length, tid, watchID);
+        DNBLogThreadedIf(LOG_WATCHPOINTS, "MachProcess::CreateWatchpoint ( addr = 0x%8.8llx, length = %zu, tid = 0x%x) => %u", (uint64_t)addr, length, tid, watchID);
         return watchID;
     }
     else
     {
-        DNBLogThreadedIf(LOG_WATCHPOINTS, "MachProcess::CreateWatchpoint ( addr = 0x%8.8llx, length = %u, tid = 0x%x) => FAILED (%u)", (uint64_t)addr, length, tid, watchID);
+        DNBLogThreadedIf(LOG_WATCHPOINTS, "MachProcess::CreateWatchpoint ( addr = 0x%8.8llx, length = %zu, tid = 0x%x) => FAILED (%u)", (uint64_t)addr, length, tid, watchID);
         m_watchpoints.Remove(watchID);
     }
     // We failed to enable the watchpoint
@@ -1071,7 +1071,7 @@
 {
     // We have a complete bundle of exceptions for our child process.
     PTHREAD_MUTEX_LOCKER (locker, m_exception_messages_mutex);
-    DNBLogThreadedIf(LOG_EXCEPTIONS, "%s: %d exception messages.", __PRETTY_FUNCTION__, m_exception_messages.size());
+    DNBLogThreadedIf(LOG_EXCEPTIONS, "%s: %zu exception messages.", __PRETTY_FUNCTION__, m_exception_messages.size());
     if (!m_exception_messages.empty())
     {
         // Let all threads recover from stopping and do any clean up based
@@ -1140,7 +1140,7 @@
 void
 MachProcess::AppendSTDOUT (char* s, size_t len)
 {
-    DNBLogThreadedIf(LOG_PROCESS, "MachProcess::%s (<%d> %s) ...", __FUNCTION__, len, s);
+    DNBLogThreadedIf(LOG_PROCESS, "MachProcess::%s (<%zu> %s) ...", __FUNCTION__, len, s);
     PTHREAD_MUTEX_LOCKER (locker, m_stdio_mutex);
     m_stdout_data.append(s, len);
     m_events.SetEvents(eEventStdioAvailable);
@@ -1152,7 +1152,7 @@
 size_t
 MachProcess::GetAvailableSTDOUT (char *buf, size_t buf_size)
 {
-    DNBLogThreadedIf(LOG_PROCESS, "MachProcess::%s (&%p[%u]) ...", __FUNCTION__, buf, buf_size);
+    DNBLogThreadedIf(LOG_PROCESS, "MachProcess::%s (&%p[%zu]) ...", __FUNCTION__, buf, buf_size);
     PTHREAD_MUTEX_LOCKER (locker, m_stdio_mutex);
     size_t bytes_available = m_stdout_data.size();
     if (bytes_available > 0)

Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachTask.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachTask.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachTask.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachTask.cpp Fri Oct 28 17:59:14 2011
@@ -172,7 +172,7 @@
     {
         n = m_vm_memory.Read(task, addr, buf, size);
 
-        DNBLogThreadedIf(LOG_MEMORY, "MachTask::ReadMemory ( addr = 0x%8.8llx, size = %zu, buf = %8.8p) => %u bytes read", (uint64_t)addr, size, buf, n);
+        DNBLogThreadedIf(LOG_MEMORY, "MachTask::ReadMemory ( addr = 0x%8.8llx, size = %zu, buf = %p) => %zu bytes read", (uint64_t)addr, size, buf, n);
         if (DNBLogCheckLogBit(LOG_MEMORY_DATA_LONG) || (DNBLogCheckLogBit(LOG_MEMORY_DATA_SHORT) && size <= 8))
         {
             DNBDataRef data((uint8_t*)buf, n, false);
@@ -194,7 +194,7 @@
     if (task != TASK_NULL)
     {
         n = m_vm_memory.Write(task, addr, buf, size);
-        DNBLogThreadedIf(LOG_MEMORY, "MachTask::WriteMemory ( addr = 0x%8.8llx, size = %zu, buf = %8.8p) => %u bytes written", (uint64_t)addr, size, buf, n);
+        DNBLogThreadedIf(LOG_MEMORY, "MachTask::WriteMemory ( addr = 0x%8.8llx, size = %zu, buf = %p) => %zu bytes written", (uint64_t)addr, size, buf, n);
         if (DNBLogCheckLogBit(LOG_MEMORY_DATA_LONG) || (DNBLogCheckLogBit(LOG_MEMORY_DATA_SHORT) && size <= 8))
         {
             DNBDataRef data((uint8_t*)buf, n, false);
@@ -284,8 +284,12 @@
     {
         float user = (float)info->user_time.seconds + (float)info->user_time.microseconds / 1000000.0f;
         float system = (float)info->user_time.seconds + (float)info->user_time.microseconds / 1000000.0f;
-        DNBLogThreaded("task_basic_info = { suspend_count = %i, virtual_size = 0x%8.8x, resident_size = 0x%8.8x, user_time = %f, system_time = %f }",
-            info->suspend_count, info->virtual_size, info->resident_size, user, system);
+        DNBLogThreaded ("task_basic_info = { suspend_count = %i, virtual_size = 0x%8.8llx, resident_size = 0x%8.8llx, user_time = %f, system_time = %f }",
+                        info->suspend_count, 
+                        (uint64_t)info->virtual_size, 
+                        (uint64_t)info->resident_size, 
+                        user, 
+                        system);
     }
     return err.Error();
 }

Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachThread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachThread.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachThread.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachThread.cpp Fri Oct 28 17:59:14 2011
@@ -349,7 +349,7 @@
     default:                        thread_run_state = "???"; break;
     }
 
-    DNBLogThreaded("[%3u] #%3u tid: 0x%4.4x, pc: 0x%16.16llx, sp: 0x%16.16llx, breakID: %3d, user: %d.%06.6d, system: %d.%06.6d, cpu: %2d, policy: %2d, run_state: %2d (%s), flags: %2d, suspend_count: %2d (current %2d), sleep_time: %d",
+    DNBLogThreaded("[%3u] #%3u tid: 0x%4.4x, pc: 0x%16.16llx, sp: 0x%16.16llx, breakID: %3d, user: %d.%6.6d, system: %d.%6.6d, cpu: %2d, policy: %2d, run_state: %2d (%s), flags: %2d, suspend_count: %2d (current %2d), sleep_time: %d",
         index,
         m_seq_id,
         m_tid,

Modified: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp Fri Oct 28 17:59:14 2011
@@ -822,7 +822,7 @@
 uint32_t
 DNBArchImplI386::EnableHardwareWatchpoint (nub_addr_t addr, nub_size_t size, bool read, bool write)
 {
-    DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchImplI386::EnableHardwareWatchpoint(addr = %8.8p, size = %u, read = %u, write = %u)", addr, size, read, write);
+    DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchImplI386::EnableHardwareWatchpoint(addr = 0x%llx, size = %zu, read = %u, write = %u)", (uint64_t)addr, size, read, write);
 
     const uint32_t num_hw_watchpoints = NumSupportedHardwareWatchpoints();
 
@@ -924,8 +924,8 @@
             {
                 addr = GetWatchAddress(debug_state, i);
                 DNBLogThreadedIf(LOG_WATCHPOINTS,
-                                 "DNBArchImplI386::GetHardwareWatchpointHit() found => %u (addr = %8.8p).",
-                                 i, addr);
+                                 "DNBArchImplI386::GetHardwareWatchpointHit() found => %u (addr = 0x%llx).",
+                                 i, (uint64_t)addr);
                 return i;
             }
         }

Modified: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Fri Oct 28 17:59:14 2011
@@ -749,7 +749,7 @@
 uint32_t
 DNBArchImplX86_64::EnableHardwareWatchpoint (nub_addr_t addr, nub_size_t size, bool read, bool write)
 {
-    DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchImplX86_64::EnableHardwareWatchpoint(addr = %8.8p, size = %u, read = %u, write = %u)", addr, size, read, write);
+    DNBLogThreadedIf(LOG_WATCHPOINTS, "DNBArchImplX86_64::EnableHardwareWatchpoint(addr = 0x%llx, size = %zu, read = %u, write = %u)", (uint64_t)addr, size, read, write);
 
     const uint32_t num_hw_watchpoints = NumSupportedHardwareWatchpoints();
 
@@ -851,8 +851,9 @@
             {
                 addr = GetWatchAddress(debug_state, i);
                 DNBLogThreadedIf(LOG_WATCHPOINTS,
-                                 "DNBArchImplX86_64::GetHardwareWatchpointHit() found => %u (addr = %8.8p).",
-                                 i, addr);
+                                 "DNBArchImplX86_64::GetHardwareWatchpointHit() found => %u (addr = 0x%llx).",
+                                 i, 
+                                 (uint64_t)addr);
                 return i;
             }
         }

Modified: lldb/trunk/tools/debugserver/source/RNBSocket.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/RNBSocket.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/RNBSocket.cpp (original)
+++ lldb/trunk/tools/debugserver/source/RNBSocket.cpp Fri Oct 28 17:59:14 2011
@@ -291,8 +291,8 @@
     if (bytessent != length)
         return rnb_err;
 
-    DNBLogThreadedIf(LOG_RNB_PACKETS, "putpkt: %*s", length, (char *)buffer);   // All data is string based in debugserver, so this is safe
-    DNBLogThreadedIf(LOG_RNB_COMM, "sent: %*s", length, (char *)buffer);
+    DNBLogThreadedIf(LOG_RNB_PACKETS, "putpkt: %*s", (int)length, (char *)buffer);   // All data is string based in debugserver, so this is safe
+    DNBLogThreadedIf(LOG_RNB_COMM, "sent: %*s", (int)length, (char *)buffer);
 
     return rnb_success;
 }

Modified: lldb/trunk/tools/debugserver/source/debugserver.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/debugserver.cpp?rev=143244&r1=143243&r2=143244&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/debugserver.cpp (original)
+++ lldb/trunk/tools/debugserver/source/debugserver.cpp Fri Oct 28 17:59:14 2011
@@ -447,18 +447,18 @@
 
                     if (ctx.GetProcessStopCount() == 1)
                     {
-                        DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i)  pid_state = %s pid_stop_count %u (old %u)) Notify??? no, first stop...", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count);
+                        DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i)  pid_state = %s pid_stop_count %zu (old %zu)) Notify??? no, first stop...", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count);
                     }
                     else
                     {
 
-                        DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i)  pid_state = %s pid_stop_count %u (old %u)) Notify??? YES!!!", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count);
+                        DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i)  pid_state = %s pid_stop_count %zu (old %zu)) Notify??? YES!!!", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count);
                         remote->NotifyThatProcessStopped ();
                     }
                 }
                 else
                 {
-                    DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i)  pid_state = %s pid_stop_count %u (old %u)) Notify??? skipping...", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count);
+                    DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i)  pid_state = %s pid_stop_count %zu (old %zu)) Notify??? skipping...", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count);
                 }
             }
             return eRNBRunLoopModeInferiorExecuting;



From gclayton at apple.com  Fri Oct 28 18:06:08 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 28 Oct 2011 23:06:08 -0000
Subject: [Lldb-commits] [lldb] r143246 -
	/lldb/trunk/source/Symbol/ClangASTContext.cpp
Message-ID: <20111028230608.E6320312800A@llvm.org>

Author: gclayton
Date: Fri Oct 28 18:06:08 2011
New Revision: 143246

URL: http://llvm.org/viewvc/llvm-project?rev=143246&view=rev
Log:
Added support for C++0x char16_t and char32_t types.


Modified:
    lldb/trunk/source/Symbol/ClangASTContext.cpp

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=143246&r1=143245&r2=143246&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Fri Oct 28 18:06:08 2011
@@ -726,10 +726,13 @@
 
         case DW_ATE_lo_user:
             // This has been seen to mean DW_AT_complex_integer
-            if (::strstr(type_name, "complex"))
+            if (type_name)
             {
-                clang_type_t complex_int_clang_type = GetBuiltinTypeForDWARFEncodingAndBitSize ("int", DW_ATE_signed, bit_size/2);
-                return ast->getComplexType (QualType::getFromOpaquePtr(complex_int_clang_type)).getAsOpaquePtr();
+                if (::strstr(type_name, "complex"))
+                {
+                    clang_type_t complex_int_clang_type = GetBuiltinTypeForDWARFEncodingAndBitSize ("int", DW_ATE_signed, bit_size/2);
+                    return ast->getComplexType (QualType::getFromOpaquePtr(complex_int_clang_type)).getAsOpaquePtr();
+                }
             }
             break;
             
@@ -884,6 +887,20 @@
 
         case DW_ATE_imaginary_float:
             break;
+                
+        case DW_ATE_UTF:
+            if (type_name)
+            {
+                if (streq(type_name, "char16_t"))
+                {
+                    return ast->Char16Ty.getAsOpaquePtr();
+                }
+                else if (streq(type_name, "char32_t"))
+                {
+                    return ast->Char32Ty.getAsOpaquePtr();
+                }
+            }
+            break;
         }
     }
     // This assert should fire for anything that we don't catch above so we know



From jingham at apple.com  Fri Oct 28 18:14:11 2011
From: jingham at apple.com (Jim Ingham)
Date: Fri, 28 Oct 2011 23:14:11 -0000
Subject: [Lldb-commits] [lldb] r143249 - in /lldb/trunk:
 include/lldb/Core/SearchFilter.h include/lldb/Target/Platform.h
 include/lldb/Target/Target.h source/Core/SearchFilter.cpp
 source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
 source/Plugins/Platform/MacOSX/PlatformDarwin.h source/Target/Platform.cpp
 source/Target/Target.cpp
Message-ID: <20111028231411.6FA6F312800A@llvm.org>

Author: jingham
Date: Fri Oct 28 18:14:11 2011
New Revision: 143249

URL: http://llvm.org/viewvc/llvm-project?rev=143249&view=rev
Log:
Added the ability for the target to specify Modules that will not be searched
when setting breakpoints, but only if no module is specified.  The Darwin 
platform uses this to not set breakpoints in dyld.

Modified:
    lldb/trunk/include/lldb/Core/SearchFilter.h
    lldb/trunk/include/lldb/Target/Platform.h
    lldb/trunk/include/lldb/Target/Target.h
    lldb/trunk/source/Core/SearchFilter.cpp
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.h
    lldb/trunk/source/Target/Platform.cpp
    lldb/trunk/source/Target/Target.cpp

Modified: lldb/trunk/include/lldb/Core/SearchFilter.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/SearchFilter.h?rev=143249&r1=143248&r2=143249&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/SearchFilter.h (original)
+++ lldb/trunk/include/lldb/Core/SearchFilter.h Fri Oct 28 18:14:11 2011
@@ -274,6 +274,24 @@
 };
 
 //----------------------------------------------------------------------
+/// @class SearchFilterForNonModuleSpecificSearches SearchFilter.h "lldb/Core/SearchFilter.h"
+/// @brief This is a SearchFilter that searches through all modules.  It also consults the Target::ModuleIsExcludedForNonModuleSpecificSearches.
+//----------------------------------------------------------------------
+class SearchFilterForNonModuleSpecificSearches :
+    public SearchFilter
+{
+public:
+    SearchFilterForNonModuleSpecificSearches (lldb::TargetSP &targetSP) : SearchFilter(targetSP) {};
+    ~SearchFilterForNonModuleSpecificSearches () {}
+    
+    virtual bool 
+    ModulePasses (const FileSpec &module_spec);
+    
+    virtual bool
+    ModulePasses (const lldb::ModuleSP &module_sp);
+};
+
+//----------------------------------------------------------------------
 /// @class SearchFilterByModule SearchFilter.h "lldb/Core/SearchFilter.h"
 /// @brief This is a SearchFilter that restricts the search to a given module.
 //----------------------------------------------------------------------

Modified: lldb/trunk/include/lldb/Target/Platform.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Platform.h?rev=143249&r1=143248&r2=143249&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Platform.h (original)
+++ lldb/trunk/include/lldb/Target/Platform.h Fri Oct 28 18:14:11 2011
@@ -417,7 +417,15 @@
             m_sdk_build = sdk_build;
         }    
         
-
+        // There may be modules that we don't want to find by default for operations like "setting breakpoint by name".
+        // The platform will return "true" from this call if the passed in module happens to be one of these.
+        
+        virtual bool
+        ModuleIsExcludedForNonModuleSpecificSearches (Target &target, const lldb::ModuleSP &module_sp)
+        {
+            return false;
+        }
+                
     protected:
         bool m_is_host;
         // Set to true when we are able to actually set the OS version while 

Modified: lldb/trunk/include/lldb/Target/Target.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Target.h?rev=143249&r1=143248&r2=143249&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Target.h (original)
+++ lldb/trunk/include/lldb/Target/Target.h Fri Oct 28 18:14:11 2011
@@ -96,6 +96,12 @@
     {
         return m_max_strlen_length;
     }
+    
+    bool
+    GetBreakpointsConsultPlatformAvoidList ()
+    {
+        return m_breakpoints_use_platform_avoid;
+    }
 
 protected:
 
@@ -113,6 +119,7 @@
     PathMappingList m_source_map;
     uint32_t m_max_children_display;
     uint32_t m_max_strlen_length;
+    OptionValueBoolean m_breakpoints_use_platform_avoid;
     
 
 };
@@ -482,6 +489,48 @@
     {
         return m_images;
     }
+    
+    
+    //------------------------------------------------------------------
+    /// Return whether this FileSpec corresponds to a module that should be considered for general searches.
+    ///
+    /// This API will be consulted by the SearchFilterForNonModuleSpecificSearches
+    /// and any module that returns \b true will not be searched.  Note the
+    /// SearchFilterForNonModuleSpecificSearches is the search filter that
+    /// gets used in the CreateBreakpoint calls when no modules is provided.
+    ///
+    /// The target call at present just consults the Platform's call of the
+    /// same name.
+    /// 
+    /// @param[in] module_sp
+    ///     A shared pointer reference to the module that checked.
+    ///
+    /// @return \b true if the module should be excluded, \b false otherwise.
+    //------------------------------------------------------------------
+    const bool
+    ModuleIsExcludedForNonModuleSpecificSearches (const FileSpec &module_spec);
+    
+    //------------------------------------------------------------------
+    /// Return whether this module should be considered for general searches.
+    ///
+    /// This API will be consulted by the SearchFilterForNonModuleSpecificSearches
+    /// and any module that returns \b true will not be searched.  Note the
+    /// SearchFilterForNonModuleSpecificSearches is the search filter that
+    /// gets used in the CreateBreakpoint calls when no modules is provided.
+    ///
+    /// The target call at present just consults the Platform's call of the
+    /// same name.
+    ///
+    /// FIXME: When we get time we should add a way for the user to set modules that they
+    /// don't want searched, in addition to or instead of the platform ones.
+    /// 
+    /// @param[in] module_sp
+    ///     A shared pointer reference to the module that checked.
+    ///
+    /// @return \b true if the module should be excluded, \b false otherwise.
+    //------------------------------------------------------------------
+    const bool
+    ModuleIsExcludedForNonModuleSpecificSearches (const lldb::ModuleSP &module_sp);
 
     ArchSpec &
     GetArchitecture ()

Modified: lldb/trunk/source/Core/SearchFilter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/SearchFilter.cpp?rev=143249&r1=143248&r2=143249&view=diff
==============================================================================
--- lldb/trunk/source/Core/SearchFilter.cpp (original)
+++ lldb/trunk/source/Core/SearchFilter.cpp Fri Oct 28 18:14:11 2011
@@ -287,6 +287,29 @@
 }
 
 //----------------------------------------------------------------------
+//  SearchFilterForNonModuleSpecificSearches:
+//  Selects a shared library matching a given file spec, consulting the targets "black list".
+//----------------------------------------------------------------------
+
+    bool 
+    SearchFilterForNonModuleSpecificSearches::ModulePasses (const FileSpec &module_spec)
+    {
+        if (m_target_sp->ModuleIsExcludedForNonModuleSpecificSearches (module_spec))
+            return false;
+        else
+            return true;
+    }
+    
+    bool
+    SearchFilterForNonModuleSpecificSearches::ModulePasses (const lldb::ModuleSP &module_sp)
+    {
+        if (m_target_sp->ModuleIsExcludedForNonModuleSpecificSearches (module_sp))
+            return false;
+        else
+            return true;
+    }
+
+//----------------------------------------------------------------------
 //  SearchFilterByModule:
 //  Selects a shared library matching a given file spec
 //----------------------------------------------------------------------

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp?rev=143249&r1=143248&r2=143249&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp Fri Oct 28 18:14:11 2011
@@ -481,4 +481,16 @@
     return NULL;
 }
 
-
+bool
+PlatformDarwin::ModuleIsExcludedForNonModuleSpecificSearches (lldb_private::Target &target, const lldb::ModuleSP &module_sp)
+{
+    ObjectFile *obj_file = module_sp->GetObjectFile();
+    if (!obj_file)
+        return false;
+    
+    ObjectFile::Type obj_type = obj_file->GetType();
+    if (obj_type == ObjectFile::eTypeDynamicLinker)
+        return true;
+    else
+        return false;
+}

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.h?rev=143249&r1=143248&r2=143249&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.h (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.h Fri Oct 28 18:14:11 2011
@@ -85,6 +85,9 @@
             lldb_private::Listener &listener, 
             lldb_private::Error &error);
 
+    virtual bool
+    ModuleIsExcludedForNonModuleSpecificSearches (lldb_private::Target &target, const lldb::ModuleSP &module_sp);
+                
 protected:
     lldb::PlatformSP m_remote_platform_sp; // Allow multiple ways to connect to a remote darwin OS
 

Modified: lldb/trunk/source/Target/Platform.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Platform.cpp?rev=143249&r1=143248&r2=143249&view=diff
==============================================================================
--- lldb/trunk/source/Target/Platform.cpp (original)
+++ lldb/trunk/source/Target/Platform.cpp Fri Oct 28 18:14:11 2011
@@ -591,4 +591,3 @@
     }
     return process_sp;
 }
-

Modified: lldb/trunk/source/Target/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=143249&r1=143248&r2=143249&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Fri Oct 28 18:14:11 2011
@@ -252,7 +252,7 @@
 Target::CreateBreakpoint (Address &addr, bool internal)
 {
     TargetSP target_sp = this->GetSP();
-    SearchFilterSP filter_sp(new SearchFilter (target_sp));
+    SearchFilterSP filter_sp(new SearchFilterForNonModuleSpecificSearches (target_sp));
     BreakpointResolverSP resolver_sp (new BreakpointResolverAddress (NULL, addr));
     return CreateBreakpoint (filter_sp, resolver_sp, internal);
 }
@@ -295,7 +295,7 @@
     else
     {
         if (m_search_filter_sp.get() == NULL)
-            m_search_filter_sp.reset (new SearchFilter (target_sp));
+            m_search_filter_sp.reset (new SearchFilterForNonModuleSpecificSearches (target_sp));
         filter_sp = m_search_filter_sp;
     }
     return filter_sp;
@@ -315,7 +315,7 @@
     else
     {
         if (m_search_filter_sp.get() == NULL)
-            m_search_filter_sp.reset (new SearchFilter (target_sp));
+            m_search_filter_sp.reset (new SearchFilterForNonModuleSpecificSearches (target_sp));
         filter_sp = m_search_filter_sp;
     }
     return filter_sp;
@@ -934,6 +934,50 @@
     BroadcastEvent (eBroadcastBitModulesUnloaded, NULL);
 }
 
+
+const bool
+Target::ModuleIsExcludedForNonModuleSpecificSearches (const FileSpec &module_spec)
+{
+
+    if (!m_breakpoints_use_platform_avoid)
+        return false;
+    else
+    {
+        ModuleList matchingModules;
+        const ArchSpec *arch_ptr = NULL;
+        const lldb_private::UUID *uuid_ptr= NULL;
+        const ConstString *object_name = NULL;
+        size_t num_modules = GetImages().FindModules(&module_spec, arch_ptr, uuid_ptr, object_name, matchingModules);
+        
+        // If there is more than one module for this file spec, only return true if ALL the modules are on the
+        // black list.
+        if (num_modules > 0)
+        {
+            for (int i  = 0; i < num_modules; i++)
+            {
+                if (!ModuleIsExcludedForNonModuleSpecificSearches (matchingModules.GetModuleAtIndex(i)))
+                    return false;
+            }
+            return true;
+        }
+        else
+            return false;
+    }
+}
+
+const bool
+Target::ModuleIsExcludedForNonModuleSpecificSearches (const lldb::ModuleSP &module_sp)
+{
+    if (!m_breakpoints_use_platform_avoid)
+        return false;
+    else if (GetPlatform())
+    {
+        return GetPlatform()->ModuleIsExcludedForNonModuleSpecificSearches (*this, module_sp);
+    }
+    else
+        return false;
+}
+
 size_t
 Target::ReadMemoryFromFileCache (const Address& addr, void *dst, size_t dst_len, Error &error)
 {
@@ -1935,6 +1979,7 @@
 #define TSC_SOURCE_MAP        "source-map"
 #define TSC_MAX_CHILDREN      "max-children-count"
 #define TSC_MAX_STRLENSUMMARY "max-string-summary-length"
+#define TSC_PLATFORM_AVOID    "breakpoints-use-platform-avoid-list"
 
 
 static const ConstString &
@@ -1986,6 +2031,14 @@
     return g_const_string;
 }
 
+static const ConstString &
+GetSettingNameForPlatformAvoid ()
+{
+    static ConstString g_const_string (TSC_PLATFORM_AVOID);
+    return g_const_string;
+}
+
+
 bool
 Target::SettingsController::SetGlobalVariable (const ConstString &var_name,
                                                const char *index_value,
@@ -2039,7 +2092,8 @@
     m_skip_prologue (true, true),
     m_source_map (NULL, NULL),
     m_max_children_display(256),
-    m_max_strlen_length(1024)
+    m_max_strlen_length(1024),
+    m_breakpoints_use_platform_avoid (true, true)
 {
     // CopyInstanceSettings is a pure virtual function in InstanceSettings; it therefore cannot be called
     // until the vtables for TargetInstanceSettings are properly set up, i.e. AFTER all the initializers.
@@ -2067,7 +2121,8 @@
     m_skip_prologue (rhs.m_skip_prologue),
     m_source_map (rhs.m_source_map),
     m_max_children_display(rhs.m_max_children_display),
-    m_max_strlen_length(rhs.m_max_strlen_length)
+    m_max_strlen_length(rhs.m_max_strlen_length),
+    m_breakpoints_use_platform_avoid (rhs.m_breakpoints_use_platform_avoid)
 {
     if (m_instance_name != InstanceSettings::GetDefaultName())
     {
@@ -2214,6 +2269,10 @@
                 break;
         }        
     }
+    else if (var_name == GetSettingNameForPlatformAvoid ())
+    {
+        err = UserSettingsController::UpdateBooleanOptionValue (value, op, m_breakpoints_use_platform_avoid);
+    }
 }
 
 void
@@ -2224,12 +2283,13 @@
     if (!new_settings_ptr)
         return;
     
-    m_expr_prefix_file          = new_settings_ptr->m_expr_prefix_file;
-    m_expr_prefix_contents_sp   = new_settings_ptr->m_expr_prefix_contents_sp;
-    m_prefer_dynamic_value      = new_settings_ptr->m_prefer_dynamic_value;
-    m_skip_prologue             = new_settings_ptr->m_skip_prologue;
-    m_max_children_display      = new_settings_ptr->m_max_children_display;
-    m_max_strlen_length         = new_settings_ptr->m_max_strlen_length;
+    m_expr_prefix_file               = new_settings_ptr->m_expr_prefix_file;
+    m_expr_prefix_contents_sp        = new_settings_ptr->m_expr_prefix_contents_sp;
+    m_prefer_dynamic_value           = new_settings_ptr->m_prefer_dynamic_value;
+    m_skip_prologue                  = new_settings_ptr->m_skip_prologue;
+    m_max_children_display           = new_settings_ptr->m_max_children_display;
+    m_max_strlen_length              = new_settings_ptr->m_max_strlen_length;
+    m_breakpoints_use_platform_avoid = new_settings_ptr->m_breakpoints_use_platform_avoid;
 }
 
 bool
@@ -2271,6 +2331,13 @@
         count_str.Printf ("%d", m_max_strlen_length);
         value.AppendString (count_str.GetData());
     }
+    else if (var_name == GetSettingNameForPlatformAvoid())
+    {
+        if (m_breakpoints_use_platform_avoid)
+            value.AppendString ("true");
+        else
+            value.AppendString ("false");
+    }
     else 
     {
         if (err)
@@ -2326,5 +2393,6 @@
     { TSC_SOURCE_MAP        , eSetVarTypeArray  , NULL          , NULL,                  false, false, "Source path remappings to use when locating source files from debug information." },
     { TSC_MAX_CHILDREN      , eSetVarTypeInt    , "256"         , NULL,                  true,  false, "Maximum number of children to expand in any level of depth." },
     { TSC_MAX_STRLENSUMMARY , eSetVarTypeInt    , "1024"        , NULL,                  true,  false, "Maximum number of characters to show when using %s in summary strings." },
+    { TSC_PLATFORM_AVOID    , eSetVarTypeBoolean, "true"        , NULL,                  false, false, "Consult the platform module avoid list when setting non-module specific breakpoints." },
     { NULL                  , eSetVarTypeNone   , NULL          , NULL,                  false, false, NULL }
 };



From gclayton at apple.com  Fri Oct 28 18:27:55 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 28 Oct 2011 23:27:55 -0000
Subject: [Lldb-commits] [lldb] r143251 - in /lldb/trunk:
 include/lldb/Interpreter/OptionGroupFormat.h
 source/Interpreter/OptionGroupFormat.cpp
Message-ID: <20111028232755.F095E312800A@llvm.org>

Author: gclayton
Date: Fri Oct 28 18:27:55 2011
New Revision: 143251

URL: http://llvm.org/viewvc/llvm-project?rev=143251&view=rev
Log:
Fixed the GDB format to allow the size and format characters to come in any
order. Also hooked up the new formats for instruction, hex float and address
to the new formats.


Modified:
    lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h
    lldb/trunk/source/Interpreter/OptionGroupFormat.cpp

Modified: lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h?rev=143251&r1=143250&r2=143251&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h (original)
+++ lldb/trunk/include/lldb/Interpreter/OptionGroupFormat.h Fri Oct 28 18:27:55 2011
@@ -106,11 +106,8 @@
 
 protected:
 
-    lldb::Format
-    SetFormatUsingGDBFormatLetter (char format_letter);
-
-    uint32_t
-    SetByteSizeUsingGDBSizeLetter (char size_letter);
+    bool
+    ParserGDBFormatLetter (char format_letter, lldb::Format &format, uint32_t &byte_size);
 
     OptionValueFormat m_format;
     OptionValueUInt64 m_byte_size;

Modified: lldb/trunk/source/Interpreter/OptionGroupFormat.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/OptionGroupFormat.cpp?rev=143251&r1=143250&r2=143251&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/OptionGroupFormat.cpp (original)
+++ lldb/trunk/source/Interpreter/OptionGroupFormat.cpp Fri Oct 28 18:27:55 2011
@@ -116,13 +116,13 @@
                         count = 0;
                 }
 
-                Format format = SetFormatUsingGDBFormatLetter (gdb_format_cstr[0]);
-                if (format != eFormatInvalid)
-                    ++gdb_format_cstr;
-
-                uint32_t byte_size = SetByteSizeUsingGDBSizeLetter (gdb_format_cstr[0]);
-                if (byte_size > 0)
+                Format format = eFormatDefault;
+                uint32_t byte_size = 0;
+                
+                while (ParserGDBFormatLetter (gdb_format_cstr[0], format, byte_size))
+                {
                     ++gdb_format_cstr;
+                }
                 
                 // We the first character of the "gdb_format_cstr" is not the 
                 // NULL terminator, we didn't consume the entire string and 
@@ -139,7 +139,7 @@
                 // Anything that wasn't set correctly should be set to the
                 // previous default
                 if (format == eFormatInvalid)
-                    format = SetFormatUsingGDBFormatLetter (m_prev_gdb_format);
+                    ParserGDBFormatLetter (m_prev_gdb_format, format, byte_size);
                 
                 const bool byte_size_enabled = m_byte_size.GetDefaultValue() < UINT64_MAX;
                 const bool count_enabled = m_count.GetDefaultValue() < UINT64_MAX;
@@ -147,7 +147,7 @@
                 {
                     // Byte size is enabled
                     if (byte_size == 0)
-                        byte_size = SetByteSizeUsingGDBSizeLetter (m_prev_gdb_size);
+                        ParserGDBFormatLetter (m_prev_gdb_size, format, byte_size);
                 }
                 else
                 {
@@ -198,62 +198,32 @@
     return error;
 }
 
-Format
-OptionGroupFormat::SetFormatUsingGDBFormatLetter (char format_letter)
+bool
+OptionGroupFormat::ParserGDBFormatLetter (char format_letter, Format &format, uint32_t &byte_size)
 {
-    Format format = eFormatInvalid;
     switch (format_letter)
     {
-        case 'o': format = eFormatOctal;        break; 
-        case 'x': format = eFormatHex;          break;
-        case 'd': format = eFormatDecimal;      break;
-        case 'u': format = eFormatUnsigned;     break;
-        case 't': format = eFormatBinary;       break;
-        case 'f': format = eFormatFloat;        break;
-        case 'a': format = eFormatHex;          break; // TODO: add a new format: eFormatAddress
-        case 'i': format = eFormatHex;          break; // TODO: add a new format: eFormatInstruction
-        case 'c': format = eFormatChar;         break;
-        case 's': format = eFormatCString;      break;
-        case 'T': format = eFormatOSType;       break;
-        case 'A': format = eFormatHex;          break; // TODO: add a new format: eFormatHexFloat
+        case 'o': format = eFormatOctal;        m_prev_gdb_format = format_letter; return true; 
+        case 'x': format = eFormatHex;          m_prev_gdb_format = format_letter; return true;
+        case 'd': format = eFormatDecimal;      m_prev_gdb_format = format_letter; return true;
+        case 'u': format = eFormatUnsigned;     m_prev_gdb_format = format_letter; return true;
+        case 't': format = eFormatBinary;       m_prev_gdb_format = format_letter; return true;
+        case 'f': format = eFormatFloat;        m_prev_gdb_format = format_letter; return true;
+        case 'a': format = eFormatAddressInfo;  m_prev_gdb_format = format_letter; return true;
+        case 'i': format = eFormatInstruction;  m_prev_gdb_format = format_letter; return true;
+        case 'c': format = eFormatChar;         m_prev_gdb_format = format_letter; return true;
+        case 's': format = eFormatCString;      m_prev_gdb_format = format_letter; return true;
+        case 'T': format = eFormatOSType;       m_prev_gdb_format = format_letter; return true;
+        case 'A': format = eFormatHexFloat;     m_prev_gdb_format = format_letter; return true;
+        case 'b': byte_size = 1;                m_prev_gdb_size = format_letter;   return true;
+        case 'h': byte_size = 2;                m_prev_gdb_size = format_letter;   return true;
+        case 'w': byte_size = 4;                m_prev_gdb_size = format_letter;   return true;
+        case 'g': byte_size = 8;                m_prev_gdb_size = format_letter;   return true;
         default:  break;
     }
-    if (format != eFormatInvalid)
-        m_prev_gdb_format = format_letter;
-    return format;
+    return false;
 }
 
-uint32_t
-OptionGroupFormat::SetByteSizeUsingGDBSizeLetter (char size_letter)
-{
-    uint32_t byte_size = 0;
-    switch (size_letter)
-    {
-        case 'b': // byte
-            byte_size = 1; 
-            break;
-
-        case 'h': // halfword
-            byte_size = 2;
-            break;
-
-        case 'w': // word
-            byte_size = 4;
-            break;
-
-        case 'g': // giant
-            byte_size = 8;
-            break;
-
-        default:
-            break;
-    }
-    if (byte_size)
-        m_prev_gdb_size = size_letter;
-    return byte_size;
-}
-
-
 void
 OptionGroupFormat::OptionParsingStarting (CommandInterpreter &interpreter)
 {



From johnny.chen at apple.com  Fri Oct 28 18:30:28 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Fri, 28 Oct 2011 23:30:28 -0000
Subject: [Lldb-commits] [lldb] r143252 - in /lldb/trunk:
 examples/customization/bin-utils/.lldbinit
 examples/customization/bin-utils/README
 examples/customization/bin-utils/binutils.py
 source/Commands/CommandObjectHelp.cpp
Message-ID: <20111028233028.E4C8C312800A@llvm.org>

Author: johnny
Date: Fri Oct 28 18:30:28 2011
New Revision: 143252

URL: http://llvm.org/viewvc/llvm-project?rev=143252&view=rev
Log:
Add an example customization directory which uses a binutils.py module to provide
commands to print the binary representaion of an integer.

Added:
    lldb/trunk/examples/customization/bin-utils/.lldbinit
    lldb/trunk/examples/customization/bin-utils/README
Modified:
    lldb/trunk/examples/customization/bin-utils/binutils.py
    lldb/trunk/source/Commands/CommandObjectHelp.cpp

Added: lldb/trunk/examples/customization/bin-utils/.lldbinit
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/examples/customization/bin-utils/.lldbinit?rev=143252&view=auto
==============================================================================
--- lldb/trunk/examples/customization/bin-utils/.lldbinit (added)
+++ lldb/trunk/examples/customization/bin-utils/.lldbinit Fri Oct 28 18:30:28 2011
@@ -0,0 +1,5 @@
+# So that ~/binutils.py takes precedence.
+script sys.path[:0] = [os.path.expanduser('~')]
+script import binutils
+command script add -f binutils.itob itob
+command script add -f binutils.utob utob

Added: lldb/trunk/examples/customization/bin-utils/README
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/examples/customization/bin-utils/README?rev=143252&view=auto
==============================================================================
--- lldb/trunk/examples/customization/bin-utils/README (added)
+++ lldb/trunk/examples/customization/bin-utils/README Fri Oct 28 18:30:28 2011
@@ -0,0 +1,36 @@
+Files in this directory:
+
+o .lldbinit:
+
+An example lldb init file that imports the binutils.py module and adds the
+following commands: 'itob' and 'utob'.
+
+o binutils.py:
+
+Python module which provides implementation for the 'itob' and 'utob' commands.
+
+o README:
+
+The file you are reading now.
+
+================================================================================
+The following terminal output shows an interaction with lldb using the .lldbinit
+and the binutils.py files which are located in my HOME directory.  The lldb init
+file imports the utils Python module and adds the 'itob' and 'utob' commands.
+
+$ /Volumes/data/lldb/svn/trunk/build/Debug/lldb
+(lldb) help itob
+Convert the integer to print its two's complement representation.
+    args[0] (mandatory) is the integer to be converted
+    args[1] (mandatory) is the bit width of the two's complement representation
+    args[2] (optional) if specified, turns on verbose printing
+Syntax: itob
+(lldb) itob -5 4
+ [1, 0, 1, 1]
+(lldb) itob -5 32 v
+ 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
+ [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1]
+(lldb) utob 0xABCD 32 v
+ 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
+ [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1]
+(lldb) 

Modified: lldb/trunk/examples/customization/bin-utils/binutils.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/examples/customization/bin-utils/binutils.py?rev=143252&r1=143251&r2=143252&view=diff
==============================================================================
--- lldb/trunk/examples/customization/bin-utils/binutils.py (original)
+++ lldb/trunk/examples/customization/bin-utils/binutils.py Fri Oct 28 18:30:28 2011
@@ -1,5 +1,7 @@
 "Collection of tools for displaying bit representation of numbers."""
 
+import StringIO
+
 def binary(n, width=None):
     """
     Return a list of (0|1)'s for the binary representation of n where n >= 0.
@@ -51,3 +53,70 @@
 # print twos_complement(-5, 64)
 # [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1]
 
+def positions(width):
+    """Helper function returning a list describing the bit positions.
+    Bit positions greater than 99 are truncated to 2 digits, for example,
+    100 -> 00 and 127 -> 27."""
+    return ['{0:2}'.format(i)[-2:] for i in reversed(range(width))]
+    
+
+def utob(debugger, command_line, result, dict):
+    """Convert the unsigned integer to print its binary representation.
+    args[0] (mandatory) is the unsigned integer to be converted
+    args[1] (optional) is the bit width of the binary representation
+    args[2] (optional) if specified, turns on verbose printing"""
+    args = command_line.split()
+    try:
+        n = int(args[0], 0)
+        width = None
+        if len(args) > 1:
+            width = int(args[1], 0)
+            if width < 0:
+                width = 0
+    except:
+        print utob.__doc__
+        return
+
+    if len(args) > 2:
+        verbose = True
+    else:
+        verbose = False
+
+    bits = binary(n, width)
+    if not bits:
+        print "insufficient width value: %d" % width
+        return
+    if verbose and width > 0:
+        pos = positions(width)
+        print ' '+' '.join(pos)
+    print ' %s' % str(bits)
+
+def itob(debugger, command_line, result, dict):
+    """Convert the integer to print its two's complement representation.
+    args[0] (mandatory) is the integer to be converted
+    args[1] (mandatory) is the bit width of the two's complement representation
+    args[2] (optional) if specified, turns on verbose printing"""
+    args = command_line.split()
+    try:
+        n = int(args[0], 0)
+        width = int(args[1], 0)
+        if width < 0:
+            width = 0
+    except:
+        print itob.__doc__
+        return
+
+    if len(args) > 2:
+        verbose = True
+    else:
+        verbose = False
+
+    bits = twos_complement(n, width)
+    if not bits:
+        print "insufficient width value: %d" % width
+        return
+    if verbose and width > 0:
+        pos = positions(width)
+        print ' '+' '.join(pos)
+    print ' %s' % str(bits)
+

Modified: lldb/trunk/source/Commands/CommandObjectHelp.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectHelp.cpp?rev=143252&r1=143251&r2=143252&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectHelp.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectHelp.cpp Fri Oct 28 18:30:28 2011
@@ -182,7 +182,7 @@
                     const char *long_help = sub_cmd_obj->GetHelpLong();
                     if ((long_help != NULL)
                         && (strlen (long_help) > 0))
-                        output_strm.Printf ("\n%s", long_help);
+                        output_strm.Printf ("%s", long_help);
                     else if (sub_cmd_obj->WantsRawCommandString())
                     {
                         std::string help_text (sub_cmd_obj->GetHelp());



From scallanan at apple.com  Fri Oct 28 18:38:38 2011
From: scallanan at apple.com (Sean Callanan)
Date: Fri, 28 Oct 2011 23:38:38 -0000
Subject: [Lldb-commits] [lldb] r143253 - in /lldb/trunk:
 include/lldb/Expression/ClangASTSource.h
 include/lldb/Expression/ClangExpressionDeclMap.h
 source/Expression/ClangASTSource.cpp
 source/Expression/ClangExpressionDeclMap.cpp
 source/Expression/ClangExpressionParser.cpp
Message-ID: <20111028233838.BB828312800A@llvm.org>

Author: spyffe
Date: Fri Oct 28 18:38:38 2011
New Revision: 143253

URL: http://llvm.org/viewvc/llvm-project?rev=143253&view=rev
Log:
As part of a general refactoring of ClangASTSource to
allow it to complete types on behalf of any AST context
(including the "scratch" AST context associated with
the target), I scrapped its role as intermediary between
the Clang parser and ClangExpressionDeclMap, and instead
made ClangExpressionDeclMap inherit from ClangASTSource.

After this, I will migrate the functions that complete
types and perform namespace lookups from
ClangExpressionDeclMap to ClangASTSource.  Ultimately
ClangExpressionDeclMap's only responsiblity will be to
look up variables and ensure that they are materialized
and dematerialized correctly.

Modified:
    lldb/trunk/include/lldb/Expression/ClangASTSource.h
    lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
    lldb/trunk/source/Expression/ClangASTSource.cpp
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
    lldb/trunk/source/Expression/ClangExpressionParser.cpp

Modified: lldb/trunk/include/lldb/Expression/ClangASTSource.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangASTSource.h?rev=143253&r1=143252&r2=143253&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangASTSource.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangASTSource.h Fri Oct 28 18:38:38 2011
@@ -39,17 +39,14 @@
     ///
     /// Initializes class variabes.
     ///
-    /// @param[in] context
-    ///     A reference to the AST context provided by the parser.
-    ///
     /// @param[in] declMap
     ///     A reference to the LLDB object that handles entity lookup.
     //------------------------------------------------------------------
-	ClangASTSource (clang::ASTContext &context,
-                    ClangExpressionDeclMap &decl_map) : 
-        m_ast_context (context),
-        m_decl_map (decl_map),
-        m_active_lookups ()
+	ClangASTSource () :
+        m_ast_context (NULL),
+        m_active_lookups (),
+        m_import_in_progress (false),
+        m_lookups_enabled (false)
     {
     }
     
@@ -59,66 +56,34 @@
 	~ClangASTSource();
 	
     //------------------------------------------------------------------
-    /// Interface stub that returns NULL.
-    //------------------------------------------------------------------
-    virtual clang::Decl *
-    GetExternalDecl(uint32_t)
-    {
-        // These are only required for AST source that want to lazily load
-        // the declarations (or parts thereof) that they return.
-        return NULL;
-    }
-    
-    //------------------------------------------------------------------
-    /// Interface stub that returns NULL.
+    /// Interface stubs.
     //------------------------------------------------------------------
-    virtual clang::Stmt *
-    GetExternalDeclStmt(uint64_t)
-    {
-        // These are only required for AST source that want to lazily load
-        // the declarations (or parts thereof) that they return.
-        return NULL;
-    }
+    clang::Decl *GetExternalDecl (uint32_t)         {   return NULL;                }
+    clang::Stmt *GetExternalDeclStmt (uint64_t)     {   return NULL;                }
+	clang::Selector GetExternalSelector (uint32_t)  {   return clang::Selector();   }
+    uint32_t GetNumExternalSelectors ()             {   return 0;                   }
+    clang::CXXBaseSpecifier *GetExternalCXXBaseSpecifiers (uint64_t Offset)
+                                                    {   return NULL;                }
+    void MaterializeVisibleDecls (const clang::DeclContext *DC)
+                                                    {   return;                     }
 	
-    //------------------------------------------------------------------
-    /// Interface stub that returns an undifferentiated Selector.
-    //------------------------------------------------------------------
-    virtual clang::Selector 
-    GetExternalSelector(uint32_t)
-    {
-        // These are also optional, although it might help with ObjC
-        // debugging if we have respectable signatures.  But a more
-        // efficient interface (that didn't require scanning all files
-        // for method signatures!) might help.
-        return clang::Selector();
-    }
-    
-    //------------------------------------------------------------------
-    /// Interface stub that returns 0.
-    //------------------------------------------------------------------
-	virtual uint32_t
-    GetNumExternalSelectors()
+    void InstallASTContext (clang::ASTContext *ast_context)
     {
-        // These are also optional, although it might help with ObjC
-        // debugging if we have respectable signatures.  But a more
-        // efficient interface (that didn't require scanning all files
-        // for method signatures!) might help.
-        return 0;
+        m_ast_context = ast_context;
     }
     
-    //------------------------------------------------------------------
-    /// Interface stub that returns NULL.
-    //------------------------------------------------------------------
-    virtual clang::CXXBaseSpecifier *
-    GetExternalCXXBaseSpecifiers(uint64_t Offset)
-    {
-        return NULL;
-    }
-	
+    //
+    // APIs for ExternalASTSource
+    //
+
     //------------------------------------------------------------------
     /// Look up all Decls that match a particular name.  Only handles
-    /// Identifiers.  Passes the request on to DeclMap, and calls
-    /// SetExternalVisibleDeclsForName with the result. 
+    /// Identifiers and DeclContexts that are either NamespaceDecls or
+    /// TranslationUnitDecls.  Calls SetExternalVisibleDeclsForName with
+    /// the result.
+    ///
+    /// The work for this function is done by
+    /// void FindExternalVisibleDecls (NameSearchContext &);
     ///
     /// @param[in] DC
     ///     The DeclContext to register the found Decls in.
@@ -129,31 +94,46 @@
     /// @return
     ///     Whatever SetExternalVisibleDeclsForName returns.
     //------------------------------------------------------------------
-    virtual clang::DeclContextLookupResult 
+    clang::DeclContextLookupResult 
     FindExternalVisibleDeclsByName (const clang::DeclContext *DC,
                                     clang::DeclarationName Name);
     
     //------------------------------------------------------------------
-    /// Interface stub.
-    //------------------------------------------------------------------
-    virtual void 
-    MaterializeVisibleDecls (const clang::DeclContext *DC);
-	
-    //------------------------------------------------------------------
-    /// Interface stub that returns true.
+    /// Enumerate all Decls in a given lexical context.
+    ///
+    /// @param[in] DC
+    ///     The DeclContext being searched.
+    ///
+    /// @param[in] isKindWeWant
+    ///     If non-NULL, a callback function that returns true given the
+    ///     DeclKinds of desired Decls, and false otherwise.
+    ///
+    /// @param[in] Decls
+    ///     A vector that is filled in with matching Decls.
     //------------------------------------------------------------------
-	virtual clang::ExternalLoadResult 
+    virtual clang::ExternalLoadResult 
     FindExternalLexicalDecls (const clang::DeclContext *DC,
                               bool (*isKindWeWant)(clang::Decl::Kind),
                               llvm::SmallVectorImpl<clang::Decl*> &Decls);
     
-    
+    //------------------------------------------------------------------
+    /// Complete a TagDecl.
+    ///
+    /// @param[in] Tag
+    ///     The Decl to be completed in place.
+    //------------------------------------------------------------------
     virtual void
     CompleteType (clang::TagDecl *Tag);
     
+    //------------------------------------------------------------------
+    /// Complete an ObjCInterfaceDecl.
+    ///
+    /// @param[in] Class
+    ///     The Decl to be completed in place.
+    //------------------------------------------------------------------
     virtual void 
     CompleteType (clang::ObjCInterfaceDecl *Class);
-
+    
     //------------------------------------------------------------------
     /// Called on entering a translation unit.  Tells Clang by calling
     /// setHasExternalVisibleStorage() and setHasExternalLexicalStorage()
@@ -163,13 +143,88 @@
     ///     Unused.
     //------------------------------------------------------------------
     void StartTranslationUnit (clang::ASTConsumer *Consumer);
+    
+    //
+    // Helper APIs
+    //
+    
+    //------------------------------------------------------------------
+    /// The worker function for FindExternalVisibleDeclsByName.
+    ///
+    /// @param[in] context
+    ///     The NameSearchContext to use when filing results.
+    //------------------------------------------------------------------
+    virtual void FindExternalVisibleDecls (NameSearchContext &context);
+    
+    void SetImportInProgress (bool import_in_progress) { m_import_in_progress = import_in_progress; }
+    bool GetImportInProgress () { return m_import_in_progress; }
+    
+    void SetLookupsEnabled (bool lookups_enabled) { m_lookups_enabled = lookups_enabled; }
+    bool GetLookupsEnabled () { return m_lookups_enabled; }
+    
+    //----------------------------------------------------------------------
+    /// @class ClangASTSourceProxy ClangASTSource.h "lldb/Expression/ClangASTSource.h"
+    /// @brief Proxy for ClangASTSource
+    ///
+    /// Clang AST contexts like to own their AST sources, so this is a
+    /// state-free proxy object.
+    //----------------------------------------------------------------------
+    class ClangASTSourceProxy : public clang::ExternalASTSource
+    {
+    public:
+        ClangASTSourceProxy (ClangASTSource &original) :
+            m_original(original)
+        {
+        }
+        
+        clang::DeclContextLookupResult 
+        FindExternalVisibleDeclsByName (const clang::DeclContext *DC,
+                                        clang::DeclarationName Name)
+        {
+            return m_original.FindExternalVisibleDeclsByName(DC, Name);
+        }
+        
+        virtual clang::ExternalLoadResult 
+        FindExternalLexicalDecls (const clang::DeclContext *DC,
+                                  bool (*isKindWeWant)(clang::Decl::Kind),
+                                  llvm::SmallVectorImpl<clang::Decl*> &Decls)
+        {
+            return m_original.FindExternalLexicalDecls(DC, isKindWeWant, Decls);
+        }
+        
+        virtual void
+        CompleteType (clang::TagDecl *Tag)
+        {
+            return m_original.CompleteType(Tag);
+        }
+        
+        virtual void 
+        CompleteType (clang::ObjCInterfaceDecl *Class)
+        {
+            return m_original.CompleteType(Class);
+        }
 
+        void StartTranslationUnit (clang::ASTConsumer *Consumer)
+        {
+            return m_original.StartTranslationUnit(Consumer);
+        }
+    private:
+        ClangASTSource &m_original;
+    };
+    
+    clang::ExternalASTSource *CreateProxy()
+    {
+        return new ClangASTSourceProxy(*this);
+    }
+    
 protected:
     friend struct NameSearchContext;
+    
+    bool                    m_import_in_progress;
+    bool                    m_lookups_enabled;
 
-	clang::ASTContext &m_ast_context;   ///< The parser's AST context, for copying types into
-	ClangExpressionDeclMap &m_decl_map; ///< The object that looks up named entities in LLDB
-    std::set<const char *> m_active_lookups;
+	clang::ASTContext      *m_ast_context;     ///< The parser's AST context, for copying types into
+    std::set<const char *>  m_active_lookups;
 };
 
 //----------------------------------------------------------------------
@@ -221,12 +276,6 @@
         m_decl_context(dc) {}
     
     //------------------------------------------------------------------
-    /// Return the AST context for the current search.  Useful when copying
-    /// types.
-    //------------------------------------------------------------------
-    clang::ASTContext *GetASTContext();
-    
-    //------------------------------------------------------------------
     /// Create a VarDecl with the name being searched for and the provided
     /// type and register it in the right places.
     ///

Modified: lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h?rev=143253&r1=143252&r2=143253&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h Fri Oct 28 18:38:38 2011
@@ -25,6 +25,7 @@
 #include "lldb/lldb-public.h"
 #include "lldb/Core/ClangForward.h"
 #include "lldb/Core/Value.h"
+#include "lldb/Expression/ClangASTSource.h"
 #include "lldb/Expression/ClangExpressionVariable.h"
 #include "lldb/Symbol/ClangASTImporter.h"
 #include "lldb/Symbol/TaggedASTType.h"
@@ -56,7 +57,9 @@
 /// Fourth and finally, it "dematerializes" the struct after the JITted code has
 /// has executed, placing the new values back where it found the old ones.
 //----------------------------------------------------------------------
-class ClangExpressionDeclMap : public ClangASTImporter::NamespaceMapCompleter
+class ClangExpressionDeclMap : 
+    public ClangASTSource,
+    public ClangASTImporter::NamespaceMapCompleter
 {
 public:
     //------------------------------------------------------------------
@@ -617,18 +620,11 @@
     /// @param[in] context
     ///     The NameSearchContext that can construct Decls for this name.
     ///
-    /// @param[in] name
-    ///     The name as a plain C string.  The NameSearchContext contains 
-    ///     a DeclarationName for the name so at first the name may seem
-    ///     redundant, but ClangExpressionDeclMap operates in RTTI land so 
-    ///     it can't access DeclarationName.
-    ///
     /// @return
     ///     True on success; false otherwise.
     //------------------------------------------------------------------
     void 
-    FindExternalVisibleDecls (NameSearchContext &context,
-                              const ConstString &name);
+    FindExternalVisibleDecls (NameSearchContext &context);
     
     //------------------------------------------------------------------
     /// [Used by ClangASTSource] Find all Decls in a context that match
@@ -656,7 +652,7 @@
     ///     The TagDecl to be completed.
     //------------------------------------------------------------------
     void
-    CompleteTagDecl (clang::TagDecl *tag_decl);
+    CompleteType (clang::TagDecl *tag_decl);
     
     //------------------------------------------------------------------
     /// [Used by ClangASTSource] Complete the definition of an
@@ -666,43 +662,7 @@
     ///     The ObjCInterfaceDecl to be completed.
     //------------------------------------------------------------------
     void
-    CompleteObjCInterfaceDecl (clang::ObjCInterfaceDecl *interface_decl);
-    
-    //------------------------------------------------------------------
-    /// [Used by ClangASTSource] Report whether a $__lldb variable has
-    /// been searched for yet.  This is the trigger for beginning to 
-    /// actually look for externally-defined names.  (Names that come
-    /// before this are typically the names of built-ins that don't need
-    /// to be looked up.)
-    ///
-    /// @return
-    ///     True if a $__lldb variable has been found.
-    //------------------------------------------------------------------
-    bool
-    GetLookupsEnabled () const
-    {
-        assert(m_parser_vars.get());
-        return m_parser_vars->m_enable_lookups;
-    }
-
-    bool
-    GetImportInProgress () const
-    {
-        if (m_parser_vars.get())
-            return m_parser_vars->m_ignore_lookups;
-        return false;
-    }
-    
-    //------------------------------------------------------------------
-    /// [Used by ClangASTSource] Indicate that a $__lldb variable has
-    /// been found.
-    //------------------------------------------------------------------
-    void
-    SetLookupsEnabled ()
-    {
-        assert(m_parser_vars.get());
-        m_parser_vars->m_enable_lookups = true;
-    }
+    CompleteType (clang::ObjCInterfaceDecl *interface_decl);
     
     //------------------------------------------------------------------
     /// [Used by ClangASTImporter] Look up the modules containing a

Modified: lldb/trunk/source/Expression/ClangASTSource.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangASTSource.cpp?rev=143253&r1=143252&r2=143253&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangASTSource.cpp (original)
+++ lldb/trunk/source/Expression/ClangASTSource.cpp Fri Oct 28 18:38:38 2011
@@ -25,9 +25,11 @@
 void
 ClangASTSource::StartTranslationUnit(ASTConsumer *Consumer) 
 {
-    // Tell Sema to ask us when looking into the translation unit's decl.
-    m_ast_context.getTranslationUnitDecl()->setHasExternalVisibleStorage();
-    m_ast_context.getTranslationUnitDecl()->setHasExternalLexicalStorage();
+    if (!m_ast_context)
+        return;
+    
+    m_ast_context->getTranslationUnitDecl()->setHasExternalVisibleStorage();
+    m_ast_context->getTranslationUnitDecl()->setHasExternalLexicalStorage();
 }
 
 // The core lookup interface.
@@ -38,7 +40,10 @@
     DeclarationName clang_decl_name
 ) 
 {
-    if (m_decl_map.GetImportInProgress())
+    if (!m_ast_context)
+        return SetNoExternalVisibleDeclsForName(decl_ctx, clang_decl_name);
+    
+    if (GetImportInProgress())
         return SetNoExternalVisibleDeclsForName(decl_ctx, clang_decl_name);
         
     std::string decl_name (clang_decl_name.getAsString());
@@ -77,13 +82,13 @@
     }
 
 
-    if (!m_decl_map.GetLookupsEnabled())
+    if (!GetLookupsEnabled())
     {
         // Wait until we see a '$' at the start of a name before we start doing 
         // any lookups so we can avoid lookup up all of the builtin types.
         if (!decl_name.empty() && decl_name[0] == '$')
         {
-            m_decl_map.SetLookupsEnabled ();
+            SetLookupsEnabled (true);
         }
         else
         {               
@@ -105,7 +110,7 @@
 //  printf("[%5u] FindExternalVisibleDeclsByName() \"%s\"\n", g_depth, uniqued_const_decl_name);
     llvm::SmallVector<NamedDecl*, 4> name_decls;    
     NameSearchContext name_search_context(*this, name_decls, clang_decl_name, decl_ctx);
-    m_decl_map.FindExternalVisibleDecls(name_search_context, const_decl_name);
+    FindExternalVisibleDecls(name_search_context);
     DeclContext::lookup_result result (SetExternalVisibleDeclsForName (decl_ctx, clang_decl_name, name_decls));
 //  --g_depth;
     m_active_lookups.erase (uniqued_const_decl_name);
@@ -113,25 +118,20 @@
 }
 
 void
-ClangASTSource::CompleteType (TagDecl *tag_decl)
+ClangASTSource::FindExternalVisibleDecls (NameSearchContext &context)
 {
-    m_decl_map.CompleteTagDecl (tag_decl);
 }
 
 void
-ClangASTSource::CompleteType (ObjCInterfaceDecl *objc_decl)
+ClangASTSource::CompleteType (TagDecl *tag_decl)
 {
-    m_decl_map.CompleteObjCInterfaceDecl (objc_decl);
 }
 
-void 
-ClangASTSource::MaterializeVisibleDecls(const DeclContext *DC)
+void
+ClangASTSource::CompleteType (ObjCInterfaceDecl *objc_decl)
 {
-    return;
 }
 
-// This is used to support iterating through an entire lexical context,
-// which isn't something the debugger should ever need to do.
 clang::ExternalLoadResult
 ClangASTSource::FindExternalLexicalDecls
 (
@@ -140,13 +140,7 @@
     llvm::SmallVectorImpl<Decl*> &Decls
 )
 {
-    return m_decl_map.FindExternalLexicalDecls (DC, isKindWeWant, Decls);
-}
-
-clang::ASTContext *
-NameSearchContext::GetASTContext() 
-{
-    return &m_ast_source.m_ast_context;
+    return ELR_Success;
 }
 
 clang::NamedDecl *
@@ -156,7 +150,7 @@
     
     assert (type && "Type for variable must be non-NULL!");
         
-    clang::NamedDecl *Decl = VarDecl::Create(m_ast_source.m_ast_context, 
+    clang::NamedDecl *Decl = VarDecl::Create(*m_ast_source.m_ast_context, 
                                              const_cast<DeclContext*>(m_decl_context), 
                                              SourceLocation(), 
                                              SourceLocation(),
@@ -173,7 +167,7 @@
 clang::NamedDecl *
 NameSearchContext::AddFunDecl (void *type) 
 {
-    clang::FunctionDecl *func_decl = FunctionDecl::Create (m_ast_source.m_ast_context,
+    clang::FunctionDecl *func_decl = FunctionDecl::Create (*m_ast_source.m_ast_context,
                                                            const_cast<DeclContext*>(m_decl_context),
                                                            SourceLocation(),
                                                            SourceLocation(),
@@ -203,7 +197,7 @@
         {
             QualType arg_qual_type (func_proto_type->getArgType(ArgIndex));
             
-            parm_var_decls.push_back(ParmVarDecl::Create (m_ast_source.m_ast_context,
+            parm_var_decls.push_back(ParmVarDecl::Create (*m_ast_source.m_ast_context,
                                                           const_cast<DeclContext*>(m_decl_context),
                                                           SourceLocation(),
                                                           SourceLocation(),
@@ -230,10 +224,10 @@
     
     proto_info.Variadic = true;
     
-    QualType generic_function_type(m_ast_source.m_ast_context.getFunctionType (m_ast_source.m_ast_context.UnknownAnyTy,     // result
-                                                                               NULL,                                        // argument types
-                                                                               0,                                           // number of arguments
-                                                                               proto_info));
+    QualType generic_function_type(m_ast_source.m_ast_context->getFunctionType (m_ast_source.m_ast_context->UnknownAnyTy,    // result
+                                                                                NULL,                                        // argument types
+                                                                                0,                                           // number of arguments
+                                                                                proto_info));
     
     return AddFunDecl(generic_function_type.getAsOpaquePtr());
 }

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=143253&r1=143252&r2=143253&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Fri Oct 28 18:38:38 2011
@@ -2228,8 +2228,12 @@
 // Interface for ClangASTSource
 
 void
-ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, const ConstString &name)
+ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context)
 {
+    assert (m_ast_context);
+    
+    const ConstString name(context.m_decl_name.getAsString().c_str());
+    
     lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
     
     if (m_parser_vars->m_ignore_lookups)
@@ -2256,7 +2260,7 @@
         
     if (const NamespaceDecl *namespace_context = dyn_cast<NamespaceDecl>(context.m_decl_context))
     {
-        ClangASTImporter::NamespaceMapSP namespace_map = m_parser_vars->GetASTImporter(context.GetASTContext())->GetNamespaceMap(namespace_context);
+        ClangASTImporter::NamespaceMapSP namespace_map = m_parser_vars->GetASTImporter(m_ast_context)->GetNamespaceMap(namespace_context);
         
         if (log && log->GetVerbose())
             log->Printf("  FEVD[%u] Inspecting namespace map %p (%d entries)", 
@@ -2327,6 +2331,7 @@
 {
     assert (m_struct_vars.get());
     assert (m_parser_vars.get());
+    assert (m_ast_context);
     
     lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
             
@@ -2482,7 +2487,7 @@
             if (!ptype_type_decl)
                 break;
             
-            Decl *parser_ptype_decl = ClangASTContext::CopyDecl(context.GetASTContext(), scratch_ast_context, ptype_type_decl);
+            Decl *parser_ptype_decl = ClangASTContext::CopyDecl(m_ast_context, scratch_ast_context, ptype_type_decl);
             
             if (!parser_ptype_decl)
                 break;
@@ -2834,7 +2839,7 @@
 }
 
 void
-ClangExpressionDeclMap::CompleteTagDecl (TagDecl *tag_decl)
+ClangExpressionDeclMap::CompleteType (TagDecl *tag_decl)
 {
     assert (m_parser_vars.get());
 
@@ -2859,7 +2864,7 @@
 }
 
 void
-ClangExpressionDeclMap::CompleteObjCInterfaceDecl (clang::ObjCInterfaceDecl *interface_decl)
+ClangExpressionDeclMap::CompleteType (clang::ObjCInterfaceDecl *interface_decl)
 {
     assert (m_parser_vars.get());
     
@@ -2877,7 +2882,6 @@
 
     if (log)
     {
-        log->Printf("    [CompleteObjCInterfaceDecl] Completing an ObjCInterfaceDecl named %s", interface_decl->getName().str().c_str());
         log->Printf("      [COID] After:");
         ASTDumper dumper((Decl*)interface_decl);
         dumper.ToLog(log, "      [COID] ");    
@@ -3011,7 +3015,7 @@
     
     Value *var_location = GetVariableValue (*m_parser_vars->m_exe_ctx, 
                                             var, 
-                                            context.GetASTContext(),
+                                            m_ast_context,
                                             &ut,
                                             &pt);
     
@@ -3061,10 +3065,10 @@
     
     TypeFromUser user_type (pvar_sp->GetTypeFromUser());
     
-    TypeFromParser parser_type (GuardedCopyType(context.GetASTContext(), 
+    TypeFromParser parser_type (GuardedCopyType(m_ast_context, 
                                                 user_type.GetASTContext(), 
                                                 user_type.GetOpaqueQualType()),
-                                context.GetASTContext());
+                                m_ast_context);
     
     NamedDecl *var_decl = context.AddVarDecl(ClangASTContext::CreateLValueReferenceType(parser_type.GetASTContext(), parser_type.GetOpaqueQualType()));
     
@@ -3100,8 +3104,8 @@
     TypeFromUser user_type (ClangASTContext::CreateLValueReferenceType(scratch_ast_context, ClangASTContext::GetVoidPtrType(scratch_ast_context, true)),
                             scratch_ast_context);
     
-    TypeFromParser parser_type (ClangASTContext::CreateLValueReferenceType(scratch_ast_context, ClangASTContext::GetVoidPtrType(context.GetASTContext(), true)),
-                                context.GetASTContext());
+    TypeFromParser parser_type (ClangASTContext::CreateLValueReferenceType(scratch_ast_context, ClangASTContext::GetVoidPtrType(m_ast_context, true)),
+                                m_ast_context);
     
     NamedDecl *var_decl = context.AddVarDecl(parser_type.GetOpaqueQualType());
     
@@ -3199,7 +3203,7 @@
 {
     lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
     
-    void *ast_type = ClangASTContext::GetBuiltinTypeForEncodingAndBitSize(context.GetASTContext(),
+    void *ast_type = ClangASTContext::GetBuiltinTypeForEncodingAndBitSize(m_ast_context,
                                                                           reg_info->encoding,
                                                                           reg_info->byte_size * 8);
     
@@ -3211,7 +3215,7 @@
     }
     
     TypeFromParser parser_type (ast_type,
-                                context.GetASTContext());
+                                m_ast_context);
     
     NamedDecl *var_decl = context.AddVarDecl(parser_type.GetOpaqueQualType());
     
@@ -3247,12 +3251,12 @@
     
     const ClangNamespaceDecl &namespace_decl = namespace_decls->begin()->second;
     
-    Decl *copied_decl = m_parser_vars->GetASTImporter(context.GetASTContext())->CopyDecl(namespace_decl.GetASTContext(), 
-                                                                                         namespace_decl.GetNamespaceDecl());
+    Decl *copied_decl = m_parser_vars->GetASTImporter(m_ast_context)->CopyDecl(namespace_decl.GetASTContext(), 
+                                                                               namespace_decl.GetNamespaceDecl());
     
     NamespaceDecl *copied_namespace_decl = dyn_cast<NamespaceDecl>(copied_decl);
     
-    m_parser_vars->GetASTImporter(context.GetASTContext())->RegisterNamespaceMap(copied_namespace_decl, namespace_decls);
+    m_parser_vars->GetASTImporter(m_ast_context)->RegisterNamespaceMap(copied_namespace_decl, namespace_decls);
     
     return dyn_cast<NamespaceDecl>(copied_decl);
 }
@@ -3298,7 +3302,7 @@
         fun_address = &fun->GetAddressRange().GetBaseAddress();
         
         fun_ast_context = fun_type->GetClangASTContext().getASTContext();
-        void *copied_type = GuardedCopyType(context.GetASTContext(), fun_ast_context, fun_opaque_type);
+        void *copied_type = GuardedCopyType(m_ast_context, fun_ast_context, fun_opaque_type);
         if (copied_type)
         {
             fun_decl = context.AddFunDecl(copied_type);
@@ -3365,7 +3369,7 @@
                                    unsigned int current_id,
                                    bool add_method)
 {
-    ASTContext *parser_ast_context = context.GetASTContext();
+    ASTContext *parser_ast_context = m_ast_context;
     ASTContext *user_ast_context = ut.GetASTContext();
     
     void *copied_type = GuardedCopyType(parser_ast_context, user_ast_context, ut.GetOpaqueQualType());

Modified: lldb/trunk/source/Expression/ClangExpressionParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionParser.cpp?rev=143253&r1=143252&r2=143253&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionParser.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionParser.cpp Fri Oct 28 18:38:38 2011
@@ -320,7 +320,8 @@
     
     if (decl_map)
     {
-        OwningPtr<clang::ExternalASTSource> ast_source(new ClangASTSource(*ast_context, *decl_map));
+        llvm::OwningPtr<clang::ExternalASTSource> ast_source(decl_map->CreateProxy());
+        decl_map->InstallASTContext(ast_context.get());
         ast_context->setExternalSource(ast_source);
     }
     



From gclayton at apple.com  Fri Oct 28 18:44:55 2011
From: gclayton at apple.com (Greg Clayton)
Date: Fri, 28 Oct 2011 23:44:55 -0000
Subject: [Lldb-commits] [lldb] r143254 - in /lldb/trunk/source:
 Commands/CommandObjectMemory.cpp Core/DataExtractor.cpp
Message-ID: <20111028234455.A2CE8312800A@llvm.org>

Author: gclayton
Date: Fri Oct 28 18:44:55 2011
New Revision: 143254

URL: http://llvm.org/viewvc/llvm-project?rev=143254&view=rev
Log:
Fixed the continuation dumping of instructions to properly advance the 
previous address only by the number of bytes consumed by the disassembly:

(lldb) x/4i 0x0000000100000ea9
0x100000ea9:  66 c7 45 fa 10 00     movw   $16, -6(%rbp)
0x100000eaf:  c7 45 f4 20 00 00 00  movl   $32, -12(%rbp)
0x100000eb6:  e8 47 00 00 00        callq  0x0000000100000f02       ; void f<nullptr_t>(nullptr_t)
0x100000ebb:  8b 45 fc              movl   -4(%rbp), %eax
(lldb) 
0x100000ebe:  48 83 c4 10  addq   $16, %rsp
0x100000ec2:  5d           popq   %rbp
0x100000ec3:  c3           ret    
0x100000ec4:  90           nop    
(lldb) 
0x100000ec5:  90  nop    
0x100000ec6:  90  nop    
0x100000ec7:  90  nop    
0x100000ec8:  90  nop    
(lldb) 
0x100000ec9:  90  nop    
0x100000eca:  90  nop    
0x100000ecb:  90  nop    
0x100000ecc:  90  nop    
(lldb) 
0x100000ecd:  90  nop    
0x100000ece:  90  nop    
0x100000ecf:  90  nop    
0x100000ed0:  55  pushq  %rbp



Modified:
    lldb/trunk/source/Commands/CommandObjectMemory.cpp
    lldb/trunk/source/Core/DataExtractor.cpp

Modified: lldb/trunk/source/Commands/CommandObjectMemory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectMemory.cpp?rev=143254&r1=143253&r2=143254&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectMemory.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectMemory.cpp Fri Oct 28 18:44:55 2011
@@ -726,16 +726,17 @@
 
 
         assert (output_stream);
-        data.Dump (output_stream,
-                   0,
-                   m_format_options.GetFormat(),
-                   item_byte_size,
-                   item_count,
-                   num_per_line,
-                   addr,
-                   0,
-                   0,
-                   exe_scope);
+        uint32_t bytes_dumped = data.Dump (output_stream,
+                                           0,
+                                           m_format_options.GetFormat(),
+                                           item_byte_size,
+                                           item_count,
+                                           num_per_line,
+                                           addr,
+                                           0,
+                                           0,
+                                           exe_scope);
+        m_next_addr = addr + bytes_dumped;
         output_stream->EOL();
         return true;
     }

Modified: lldb/trunk/source/Core/DataExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/DataExtractor.cpp?rev=143254&r1=143253&r2=143254&view=diff
==============================================================================
--- lldb/trunk/source/Core/DataExtractor.cpp (original)
+++ lldb/trunk/source/Core/DataExtractor.cpp Fri Oct 28 18:44:55 2011
@@ -1319,16 +1319,14 @@
     if (s == NULL)
         return start_offset;
 
-    uint32_t offset;
-    uint32_t count;
-    uint32_t line_start_offset;
-
     if (item_format == eFormatPointer)
     {
         if (item_byte_size != 4 && item_byte_size != 8)
             item_byte_size = s->GetAddressByteSize();
     }
     
+    uint32_t offset = start_offset;
+
     if (item_format == eFormatInstruction)
     {
         Target *target = NULL;
@@ -1347,8 +1345,11 @@
                     so_addr.SetSection(NULL);
                 }
 
-                if (disassembler_sp->DecodeInstructions (so_addr, *this, start_offset, item_count, false))
+                size_t bytes_consumed = disassembler_sp->DecodeInstructions (so_addr, *this, start_offset, item_count, false);
+                
+                if (bytes_consumed)
                 {
+                    offset += bytes_consumed;
                     const bool show_address = base_addr != LLDB_INVALID_ADDRESS;
                     const bool show_bytes = true;
                     ExecutionContext exe_ctx;
@@ -1366,8 +1367,8 @@
     if ((item_format == eFormatOSType || item_format == eFormatAddressInfo) && item_byte_size > 8)
         item_format = eFormatHex;
 
-    
-    for (offset = start_offset, line_start_offset = start_offset, count = 0; ValidOffset(offset) && count < item_count; ++count)
+    uint32_t line_start_offset = start_offset;
+    for (uint32_t count = 0; ValidOffset(offset) && count < item_count; ++count)
     {
         if ((count % num_per_line) == 0)
         {



From johnny.chen at apple.com  Fri Oct 28 19:21:50 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Sat, 29 Oct 2011 00:21:50 -0000
Subject: [Lldb-commits] [lldb] r143260 -
	/lldb/trunk/source/Interpreter/CommandInterpreter.cpp
Message-ID: <20111029002150.4A803312800A@llvm.org>

Author: johnny
Date: Fri Oct 28 19:21:50 2011
New Revision: 143260

URL: http://llvm.org/viewvc/llvm-project?rev=143260&view=rev
Log:
Get a dummy target to allow for calculator mode while processing backticks.
This also helps break the infinite loop caused when target is null.

So that we can have:

$ /Volumes/data/lldb/svn/trunk/build/Debug/lldb
(lldb) itob `0x123 - 0x321` 32 v
 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0
 [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0]
(lldb) 

Modified:
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp

Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=143260&r1=143259&r2=143260&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Fri Oct 28 19:21:50 2011
@@ -1070,6 +1070,10 @@
                 std::string expr_str (command, expr_content_start, end_backtick - expr_content_start);
                 
                 Target *target = m_exe_ctx.GetTargetPtr();
+                // Get a dummy target to allow for calculator mode while processing backticks.
+                // This also helps break the infinite loop caused when target is null.
+                if (!target)
+                    target = Host::GetDummyTarget(GetDebugger()).get();
                 if (target)
                 {
                     const bool unwind_on_error = true;



From johnny.chen at apple.com  Fri Oct 28 19:35:28 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Sat, 29 Oct 2011 00:35:28 -0000
Subject: [Lldb-commits] [lldb] r143261 - /lldb/trunk/test/bench-history
Message-ID: <20111029003528.301E6312800A@llvm.org>

Author: johnny
Date: Fri Oct 28 19:35:28 2011
New Revision: 143261

URL: http://llvm.org/viewvc/llvm-project?rev=143261&view=rev
Log:
Add bench entries.

Modified:
    lldb/trunk/test/bench-history

Modified: lldb/trunk/test/bench-history
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/bench-history?rev=143261&r1=143260&r2=143261&view=diff
==============================================================================
--- lldb/trunk/test/bench-history (original)
+++ lldb/trunk/test/bench-history Fri Oct 28 19:35:28 2011
@@ -88,3 +88,22 @@
 lldb expr cmd benchmark: Avg: 0.211872 (Laps: 25, Total Elapsed Time: 5.296811, min=0.203827, max=0.259524)
 lldb disassembly benchmark: Avg: 0.104108 (Laps: 10, Total Elapsed Time: 1.041076, min=0.089751, max=0.227173)
 
+r143260
+# No performance regression.
+[16:51:27] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py -e /Volumes/data/lldb/svn/regression/build/Debug/lldb -x '-F Driver::MainLoop()' 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.103818 (Laps: 30, Total Elapsed Time: 3.114534, min=0.101654, max=0.135579)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.102786 (Laps: 30, Total Elapsed Time: 3.083594, min=0.101567, max=0.115159)
+lldb startup delay (run to breakpoint) benchmark: Avg: 0.444478 (Laps: 30, Total Elapsed Time: 13.334348, min=0.429840, max=0.514523)
+lldb frame variable benchmark: Avg: 1.627282 (Laps: 20, Total Elapsed Time: 32.545639, min=1.596098, max=1.768229)
+lldb stepping benchmark: Avg: 0.134925 (Laps: 50, Total Elapsed Time: 6.746272, min=0.101132, max=1.743882)
+lldb expr cmd benchmark: Avg: 0.209595 (Laps: 25, Total Elapsed Time: 5.239863, min=0.203182, max=0.255394)
+lldb disassembly benchmark: Avg: 0.091296 (Laps: 10, Total Elapsed Time: 0.912963, min=0.089690, max=0.103690)
+[17:31:27] johnny:/Volumes/data/lldb/svn/trunk/test $ ./bench.py -e /Volumes/data/lldb/svn/regression/build/Debug/lldb -x '-F Driver::MainLoop()' 2>&1 | grep -P '^lldb.*benchmark:'
+lldb startup delay (create fresh target) benchmark: Avg: 0.104030 (Laps: 30, Total Elapsed Time: 3.120891, min=0.101980, max=0.136737)
+lldb startup delay (set first breakpoint) benchmark: Avg: 0.102375 (Laps: 30, Total Elapsed Time: 3.071264, min=0.101454, max=0.103283)
+lldb startup delay (run to breakpoint) benchmark: Avg: 0.443155 (Laps: 30, Total Elapsed Time: 13.294637, min=0.434646, max=0.459273)
+lldb frame variable benchmark: Avg: 1.608266 (Laps: 20, Total Elapsed Time: 32.165314, min=1.596172, max=1.620366)
+lldb stepping benchmark: Avg: 0.104140 (Laps: 50, Total Elapsed Time: 5.207003, min=0.101436, max=0.196166)
+lldb expr cmd benchmark: Avg: 0.208264 (Laps: 25, Total Elapsed Time: 5.206604, min=0.204082, max=0.258287)
+lldb disassembly benchmark: Avg: 0.091677 (Laps: 10, Total Elapsed Time: 0.916773, min=0.090101, max=0.099648)
+



From jingham at apple.com  Fri Oct 28 19:54:12 2011
From: jingham at apple.com (Jim Ingham)
Date: Sat, 29 Oct 2011 00:54:12 -0000
Subject: [Lldb-commits] [lldb] r143264 - /lldb/trunk/source/Symbol/Symbol.cpp
Message-ID: <20111029005412.7ECC0312800A@llvm.org>

Author: jingham
Date: Fri Oct 28 19:54:12 2011
New Revision: 143264

URL: http://llvm.org/viewvc/llvm-project?rev=143264&view=rev
Log:
Fix a type in Symbol::Compare which was causing calls to Compare with type eSymbolTypeAny to fail.

Modified:
    lldb/trunk/source/Symbol/Symbol.cpp

Modified: lldb/trunk/source/Symbol/Symbol.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Symbol.cpp?rev=143264&r1=143263&r2=143264&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Symbol.cpp (original)
+++ lldb/trunk/source/Symbol/Symbol.cpp Fri Oct 28 19:54:12 2011
@@ -303,7 +303,7 @@
 bool
 Symbol::Compare(const ConstString& name, SymbolType type) const
 {
-    if (m_type == eSymbolTypeAny || m_type == type)
+    if (type == eSymbolTypeAny || m_type == type)
         return m_mangled.GetMangledName() == name || m_mangled.GetDemangledName() == name;
     return false;
 }



From gclayton at apple.com  Fri Oct 28 19:57:29 2011
From: gclayton at apple.com (Greg Clayton)
Date: Sat, 29 Oct 2011 00:57:29 -0000
Subject: [Lldb-commits] [lldb] r143266 - in /lldb/trunk:
 include/lldb/Interpreter/Options.h
 source/Interpreter/CommandInterpreter.cpp source/Interpreter/Options.cpp
Message-ID: <20111029005729.2968F312800A@llvm.org>

Author: gclayton
Date: Fri Oct 28 19:57:28 2011
New Revision: 143266

URL: http://llvm.org/viewvc/llvm-project?rev=143266&view=rev
Log:
Fixed the "expression" command when it comes to using it with the new GDB format
command suffix:

(lldb) expression/x 3+3

Since "expression" is a raw command that has options, we need to make sure the
command gets its options properly terminated with a "--".

Also fixed an issue where if you try to use the GDB command suffix on a 
command that doesn't support the "--gdb-format" command, it will report an
appropriate error.

For the fix above, you can query an lldb_private::Options object to see if it
supports a long option by name.


Modified:
    lldb/trunk/include/lldb/Interpreter/Options.h
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp
    lldb/trunk/source/Interpreter/Options.cpp

Modified: lldb/trunk/include/lldb/Interpreter/Options.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/Options.h?rev=143266&r1=143265&r2=143266&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/Options.h (original)
+++ lldb/trunk/include/lldb/Interpreter/Options.h Fri Oct 28 19:57:28 2011
@@ -158,6 +158,9 @@
     GenerateOptionUsage (Stream &strm,
                          CommandObject *cmd);
 
+    bool
+    SupportsLongOption (const char *long_option);
+
     // The following two pure virtual functions must be defined by every 
     // class that inherits from this class.
 

Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=143266&r1=143265&r2=143266&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Fri Oct 28 19:57:28 2011
@@ -1359,8 +1359,30 @@
                 {
                 case '/':
                     // GDB format suffixes
-                    revised_command_line.Printf (" --gdb-format=%s", suffix.c_str() + 1);
+                    {
+                        Options *command_options = cmd_obj->GetOptions();
+                        if (command_options && command_options->SupportsLongOption("gdb-format"))
+                        {
+                            revised_command_line.Printf (" --gdb-format=%s", suffix.c_str() + 1);
+                            if (wants_raw_input && command_string.find ("-- ") == std::string::npos)
+                                revised_command_line.Printf (" --");
+                        }
+                        else
+                        {
+                            result.AppendErrorWithFormat ("the '%s' command doesn't support the --gdb-format option\n", 
+                                                          cmd_obj->GetCommandName());
+                            result.SetStatus (eReturnStatusFailed);
+                            return false;
+                        }
+                    }
                     break;
+
+                default:
+                    result.AppendErrorWithFormat ("unknown command shorthand suffix: '%s'\n", 
+                                                  suffix.c_str());
+                    result.SetStatus (eReturnStatusFailed);
+                    return false;
+        
                 }
             }
         }

Modified: lldb/trunk/source/Interpreter/Options.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/Options.cpp?rev=143266&r1=143265&r2=143266&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/Options.cpp (original)
+++ lldb/trunk/source/Interpreter/Options.cpp Fri Oct 28 19:57:28 2011
@@ -186,7 +186,7 @@
     if (num_options == 0)
         return;
 
-    const OptionDefinition *full_options_table = GetDefinitions();
+    const OptionDefinition *opt_defs = GetDefinitions();
     m_required_options.resize(1);
     m_optional_options.resize(1);
     
@@ -196,7 +196,7 @@
     
     for (int i = 0; i < num_options; i++)
     {
-        uint32_t this_usage_mask = full_options_table[i].usage_mask;
+        uint32_t this_usage_mask = opt_defs[i].usage_mask;
         if (this_usage_mask == LLDB_OPT_SET_ALL)
         {
             if (num_option_sets == 0)
@@ -224,12 +224,12 @@
         {
             for (int j = 0; j < num_option_sets; j++)
             {
-                if (full_options_table[i].usage_mask & 1 << j)
+                if (opt_defs[i].usage_mask & 1 << j)
                 {
-                    if (full_options_table[i].required)
-                        m_required_options[j].insert(full_options_table[i].short_option);
+                    if (opt_defs[i].required)
+                        m_required_options[j].insert(opt_defs[i].short_option);
                     else
-                        m_optional_options[j].insert(full_options_table[i].short_option);
+                        m_optional_options[j].insert(opt_defs[i].short_option);
                 }
             }
         }
@@ -239,15 +239,15 @@
 uint32_t
 Options::NumCommandOptions ()
 {
-    const OptionDefinition *full_options_table = GetDefinitions ();
-    if (full_options_table == NULL) 
+    const OptionDefinition *opt_defs = GetDefinitions ();
+    if (opt_defs == NULL) 
         return 0;
         
     int i = 0;
 
-    if (full_options_table != NULL)
+    if (opt_defs != NULL)
     {
-        while (full_options_table[i].long_option != NULL)
+        while (opt_defs[i].long_option != NULL)
             ++i;
     }
 
@@ -267,21 +267,21 @@
 
         uint32_t i;
         uint32_t j;
-        const OptionDefinition *full_options_table = GetDefinitions();
+        const OptionDefinition *opt_defs = GetDefinitions();
 
         std::bitset<256> option_seen;
 
         m_getopt_table.resize(num_options + 1);
         for (i = 0, j = 0; i < num_options; ++i)
         {
-            char short_opt = full_options_table[i].short_option;
+            char short_opt = opt_defs[i].short_option;
 
             if (option_seen.test(short_opt) == false)
             {
-                m_getopt_table[j].name    = full_options_table[i].long_option;
-                m_getopt_table[j].has_arg = full_options_table[i].option_has_arg;
+                m_getopt_table[j].name    = opt_defs[i].long_option;
+                m_getopt_table[j].has_arg = opt_defs[i].option_has_arg;
                 m_getopt_table[j].flag    = NULL;
-                m_getopt_table[j].val     = full_options_table[i].short_option;
+                m_getopt_table[j].val     = opt_defs[i].short_option;
                 option_seen.set(short_opt);
                 ++j;
             }
@@ -367,6 +367,30 @@
     }
 }
 
+bool
+Options::SupportsLongOption (const char *long_option)
+{
+    if (long_option && long_option[0])
+    {
+        const OptionDefinition *opt_defs = GetDefinitions ();
+        if (opt_defs)
+        {
+            const char *long_option_name;
+            if (long_option[0] == '-' && long_option[1] == '-')
+                long_option_name += 2;
+            else
+                long_option_name = long_option;
+
+            for (uint32_t i = 0; opt_defs[i].long_option; ++i)
+            {
+                if (strcmp(opt_defs[i].long_option, long_option_name) == 0)
+                    return true;
+            }
+        }
+    }
+    return false;
+}
+
 void
 Options::GenerateOptionUsage
 (
@@ -376,7 +400,7 @@
 {
     const uint32_t screen_width = m_interpreter.GetDebugger().GetTerminalWidth();
 
-    const OptionDefinition *full_options_table = GetDefinitions();
+    const OptionDefinition *opt_defs = GetDefinitions();
     const uint32_t save_indent_level = strm.GetIndentLevel();
     const char *name;
 
@@ -424,14 +448,14 @@
         bool first;
         for (i = 0, first = true; i < num_options; ++i)
         {
-            if (full_options_table[i].usage_mask & opt_set_mask)
+            if (opt_defs[i].usage_mask & opt_set_mask)
             {
                 // Add current option to the end of out_stream.
 
-                if (full_options_table[i].required == true && 
-                    full_options_table[i].option_has_arg == no_argument)
+                if (opt_defs[i].required == true && 
+                    opt_defs[i].option_has_arg == no_argument)
                 {
-                    options.insert (full_options_table[i].short_option);
+                    options.insert (opt_defs[i].short_option);
                 }
             }
         }
@@ -455,14 +479,14 @@
 
         for (i = 0, options.clear(); i < num_options; ++i)
         {
-            if (full_options_table[i].usage_mask & opt_set_mask)
+            if (opt_defs[i].usage_mask & opt_set_mask)
             {
                 // Add current option to the end of out_stream.
 
-                if (full_options_table[i].required == false &&
-                    full_options_table[i].option_has_arg == no_argument)
+                if (opt_defs[i].required == false &&
+                    opt_defs[i].option_has_arg == no_argument)
                 {
-                    options.insert (full_options_table[i].short_option);
+                    options.insert (opt_defs[i].short_option);
                 }
             }
         }
@@ -489,23 +513,23 @@
         
         for (i = 0; i < num_options; ++i)
         {
-            if (full_options_table[i].usage_mask & opt_set_mask)
+            if (opt_defs[i].usage_mask & opt_set_mask)
             {
                 // Add current option to the end of out_stream.
-                CommandArgumentType arg_type = full_options_table[i].argument_type;
+                CommandArgumentType arg_type = opt_defs[i].argument_type;
                 
-                if (full_options_table[i].required)
+                if (opt_defs[i].required)
                 {
-                    if (full_options_table[i].option_has_arg == required_argument)
+                    if (opt_defs[i].option_has_arg == required_argument)
                     {
                         strm.Printf (" -%c <%s>",
-                                     full_options_table[i].short_option, 
+                                     opt_defs[i].short_option, 
                                      CommandObject::GetArgumentName (arg_type));
                     }
-                    else if (full_options_table[i].option_has_arg == optional_argument)
+                    else if (opt_defs[i].option_has_arg == optional_argument)
                     {
                         strm.Printf (" -%c [<%s>]",
-                                     full_options_table[i].short_option,
+                                     opt_defs[i].short_option,
                                      CommandObject::GetArgumentName (arg_type));
                     }
                 }
@@ -516,19 +540,19 @@
 
         for (i = 0; i < num_options; ++i)
         {
-            if (full_options_table[i].usage_mask & opt_set_mask)
+            if (opt_defs[i].usage_mask & opt_set_mask)
             {
                 // Add current option to the end of out_stream.
 
-                CommandArgumentType arg_type = full_options_table[i].argument_type;
+                CommandArgumentType arg_type = opt_defs[i].argument_type;
                 
-                if (! full_options_table[i].required)
+                if (! opt_defs[i].required)
                 {
-                    if (full_options_table[i].option_has_arg == required_argument)
-                        strm.Printf (" [-%c <%s>]", full_options_table[i].short_option,
+                    if (opt_defs[i].option_has_arg == required_argument)
+                        strm.Printf (" [-%c <%s>]", opt_defs[i].short_option,
                                      CommandObject::GetArgumentName (arg_type));
-                    else if (full_options_table[i].option_has_arg == optional_argument)
-                        strm.Printf (" [-%c [<%s>]]", full_options_table[i].short_option,
+                    else if (opt_defs[i].option_has_arg == optional_argument)
+                        strm.Printf (" [-%c [<%s>]]", opt_defs[i].short_option,
                                      CommandObject::GetArgumentName (arg_type));
                 }
             }
@@ -557,11 +581,11 @@
 
     for (i = 0; i < num_options; ++i)
     {
-        pos = options_seen.find (full_options_table[i].short_option);
+        pos = options_seen.find (opt_defs[i].short_option);
         if (pos == options_seen.end())
         {
-            options_seen.insert (full_options_table[i].short_option);
-            sorted_options.push_back (full_options_table[i].short_option);
+            options_seen.insert (opt_defs[i].short_option);
+            sorted_options.push_back (opt_defs[i].short_option);
         }
     }
 
@@ -578,7 +602,7 @@
         bool found = false;
         for (i = 0; i < num_options && !found; ++i)
         {
-            if (full_options_table[i].short_option == option)
+            if (opt_defs[i].short_option == option)
             {
                 found = true;
                 //Print out the help information for this option.
@@ -589,36 +613,36 @@
                 else
                     strm.EOL();
                 
-                CommandArgumentType arg_type = full_options_table[i].argument_type;
+                CommandArgumentType arg_type = opt_defs[i].argument_type;
                 
                 StreamString arg_name_str;
                 arg_name_str.Printf ("<%s>", CommandObject::GetArgumentName (arg_type));
 
                 strm.Indent ();
-                strm.Printf ("-%c", full_options_table[i].short_option);
+                strm.Printf ("-%c", opt_defs[i].short_option);
                 if (arg_type != eArgTypeNone)
                     strm.Printf (" <%s>",  CommandObject::GetArgumentName (arg_type));
-                strm.Printf ("  ( --%s", full_options_table[i].long_option);
+                strm.Printf ("  ( --%s", opt_defs[i].long_option);
                 if (arg_type != eArgTypeNone)
                     strm.Printf (" <%s>", CommandObject::GetArgumentName (arg_type));
                 strm.PutCString(" )\n");
                 
                 strm.IndentMore (5);
                 
-                if (full_options_table[i].usage_text)
+                if (opt_defs[i].usage_text)
                     OutputFormattedUsageText (strm,
-                                              full_options_table[i].usage_text,
+                                              opt_defs[i].usage_text,
                                               screen_width);
-                if (full_options_table[i].enum_values != NULL)
+                if (opt_defs[i].enum_values != NULL)
                 {
                     strm.Indent ();
                     strm.Printf("Values: ");
-                    for (int k = 0; full_options_table[i].enum_values[k].string_value != NULL; k++) 
+                    for (int k = 0; opt_defs[i].enum_values[k].string_value != NULL; k++) 
                     {
                         if (k == 0)
-                            strm.Printf("%s", full_options_table[i].enum_values[k].string_value);
+                            strm.Printf("%s", opt_defs[i].enum_values[k].string_value);
                         else
-                            strm.Printf(" | %s", full_options_table[i].enum_values[k].string_value);
+                            strm.Printf(" | %s", opt_defs[i].enum_values[k].string_value);
                     }
                     strm.EOL();
                 }



From gclayton at apple.com  Fri Oct 28 20:19:09 2011
From: gclayton at apple.com (Greg Clayton)
Date: Sat, 29 Oct 2011 01:19:09 -0000
Subject: [Lldb-commits] [lldb] r143269 - in /lldb/trunk:
 lldb.xcodeproj/project.pbxproj resources/LLDB-Info.plist
 tools/debugserver/debugserver.xcodeproj/project.pbxproj
Message-ID: <20111029011909.25FD9312800A@llvm.org>

Author: gclayton
Date: Fri Oct 28 20:19:08 2011
New Revision: 143269

URL: http://llvm.org/viewvc/llvm-project?rev=143269&view=rev
Log:
Updated the project to use the "DEVELOPER_DIR" build setting that specifies
the path to the /Developer directory, and also bumped the Xcode project version
for lldb-83 and debugserver-148.


Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/resources/LLDB-Info.plist
    lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=143269&r1=143268&r2=143269&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Oct 28 20:19:08 2011
@@ -3657,7 +3657,7 @@
 				FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				INSTALL_PATH = /Developer/usr/bin;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = "darwin-debug";
 			};
@@ -3669,7 +3669,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
 				FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks;
-				INSTALL_PATH = /Developer/usr/bin;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = "darwin-debug";
 			};
@@ -3680,7 +3680,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				FRAMEWORK_SEARCH_PATHS = /System/Library/PrivateFrameworks;
-				INSTALL_PATH = /Developer/usr/bin;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = "darwin-debug";
 			};
@@ -3691,9 +3691,9 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 82;
+				DYLIB_CURRENT_VERSION = 83;
 				EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3710,7 +3710,7 @@
 				);
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "resources/LLDB-Info.plist";
-				INSTALL_PATH = /Developer/Library/PrivateFrameworks;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/Library/PrivateFrameworks";
 				LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3741,10 +3741,10 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
 				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 82;
+				DYLIB_CURRENT_VERSION = 83;
 				EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3760,7 +3760,7 @@
 				);
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "resources/LLDB-Info.plist";
-				INSTALL_PATH = /Developer/Library/PrivateFrameworks;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/Library/PrivateFrameworks";
 				LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3790,8 +3790,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 82;
-				DYLIB_CURRENT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
+				DYLIB_CURRENT_VERSION = 83;
 				EXECUTABLE_EXTENSION = a;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3804,7 +3804,7 @@
 					__STDC_LIMIT_MACROS,
 					LLDB_CONFIGURATION_DEBUG,
 				);
-				LD_DYLIB_INSTALL_NAME = "/Developer/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
+				LD_DYLIB_INSTALL_NAME = "$(DEVELOPER_DIR)/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(LLVM_BUILD_DIR)",
@@ -3828,8 +3828,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 82;
-				DYLIB_CURRENT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
+				DYLIB_CURRENT_VERSION = 83;
 				EXECUTABLE_EXTENSION = a;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3842,7 +3842,7 @@
 					__STDC_LIMIT_MACROS,
 					LLDB_CONFIGURATION_RELEASE,
 				);
-				LD_DYLIB_INSTALL_NAME = "/Developer/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
+				LD_DYLIB_INSTALL_NAME = "$(DEVELOPER_DIR)/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(LLVM_BUILD_DIR)",
@@ -3866,8 +3866,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 82;
-				DYLIB_CURRENT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
+				DYLIB_CURRENT_VERSION = 83;
 				EXECUTABLE_EXTENSION = a;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3880,7 +3880,7 @@
 					__STDC_LIMIT_MACROS,
 					LLDB_CONFIGURATION_BUILD_AND_INTEGRATION,
 				);
-				LD_DYLIB_INSTALL_NAME = "/Developer/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
+				LD_DYLIB_INSTALL_NAME = "$(DEVELOPER_DIR)/Library/PrivateFrameworks/LLDB.framework/Resources/lldb-core.a";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(LLVM_BUILD_DIR)",
@@ -3939,7 +3939,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -3948,7 +3948,7 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "lldb-Info.plist";
-				INSTALL_PATH = /Developer/usr/bin;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"-sectcreate",
@@ -3968,10 +3968,10 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
 				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 82;
+				DYLIB_CURRENT_VERSION = 83;
 				EXPORTED_SYMBOLS_FILE = "resources/lldb-framework-exports";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3987,7 +3987,7 @@
 				);
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "resources/LLDB-Info.plist";
-				INSTALL_PATH = /Developer/Library/PrivateFrameworks;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/Library/PrivateFrameworks";
 				LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4028,7 +4028,7 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				INSTALL_PATH = /usr/local/bin;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -4054,7 +4054,7 @@
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				INSTALL_PATH = /usr/local/bin;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -4078,7 +4078,7 @@
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				INSTALL_PATH = /usr/local/bin;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -4094,7 +4094,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -4105,7 +4105,7 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "lldb-Info.plist";
-				INSTALL_PATH = /Developer/usr/bin;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"-sectcreate",
@@ -4124,7 +4124,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -4133,7 +4133,7 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "lldb-Info.plist";
-				INSTALL_PATH = /Developer/usr/bin;
+				INSTALL_PATH = "$(DEVELOPER_DIR)/usr/bin";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"-sectcreate",

Modified: lldb/trunk/resources/LLDB-Info.plist
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/resources/LLDB-Info.plist?rev=143269&r1=143268&r2=143269&view=diff
==============================================================================
--- lldb/trunk/resources/LLDB-Info.plist (original)
+++ lldb/trunk/resources/LLDB-Info.plist Fri Oct 28 20:19:08 2011
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>82</string>
+	<string>83</string>
 	<key>CFBundleName</key>
 	<string>${EXECUTABLE_NAME}</string>
 </dict>

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=143269&r1=143268&r2=143269&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj Fri Oct 28 20:19:08 2011
@@ -475,7 +475,7 @@
 					i386,
 				);
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 147;
+				CURRENT_PROJECT_VERSION = 148;
 				"GCC_VERSION[sdk=iphoneos*][arch=*]" = 4.2;
 				"GCC_VERSION[sdk=macosx*][arch=*]" = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -496,7 +496,7 @@
 					x86_64,
 					i386,
 				);
-				CURRENT_PROJECT_VERSION = 147;
+				CURRENT_PROJECT_VERSION = 148;
 				DEAD_CODE_STRIPPING = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -517,7 +517,7 @@
 					x86_64,
 					i386,
 				);
-				CURRENT_PROJECT_VERSION = 147;
+				CURRENT_PROJECT_VERSION = 148;
 				DEAD_CODE_STRIPPING = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -535,7 +535,7 @@
 			buildSettings = {
 				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 147;
+				CURRENT_PROJECT_VERSION = 148;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
 				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (
@@ -575,7 +575,7 @@
 				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 147;
+				CURRENT_PROJECT_VERSION = 148;
 				FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
 				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (
 					"$(SDKROOT)/System/Library/PrivateFrameworks",
@@ -615,7 +615,7 @@
 				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "source/debugserver-entitlements.plist";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 147;
+				CURRENT_PROJECT_VERSION = 148;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = $SDKROOT/System/Library/PrivateFrameworks;
 				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = (



From gclayton at apple.com  Fri Oct 28 20:19:47 2011
From: gclayton at apple.com (Greg Clayton)
Date: Sat, 29 Oct 2011 01:19:47 -0000
Subject: [Lldb-commits] [lldb] r143271 - /lldb/tags/lldb-83/
Message-ID: <20111029011947.A8BED312800A@llvm.org>

Author: gclayton
Date: Fri Oct 28 20:19:47 2011
New Revision: 143271

URL: http://llvm.org/viewvc/llvm-project?rev=143271&view=rev
Log:
lldb-83


Added:
    lldb/tags/lldb-83/
      - copied from r143270, lldb/trunk/


From jmolenda at apple.com  Fri Oct 28 20:34:50 2011
From: jmolenda at apple.com (Jason Molenda)
Date: Sat, 29 Oct 2011 01:34:50 -0000
Subject: [Lldb-commits] [lldb] r143273 - /lldb/trunk/source/Core/ArchSpec.cpp
Message-ID: <20111029013450.4ACD3312800A@llvm.org>

Author: jmolenda
Date: Fri Oct 28 20:34:50 2011
New Revision: 143273

URL: http://llvm.org/viewvc/llvm-project?rev=143273&view=rev
Log:
Remove alpha from list of known architectures -- it was just removed
from llvm TOT.

Modified:
    lldb/trunk/source/Core/ArchSpec.cpp

Modified: lldb/trunk/source/Core/ArchSpec.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ArchSpec.cpp?rev=143273&r1=143272&r2=143273&view=diff
==============================================================================
--- lldb/trunk/source/Core/ArchSpec.cpp (original)
+++ lldb/trunk/source/Core/ArchSpec.cpp Fri Oct 28 20:34:50 2011
@@ -43,9 +43,6 @@
 // This core information can be looked using the ArchSpec::Core as the index
 static const CoreDefinition g_core_definitions[ArchSpec::kNumCores] =
 {
-    // TODO: verify alpha has 32 bit fixed instructions
-    { eByteOrderLittle, 4, 4, 4, llvm::Triple::alpha  , ArchSpec::eCore_alpha_generic   , "alpha"     },
-
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_generic     , "arm"       },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv4       , "armv4"     },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv4t      , "armv4t"    },



From johnny.chen at apple.com  Fri Oct 28 20:58:39 2011
From: johnny.chen at apple.com (Johnny Chen)
Date: Sat, 29 Oct 2011 01:58:39 -0000
Subject: [Lldb-commits] [lldb] r143274 - in
 /lldb/trunk/test/functionalities/backticks: ./
 TestBackticksWithoutATarget.py
Message-ID: <20111029015839.75CB7312800A@llvm.org>

Author: johnny
Date: Fri Oct 28 20:58:39 2011
New Revision: 143274

URL: http://llvm.org/viewvc/llvm-project?rev=143274&view=rev
Log:
Add a simple regression test to go with r143260.
CommandInterpreter::PreprocessCommand() should not infinite loop
when a target has not been specified yet.

Added:
    lldb/trunk/test/functionalities/backticks/
    lldb/trunk/test/functionalities/backticks/TestBackticksWithoutATarget.py

Added: lldb/trunk/test/functionalities/backticks/TestBackticksWithoutATarget.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/backticks/TestBackticksWithoutATarget.py?rev=143274&view=auto
==============================================================================
--- lldb/trunk/test/functionalities/backticks/TestBackticksWithoutATarget.py (added)
+++ lldb/trunk/test/functionalities/backticks/TestBackticksWithoutATarget.py Fri Oct 28 20:58:39 2011
@@ -0,0 +1,23 @@
+"""
+Test that backticks without a target should work (not infinite looping).
+"""
+
+import os, time
+import unittest2
+import lldb
+from lldbtest import *
+
+class BackticksWithNoTargetTestCase(TestBase):
+
+    mydir = "functionalities/backticks"
+
+    def test_backticks_no_target(self):
+        """A simple test of backticks without a target."""
+        self.expect("print `1+2-3`",
+            substrs = [' = 0'])
+
+if __name__ == '__main__':
+    import atexit
+    lldb.SBDebugger.Initialize()
+    atexit.register(lambda: lldb.SBDebugger.Terminate())
+    unittest2.main()



From scallanan at apple.com  Fri Oct 28 20:58:46 2011
From: scallanan at apple.com (Sean Callanan)
Date: Sat, 29 Oct 2011 01:58:46 -0000
Subject: [Lldb-commits] [lldb] r143275 - in /lldb/trunk:
 include/lldb/Expression/ClangASTSource.h
 include/lldb/Expression/ClangExpressionDeclMap.h
 source/Expression/ClangASTSource.cpp
 source/Expression/ClangExpressionDeclMap.cpp
 source/Expression/ClangUserExpression.cpp
 source/Expression/ClangUtilityFunction.cpp
Message-ID: <20111029015846.78901312800A@llvm.org>

Author: spyffe
Date: Fri Oct 28 20:58:46 2011
New Revision: 143275

URL: http://llvm.org/viewvc/llvm-project?rev=143275&view=rev
Log:
I moved the responsibility for interacting with the
AST importer on completing namespace mappings from
ClangExpressionDeclMap to ClangASTSource.

ClangASTSource now contains a TargetSP which it
uses to lookup namespaces in all of a target's
modules.  I will use the TargetSP in the future to
look up globals.

Modified:
    lldb/trunk/include/lldb/Expression/ClangASTSource.h
    lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
    lldb/trunk/source/Expression/ClangASTSource.cpp
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
    lldb/trunk/source/Expression/ClangUserExpression.cpp
    lldb/trunk/source/Expression/ClangUtilityFunction.cpp

Modified: lldb/trunk/include/lldb/Expression/ClangASTSource.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangASTSource.h?rev=143275&r1=143274&r2=143275&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangASTSource.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangASTSource.h Fri Oct 28 20:58:46 2011
@@ -15,11 +15,10 @@
 #include "clang/Basic/IdentifierTable.h"
 #include "clang/AST/ExternalASTSource.h"
 #include "lldb/Symbol/ClangASTImporter.h"
+#include "lldb/Target/Target.h"
 
 namespace lldb_private {
     
-class ClangExpressionDeclMap;
-
 //----------------------------------------------------------------------
 /// @class ClangASTSource ClangASTSource.h "lldb/Expression/ClangASTSource.h"
 /// @brief Provider for named objects defined in the debug info for Clang
@@ -31,7 +30,9 @@
 /// to Clang for these names, consulting the ClangExpressionDeclMap to do
 /// the actual lookups.
 //----------------------------------------------------------------------
-class ClangASTSource : public clang::ExternalASTSource 
+class ClangASTSource : 
+    public clang::ExternalASTSource,
+    public ClangASTImporter::NamespaceMapCompleter
 {
 public:
     //------------------------------------------------------------------
@@ -42,11 +43,12 @@
     /// @param[in] declMap
     ///     A reference to the LLDB object that handles entity lookup.
     //------------------------------------------------------------------
-	ClangASTSource () :
+	ClangASTSource (const lldb::TargetSP &target) :
         m_ast_context (NULL),
         m_active_lookups (),
         m_import_in_progress (false),
-        m_lookups_enabled (false)
+        m_lookups_enabled (false),
+        m_target (target)
     {
     }
     
@@ -69,6 +71,13 @@
 	
     void InstallASTContext (clang::ASTContext *ast_context)
     {
+        if (!m_ast_importer.get() ||
+            m_ast_importer->TargetASTContext() != ast_context)
+        {
+            m_ast_importer.reset(new ClangASTImporter(ast_context));
+            m_ast_importer->InstallMapCompleter(*this);
+        }
+        
         m_ast_context = ast_context;
     }
     
@@ -145,6 +154,29 @@
     void StartTranslationUnit (clang::ASTConsumer *Consumer);
     
     //
+    // APIs for NamespaceMapCompleter
+    //
+    
+    
+    //------------------------------------------------------------------
+    /// Look up the modules containing a given namespace and put the 
+    /// appropriate entries in the namespace map.
+    ///
+    /// @param[in] namespace_map
+    ///     The map to be completed.
+    ///
+    /// @param[in] name
+    ///     The name of the namespace to be found.
+    ///
+    /// @param[in] parent_map
+    ///     The map for the namespace's parent namespace, if there is
+    ///     one.
+    //------------------------------------------------------------------
+    void CompleteNamespaceMap (ClangASTImporter::NamespaceMapSP &namespace_map,
+                               const ConstString &name,
+                               ClangASTImporter::NamespaceMapSP &parent_map) const;
+    
+    //
     // Helper APIs
     //
     
@@ -223,8 +255,10 @@
     bool                    m_import_in_progress;
     bool                    m_lookups_enabled;
 
-	clang::ASTContext      *m_ast_context;     ///< The parser's AST context, for copying types into
-    std::set<const char *>  m_active_lookups;
+    const lldb::TargetSP                m_target;           ///< The target to use in finding variables and types.
+	clang::ASTContext                  *m_ast_context;      ///< The parser's AST context, for copying types into
+    std::auto_ptr<ClangASTImporter>     m_ast_importer;
+    std::set<const char *>              m_active_lookups;
 };
 
 //----------------------------------------------------------------------

Modified: lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h?rev=143275&r1=143274&r2=143275&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h Fri Oct 28 20:58:46 2011
@@ -58,8 +58,7 @@
 /// has executed, placing the new values back where it found the old ones.
 //----------------------------------------------------------------------
 class ClangExpressionDeclMap : 
-    public ClangASTSource,
-    public ClangASTImporter::NamespaceMapCompleter
+    public ClangASTSource
 {
 public:
     //------------------------------------------------------------------
@@ -72,7 +71,8 @@
     ///     the result persistent variable, and instead marks the variable
     ///     as persisting.
     //------------------------------------------------------------------
-    ClangExpressionDeclMap (bool keep_result_in_memory);
+    ClangExpressionDeclMap (bool keep_result_in_memory,
+                            ExecutionContext &exe_ctx);
     
     //------------------------------------------------------------------
     /// Destructor
@@ -663,25 +663,6 @@
     //------------------------------------------------------------------
     void
     CompleteType (clang::ObjCInterfaceDecl *interface_decl);
-    
-    //------------------------------------------------------------------
-    /// [Used by ClangASTImporter] Look up the modules containing a
-    /// given namespace and put the appropriate entries in the namespace
-    /// map.
-    ///
-    /// @param[in] namespace_map
-    ///     The map to be completed.
-    ///
-    /// @param[in] name
-    ///     The name of the namespace to be found.
-    ///
-    /// @param[in] parent_map
-    ///     The map for the namespace's parent namespace, if there is
-    ///     one.
-    //------------------------------------------------------------------
-    void CompleteNamespaceMap (ClangASTImporter::NamespaceMapSP &namespace_map,
-                               const ConstString &name,
-                               ClangASTImporter::NamespaceMapSP &parent_map) const;
 
 private:
     ClangExpressionVariableList    m_found_entities;           ///< All entities that were looked up for the parser.
@@ -714,19 +695,6 @@
             return NULL;
         }
         
-        ClangASTImporter *GetASTImporter (clang::ASTContext *ast_context)
-        {            
-            if (!m_ast_importer.get())
-                m_ast_importer.reset(new ClangASTImporter(ast_context));
-            
-            if (m_ast_importer->TargetASTContext() != ast_context)
-                return NULL;
-            
-            m_ast_importer->InstallMapCompleter(m_decl_map);
-            
-            return m_ast_importer.get();
-        }
-        
         ExecutionContext           *m_exe_ctx;          ///< The execution context to use when parsing.
         SymbolContext               m_sym_ctx;          ///< The symbol context to use in finding variables and types.
         ClangPersistentVariables   *m_persistent_vars;  ///< The persistent variables for the process.

Modified: lldb/trunk/source/Expression/ClangASTSource.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangASTSource.cpp?rev=143275&r1=143274&r2=143275&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangASTSource.cpp (original)
+++ lldb/trunk/source/Expression/ClangASTSource.cpp Fri Oct 28 20:58:46 2011
@@ -11,9 +11,13 @@
 #include "clang/AST/ASTContext.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Module.h"
+#include "lldb/Core/ModuleList.h"
 #include "lldb/Expression/ClangASTSource.h"
 #include "lldb/Expression/ClangExpression.h"
 #include "lldb/Expression/ClangExpressionDeclMap.h"
+#include "lldb/Symbol/ClangNamespaceDecl.h"
+#include "lldb/Symbol/SymbolVendor.h"
+#include "lldb/Target/Target.h"
 
 using namespace clang;
 using namespace lldb_private;
@@ -143,6 +147,101 @@
     return ELR_Success;
 }
 
+void 
+ClangASTSource::CompleteNamespaceMap (ClangASTImporter::NamespaceMapSP &namespace_map,
+                                      const ConstString &name,
+                                      ClangASTImporter::NamespaceMapSP &parent_map) const
+{
+    static unsigned int invocation_id = 0;
+    unsigned int current_id = invocation_id++;
+    
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+    
+    if (log)
+    {
+        if (parent_map && parent_map->size())
+            log->Printf("CompleteNamespaceMap[%u] Searching for namespace %s in namespace %s",
+                        current_id,
+                        name.GetCString(),
+                        parent_map->begin()->second.GetNamespaceDecl()->getDeclName().getAsString().c_str());
+        else
+            log->Printf("CompleteNamespaceMap[%u] Searching for namespace %s",
+                        current_id,
+                        name.GetCString());
+    }
+    
+    
+    if (parent_map)
+    {
+        for (ClangASTImporter::NamespaceMap::iterator i = parent_map->begin(), e = parent_map->end();
+             i != e;
+             ++i)
+        {
+            ClangNamespaceDecl found_namespace_decl;
+            
+            lldb::ModuleSP module_sp = i->first;
+            ClangNamespaceDecl module_parent_namespace_decl = i->second;
+            
+            SymbolVendor *symbol_vendor = module_sp->GetSymbolVendor();
+            
+            if (!symbol_vendor)
+                continue;
+            
+            SymbolContext null_sc;
+            
+            found_namespace_decl = symbol_vendor->FindNamespace(null_sc, name, &module_parent_namespace_decl);
+            
+            if (!found_namespace_decl)
+                continue;
+            
+            namespace_map->push_back(std::pair<lldb::ModuleSP, ClangNamespaceDecl>(module_sp, found_namespace_decl));
+            
+            if (log)
+                log->Printf("  CMN[%u] Found namespace %s in module %s",
+                            current_id,
+                            name.GetCString(), 
+                            module_sp->GetFileSpec().GetFilename().GetCString());
+        }
+    }
+    else
+    {
+        ModuleList &images = m_target->GetImages();
+        ClangNamespaceDecl null_namespace_decl;
+        
+        for (uint32_t i = 0, e = images.GetSize();
+             i != e;
+             ++i)
+        {
+            lldb::ModuleSP image = images.GetModuleAtIndex(i);
+            
+            if (!image)
+                continue;
+            
+            ClangNamespaceDecl found_namespace_decl;
+            
+            SymbolVendor *symbol_vendor = image->GetSymbolVendor();
+            
+            if (!symbol_vendor)
+                continue;
+            
+            SymbolContext null_sc;
+            
+            found_namespace_decl = symbol_vendor->FindNamespace(null_sc, name, &null_namespace_decl);
+            
+            if (!found_namespace_decl)
+                continue;
+            
+            namespace_map->push_back(std::pair<lldb::ModuleSP, ClangNamespaceDecl>(image, found_namespace_decl));
+            
+            if (log)
+                log->Printf("  CMN[%u] Found namespace %s in module %s",
+                            current_id,
+                            name.GetCString(), 
+                            image->GetFileSpec().GetFilename().GetCString());
+        }
+    }
+}
+
 clang::NamedDecl *
 NameSearchContext::AddVarDecl(void *type) 
 {

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=143275&r1=143274&r2=143275&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Fri Oct 28 20:58:46 2011
@@ -48,7 +48,8 @@
 using namespace lldb_private;
 using namespace clang;
 
-ClangExpressionDeclMap::ClangExpressionDeclMap (bool keep_result_in_memory) :
+ClangExpressionDeclMap::ClangExpressionDeclMap (bool keep_result_in_memory, ExecutionContext &exe_ctx) :
+    ClangASTSource (exe_ctx.GetTargetSP()),
     m_found_entities (),
     m_struct_members (),
     m_keep_result_in_memory (keep_result_in_memory),
@@ -2128,103 +2129,6 @@
     return VariableSP();
 }
 
-// Interface for ClangASTImporter
-
-void 
-ClangExpressionDeclMap::CompleteNamespaceMap (ClangASTImporter::NamespaceMapSP &namespace_map,
-                                              const ConstString &name,
-                                              ClangASTImporter::NamespaceMapSP &parent_map) const
-{
-    static unsigned int invocation_id = 0;
-    unsigned int current_id = invocation_id++;
-    
-    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-    
-    if (log)
-    {
-        if (parent_map && parent_map->size())
-            log->Printf("CompleteNamespaceMap[%u] Searching for namespace %s in namespace %s",
-                        current_id,
-                        name.GetCString(),
-                        parent_map->begin()->second.GetNamespaceDecl()->getDeclName().getAsString().c_str());
-        else
-            log->Printf("CompleteNamespaceMap[%u] Searching for namespace %s",
-                        current_id,
-                        name.GetCString());
-    }
-
-    
-    if (parent_map)
-    {
-        for (ClangASTImporter::NamespaceMap::iterator i = parent_map->begin(), e = parent_map->end();
-             i != e;
-             ++i)
-        {
-            ClangNamespaceDecl found_namespace_decl;
-            
-            ModuleSP module_sp = i->first;
-            ClangNamespaceDecl module_parent_namespace_decl = i->second;
-            
-            SymbolVendor *symbol_vendor = module_sp->GetSymbolVendor();
-            
-            if (!symbol_vendor)
-                continue;
-            
-            SymbolContext null_sc;
-                
-            found_namespace_decl = symbol_vendor->FindNamespace(null_sc, name, &module_parent_namespace_decl);
-                
-            if (!found_namespace_decl)
-                continue;
-                
-            namespace_map->push_back(std::pair<ModuleSP, ClangNamespaceDecl>(module_sp, found_namespace_decl));
-                    
-            if (log)
-                log->Printf("  CMN[%u] Found namespace %s in module %s",
-                            current_id,
-                            name.GetCString(), 
-                            module_sp->GetFileSpec().GetFilename().GetCString());
-        }
-    }
-    else
-    {
-        ModuleList &images = m_parser_vars->m_sym_ctx.target_sp->GetImages();
-        ClangNamespaceDecl null_namespace_decl;
-        
-        for (uint32_t i = 0, e = images.GetSize();
-             i != e;
-             ++i)
-        {
-            ModuleSP image = images.GetModuleAtIndex(i);
-            
-            if (!image)
-                continue;
-            
-            ClangNamespaceDecl found_namespace_decl;
-            
-            SymbolVendor *symbol_vendor = image->GetSymbolVendor();
-            
-            if (!symbol_vendor)
-                continue;
-            
-            SymbolContext null_sc;
-            
-            found_namespace_decl = symbol_vendor->FindNamespace(null_sc, name, &null_namespace_decl);
-            
-            if (!found_namespace_decl)
-                continue;
-            
-            namespace_map->push_back(std::pair<ModuleSP, ClangNamespaceDecl>(image, found_namespace_decl));
-                
-            if (log)
-                log->Printf("  CMN[%u] Found namespace %s in module %s",
-                            current_id,
-                            name.GetCString(), 
-                            image->GetFileSpec().GetFilename().GetCString());
-        }
-    }
-}
-
 // Interface for ClangASTSource
 
 void
@@ -2260,7 +2164,7 @@
         
     if (const NamespaceDecl *namespace_context = dyn_cast<NamespaceDecl>(context.m_decl_context))
     {
-        ClangASTImporter::NamespaceMapSP namespace_map = m_parser_vars->GetASTImporter(m_ast_context)->GetNamespaceMap(namespace_context);
+        ClangASTImporter::NamespaceMapSP namespace_map = m_ast_importer->GetNamespaceMap(namespace_context);
         
         if (log && log->GetVerbose())
             log->Printf("  FEVD[%u] Inspecting namespace map %p (%d entries)", 
@@ -2757,9 +2661,7 @@
     
     if (!context_decl)
         return ELR_Failure;
-    
-    ASTContext *ast_context = &context_decl->getASTContext();
-    
+        
     static unsigned int invocation_id = 0;
     unsigned int current_id = invocation_id++;
     
@@ -2785,12 +2687,7 @@
     Decl *original_decl = NULL;
     ASTContext *original_ctx = NULL;
     
-    ClangASTImporter *ast_importer = m_parser_vars->GetASTImporter(ast_context);
-    
-    if (!ast_importer)
-        return ELR_Failure;
-    
-    if (!ast_importer->ResolveDeclOrigin(context_decl, &original_decl, &original_ctx))
+    if (!m_ast_importer->ResolveDeclOrigin(context_decl, &original_decl, &original_ctx))
         return ELR_Failure;
     
     if (log)
@@ -2829,7 +2726,7 @@
                     log->Printf("  FELD[%d] Adding lexical decl %s", current_id, ast_dumper.GetCString());
             }
                         
-            Decl *copied_decl = ast_importer->CopyDecl(original_ctx, decl);
+            Decl *copied_decl = m_ast_importer->CopyDecl(original_ctx, decl);
             
             decls.push_back(copied_decl);
         }
@@ -2853,7 +2750,7 @@
         dumper.ToLog(log, "      [CTD] ");
     }
         
-    m_parser_vars->GetASTImporter(&tag_decl->getASTContext())->CompleteTagDecl (tag_decl);
+    m_ast_importer->CompleteTagDecl (tag_decl);
 
     if (log)
     {
@@ -2878,7 +2775,7 @@
         dumper.ToLog(log, "      [COID] ");    
     }
     
-    m_parser_vars->GetASTImporter(&interface_decl->getASTContext())->CompleteObjCInterfaceDecl (interface_decl);
+    m_ast_importer->CompleteObjCInterfaceDecl (interface_decl);
 
     if (log)
     {
@@ -3251,12 +3148,11 @@
     
     const ClangNamespaceDecl &namespace_decl = namespace_decls->begin()->second;
     
-    Decl *copied_decl = m_parser_vars->GetASTImporter(m_ast_context)->CopyDecl(namespace_decl.GetASTContext(), 
-                                                                               namespace_decl.GetNamespaceDecl());
+    Decl *copied_decl = m_ast_importer->CopyDecl(namespace_decl.GetASTContext(), namespace_decl.GetNamespaceDecl());
     
     NamespaceDecl *copied_namespace_decl = dyn_cast<NamespaceDecl>(copied_decl);
     
-    m_parser_vars->GetASTImporter(m_ast_context)->RegisterNamespaceMap(copied_namespace_decl, namespace_decls);
+    m_ast_importer->RegisterNamespaceMap(copied_namespace_decl, namespace_decls);
     
     return dyn_cast<NamespaceDecl>(copied_decl);
 }
@@ -3416,11 +3312,8 @@
     assert (m_parser_vars.get());
     
     m_parser_vars->m_ignore_lookups = true;
-    
-    lldb_private::ClangASTImporter *importer = m_parser_vars->GetASTImporter(dest_context);
-    
-    QualType ret_qual_type = importer->CopyType (source_context,
-                                                 QualType::getFromOpaquePtr(clang_type));
+        
+    QualType ret_qual_type = m_ast_importer->CopyType (source_context, QualType::getFromOpaquePtr(clang_type));
     
     void *ret = ret_qual_type.getAsOpaquePtr();
     

Modified: lldb/trunk/source/Expression/ClangUserExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUserExpression.cpp?rev=143275&r1=143274&r2=143275&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangUserExpression.cpp (original)
+++ lldb/trunk/source/Expression/ClangUserExpression.cpp Fri Oct 28 20:58:46 2011
@@ -231,7 +231,7 @@
     
     m_desired_type = desired_type;
     
-    m_expr_decl_map.reset(new ClangExpressionDeclMap(keep_result_in_memory));
+    m_expr_decl_map.reset(new ClangExpressionDeclMap(keep_result_in_memory, exe_ctx));
     
     if (!m_expr_decl_map->WillParse(exe_ctx))
     {

Modified: lldb/trunk/source/Expression/ClangUtilityFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUtilityFunction.cpp?rev=143275&r1=143274&r2=143275&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangUtilityFunction.cpp (original)
+++ lldb/trunk/source/Expression/ClangUtilityFunction.cpp Fri Oct 28 20:58:46 2011
@@ -99,7 +99,7 @@
     
     bool keep_result_in_memory = false;
     
-    m_expr_decl_map.reset(new ClangExpressionDeclMap(keep_result_in_memory));
+    m_expr_decl_map.reset(new ClangExpressionDeclMap(keep_result_in_memory, exe_ctx));
     
     m_data_allocator.reset(new ProcessDataAllocator(*process));
     



From scallanan at apple.com  Fri Oct 28 21:28:18 2011
From: scallanan at apple.com (Sean Callanan)
Date: Sat, 29 Oct 2011 02:28:18 -0000
Subject: [Lldb-commits] [lldb] r143276 - in /lldb/trunk:
 include/lldb/Expression/ClangASTSource.h
 include/lldb/Expression/ClangExpressionDeclMap.h
 source/Expression/ClangASTSource.cpp
 source/Expression/ClangExpressionDeclMap.cpp
Message-ID: <20111029022818.92CFA312800A@llvm.org>

Author: spyffe
Date: Fri Oct 28 21:28:18 2011
New Revision: 143276

URL: http://llvm.org/viewvc/llvm-project?rev=143276&view=rev
Log:
Moved FindExternalLexicalDecls and a few smaller
functions from ClangExpressionDeclMap to ClangASTSource.

Modified:
    lldb/trunk/include/lldb/Expression/ClangASTSource.h
    lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
    lldb/trunk/source/Expression/ClangASTSource.cpp
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp

Modified: lldb/trunk/include/lldb/Expression/ClangASTSource.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangASTSource.h?rev=143276&r1=143275&r2=143276&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangASTSource.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangASTSource.h Fri Oct 28 21:28:18 2011
@@ -120,7 +120,7 @@
     /// @param[in] Decls
     ///     A vector that is filled in with matching Decls.
     //------------------------------------------------------------------
-    virtual clang::ExternalLoadResult 
+    clang::ExternalLoadResult 
     FindExternalLexicalDecls (const clang::DeclContext *DC,
                               bool (*isKindWeWant)(clang::Decl::Kind),
                               llvm::SmallVectorImpl<clang::Decl*> &Decls);
@@ -157,7 +157,6 @@
     // APIs for NamespaceMapCompleter
     //
     
-    
     //------------------------------------------------------------------
     /// Look up the modules containing a given namespace and put the 
     /// appropriate entries in the namespace map.
@@ -180,6 +179,10 @@
     // Helper APIs
     //
     
+    clang::NamespaceDecl *
+    AddNamespace (NameSearchContext &context, 
+                  ClangASTImporter::NamespaceMapSP &namespace_decls);
+    
     //------------------------------------------------------------------
     /// The worker function for FindExternalVisibleDeclsByName.
     ///

Modified: lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h?rev=143276&r1=143275&r2=143276&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h Fri Oct 28 21:28:18 2011
@@ -117,10 +117,6 @@
     //------------------------------------------------------------------
     const ConstString &
     GetPersistentResultName ();
-    
-    clang::NamespaceDecl *
-    AddNamespace (NameSearchContext &context, 
-                  ClangASTImporter::NamespaceMapSP &namespace_decls);
 
     //------------------------------------------------------------------
     /// [Used by IRForTarget] Get a constant variable given a name,
@@ -625,45 +621,6 @@
     //------------------------------------------------------------------
     void 
     FindExternalVisibleDecls (NameSearchContext &context);
-    
-    //------------------------------------------------------------------
-    /// [Used by ClangASTSource] Find all Decls in a context that match
-    /// a given criterion.
-    ///
-    /// @param[in] decl_context
-    ///     The DeclContext to search.
-    ///
-    /// @param[in] predicate
-    ///     Returns True if a DeclKind is desired; False if not.
-    ///
-    /// @param[in] decls
-    ///     A list to add all found Decls that have a desired DeclKind
-    ///     into.
-    //------------------------------------------------------------------
-    clang::ExternalLoadResult
-    FindExternalLexicalDecls (const clang::DeclContext *decl_context, 
-                              bool (*predicate)(clang::Decl::Kind),
-                              llvm::SmallVectorImpl<clang::Decl*> &decls);
-    
-    //------------------------------------------------------------------
-    /// [Used by ClangASTSource] Complete the definition of a TagDecl.
-    ///
-    /// @param[in] tag_decl
-    ///     The TagDecl to be completed.
-    //------------------------------------------------------------------
-    void
-    CompleteType (clang::TagDecl *tag_decl);
-    
-    //------------------------------------------------------------------
-    /// [Used by ClangASTSource] Complete the definition of an
-    /// ObjCInterfaceDecl.
-    ///
-    /// @param[in] tag_decl
-    ///     The ObjCInterfaceDecl to be completed.
-    //------------------------------------------------------------------
-    void
-    CompleteType (clang::ObjCInterfaceDecl *interface_decl);
-
 private:
     ClangExpressionVariableList    m_found_entities;           ///< All entities that were looked up for the parser.
     ClangExpressionVariableList    m_struct_members;           ///< All entities that need to be placed in the struct.

Modified: lldb/trunk/source/Expression/ClangASTSource.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangASTSource.cpp?rev=143276&r1=143275&r2=143276&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangASTSource.cpp (original)
+++ lldb/trunk/source/Expression/ClangASTSource.cpp Fri Oct 28 21:28:18 2011
@@ -12,9 +12,9 @@
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleList.h"
+#include "lldb/Expression/ASTDumper.h"
 #include "lldb/Expression/ClangASTSource.h"
 #include "lldb/Expression/ClangExpression.h"
-#include "lldb/Expression/ClangExpressionDeclMap.h"
 #include "lldb/Symbol/ClangNamespaceDecl.h"
 #include "lldb/Symbol/SymbolVendor.h"
 #include "lldb/Target/Target.h"
@@ -128,23 +128,133 @@
 
 void
 ClangASTSource::CompleteType (TagDecl *tag_decl)
-{
+{    
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+    
+    if (log)
+    {
+        log->Printf("    [CompleteTagDecl] Completing a TagDecl named %s", tag_decl->getName().str().c_str());
+        log->Printf("      [CTD] Before:");
+        ASTDumper dumper((Decl*)tag_decl);
+        dumper.ToLog(log, "      [CTD] ");
+    }
+    
+    m_ast_importer->CompleteTagDecl (tag_decl);
+    
+    if (log)
+    {
+        log->Printf("      [CTD] After:");
+        ASTDumper dumper((Decl*)tag_decl);
+        dumper.ToLog(log, "      [CTD] ");
+    }
 }
 
 void
-ClangASTSource::CompleteType (ObjCInterfaceDecl *objc_decl)
-{
+ClangASTSource::CompleteType (clang::ObjCInterfaceDecl *interface_decl)
+{    
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+    
+    if (log)
+    {
+        log->Printf("    [CompleteObjCInterfaceDecl] Completing an ObjCInterfaceDecl named %s", interface_decl->getName().str().c_str());
+        log->Printf("      [COID] Before:");
+        ASTDumper dumper((Decl*)interface_decl);
+        dumper.ToLog(log, "      [COID] ");    
+    }
+    
+    m_ast_importer->CompleteObjCInterfaceDecl (interface_decl);
+    
+    if (log)
+    {
+        log->Printf("      [COID] After:");
+        ASTDumper dumper((Decl*)interface_decl);
+        dumper.ToLog(log, "      [COID] ");    
+    }
 }
 
 clang::ExternalLoadResult
-ClangASTSource::FindExternalLexicalDecls
-(
-    const DeclContext *DC, 
-    bool (*isKindWeWant)(Decl::Kind),
-    llvm::SmallVectorImpl<Decl*> &Decls
-)
-{
-    return ELR_Success;
+ClangASTSource::FindExternalLexicalDecls (const DeclContext *decl_context, 
+                                          bool (*predicate)(Decl::Kind),
+                                          llvm::SmallVectorImpl<Decl*> &decls)
+{    
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+    
+    const Decl *context_decl = dyn_cast<Decl>(decl_context);
+    
+    if (!context_decl)
+        return ELR_Failure;
+    
+    static unsigned int invocation_id = 0;
+    unsigned int current_id = invocation_id++;
+    
+    if (log)
+    {
+        if (const NamedDecl *context_named_decl = dyn_cast<NamedDecl>(context_decl))
+            log->Printf("FindExternalLexicalDecls[%u] in '%s' (a %s) with %s predicate",
+                        current_id,
+                        context_named_decl->getNameAsString().c_str(),
+                        context_decl->getDeclKindName(), 
+                        (predicate ? "non-null" : "null"));
+        else if(context_decl)
+            log->Printf("FindExternalLexicalDecls[%u] in a %s with %s predicate",
+                        current_id,
+                        context_decl->getDeclKindName(), 
+                        (predicate ? "non-null" : "null"));
+        else
+            log->Printf("FindExternalLexicalDecls[%u] in a NULL context with %s predicate",
+                        current_id,
+                        (predicate ? "non-null" : "null"));
+    }
+    
+    Decl *original_decl = NULL;
+    ASTContext *original_ctx = NULL;
+    
+    if (!m_ast_importer->ResolveDeclOrigin(context_decl, &original_decl, &original_ctx))
+        return ELR_Failure;
+    
+    if (log)
+    {       
+        log->Printf("  FELD[%u] Original decl:", current_id);
+        ASTDumper(original_decl).ToLog(log, "    ");
+    }
+    
+    if (TagDecl *original_tag_decl = dyn_cast<TagDecl>(original_decl))
+    {
+        ExternalASTSource *external_source = original_ctx->getExternalSource();
+        
+        if (external_source)
+            external_source->CompleteType (original_tag_decl);
+    }
+    
+    DeclContext *original_decl_context = dyn_cast<DeclContext>(original_decl);
+    
+    if (!original_decl_context)
+        return ELR_Failure;
+    
+    for (TagDecl::decl_iterator iter = original_decl_context->decls_begin();
+         iter != original_decl_context->decls_end();
+         ++iter)
+    {
+        Decl *decl = *iter;
+        
+        if (!predicate || predicate(decl->getKind()))
+        {
+            if (log)
+            {
+                ASTDumper ast_dumper(decl);
+                if (const NamedDecl *context_named_decl = dyn_cast<NamedDecl>(context_decl))
+                    log->Printf("  FELD[%d] Adding [to %s] lexical decl %s", current_id, context_named_decl->getNameAsString().c_str(), ast_dumper.GetCString());
+                else
+                    log->Printf("  FELD[%d] Adding lexical decl %s", current_id, ast_dumper.GetCString());
+            }
+            
+            Decl *copied_decl = m_ast_importer->CopyDecl(original_ctx, decl);
+            
+            decls.push_back(copied_decl);
+        }
+    }
+    
+    return ELR_AlreadyLoaded;
 }
 
 void 
@@ -242,6 +352,25 @@
     }
 }
 
+NamespaceDecl *
+ClangASTSource::AddNamespace (NameSearchContext &context, ClangASTImporter::NamespaceMapSP &namespace_decls)
+{
+    if (namespace_decls.empty())
+        return NULL;
+    
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+        
+    const ClangNamespaceDecl &namespace_decl = namespace_decls->begin()->second;
+    
+    Decl *copied_decl = m_ast_importer->CopyDecl(namespace_decl.GetASTContext(), namespace_decl.GetNamespaceDecl());
+    
+    NamespaceDecl *copied_namespace_decl = dyn_cast<NamespaceDecl>(copied_decl);
+    
+    m_ast_importer->RegisterNamespaceMap(copied_namespace_decl, namespace_decls);
+    
+    return dyn_cast<NamespaceDecl>(copied_decl);
+}
+
 clang::NamedDecl *
 NameSearchContext::AddVarDecl(void *type) 
 {

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=143276&r1=143275&r2=143276&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Fri Oct 28 21:28:18 2011
@@ -2648,143 +2648,6 @@
     } while(0);
 }
 
-clang::ExternalLoadResult
-ClangExpressionDeclMap::FindExternalLexicalDecls (const DeclContext *decl_context, 
-                                                  bool (*predicate)(Decl::Kind),
-                                                  llvm::SmallVectorImpl<Decl*> &decls)
-{
-    assert (m_parser_vars.get());
-    
-    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-        
-    const Decl *context_decl = dyn_cast<Decl>(decl_context);
-    
-    if (!context_decl)
-        return ELR_Failure;
-        
-    static unsigned int invocation_id = 0;
-    unsigned int current_id = invocation_id++;
-    
-    if (log)
-    {
-        if (const NamedDecl *context_named_decl = dyn_cast<NamedDecl>(context_decl))
-            log->Printf("FindExternalLexicalDecls[%u] in '%s' (a %s) with %s predicate",
-                        current_id,
-                        context_named_decl->getNameAsString().c_str(),
-                        context_decl->getDeclKindName(), 
-                        (predicate ? "non-null" : "null"));
-        else if(context_decl)
-            log->Printf("FindExternalLexicalDecls[%u] in a %s with %s predicate",
-                        current_id,
-                        context_decl->getDeclKindName(), 
-                        (predicate ? "non-null" : "null"));
-        else
-            log->Printf("FindExternalLexicalDecls[%u] in a NULL context with %s predicate",
-                        current_id,
-                        (predicate ? "non-null" : "null"));
-    }
-    
-    Decl *original_decl = NULL;
-    ASTContext *original_ctx = NULL;
-    
-    if (!m_ast_importer->ResolveDeclOrigin(context_decl, &original_decl, &original_ctx))
-        return ELR_Failure;
-    
-    if (log)
-    {       
-        log->Printf("  FELD[%u] Original decl:", current_id);
-        ASTDumper(original_decl).ToLog(log, "    ");
-    }
-    
-    if (TagDecl *original_tag_decl = dyn_cast<TagDecl>(original_decl))
-    {
-        ExternalASTSource *external_source = original_ctx->getExternalSource();
-        
-        if (external_source)
-            external_source->CompleteType (original_tag_decl);
-    }
-    
-    DeclContext *original_decl_context = dyn_cast<DeclContext>(original_decl);
-    
-    if (!original_decl_context)
-        return ELR_Failure;
-    
-    for (TagDecl::decl_iterator iter = original_decl_context->decls_begin();
-         iter != original_decl_context->decls_end();
-         ++iter)
-    {
-        Decl *decl = *iter;
-        
-        if (!predicate || predicate(decl->getKind()))
-        {
-            if (log)
-            {
-                ASTDumper ast_dumper(decl);
-                if (const NamedDecl *context_named_decl = dyn_cast<NamedDecl>(context_decl))
-                    log->Printf("  FELD[%d] Adding [to %s] lexical decl %s", current_id, context_named_decl->getNameAsString().c_str(), ast_dumper.GetCString());
-                else
-                    log->Printf("  FELD[%d] Adding lexical decl %s", current_id, ast_dumper.GetCString());
-            }
-                        
-            Decl *copied_decl = m_ast_importer->CopyDecl(original_ctx, decl);
-            
-            decls.push_back(copied_decl);
-        }
-    }
-    
-    return ELR_AlreadyLoaded;
-}
-
-void
-ClangExpressionDeclMap::CompleteType (TagDecl *tag_decl)
-{
-    assert (m_parser_vars.get());
-
-    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-
-    if (log)
-    {
-        log->Printf("    [CompleteTagDecl] Completing a TagDecl named %s", tag_decl->getName().str().c_str());
-        log->Printf("      [CTD] Before:");
-        ASTDumper dumper((Decl*)tag_decl);
-        dumper.ToLog(log, "      [CTD] ");
-    }
-        
-    m_ast_importer->CompleteTagDecl (tag_decl);
-
-    if (log)
-    {
-        log->Printf("      [CTD] After:");
-        ASTDumper dumper((Decl*)tag_decl);
-        dumper.ToLog(log, "      [CTD] ");
-    }
-}
-
-void
-ClangExpressionDeclMap::CompleteType (clang::ObjCInterfaceDecl *interface_decl)
-{
-    assert (m_parser_vars.get());
-    
-    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-    
-    if (log)
-    {
-        log->Printf("    [CompleteObjCInterfaceDecl] Completing an ObjCInterfaceDecl named %s", interface_decl->getName().str().c_str());
-        log->Printf("      [COID] Before:");
-        ASTDumper dumper((Decl*)interface_decl);
-        dumper.ToLog(log, "      [COID] ");    
-    }
-    
-    m_ast_importer->CompleteObjCInterfaceDecl (interface_decl);
-
-    if (log)
-    {
-        log->Printf("      [COID] After:");
-        ASTDumper dumper((Decl*)interface_decl);
-        dumper.ToLog(log, "      [COID] ");    
-    }
-}
-
 Value *
 ClangExpressionDeclMap::GetVariableValue
 (
@@ -3031,7 +2894,6 @@
     entity->m_parser_vars->m_llvm_value  = NULL;
     entity->m_parser_vars->m_lldb_value  = symbol_location.release();
     entity->m_parser_vars->m_lldb_sym    = &symbol;
-    //entity->m_flags                      |= ClangExpressionVariable::EVUnknownType;
     
     if (log)
     {
@@ -3136,27 +2998,6 @@
     }
 }
 
-NamespaceDecl *
-ClangExpressionDeclMap::AddNamespace (NameSearchContext &context, ClangASTImporter::NamespaceMapSP &namespace_decls)
-{
-    if (namespace_decls.empty())
-        return NULL;
-    
-    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-    
-    assert (m_parser_vars.get());
-    
-    const ClangNamespaceDecl &namespace_decl = namespace_decls->begin()->second;
-    
-    Decl *copied_decl = m_ast_importer->CopyDecl(namespace_decl.GetASTContext(), namespace_decl.GetNamespaceDecl());
-    
-    NamespaceDecl *copied_namespace_decl = dyn_cast<NamespaceDecl>(copied_decl);
-    
-    m_ast_importer->RegisterNamespaceMap(copied_namespace_decl, namespace_decls);
-    
-    return dyn_cast<NamespaceDecl>(copied_decl);
-}
-
 void
 ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context,
                                         Function* fun,



From scallanan at apple.com  Sat Oct 29 14:50:44 2011
From: scallanan at apple.com (Sean Callanan)
Date: Sat, 29 Oct 2011 19:50:44 -0000
Subject: [Lldb-commits] [lldb] r143292 - in /lldb/trunk:
 include/lldb/Expression/ClangASTSource.h
 include/lldb/Expression/ClangExpressionDeclMap.h
 source/Expression/ClangASTSource.cpp
 source/Expression/ClangExpressionDeclMap.cpp
Message-ID: <20111029195044.297893524076@llvm.org>

Author: spyffe
Date: Sat Oct 29 14:50:43 2011
New Revision: 143292

URL: http://llvm.org/viewvc/llvm-project?rev=143292&view=rev
Log:
Cloned FindExternalVisibleDecls from
ClangExpressionDeclMap to ClangASTSource, and
moved all general type and namespace lookups
into ClangASTSource.  Now ClangASTSource is ready
to complete types given nothing more than a target
and an AST context.

Modified:
    lldb/trunk/include/lldb/Expression/ClangASTSource.h
    lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
    lldb/trunk/source/Expression/ClangASTSource.cpp
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp

Modified: lldb/trunk/include/lldb/Expression/ClangASTSource.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangASTSource.h?rev=143292&r1=143291&r2=143292&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangASTSource.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangASTSource.h Sat Oct 29 14:50:43 2011
@@ -195,7 +195,7 @@
     bool GetImportInProgress () { return m_import_in_progress; }
     
     void SetLookupsEnabled (bool lookups_enabled) { m_lookups_enabled = lookups_enabled; }
-    bool GetLookupsEnabled () { return m_lookups_enabled; }
+    bool GetLookupsEnabled () { return m_lookups_enabled; } 
     
     //----------------------------------------------------------------------
     /// @class ClangASTSourceProxy ClangASTSource.h "lldb/Expression/ClangASTSource.h"
@@ -253,6 +253,54 @@
     }
     
 protected:
+    //------------------------------------------------------------------
+    /// Find all entities matching a given name in a given module,
+    /// using a NameSearchContext to make Decls for them.
+    ///
+    /// @param[in] context
+    ///     The NameSearchContext that can construct Decls for this name.
+    ///
+    /// @param[in] module
+    ///     If non-NULL, the module to query.
+    ///
+    /// @param[in] namespace_decl
+    ///     If valid and module is non-NULL, the parent namespace.
+    ///
+    /// @param[in] current_id
+    ///     The ID for the current FindExternalVisibleDecls invocation,
+    ///     for logging purposes.
+    ///
+    /// @return
+    ///     True on success; false otherwise.
+    //------------------------------------------------------------------
+    void 
+    FindExternalVisibleDecls (NameSearchContext &context, 
+                              lldb::ModuleSP module,
+                              ClangNamespaceDecl &namespace_decl,
+                              unsigned int current_id);
+        
+    //------------------------------------------------------------------
+    /// A wrapper for ClangASTContext::CopyType that sets a flag that
+    /// indicates that we should not respond to queries during import.
+    ///
+    /// @param[in] dest_context
+    ///     The target AST context, typically the parser's AST context.
+    ///
+    /// @param[in] source_context
+    ///     The source AST context, typically the AST context of whatever
+    ///     symbol file the type was found in.
+    ///
+    /// @param[in] clang_type
+    ///     The source type.
+    ///
+    /// @return
+    ///     The imported type.
+    //------------------------------------------------------------------
+    void *
+    GuardedCopyType (clang::ASTContext *dest_context, 
+                     clang::ASTContext *source_context,
+                     void *clang_type);
+    
     friend struct NameSearchContext;
     
     bool                    m_import_in_progress;

Modified: lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h?rev=143292&r1=143291&r2=143292&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h Sat Oct 29 14:50:43 2011
@@ -621,6 +621,38 @@
     //------------------------------------------------------------------
     void 
     FindExternalVisibleDecls (NameSearchContext &context);
+    
+    //------------------------------------------------------------------
+    /// Find all entities matching a given name in a given module/namespace,
+    /// using a NameSearchContext to make Decls for them.
+    ///
+    /// @param[in] context
+    ///     The NameSearchContext that can construct Decls for this name.
+    ///
+    /// @param[in] module
+    ///     If non-NULL, the module to query.
+    ///
+    /// @param[in] namespace_decl
+    ///     If valid and module is non-NULL, the parent namespace.
+    ///
+    /// @param[in] name
+    ///     The name as a plain C string.  The NameSearchContext contains 
+    ///     a DeclarationName for the name so at first the name may seem
+    ///     redundant, but ClangExpressionDeclMap operates in RTTI land so 
+    ///     it can't access DeclarationName.
+    ///
+    /// @param[in] current_id
+    ///     The ID for the current FindExternalVisibleDecls invocation,
+    ///     for logging purposes.
+    ///
+    /// @return
+    ///     True on success; false otherwise.
+    //------------------------------------------------------------------
+    void 
+    FindExternalVisibleDecls (NameSearchContext &context, 
+                              lldb::ModuleSP module,
+                              ClangNamespaceDecl &namespace_decl,
+                              unsigned int current_id);
 private:
     ClangExpressionVariableList    m_found_entities;           ///< All entities that were looked up for the parser.
     ClangExpressionVariableList    m_struct_members;           ///< All entities that need to be placed in the struct.
@@ -637,8 +669,7 @@
             m_exe_ctx(NULL),
             m_sym_ctx(),
             m_persistent_vars(NULL),
-            m_enable_lookups(false),
-            m_ignore_lookups(false)
+            m_enable_lookups(false)
         {
         }
         
@@ -656,7 +687,6 @@
         SymbolContext               m_sym_ctx;          ///< The symbol context to use in finding variables and types.
         ClangPersistentVariables   *m_persistent_vars;  ///< The persistent variables for the process.
         bool                        m_enable_lookups;   ///< Set to true during parsing if we have found the first "$__lldb" name.
-        bool                        m_ignore_lookups;   ///< True during an import when we should be ignoring type lookups.
         std::auto_ptr<ClangASTImporter> m_ast_importer; ///< The importer used to import types on the parser's behalf.
         TargetInfo                  m_target_info;      ///< Basic information about the target.
     private:
@@ -765,39 +795,6 @@
     }
     
     //------------------------------------------------------------------
-    /// [Used by ClangASTSource] Find all entities matching a given name,
-    /// using a NameSearchContext to make Decls for them.
-    ///
-    /// @param[in] context
-    ///     The NameSearchContext that can construct Decls for this name.
-    ///
-    /// @param[in] module
-    ///     If non-NULL, the module to query.
-    ///
-    /// @param[in] namespace_decl
-    ///     If valid and module is non-NULL, the parent namespace.
-    ///
-    /// @param[in] name
-    ///     The name as a plain C string.  The NameSearchContext contains 
-    ///     a DeclarationName for the name so at first the name may seem
-    ///     redundant, but ClangExpressionDeclMap operates in RTTI land so 
-    ///     it can't access DeclarationName.
-    ///
-    /// @param[in] current_id
-    ///     The ID for the current FindExternalVisibleDecls invocation,
-    ///     for logging purposes.
-    ///
-    /// @return
-    ///     True on success; false otherwise.
-    //------------------------------------------------------------------
-    void 
-    FindExternalVisibleDecls (NameSearchContext &context, 
-                              lldb::ModuleSP module,
-                              ClangNamespaceDecl &namespace_decl,
-                              const ConstString &name,
-                              unsigned int current_id);
-    
-    //------------------------------------------------------------------
     /// Given a stack frame, find a variable that matches the given name and 
     /// type.  We need this for expression re-use; we may not always get the
     /// same lldb::Variable back, and we want the expression to work wherever 
@@ -1167,28 +1164,6 @@
                               const RegisterInfo &reg_info,
                               lldb::addr_t addr, 
                               Error &err);
-    
-    //------------------------------------------------------------------
-    /// A wrapper for ClangASTContext::CopyType that sets a flag that
-    /// indicates that we should not respond to queries during import.
-    ///
-    /// @param[in] dest_context
-    ///     The target AST context, typically the parser's AST context.
-    ///
-    /// @param[in] source_context
-    ///     The source AST context, typically the AST context of whatever
-    ///     symbol file the type was found in.
-    ///
-    /// @param[in] clang_type
-    ///     The source type.
-    ///
-    /// @return
-    ///     The imported type.
-    //------------------------------------------------------------------
-    void *
-    GuardedCopyType (clang::ASTContext *dest_context, 
-                     clang::ASTContext *source_context,
-                     void *clang_type);
 };
     
 } // namespace lldb_private

Modified: lldb/trunk/source/Expression/ClangASTSource.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangASTSource.cpp?rev=143292&r1=143291&r2=143292&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangASTSource.cpp (original)
+++ lldb/trunk/source/Expression/ClangASTSource.cpp Sat Oct 29 14:50:43 2011
@@ -122,11 +122,6 @@
 }
 
 void
-ClangASTSource::FindExternalVisibleDecls (NameSearchContext &context)
-{
-}
-
-void
 ClangASTSource::CompleteType (TagDecl *tag_decl)
 {    
     lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
@@ -257,6 +252,211 @@
     return ELR_AlreadyLoaded;
 }
 
+void
+ClangASTSource::FindExternalVisibleDecls (NameSearchContext &context)
+{
+    assert (m_ast_context);
+    
+    const ConstString name(context.m_decl_name.getAsString().c_str());
+    
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+    
+    static unsigned int invocation_id = 0;
+    unsigned int current_id = invocation_id++;
+    
+    if (log)
+    {
+        if (!context.m_decl_context)
+            log->Printf("ClangASTSource::FindExternalVisibleDecls[%u] for '%s' in a NULL DeclContext", current_id, name.GetCString());
+        else if (const NamedDecl *context_named_decl = dyn_cast<NamedDecl>(context.m_decl_context))
+            log->Printf("ClangASTSource::FindExternalVisibleDecls[%u] for '%s' in '%s'", current_id, name.GetCString(), context_named_decl->getNameAsString().c_str());
+        else
+            log->Printf("ClangASTSource::FindExternalVisibleDecls[%u] for '%s' in a '%s'", current_id, name.GetCString(), context.m_decl_context->getDeclKindName());
+    }
+    
+    context.m_namespace_map.reset(new ClangASTImporter::NamespaceMap);
+    
+    if (const NamespaceDecl *namespace_context = dyn_cast<NamespaceDecl>(context.m_decl_context))
+    {
+        ClangASTImporter::NamespaceMapSP namespace_map = m_ast_importer->GetNamespaceMap(namespace_context);
+        
+        if (log && log->GetVerbose())
+            log->Printf("  CAS::FEVD[%u] Inspecting namespace map %p (%d entries)", 
+                        current_id, 
+                        namespace_map.get(), 
+                        (int)namespace_map->size());
+        
+        if (!namespace_map)
+            return;
+        
+        for (ClangASTImporter::NamespaceMap::iterator i = namespace_map->begin(), e = namespace_map->end();
+             i != e;
+             ++i)
+        {
+            if (log)
+                log->Printf("  CAS::FEVD[%u] Searching namespace %s in module %s",
+                            current_id,
+                            i->second.GetNamespaceDecl()->getNameAsString().c_str(),
+                            i->first->GetFileSpec().GetFilename().GetCString());
+            
+            FindExternalVisibleDecls(context,
+                                     i->first,
+                                     i->second,
+                                     current_id);
+        }
+    }
+    else if (!isa<TranslationUnitDecl>(context.m_decl_context))
+    {
+        // we shouldn't be getting FindExternalVisibleDecls calls for these
+        return;
+    }
+    else
+    {
+        ClangNamespaceDecl namespace_decl;
+        
+        if (log)
+            log->Printf("  CAS::FEVD[%u] Searching the root namespace", current_id);
+        
+        FindExternalVisibleDecls(context,
+                                 lldb::ModuleSP(),
+                                 namespace_decl,
+                                 current_id);
+    }
+    
+    if (!context.m_namespace_map->empty())
+    {
+        if (log && log->GetVerbose())
+            log->Printf("  CAS::FEVD[%u] Registering namespace map %p (%d entries)", 
+                        current_id,
+                        context.m_namespace_map.get(), 
+                        (int)context.m_namespace_map->size());
+        
+        NamespaceDecl *clang_namespace_decl = AddNamespace(context, context.m_namespace_map);
+        
+        if (clang_namespace_decl)
+            clang_namespace_decl->setHasExternalVisibleStorage();
+    }
+}
+
+void 
+ClangASTSource::FindExternalVisibleDecls (NameSearchContext &context, 
+                                          lldb::ModuleSP module_sp,
+                                          ClangNamespaceDecl &namespace_decl,
+                                          unsigned int current_id)
+{
+    assert (m_ast_context);
+    
+    lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+    
+    SymbolContextList sc_list;
+    
+    const ConstString name(context.m_decl_name.getAsString().c_str());
+    
+    const char *name_unique_cstr = name.GetCString();
+    
+    if (name_unique_cstr == NULL)
+        return;
+    
+    // The ClangASTSource is not responsible for finding $-names.
+    if (name_unique_cstr[0] == '$')
+        return;
+    
+    if (module_sp && namespace_decl)
+    {
+        ClangNamespaceDecl found_namespace_decl;
+        
+        SymbolVendor *symbol_vendor = module_sp->GetSymbolVendor();
+        
+        if (symbol_vendor)
+        {
+            SymbolContext null_sc;
+            
+            found_namespace_decl = symbol_vendor->FindNamespace(null_sc, name, &namespace_decl);
+            
+            if (found_namespace_decl)
+            {
+                context.m_namespace_map->push_back(std::pair<lldb::ModuleSP, ClangNamespaceDecl>(module_sp, found_namespace_decl));
+                
+                if (log)
+                    log->Printf("  CAS::FEVD[%u] Found namespace %s in module %s",
+                                current_id,
+                                name.GetCString(), 
+                                module_sp->GetFileSpec().GetFilename().GetCString());
+            }
+        }
+    }
+    else 
+    {
+        ModuleList &images = m_target->GetImages();
+        
+        for (uint32_t i = 0, e = images.GetSize();
+             i != e;
+             ++i)
+        {
+            lldb::ModuleSP image = images.GetModuleAtIndex(i);
+            
+            if (!image)
+                continue;
+            
+            ClangNamespaceDecl found_namespace_decl;
+            
+            SymbolVendor *symbol_vendor = image->GetSymbolVendor();
+            
+            if (!symbol_vendor)
+                continue;
+            
+            SymbolContext null_sc;
+            
+            found_namespace_decl = symbol_vendor->FindNamespace(null_sc, name, &namespace_decl);
+            
+            if (found_namespace_decl)
+            {
+                context.m_namespace_map->push_back(std::pair<lldb::ModuleSP, ClangNamespaceDecl>(image, found_namespace_decl));
+                
+                if (log)
+                    log->Printf("  CAS::FEVD[%u] Found namespace %s in module %s",
+                                current_id,
+                                name.GetCString(), 
+                                image->GetFileSpec().GetFilename().GetCString());
+            }
+        }
+    }
+    
+    static ConstString id_name("id");
+    
+    do 
+    {
+        TypeList types;
+        SymbolContext null_sc;
+        
+        if (module_sp && namespace_decl)
+            module_sp->FindTypes(null_sc, name, &namespace_decl, true, 1, types);
+        else if(name != id_name)
+            m_target->GetImages().FindTypes (null_sc, name, true, 1, types);
+        else
+            break;
+        
+        if (types.GetSize())
+        {
+            lldb::TypeSP type_sp = types.GetTypeAtIndex(0);
+            
+            if (log)
+            {
+                const char *name_string = type_sp->GetName().GetCString();
+                
+                log->Printf("  CAS::FEVD[%u] Matching type found for \"%s\": %s", 
+                            current_id, 
+                            name.GetCString(), 
+                            (name_string ? name_string : "<anonymous>"));
+            }
+            
+            void *copied_type = GuardedCopyType(m_ast_context, type_sp->GetClangAST(), type_sp->GetClangFullType());
+            
+            context.AddTypeDecl(copied_type);
+        }
+    } while(0);
+}
+
 void 
 ClangASTSource::CompleteNamespaceMap (ClangASTImporter::NamespaceMapSP &namespace_map,
                                       const ConstString &name,
@@ -371,6 +571,22 @@
     return dyn_cast<NamespaceDecl>(copied_decl);
 }
 
+void * 
+ClangASTSource::GuardedCopyType (ASTContext *dest_context, 
+                                 ASTContext *source_context,
+                                 void *clang_type)
+{    
+    SetImportInProgress(true);
+    
+    QualType ret_qual_type = m_ast_importer->CopyType (source_context, QualType::getFromOpaquePtr(clang_type));
+    
+    void *ret = ret_qual_type.getAsOpaquePtr();
+    
+    SetImportInProgress(false);
+    
+    return ret;
+}
+
 clang::NamedDecl *
 NameSearchContext::AddVarDecl(void *type) 
 {

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=143292&r1=143291&r2=143292&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Sat Oct 29 14:50:43 2011
@@ -2140,7 +2140,7 @@
     
     lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
     
-    if (m_parser_vars->m_ignore_lookups)
+    if (GetImportInProgress())
     {
         if (log && log->GetVerbose())
             log->Printf("Ignoring a query during an import");
@@ -2153,21 +2153,19 @@
     if (log)
     {
         if (!context.m_decl_context)
-            log->Printf("FindExternalVisibleDecls[%u] for '%s' in a NULL DeclContext", current_id, name.GetCString());
+            log->Printf("ClangExpressionDeclMap::FindExternalVisibleDecls[%u] for '%s' in a NULL DeclContext", current_id, name.GetCString());
         else if (const NamedDecl *context_named_decl = dyn_cast<NamedDecl>(context.m_decl_context))
-            log->Printf("FindExternalVisibleDecls[%u] for '%s' in '%s'", current_id, name.GetCString(), context_named_decl->getNameAsString().c_str());
+            log->Printf("ClangExpressionDeclMap::FindExternalVisibleDecls[%u] for '%s' in '%s'", current_id, name.GetCString(), context_named_decl->getNameAsString().c_str());
         else
-            log->Printf("FindExternalVisibleDecls[%u] for '%s' in a '%s'", current_id, name.GetCString(), context.m_decl_context->getDeclKindName());
+            log->Printf("ClangExpressionDeclMap::FindExternalVisibleDecls[%u] for '%s' in a '%s'", current_id, name.GetCString(), context.m_decl_context->getDeclKindName());
     }
-    
-    context.m_namespace_map.reset(new ClangASTImporter::NamespaceMap);
-        
+            
     if (const NamespaceDecl *namespace_context = dyn_cast<NamespaceDecl>(context.m_decl_context))
     {
         ClangASTImporter::NamespaceMapSP namespace_map = m_ast_importer->GetNamespaceMap(namespace_context);
         
         if (log && log->GetVerbose())
-            log->Printf("  FEVD[%u] Inspecting namespace map %p (%d entries)", 
+            log->Printf("  CEDM::FEVD[%u] Inspecting namespace map %p (%d entries)", 
                         current_id, 
                         namespace_map.get(), 
                         (int)namespace_map->size());
@@ -2180,7 +2178,7 @@
              ++i)
         {
             if (log)
-                log->Printf("  FEVD[%u] Searching namespace %s in module %s",
+                log->Printf("  CEDM::FEVD[%u] Searching namespace %s in module %s",
                             current_id,
                             i->second.GetNamespaceDecl()->getNameAsString().c_str(),
                             i->first->GetFileSpec().GetFilename().GetCString());
@@ -2188,7 +2186,6 @@
             FindExternalVisibleDecls(context,
                                      i->first,
                                      i->second,
-                                     name,
                                      current_id);
         }
     }
@@ -2202,50 +2199,37 @@
         ClangNamespaceDecl namespace_decl;
         
         if (log)
-            log->Printf("  FEVD[%u] Searching the root namespace", current_id);
+            log->Printf("  CEDM::FEVD[%u] Searching the root namespace", current_id);
         
         FindExternalVisibleDecls(context,
                                  lldb::ModuleSP(),
                                  namespace_decl,
-                                 name,
                                  current_id);
     }
     
-    if (!context.m_namespace_map->empty())
-    {
-        if (log && log->GetVerbose())
-            log->Printf("  FEVD[%u] Registering namespace map %p (%d entries)", 
-                        current_id,
-                        context.m_namespace_map.get(), 
-                        (int)context.m_namespace_map->size());
-        
-        NamespaceDecl *clang_namespace_decl = AddNamespace(context, context.m_namespace_map);
-        
-        if (clang_namespace_decl)
-            clang_namespace_decl->setHasExternalVisibleStorage();
-    }
+    if (!context.m_found.variable)
+        ClangASTSource::FindExternalVisibleDecls(context);
 }
 
 void 
 ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, 
                                                   lldb::ModuleSP module_sp,
                                                   ClangNamespaceDecl &namespace_decl,
-                                                  const ConstString &name,
                                                   unsigned int current_id)
 {
-    assert (m_struct_vars.get());
-    assert (m_parser_vars.get());
     assert (m_ast_context);
     
     lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-            
+    
     SymbolContextList sc_list;
     
+    const ConstString name(context.m_decl_name.getAsString().c_str());
+    
     const char *name_unique_cstr = name.GetCString();
     
     if (name_unique_cstr == NULL)
         return;
-
+    
     // Only look for functions by name out in our symbols if the function 
     // doesn't start with our phony prefix of '$'
     Target *target = m_parser_vars->m_exe_ctx->GetTargetPtr();
@@ -2280,7 +2264,7 @@
             
             if (log && log->GetVerbose())
             {
-                log->Printf ("  FEVD[%u] Type for \"this\" is: ", current_id);
+                log->Printf ("  CEDM::FEVD[%u] Type for \"this\" is: ", current_id);
                 StreamString strm;
                 this_type->Dump(&strm, true);
                 log->PutCString (strm.GetData());
@@ -2308,7 +2292,7 @@
             if (log)
             {
                 ASTDumper ast_dumper(pointer_target_qual_type);
-                log->Printf("  FEVD[%u] Adding type for $__lldb_class: %s", current_id, ast_dumper.GetCString());
+                log->Printf("  CEDM::FEVD[%u] Adding type for $__lldb_class: %s", current_id, ast_dumper.GetCString());
             }
             
             AddOneType(context, class_user_type, current_id, true);
@@ -2402,7 +2386,7 @@
                 break;
             
             if (log)
-                log->Printf("  FEVD[%u] Found persistent type %s", current_id, name.GetCString());
+                log->Printf("  CEDM::FEVD[%u] Found persistent type %s", current_id, name.GetCString());
             
             context.AddNamedDecl(parser_ptype_type_decl);
         } while (0);
@@ -2420,11 +2404,11 @@
         if (m_parser_vars->m_exe_ctx->GetRegisterContext())
         {
             const RegisterInfo *reg_info(m_parser_vars->m_exe_ctx->GetRegisterContext()->GetRegisterInfoByName(reg_name));
-                        
+            
             if (reg_info)
             {
                 if (log)
-                    log->Printf("  FEVD[%u] Found register %s", current_id, reg_info->name);
+                    log->Printf("  CEDM::FEVD[%u] Found register %s", current_id, reg_info->name);
                 
                 AddOneRegister(context, reg_info, current_id);
             }
@@ -2549,103 +2533,7 @@
                 }
             }
         }
-        
-        if (module_sp && namespace_decl)
-        {
-            ClangNamespaceDecl found_namespace_decl;
-            
-            SymbolVendor *symbol_vendor = module_sp->GetSymbolVendor();
-            
-            if (symbol_vendor)
-            {
-                SymbolContext null_sc;
-                
-                found_namespace_decl = symbol_vendor->FindNamespace(null_sc, name, &namespace_decl);
-                
-                if (found_namespace_decl)
-                {
-                    context.m_namespace_map->push_back(std::pair<ModuleSP, ClangNamespaceDecl>(module_sp, found_namespace_decl));
-                    
-                    if (log)
-                        log->Printf("  FEVD[%u] Found namespace %s in module %s",
-                                    current_id,
-                                    name.GetCString(), 
-                                    module_sp->GetFileSpec().GetFilename().GetCString());
-                }
-            }
-        }
-        else 
-        {
-            ModuleList &images = m_parser_vars->m_sym_ctx.target_sp->GetImages();
-                        
-            for (uint32_t i = 0, e = images.GetSize();
-                 i != e;
-                 ++i)
-            {
-                ModuleSP image = images.GetModuleAtIndex(i);
-                
-                if (!image)
-                    continue;
-                
-                ClangNamespaceDecl found_namespace_decl;
-                
-                SymbolVendor *symbol_vendor = image->GetSymbolVendor();
-                
-                if (!symbol_vendor)
-                    continue;
-                
-                SymbolContext null_sc;
-                
-                found_namespace_decl = symbol_vendor->FindNamespace(null_sc, name, &namespace_decl);
-                
-                if (found_namespace_decl)
-                {
-                    context.m_namespace_map->push_back(std::pair<ModuleSP, ClangNamespaceDecl>(image, found_namespace_decl));
-                    
-                    if (log)
-                        log->Printf("  FEVD[%u] Found namespace %s in module %s",
-                                    current_id,
-                                    name.GetCString(), 
-                                    image->GetFileSpec().GetFilename().GetCString());
-                }
-            }
-        }
     }
-    
-    static ConstString id_name("id");
-    
-    do 
-    {
-        TypeList types;
-        SymbolContext null_sc;
-        
-        if (module_sp && namespace_decl)
-            module_sp->FindTypes(null_sc, name, &namespace_decl, true, 1, types);
-        else if(name != id_name)
-            target->GetImages().FindTypes (null_sc, name, true, 1, types);
-        else
-            break;
-        
-        if (types.GetSize())
-        {
-            TypeSP type_sp = types.GetTypeAtIndex(0);
-            
-            if (log)
-            {
-                const char *name_string = type_sp->GetName().GetCString();
-                
-                log->Printf("  FEVD[%u] Matching type found for \"%s\": %s", 
-                            current_id, 
-                            name.GetCString(), 
-                            (name_string ? name_string : "<anonymous>"));
-            }
-
-            TypeFromUser user_type(type_sp->GetClangFullType(),
-                                   type_sp->GetClangAST());
-                
-            AddOneType(context, user_type, current_id, false);
-        }
-    } while(0);
 }
 
 Value *
@@ -2812,7 +2700,7 @@
     if (log)
     {
         ASTDumper ast_dumper(var_decl);        
-        log->Printf("  FEVD[%u] Found variable %s, returned %s", current_id, decl_name.c_str(), ast_dumper.GetCString());
+        log->Printf("  CEDM::FEVD[%u] Found variable %s, returned %s", current_id, decl_name.c_str(), ast_dumper.GetCString());
     }
 }
 
@@ -2841,7 +2729,7 @@
     if (log)
     {
         ASTDumper ast_dumper(var_decl);
-        log->Printf("  FEVD[%u] Added pvar %s, returned %s", current_id, pvar_sp->GetName().GetCString(), ast_dumper.GetCString());
+        log->Printf("  CEDM::FEVD[%u] Added pvar %s, returned %s", current_id, pvar_sp->GetName().GetCString(), ast_dumper.GetCString());
     }
 }
 
@@ -2899,7 +2787,7 @@
     {
         ASTDumper ast_dumper(var_decl);
         
-        log->Printf("  FEVD[%u] Found variable %s, returned %s", current_id, decl_name.c_str(), ast_dumper.GetCString());
+        log->Printf("  CEDM::FEVD[%u] Found variable %s, returned %s", current_id, decl_name.c_str(), ast_dumper.GetCString());
     }
 }
 
@@ -2994,7 +2882,7 @@
     if (log && log->GetVerbose())
     {
         ASTDumper ast_dumper(var_decl);
-        log->Printf("  FEVD[%d] Added register %s, returned %s", current_id, context.m_decl_name.getAsString().c_str(), ast_dumper.GetCString());
+        log->Printf("  CEDM::FEVD[%d] Added register %s, returned %s", current_id, context.m_decl_name.getAsString().c_str(), ast_dumper.GetCString());
     }
 }
 
@@ -3092,7 +2980,7 @@
     {
         ASTDumper ast_dumper(fun_decl);
         
-        log->Printf("  FEVD[%u] Found %s function %s, returned %s", 
+        log->Printf("  CEDM::FEVD[%u] Found %s function %s, returned %s", 
                     current_id,
                     (fun ? "specific" : "generic"), 
                     decl_name.c_str(), 
@@ -3110,9 +2998,7 @@
     ASTContext *user_ast_context = ut.GetASTContext();
     
     void *copied_type = GuardedCopyType(parser_ast_context, user_ast_context, ut.GetOpaqueQualType());
- 
-    TypeFromParser parser_type(copied_type, parser_ast_context);
-    
+     
     if (add_method && ClangASTContext::IsAggregateType(copied_type))
     {
         void *args[1];
@@ -3144,21 +3030,3 @@
     
     context.AddTypeDecl(copied_type);
 }
-
-void * 
-ClangExpressionDeclMap::GuardedCopyType (ASTContext *dest_context, 
-                                         ASTContext *source_context,
-                                         void *clang_type)
-{
-    assert (m_parser_vars.get());
-    
-    m_parser_vars->m_ignore_lookups = true;
-        
-    QualType ret_qual_type = m_ast_importer->CopyType (source_context, QualType::getFromOpaquePtr(clang_type));
-    
-    void *ret = ret_qual_type.getAsOpaquePtr();
-    
-    m_parser_vars->m_ignore_lookups = false;
-    
-    return ret;
-}



From jmolenda at apple.com  Sat Oct 29 15:32:56 2011
From: jmolenda at apple.com (Jason Molenda)
Date: Sat, 29 Oct 2011 20:32:56 -0000
Subject: [Lldb-commits] [lldb] r143294 - in /lldb/trunk:
 include/lldb/Core/ArchSpec.h source/Core/ArchSpec.cpp
Message-ID: <20111029203256.CEDEE3524076@llvm.org>

Author: jmolenda
Date: Sat Oct 29 15:32:56 2011
New Revision: 143294

URL: http://llvm.org/viewvc/llvm-project?rev=143294&view=rev
Log:
finish removal of alpha arch -- previous half-removal caused lldb to assert on startup

Modified:
    lldb/trunk/include/lldb/Core/ArchSpec.h
    lldb/trunk/source/Core/ArchSpec.cpp

Modified: lldb/trunk/include/lldb/Core/ArchSpec.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ArchSpec.h?rev=143294&r1=143293&r2=143294&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ArchSpec.h (original)
+++ lldb/trunk/include/lldb/Core/ArchSpec.h Sat Oct 29 15:32:56 2011
@@ -34,8 +34,6 @@
 public:
     enum Core
     {
-        eCore_alpha_generic,
-
         eCore_arm_generic,
         eCore_arm_armv4,
         eCore_arm_armv4t,
@@ -192,7 +190,7 @@
     bool
     IsValid () const
     {
-        return m_core >= eCore_alpha_generic && m_core < kNumCores;
+        return m_core >= eCore_arm_generic && m_core < kNumCores;
     }
 
 

Modified: lldb/trunk/source/Core/ArchSpec.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ArchSpec.cpp?rev=143294&r1=143293&r2=143294&view=diff
==============================================================================
--- lldb/trunk/source/Core/ArchSpec.cpp (original)
+++ lldb/trunk/source/Core/ArchSpec.cpp Sat Oct 29 15:32:56 2011
@@ -189,7 +189,6 @@
     { ArchSpec::eCore_ppc_generic     , llvm::ELF::EM_PPC    , LLDB_INVALID_CPUTYPE }, // PowerPC
     { ArchSpec::eCore_ppc64_generic   , llvm::ELF::EM_PPC64  , LLDB_INVALID_CPUTYPE }, // PowerPC64
     { ArchSpec::eCore_arm_generic     , llvm::ELF::EM_ARM    , LLDB_INVALID_CPUTYPE }, // ARM
-    { ArchSpec::eCore_alpha_generic   , llvm::ELF::EM_ALPHA  , LLDB_INVALID_CPUTYPE }, // DEC Alpha
     { ArchSpec::eCore_sparc9_generic  , llvm::ELF::EM_SPARCV9, LLDB_INVALID_CPUTYPE }, // SPARC V9
     { ArchSpec::eCore_x86_64_x86_64   , llvm::ELF::EM_X86_64 , LLDB_INVALID_CPUTYPE }, // AMD64
 };



From peter at pcc.me.uk  Sun Oct 30 19:43:13 2011
From: peter at pcc.me.uk (Peter Collingbourne)
Date: Mon, 31 Oct 2011 00:43:13 -0000
Subject: [Lldb-commits] [lldb] r143323 - /lldb/trunk/test/Makefile
Message-ID: <20111031004313.287073524001@llvm.org>

Author: pcc
Date: Sun Oct 30 19:43:12 2011
New Revision: 143323

URL: http://llvm.org/viewvc/llvm-project?rev=143323&view=rev
Log:
When running tests, prepend our LibDir to the user's SHLIBPATH_VAR
instead of replacing it.

Modified:
    lldb/trunk/test/Makefile

Modified: lldb/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/Makefile?rev=143323&r1=143322&r2=143323&view=diff
==============================================================================
--- lldb/trunk/test/Makefile (original)
+++ lldb/trunk/test/Makefile Sun Oct 30 19:43:12 2011
@@ -32,5 +32,5 @@
 	rm -rf ../test-rdir
 	env PATH="$(ToolDir):$(PATH)" \
 	    PYTHONPATH=$(ToolDir) \
-	    $(SHLIBPATH_VAR)=$(LibDir) \
+	    $(SHLIBPATH_VAR)=$(LibDir):$($(SHLIBPATH_VAR)) \
 	     python $(PROJ_SRC_DIR)/dotest.py -i -v -r ../test-rdir