Don't indent log lines by frame # spaces if the frame # exceeds 100 - the indentation

gets to be a problem if you have a unbounded stack walk.

Fix the CFA sanity checks.  Add one to the arch default UnwindPlan run which was giving
one extra stack frame on the main thread.  Fix a couple of logging lines that had their
argument order incorrect.

llvm-svn: 117350

1 files changed, 4 insertions, 4 deletions

diff --git a/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp b/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp
index e2d2f9c8f67..d7d0a1005b5 100644
--- a/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp
+++ b/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp
@@ -72,7 +72,7 @@ UnwindLLDB::GetFrameCount()
                 if (log)
                 {
                     log->Printf("%*sFrame %d invalid RegisterContext for this frame, stopping stack walk", 
-                                cur_idx, "", cur_idx);
+                                cur_idx < 100 ? cur_idx : 100, "", cur_idx);
                 }
                 break;
             }
@@ -82,7 +82,7 @@ UnwindLLDB::GetFrameCount()
                 if (log)
                 {
                     log->Printf("%*sFrame %d did not get CFA for this frame, stopping stack walk",
-                                cur_idx, "", cur_idx);
+                                cur_idx < 100 ? cur_idx : 100, "", cur_idx);
                 }
                 break;
             }
@@ -92,7 +92,7 @@ UnwindLLDB::GetFrameCount()
                 if (log)
                 {
                     log->Printf("%*sFrame %d did not get a valid CFA for this frame, stopping stack walk",
-                                cur_idx, "", cur_idx);
+                                cur_idx < 100 ? cur_idx : 100, "", cur_idx);
                 }
                 break;
             }
@@ -102,7 +102,7 @@ UnwindLLDB::GetFrameCount()
                 if (log)
                 {
                     log->Printf("%*sFrame %d did not get PC for this frame, stopping stack walk",
-                                cur_idx, "", cur_idx);
+                                cur_idx < 100 ? cur_idx : 100, "", cur_idx);
                 }
                 break;
             }