[llvm-commits] [parallel] CVS: llvm/tools/llvm-db/Commands.cpp Makefile llvm-db.cpp

[Misha Brukman]

Changes in directory llvm/tools/llvm-db:

Commands.cpp updated: 1.3 -> 1.3.2.1
Makefile updated: 1.1 -> 1.1.2.1
llvm-db.cpp updated: 1.1 -> 1.1.2.1

---
Log message:

Merge from trunk

---
Diffs of the changes:  (+11 -5)

Index: llvm/tools/llvm-db/Commands.cpp
diff -u llvm/tools/llvm-db/Commands.cpp:1.3 llvm/tools/llvm-db/Commands.cpp:1.3.2.1
--- llvm/tools/llvm-db/Commands.cpp:1.3	Tue Jan  6 17:46:17 2004
+++ llvm/tools/llvm-db/Commands.cpp	Mon Mar  1 17:59:18 2004
@@ -489,7 +489,11 @@
     throw "FIXME: breaking at the current location is not implemented yet!";
   }
   
-  
+  if (!File) File = CurrentFile;
+  if (File == 0)
+    throw "Unknown file to place breakpoint!";
+
+  std::cerr << "Break: " << File->getFilename() << ":" << LineNo << "\n";
   
   throw "breakpoints not implemented yet!";
 }


Index: llvm/tools/llvm-db/Makefile
diff -u llvm/tools/llvm-db/Makefile:1.1 llvm/tools/llvm-db/Makefile:1.1.2.1
--- llvm/tools/llvm-db/Makefile:1.1	Sun Jan  4 23:27:31 2004
+++ llvm/tools/llvm-db/Makefile	Mon Mar  1 17:59:18 2004
@@ -41,10 +41,10 @@
 # What the Sparc JIT requires
 ifdef ENABLE_SPARC_JIT
   CPPFLAGS += -DENABLE_SPARC_JIT
-  JITLIBS  += sparc 
-  ARCHLIBS += sched livevar instrument.a profpaths \
-              bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \
-              select
+  JITLIBS  += sparcv9
+  ARCHLIBS += sched sparcv9livevar instrument.a profpaths \
+              bcwriter transforms.a ipo.a ipa.a datastructure.a \
+              sparcv9regalloc sparcv9select
 endif
 
 USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \


Index: llvm/tools/llvm-db/llvm-db.cpp
diff -u llvm/tools/llvm-db/llvm-db.cpp:1.1 llvm/tools/llvm-db/llvm-db.cpp:1.1.2.1
--- llvm/tools/llvm-db/llvm-db.cpp:1.1	Sun Jan  4 23:27:31 2004
+++ llvm/tools/llvm-db/llvm-db.cpp	Mon Mar  1 17:59:18 2004
@@ -14,6 +14,7 @@
 
 #include "CLIDebugger.h"
 #include "Support/CommandLine.h"
+#include "Support/Signals.h"
 #include <iostream>
 
 using namespace llvm;
@@ -51,6 +52,7 @@
 int main(int argc, char **argv, char * const *envp) {
   cl::ParseCommandLineOptions(argc, argv,
                               " llvm source-level debugger\n");
+  PrintStackTraceOnErrorSignal();
 
   if (Version || !Quiet) {
     std::cout << "llvm-db: The LLVM source-level debugger\n";