#include "sdcdb.h"
#include "symtab.h"
+#include "newalloc.h"
extern char *currModName ;
structdef *structWithName (char *);
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 ;
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 */
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++;
module *nmod ;
char buffer[512];
- Safe_calloc(1,nmod,sizeof(module));
+ nmod = Safe_calloc(1,sizeof(module));
addSet (&modules,nmod);
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);
}
return structs[i];
}
- Safe_calloc(1,nsdef,sizeof(structdef));
+ nsdef = Safe_calloc(1,sizeof(structdef));
nsdef->tag = alloccpy(s,strlen(s));
nsdef->sname = currModName ;
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));
}
/*-----------------------------------------------------------------*/
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));
}
/*-----------------------------------------------------------------*/
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));
}
}
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;