sdcdb updates,ddd

[fw/sdcc] / debugger / mcs51 / symtab.c

diff --git a/debugger/mcs51/symtab.c b/debugger/mcs51/symtab.c
index 5333eae4ef7a9ea8dc46676f6d53c19b81702856..75fac2345b4dfe145ec340b5e12aa80da4472045 100644 (file)
--- a/debugger/mcs51/symtab.c
+++ b/debugger/mcs51/symtab.c
@@ -23,8 +23,8 @@
 
 #include "sdcdb.h"
 #include "symtab.h"
+#include "newalloc.h"
 
-extern char *currModName ;
 structdef *structWithName (char *);
 
 /*------------------------------------------------------------------*/
@@ -90,7 +90,7 @@ void parseFunc (char *line)
     function *func ;
     char *rs;
     int i;
-    Safe_calloc(1,func,sizeof(function));
+    func = Safe_calloc(1,sizeof(function));
     func->sym = parseSymbol(line,&rs);
     func->sym->isfunc = 1;
     func->modName = currModName ;
@@ -119,7 +119,7 @@ static char  *parseTypeInfo (symbol *sym, char *s)
     s = ++bp;
     while (*s != ')') { /* till we reach the end */
   link *type;
-  Safe_calloc(1,type,sizeof(link));
+  type = Safe_calloc(1,sizeof(link));
   if (*s == ',') s++;
 
   /* is a declarator */
@@ -240,7 +240,7 @@ symbol *parseSymbol (char *s, char **rs)
     symbol *nsym ;
     char *bp = s;
 
-    Safe_calloc(1,nsym,sizeof(symbol));
+    nsym = Safe_calloc(1,sizeof(symbol));
 
     /* copy over the mangled name */
     while (*bp != '(') bp++;
@@ -280,8 +280,20 @@ symbol *parseSymbol (char *s, char **rs)
     /* get the stack offset */
     s++;
     nsym->offset = strtol(s,&s,10);
-    *rs = s;
 
+    if ( nsym->addrspace == 'R' )
+    {
+        /* get registeroffset */
+        while (*s && *s != '[') s++ ;
+        s++ ;
+        if ( *s == 'r' )
+        {
+            nsym->addr = strtol(s+1,&s,10);
+        }
+        while (*s && *s != ']') s++ ;
+    }
+
+    *rs = s;
     addSet(&symbols,nsym);
 
     return nsym;
@@ -335,7 +347,7 @@ module *parseModule (char *s, bool createName )
     module *nmod ;
     char buffer[512];
 
-    Safe_calloc(1,nmod,sizeof(module));
+    nmod = Safe_calloc(1,sizeof(module));
 
     addSet (&modules,nmod);
 
@@ -346,11 +358,11 @@ module *parseModule (char *s, bool createName )
     if (createName) {
   sprintf(buffer,"%s.c",s);
 
-  Safe_calloc(1,nmod->c_name,strlen(buffer)+1);
+  nmod->c_name = Safe_malloc(strlen(buffer)+1);
   strcpy(nmod->c_name,buffer);
 
   sprintf(buffer,"%s.asm",s);
-  Safe_calloc(1,nmod->asm_name,strlen(buffer)+1);
+  nmod->asm_name = Safe_malloc(strlen(buffer)+1);
   strcpy(nmod->asm_name,buffer);
     }
 
@@ -432,7 +444,7 @@ structdef *structWithName (char *s)
       return structs[i];
     }
 
-    Safe_calloc(1,nsdef,sizeof(structdef));
+    nsdef = Safe_calloc(1,sizeof(structdef));
     nsdef->tag = alloccpy(s,strlen(s));
     nsdef->sname = currModName ;
 
@@ -543,27 +555,33 @@ symbol *symLookup (char *name, context *ctxt)
 {
     symbol *sym = NULL ;
 
-    /* first try & find a local variable for the
-       given name */
-    if ( applyToSet(symbols,symLocal,
+    if ((ctxt) && (ctxt->func) &&
+        (ctxt->func->sym) && (ctxt->func->sym->name)) {
+      /* first try & find a local variable for the given name */
+      if ( applyToSet(symbols,symLocal,
         name,
         ctxt->func->sym->name,
         ctxt->block,
         ctxt->level,
         &sym))
-  return sym;
+         return sym;
+      sym = NULL;
+    }
+
+    if ((ctxt) && (ctxt->func) &&
+        (ctxt->func->mod) && (ctxt->func->mod->name)) {
+      /* then try local to this module */
+      if (applyToSet(symbols,symLocal,
+          name,
+          ctxt->func->mod->name,
+          0,0,&sym))
+             return sym;
+      sym = NULL;
+    }
 
-    sym = NULL;
-    /* then try local to this module */
-    if (applyToSet(symbols,symLocal,
-       name,
-       ctxt->func->mod->name,
-       0,0,&sym))
-  return sym;
-    sym = NULL;
     /* no:: try global */
     if ( applyToSet(symbols,symGlobal,name,&sym))
-  return sym;
+      return sym;
 
     /* cannot find return null */
     return NULL;
@@ -589,9 +607,8 @@ static void lnkFuncEnd (char *s)
 
     s++;
     sscanf(s,"%x",&func->sym->eaddr);
-#ifdef SDCDB_DEBUG
-    printf("%s(eaddr%x)\n",func->sym->name,func->sym->eaddr);
-#endif
+
+    Dprintf(D_symtab, ("%s(eaddr%x)\n",func->sym->name,func->sym->eaddr));
 }
 
 /*-----------------------------------------------------------------*/
@@ -615,9 +632,8 @@ static void lnkSymRec (char *s)
 
     s++;
     sscanf(s,"%x",&sym->addr);
-#ifdef SDCDB_DEBUG
-    printf("%s(%x)\n",sym->name,sym->addr);
-#endif
+
+    Dprintf(D_symtab, ("%s(%x)\n",sym->name,sym->addr));
 }
 
 /*-----------------------------------------------------------------*/
@@ -647,9 +663,7 @@ static void lnkAsmSrc (char *s)
     line--;
     if (line < mod->nasmLines) {
   mod->asmLines[line]->addr = addr;
-#ifdef SDCDB_DEBUG
-  printf("%s(%d:%x) %s",mod->asm_name,line,addr,mod->asmLines[line]->src);
-#endif
+  Dprintf(D_symtab, ("%s(%d:%x) %s",mod->asm_name,line,addr,mod->asmLines[line]->src));
     }
 }
 
@@ -689,10 +703,8 @@ static void lnkCSrc (char *s)
   mod->cLines[line]->addr = addr;
   mod->cLines[line]->block = block;
   mod->cLines[line]->level = level;
-#ifdef SDCDB_DEBUG
-  printf("%s(%d:%x) %s",mod->c_name,
-         line+1,addr,mod->cLines[line]->src);
-#endif
+  Dprintf(D_symtab, ("%s(%d:%x) %s",mod->c_name,
+         line+1,addr,mod->cLines[line]->src));
     }
     return;