Changeset 8dd3ac in git

Timestamp:

Apr 20, 1999, 7:02:49 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

71f6706ea153c065bbdd021bb4c72b845656104c

Parents:

7c0745a074f1698979a57dcb6b2c59a48277e802

Message:

*hannes: debugger


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

Location:

Singular

Files:

• attrib.cc (modified) (4 diffs)
• extra.cc (modified) (3 diffs)
• febase.inc (modified) (4 diffs)
• sdb.cc (modified) (2 diffs)
• sdb.h (modified) (2 diffs)

Singular/attrib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: attrib.cc,v 1.12 1999-04-15 17:28:02 Singular Exp $ */
+/* $Id: attrib.cc,v 1.13 1999-04-20 17:02:45 Singular Exp $ */
 
 /*
@@ -263 +263 @@
   }
   attr at=v->attribute;
-  if (v->Typ()==PROC_CMD)
-  {
-    procinfo *p=(procinfo *)v->Data();
-    if (p->trace_flag!=0)
-      Print("TRACE:%d\n",p->trace_flag);
-  }    
   if (hasFlag(v,FLAG_STD))
   {
@@ -300 +294 @@
     res->data=(void *)(((ideal)v->Data())->rank);
   }
-  else if ((v->Typ()==PROC_CMD) && (strcmp(name,"TRACE")==0))
-  {
-    procinfo *p=(procinfo *)v->Data();
-    res->rtyp=INT_CMD;
-    res->data=(void *)p->trace_flag;
-  }    
   else
   {
@@ -362 +350 @@
     I->rank=max(I->rank,(int)c->Data());
   }
-  else if ((strcmp(name,"TRACE")==0)&&(v->Typ()==PROC_CMD))
-  {
-    if (c->Typ()!=INT_CMD)
-    {
-      WerrorS("attrib `TRACE` must be int");
-      return TRUE;
-    }
-    procinfo *p=(procinfo *)v->Data();
-    p->trace_flag=(int)c->Data();
-  }    
 #ifdef DRING
   else if (strcmp(name,"D")==0)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.88 1999-01-22 17:40:49 Singular Exp $ */
+/* $Id: extra.cc,v 1.89 1999-04-20 17:02:47 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -48 +48 @@
 #include "kstd1.h"
 #include "syz.h"
+#include "sdb.h"
 
 // Define to enable many more system commands
@@ -905 +906 @@
     else
 #endif
+/*==================== sdb-debugger =================*/
+    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->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;
+          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 TRUE;
+      }
+      return FALSE;
+    }
+    else
 /*==================== print all option values =================*/
 #ifndef NDEBUG

Singular/febase.inc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.inc,v 1.21 1999-04-15 17:28:02 Singular Exp $ */
+/* $Id: febase.inc,v 1.22 1999-04-20 17:02:48 Singular Exp $ */
 /*
 * ABSTRACT: handling of 'voices'
@@ -393 +393 @@
    )
   || (traceit&TRACE_SHOW_LINE)
-  || (traceit&TRACE_SHOW_LINE1)
-  || ((currentVoice->pi!=NULL)&&(currentVoice->pi->trace_flag&TRACE_SHOW_LINE)))
+  || (traceit&TRACE_SHOW_LINE1))
   {
     if (currentVoice->typ!=BT_example)
@@ -422 +421 @@
     }
   }
-  else if ((traceit&TRACE_SHOW_LINENO)
-  || ((currentVoice->pi!=NULL)&&(currentVoice->pi->trace_flag&TRACE_SHOW_LINENO)))
+  else if (traceit&TRACE_SHOW_LINENO)
   {
     Print("{%d}",yylineno);
@@ -430 +428 @@
   if ((blocknest==0)
   && (currentVoice->pi!=NULL)
-  && (currentVoice->pi->trace_flag&TRACE_BREAKPOINT))
+  && (currentVoice->pi->trace_flag!=0))
   {
     sdb(currentVoice, anf, len_s);

Singular/sdb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sdb.cc,v 1.1 1999-04-15 17:28:47 Singular Exp $ */
+/* $Id: sdb.cc,v 1.2 1999-04-20 17:02:48 Singular Exp $ */
 /*
 * ABSTRACT: Singular debugger
@@ -9 +9 @@
 #include "mod2.h"
 #include "tok.h"
+#include "mmemory.h"
 #include "febase.h"
 #include "ipshell.h"
+#include "ipid.h"
 #include "sdb.h"
+
+int sdb_lines[6]={-1,-1,-1,-1,-1,-1,-1};
+
+int sdb_checkline(char f)
+{
+  int i;
+  char ff=f>>1;
+  for(i=0;i<7;i++)
+  {
+    if((ff & 1) && (yylineno==sdb_lines[i]))
+      return i+1;
+    ff>>=1;
+    if (ff==0) return 0;
+  }
+  return 0;
+}
+
+static char sdb_lastcmd='c';
 
 void sdb(Voice * currentVoice, char * currLine, int len)
 {
-  loop
+  int bp=0;
+  if ((len>1)
+  && ((currentVoice->pi->trace_flag & 1)
+    || (bp=sdb_checkline(currentVoice->pi->trace_flag)))
+  )
   {
-    char gdb[80];
-    char *p=currLine+len-1;
-    while ((*p<=' ') && (p!=currLine))
+    loop
     {
-      p--; len--;
-    }
-    if (p!=currLine)
-    {
+      char gdb[80];
+      char *p=currLine+len-1;
+      while ((*p<=' ') && (p!=currLine))
+      {
+        p--; len--;
+      }
+      if (p==currLine) return;
+
+      currentVoice->pi->trace_flag&= ~1; // delete flag for "all lines"
       fprintf(stdout,"(%s,%d) >>",currentVoice->filename,yylineno);mflush();
       fwrite(currLine,1,len,stdout);
-      fprintf(stdout,"<< (p, f-finish,b,...)\n");mflush();
+      fprintf(stdout,"<<\nbreakpoint %d (p..,f,b,c,n,q,e..)\n",bp);mflush();
       fgets(gdb,80,stdin);
       p=gdb;
       while (*p==' ') p++;
       if (*p >' ')
-        printf("command:%c\n",*p);
-      switch(*p)
       {
-        case 'f':
-          currentVoice->pi->trace_flag&= ~TRACE_BREAKPOINT;
+        sdb_lastcmd=*p;
+      }
+      printf("command:%c\n",sdb_lastcmd);
+      switch(sdb_lastcmd)
+      {
+        case 'd':
+          currentVoice->pi->trace_flag &= (~Sy_bit(bp));
+          break;
+        case 'n':
+          currentVoice->pi->trace_flag|= 1;
           return;
+//        case 'e':
+//        {
+//          sdb_lastcmd='c';
+//          if (*(p+1)!=' ')
+//          {
+//            printf("?? no string to execute\n");
+//          }
+//          else
+//          {
+//            p+=2;
+//            char *s=(char *)AllocL(strlen(p) + 4);
+//            strcpy( s,p);
+//            strcat( s,"\n;\n");
+//            newBuffer(s,BT_execute);
+//          }
+//          return;
+//        }
         case 'p':
-          printf(".....\n");
+        {
+          p+=2;
+          char *pp=p+1;
+          while (*pp>' ') pp++;
+          *pp='\0';
+          printf("request `%s`",p);
+          idhdl h=ggetid(p,TRUE);
+          if (h==NULL) printf("NULL\n");
+          else
+          {
+            sleftv tmp;
+            memset(&tmp,0,sizeof(tmp));
+            tmp.rtyp=IDHDL;
+            tmp.data=h;
+            printf("(type %s):",Tok2Cmdname(tmp.Typ()));
+            tmp.Print();
+          }
           break;
+        }
         case 'b':
           VoiceBackTrack();
-          break;
+          break;
         case 'q':
           m2_end(999);
+        case 'c':
         default:
           return;

Singular/sdb.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sdb.h,v 1.1 1999-04-15 17:28:48 Singular Exp $ */
+/* $Id: sdb.h,v 1.2 1999-04-20 17:02:49 Singular Exp $ */
 /*
 * ABSTRACT: Singular debugger
@@ -11 +11 @@
 #include "febase.h"
 
+extern int sdb_lines[];
+
 void sdb(Voice * currentVoice, char * currLine, int len);
 #endif