Changeset 3105b0 in git

Timestamp:

Aug 20, 1999, 6:06:49 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

99a286c05af3b60f04f2443ada520b679a44e7a3

Parents:

eb4fa6810e4f32cc808925d5dc987963d1c02d5b

Message:

*hannes: more sdb modi


git-svn-id: file:///usr/local/Singular/svn/trunk@3526 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• extra.cc (modified) (3 diffs)
• sdb.cc (modified) (8 diffs)
• sdb.h (modified) (2 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.102 1999-08-17 09:25:45 Singular Exp $ */
+/* $Id: extra.cc,v 1.103 1999-08-20 16:06:49 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -49 +49 @@
 #include "syz.h"
 #include "sdb.h"
-#include "version.h"
 
 // Define to enable many more system commands
@@ -954 +953 @@
     if (strcmp(sys_cmd, "breakpoint") == 0)
     {
-      if ((h!=NULL) && (h->Typ()==PROC_CMD))
-      {
-        procinfov p=(procinfov)h->Data();
-        if (p->language!=LANG_SINGULAR)
-        {
-          WerrorS("set breakpoints only in Singular procedures");
-          return TRUE;
-        }
-        int lineno=p->data.s.body_lineno;
+      if (h==NULL)
+      {
+       sdb_show_bp();
+       return FALSE;
+      }
+      else if (h->Typ()==PROC_CMD)
+      {
+        int lineno=0;
         if ((h->next!=NULL) && (h->next->Typ()==INT_CMD))
         {
           lineno=(int)h->next->Data();
         }
-        int i;
-        if (lineno== -1)
-        {
-          i=p->trace_flag;
-          p->trace_flag &=1;
-          Print("breakpoints in %s deleted(%#x)\n",p->procname,i &255);
-          return FALSE;
-        }
-        i=0;
-        while((i<7) && (sdb_lines[i]!=-1)) i++;
-        if (sdb_lines[i]!= -1)
-        {
-          PrintS("too many breakpoints set, max is 7\n");
-          return FALSE;
-        }
-        else
-        {
-          sdb_lines[i]=lineno;
-          sdb_files[i]=p->libname;
-          i++;
-          Print("breakpoint %d, at line %d in %s\n",i,lineno,p->procname);
-          p->trace_flag|=(1<<i);
-        }
-      }
-      else
-      {
-        WerrorS("system(\"breakpoint\",`proc`,`int`) expected");
+        return sdb_set_breakpoint(h->Name(),lineno);
+      }
+      else
+      {
+        WerrorS("system(\"breakpoint\",`proc`[,`int`]) expected");
         return TRUE;
       }
-      return FALSE;
     }
     else

Singular/sdb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sdb.cc,v 1.9 1999-06-10 15:14:03 Singular Exp $ */
+/* $Id: sdb.cc,v 1.10 1999-08-20 16:06:48 Singular Exp $ */
 /*
 * ABSTRACT: Singular debugger
@@ -17 +17 @@
 #include "sdb.h"
 
+// We use 8 breakpoints - corresponding to a bit in a char variable in procinfo
+// bit 1..7 force a breakpoint, if lineno==sdb_lines[i-1],
+//                         (for displaying only: file sdb_files[i-1])
+// bit 0 force a breakpoint in every line (used for 'n')
+
 int sdb_lines[]={-1,-1,-1,-1,-1,-1,-1,-1};
 char * sdb_files[6];
@@ -33 +38 @@
   }
   return 0;
+}
+
+static char *sdb_find_arg(char *p)
+{
+  p++;
+  while (*p==' ') p++;
+  char *pp=p;
+  while (*pp>' ') pp++;
+  *pp='\0';
+  return p;
+}
+
+void sdb_show_bp()
+{
+  for(int i=0; i<7;i++)
+    if (sdb_lines[i]!= -1)
+      Print("Breakpoint %d: %s::%d\n",i+1,sdb_files[i],sdb_lines[i]);
+}
+
+BOOLEAN sdb_set_breakpoint(const char *pp, int given_lineno)
+{
+  idhdl h=ggetid(pp,TRUE);
+  if ((h==NULL)||(IDTYP(h)!=PROC_CMD))
+  {
+    PrintS(" not found\n");
+    return TRUE;
+  }
+  else
+  {
+    procinfov p=(procinfov)IDDATA(h);
+    #ifdef HAVE_DYNAMIC_LOADING
+    if (p->language!=LANG_SINGULAR)
+    {
+      PrintS("is not a Singular procedure\n");
+      return TRUE;
+    }
+    #endif
+    int lineno;
+    if (given_lineno >0) lineno=given_lineno;
+    else                 lineno=p->data.s.body_lineno;
+    int i;
+    if (given_lineno== -1)
+    {
+      i=p->trace_flag;
+      p->trace_flag &=1;
+      Print("breakpoints in %s deleted(%#x)\n",p->procname,i &255);
+      return FALSE;
+    }
+    i=0;
+    while((i<7) && (sdb_lines[i]!=-1)) i++;
+    if (sdb_lines[i]!= -1)
+    {
+      PrintS("too many breakpoints set, max is 7\n");
+      return TRUE;
+    }
+    sdb_lines[i]=lineno;
+    sdb_files[i]=p->libname;
+    i++;
+    p->trace_flag|=(1<<i);
+    Print("breakpoint %d, at line %d in %s\n",i,lineno,p->procname);
+    return FALSE;
+  }
 }
 
@@ -122 +189 @@
   unlink(filename);
   FreeL(filename);
-}
-
-static char *sdb_find_arg(char *p)
-{
-  p++;
-  while (*p==' ') p++;
-  char *pp=p;
-  while (*pp>' ') pp++;
-  *pp='\0';
-  return p;
 }
 
@@ -172 +229 @@
           PrintS(
           "b - print backtrace of calling stack\n"
+          "B <proc> [<line>] - define breakpoint\n"
           "c - continue\n"
           "d - delete current breakpoint\n"
+          "D - show all preakpoints\n"
           "e - edit the current procedure (current call will be aborted)\n"
           "h,? - display this help screen\n"
@@ -199 +258 @@
           break;
         }
+        case 'D':
+          sdb_show_bp();
+          break;
         case 'n':
           currentVoice->pi->trace_flag|= 1;
@@ -211 +273 @@
         {
           p=sdb_find_arg(p);
-          Print("request `%s`",p);
+          Print("variable `%s`",p);
           idhdl h=ggetid(p,TRUE);
           if (h==NULL)
-            PrintS("NULL\n");
+            PrintS(" not found\n");
           else
           {
@@ -229 +291 @@
           VoiceBackTrack();
           break;
+        case 'B':
+        {
+          p=sdb_find_arg(p);
+          Print("procedure `%s` ",p);
+          sdb_set_breakpoint(p);
+          break;
+        }
         case 'q':
         {

Singular/sdb.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sdb.h,v 1.4 1999-05-06 16:53:25 Singular Exp $ */
+/* $Id: sdb.h,v 1.5 1999-08-20 16:06:49 Singular Exp $ */
 /*
 * ABSTRACT: Singular debugger
@@ -17 +17 @@
 
 void sdb_edit(procinfo *pi);
+void sdb_show_bp();
+BOOLEAN sdb_set_breakpoint(const char *p, int lineno=0);
 void sdb(Voice * currentVoice, const char * currLine, int len);
 #endif