set *modules = NULL; /* set of all modules */
set *functions = NULL ; /* set of functions */
set *symbols = NULL ; /* set of symbols */
+set *sfrsymbols= NULL ; /* set of symbols of sfr or sbit */
int nStructs = 0 ;
structdef **structs = NULL ; /* all structures */
int nLinkrecs = 0;
context *currCtxt = NULL;
short fullname = 0;
short showfull = 0;
-short userinterrupt = 0;
+char userinterrupt = 0;
+char nointerrupt = 0;
+char contsim = 0;
char *ssdirl = DATADIR LIB_DIR_SUFFIX ":" DATADIR LIB_DIR_SUFFIX "/small" ;
char *simArgs[40];
int nsimArgs = 0;
char model_str[20];
-
/* fake filename & lineno to make linker */
char *filename=NULL;
int lineno = 0;
int fatalError = 0;
+static void commandLoop(FILE *cmdfile);
+
/* command table */
struct cmdtab
{
precede the synonym "b" */
/* break point */
{ "break" , cmdSetUserBp ,
- "{b}reak\t\t\t [LINE | FILE:LINE | FILE:FUNCTION | FUNCTION]\n",
+ "{b}reak\t\t\t [LINE | FILE:LINE | FILE:FUNCTION | FUNCTION | *<address>]\n",
+ },
+ { "tbreak" , cmdSetTmpUserBp ,
+ "tbreak\t\t\t [LINE | FILE:LINE | FILE:FUNCTION | FUNCTION | *<address>]\n",
},
{ "b" , cmdSetUserBp , NULL },
+ { "jump" , cmdJump ,
+ "jump\t\t\tContinue program being debugged at specified line or address\n [LINE | FILE:LINE | *<address>]\n",
+ },
{ "clear" , cmdClrUserBp ,
"{cl}ear\t\t\t [LINE | FILE:LINE | FILE:FUNCTION | FUNCTION]\n"
},
{ "continue" , cmdContinue ,
"{c}ontinue\t\t Continue program being debugged, after breakpoint.\n"
},
+ { "condition" , cmdCondition ,
+ "condition brkpoint_number expr\t\tSet condition for breakpoint.\n"
+ },
+ { "ignore" , cmdIgnore ,
+ "brkpoint_number count\t\tSet ignore count for breakpoint.\n"
+ },
+ { "commands" , cmdCommands ,
+ "commands [brkpoint_number]\t\tSetting commands for breakpoint.\n"
+ },
{ "c" , cmdContinue , NULL },
- { "disassemble",cmdDisasmF , "x disassemble asm commands\n" },
+ { "disassemble",cmdDisasmF , "disassemble [startaddr [endaddress]]\tdisassemble asm commands\n" },
{ "delete" , cmdDelUserBp ,
"{d}elete n\t\t clears break point number n\n"
},
{ "display" , cmdDisplay ,
- "display [<variable>]\t print value of given variable each time the program stops\n"
+ "display [/<fmt>] [<variable>]\t print value of given variable each time the program stops\n"
},
{ "undisplay" , cmdUnDisplay ,
"undisplay [<variable>]\t dont display this variable or all\n"
},
+ { "down" , cmdDown ,
+ "down\t\tSelect and print stack frame called by this one.\nAn argument says how many frames down to go.\n"
+ },
+ { "up" , cmdUp ,
+ "up\t\tSelect and print stack frame that called this one.\nAn argument says how many frames up to go.\n"
+ },
{ "d" , cmdDelUserBp , NULL },
{ "info" , cmdInfo ,
" <copying warranty>\t copying & distribution terms, warranty\n"
},
{ "set" , cmdSetOption , "set <srcmode>\t\t toggle between c/asm.\nset variable <var> = >value\t\tset variable to new value\n" },
+ { "stepi" , cmdStepi ,
+ "stepi\t\t\tStep one instruction exactly.\n"
+ },
{ "step" , cmdStep ,
- "{s}tep\t\t\t Step program until it reaches a different source line.\n"
+ "{s}tep\t\t\tStep program until it reaches a different source line.\n"
+ },
+ { "source" , cmdSource ,
+ "source <FILE>\t\t\tRead commands from a file named FILE.\n"
},
{ "s" , cmdStep , NULL },
+ { "nexti" , cmdNexti ,
+ "nexti\t\t\tStep one instruction, but proceed through subroutine calls.\n"
+ },
{ "next" , cmdNext ,
- "{n}ext\t\t\t Step program, proceeding through subroutine calls.\n"
+ "{n}ext\t\t\tStep program, proceeding through subroutine calls.\n"
},
{ "n" , cmdNext , NULL },
{ "run" , cmdRun ,
- "{r}un\t\t\t Start debugged program. \n"
+ "{r}un\t\t\tStart debugged program. \n"
},
{ "r" , cmdRun , NULL },
{ "ptype" , cmdPrintType ,
- "{pt}ype <variable>\t print type information of a variable\n"
+ "{pt}ype <variable>\tprint type information of a variable\n"
},
{ "pt" , cmdPrintType , NULL },
{ "print" , cmdPrint ,
"file <filename>\t\t load symbolic information from <filename>\n"
},
{ "frame" , cmdFrame ,
- "{fr}ame\t\t\t print information about the current Stack\n"
+ "{fr}ame\t\t print information about the current Stack\n"
},
{ "finish" , cmdFinish ,
"{fi}nish\t\t execute till return of current function\n"
},
{ "fi" , cmdFinish , NULL },
- { "where" , cmdWhere , "where\t\t\t print stack\n" },
+ { "where" , cmdWhere , "where\t\t print stack\n" },
{ "fr" , cmdFrame , NULL },
{ "f" , cmdFrame , NULL },
{ "x /i" , cmdDisasm1 , "x\t\t disassemble one asm command\n" },
if (!(mfile = searchDirsFopen(name))) {
- fprintf(stderr,"sdcdb: cannot open module %s -- use '--directory=<source directory> option\n",name);
- return NULL;
+ fprintf(stderr,"sdcdb: cannot open module %s -- use '--directory=<source directory> option\n",name);
+ return NULL;
}
while ((bp = fgets(buffer,sizeof(buffer),mfile))) {
- (*nlines)++;
+ (*nlines)++;
- slines = (srcLine **)resize((void **)slines,*nlines);
+ slines = (srcLine **)resize((void **)slines,*nlines);
- slines[(*nlines)-1] = Safe_calloc(1,sizeof(srcLine));
- slines[(*nlines)-1]->src = alloccpy(bp,strlen(bp));
- }
+ slines[(*nlines)-1] = Safe_calloc(1,sizeof(srcLine));
+ slines[(*nlines)-1]->src = alloccpy(bp,strlen(bp));
+ slines[(*nlines)-1]->addr= INT_MAX;
+ }
fclose(mfile);
return slines;
/* if symbol then parse the symbol */
case SYM_REC:
- parseSymbol(loop->line,&rs);
+ parseSymbol(loop->line,&rs,2);
break;
case LNK_REC:
}
}
+/*-----------------------------------------------------------------*/
+/* generate extra sets of sfr and sbit symbols */
+/*-----------------------------------------------------------------*/
+static void specialFunctionRegs ()
+{
+ symbol *sym;
+ for (sym = setFirstItem(symbols);
+ sym ;
+ sym = setNextItem(symbols))
+ {
+ if ( sym->addrspace == 'I' ||
+ sym->addrspace == 'J')
+ {
+ addSet(&sfrsymbols,sym);
+ }
+ }
+}
/*-----------------------------------------------------------------*/
/* functionPoints - determine the execution points within a func */
/*-----------------------------------------------------------------*/
{
function *func;
symbol *sym;
-
- /* for all functions do */
- for ( func = setFirstItem(functions); func;
- func = setNextItem(functions)) {
- int j ;
- module *mod;
-
- sym = func->sym;
-
- Dprintf(D_sdcdb, ("sdcdb: func '%s' has entry '0x%x' exit '0x%x'\n",
- func->sym->name,
- func->sym->addr,
- func->sym->eaddr));
-
- if (!func->sym->addr && !func->sym->eaddr)
- continue ;
-
- /* for all source lines in the module find
- the ones with address >= start and <= end
- and put them in the point */
- mod = NULL ;
- if (! applyToSet(modules,moduleWithName,func->modName,&mod))
- continue ;
- func->mod = mod ;
- func->entryline= INT_MAX;
- func->exitline = 0;
- func->aentryline = INT_MAX ;
- func->aexitline = 0;
-
- /* do it for the C Lines first */
- for ( j = 0 ; j < mod->ncLines ; j++ ) {
- if (mod->cLines[j]->addr >= sym->addr &&
- mod->cLines[j]->addr <= sym->eaddr ) {
-
exePoint *ep ;
- /* add it to the execution point */
- if (func->entryline > j)
- func->entryline = j;
-
- if (func->exitline < j)
- func->exitline = j;
-
- ep = Safe_calloc(1,sizeof(exePoint));
- ep->addr = mod->cLines[j]->addr ;
- ep->line = j;
- ep->block= mod->cLines[j]->block;
- ep->level= mod->cLines[j]->level;
- addSet(&func->cfpoints,ep);
- }
- }
-
- /* do the same for asm execution points */
- for ( j = 0 ; j < mod->nasmLines ; j++ ) {
- if (mod->asmLines[j]->addr >= sym->addr &&
- mod->asmLines[j]->addr <= sym->eaddr ) {
+ // add _main dummy for runtime env
+ if ((func = needExtraMainFunction()))
+ {
+ function *func1;
+
+ /* alloc new _main function */
+ func1 = Safe_calloc(1,sizeof(function));
+ *func1 = *func;
+ func1->sym = Safe_calloc(1,sizeof(symbol));
+ *func1->sym = *func->sym;
+ func1->sym->name = alloccpy("_main",5);
+ func1->sym->rname = alloccpy("G$_main$0$",10);
+ /* TODO must be set by symbol information */
+ func1->sym->addr = 0;
+ func1->sym->eaddr = 0x2f;
+ addSet(&functions,func1);
+ }
- exePoint *ep ;
- /* add it to the execution point */
- if (func->aentryline > j)
- func->aentryline = j;
-
- if (func->aexitline < j)
- func->aexitline = j;
-
- /* add it to the execution point */
- ep = Safe_calloc(1,sizeof(exePoint));
- ep->addr = mod->asmLines[j]->addr ;
- ep->line = j;
- addSet(&func->afpoints,ep);
- }
- }
+ /* for all functions do */
+ for ( func = setFirstItem(functions); func;
+ func = setNextItem(functions)) {
+ int j ;
+ module *mod;
+
+ sym = func->sym;
+
+ Dprintf(D_sdcdb, ("sdcdb: func '%s' has entry '0x%x' exit '0x%x'\n",
+ func->sym->name,
+ func->sym->addr,
+ func->sym->eaddr));
+
+ if (!func->sym->addr && !func->sym->eaddr)
+ continue ;
+
+ /* for all source lines in the module find
+ the ones with address >= start and <= end
+ and put them in the point */
+ mod = NULL ;
+ if (! applyToSet(modules,moduleWithName,func->modName,&mod))
+ continue ;
+ func->mod = mod ;
+ func->entryline= INT_MAX-2;
+ func->exitline = 0;
+ func->aentryline = INT_MAX-2 ;
+ func->aexitline = 0;
+
+ /* do it for the C Lines first */
+ for ( j = 0 ; j < mod->ncLines ; j++ ) {
+ if (mod->cLines[j]->addr < INT_MAX &&
+ mod->cLines[j]->addr >= sym->addr &&
+ mod->cLines[j]->addr <= sym->eaddr ) {
+
+
+ /* add it to the execution point */
+ if (func->entryline > j)
+ func->entryline = j;
+
+ if (func->exitline < j)
+ func->exitline = j;
+
+ ep = Safe_calloc(1,sizeof(exePoint));
+ ep->addr = mod->cLines[j]->addr ;
+ ep->line = j;
+ ep->block= mod->cLines[j]->block;
+ ep->level= mod->cLines[j]->level;
+ addSet(&func->cfpoints,ep);
+ }
+ }
+ /* check double line execution points of module */
+ for (ep = setFirstItem(mod->cfpoints); ep;
+ ep = setNextItem(mod->cfpoints))
+ {
+ if (ep->addr >= sym->addr &&
+ ep->addr <= sym->eaddr )
+ {
+ addSet(&func->cfpoints,ep);
+ }
+ }
+ /* do the same for asm execution points */
+ for ( j = 0 ; j < mod->nasmLines ; j++ ) {
+ if (mod->asmLines[j]->addr < INT_MAX &&
+ mod->asmLines[j]->addr >= sym->addr &&
+ mod->asmLines[j]->addr <= sym->eaddr ) {
+
+ exePoint *ep ;
+ /* add it to the execution point */
+ if (func->aentryline > j)
+ func->aentryline = j;
+
+ if (func->aexitline < j)
+ func->aexitline = j;
+
+ /* add it to the execution point */
+ ep = Safe_calloc(1,sizeof(exePoint));
+ ep->addr = mod->asmLines[j]->addr ;
+ ep->line = j;
+ addSet(&func->afpoints,ep);
+ }
+ }
+ if ( func->entryline == INT_MAX-2 )
+ func->entryline = 0;
+ if ( func->aentryline == INT_MAX-2 )
+ func->aentryline = 0;
#ifdef SDCDB_DEBUG
- if (!( D_sdcdb & sdcdbDebug))
- return;
-
- Dprintf(D_sdcdb, ("sdcdb: function '%s' has the following C exePoints\n",
- func->sym->name));
- {
- exePoint *ep;
-
- for (ep = setFirstItem(func->cfpoints); ep;
- ep = setNextItem(func->cfpoints))
- Dprintf(D_sdcdb, ("sdcdb: {0x%x,%d} %s",
- ep->addr,ep->line,mod->cLines[ep->line]->src));
-
- Dprintf(D_sdcdb, ("sdcdb: and the following ASM exePoints\n"));
- for (ep = setFirstItem(func->afpoints); ep;
- ep = setNextItem(func->afpoints))
- Dprintf (D_sdcdb, ("sdcdb: {0x%x,%d} %s",
- ep->addr,ep->line,mod->asmLines[ep->line]->src));
- }
+ if (!( D_sdcdb & sdcdbDebug))
+ continue;
+
+ Dprintf(D_sdcdb, ("sdcdb: function '%s' has the following C exePoints\n",
+ func->sym->name));
+ {
+ exePoint *ep;
+
+ for (ep = setFirstItem(func->cfpoints); ep;
+ ep = setNextItem(func->cfpoints))
+ Dprintf(D_sdcdb, ("sdcdb: {0x%x,%d} %s",
+ ep->addr,ep->line+1,mod->cLines[ep->line]->src));
+
+ Dprintf(D_sdcdb, ("sdcdb: and the following ASM exePoints\n"));
+ for (ep = setFirstItem(func->afpoints); ep;
+ ep = setNextItem(func->afpoints))
+ Dprintf (D_sdcdb, ("sdcdb: {0x%x,%d} %s",
+ ep->addr,ep->line+1,mod->asmLines[ep->line]->src));
+ }
#endif
}
}
module */
functionPoints();
+ /* extract known special function registers */
+ specialFunctionRegs();
+
/* start the simulator & setup connection to it */
if ( sock == -1 )
openSimulator((char **)simArgs,nsimArgs);
and function exit break points */
applyToSet(functions,setEntryExitBP);
- /* ad we are done */
+ setMainContext();
+ return 0;
+}
+
+/*-----------------------------------------------------------------*/
+/* cmdSource - read commands from file */
+/*-----------------------------------------------------------------*/
+int cmdSource (char *s, context *cctxt)
+{
+ FILE *cmdfile;
+ char *bp = s+strlen(s) -1;
+
+ while (isspace(*s))
+ ++s;
+
+ while (isspace(*bp)) bp--;
+ *++bp = '\0';
+
+ if (!( cmdfile = searchDirsFopen(s)))
+ {
+ fprintf(stderr,"commandfile '%s' not found\n",s);
+ return 0;
+ }
+ commandLoop( cmdfile );
+ fclose( cmdfile );
return 0;
}
for (i = 0 ; i < (sizeof(cmdTab)/sizeof(struct cmdtab)) ; i++)
{
if ((cmdTab[i].htxt) && !strcmp(cmdTab[i].cmd,s))
- fprintf(stdout,"%s",cmdTab[i].htxt);
+ {
+ s = strrchr(cmdTab[i].htxt,'\t');
+ if ( !s )
+ s = cmdTab[i].htxt;
+ else
+ s++;
+ fprintf(stdout,"%s",s);
+ break;
+ }
}
return 0;
}
if (srcMode == SRC_CMODE)
fprintf(stdout,"\032\032%s:%d:1:beg:0x%08x\n",
currCtxt->func->mod->cfullname,
- currCtxt->cline,currCtxt->addr);
+ currCtxt->cline+1,currCtxt->addr);
else
fprintf(stdout,"\032\032%s:%d:1:beg:0x%08x\n",
currCtxt->func->mod->afullname,
return rv;
}
+static FILE *actualcmdfile=NULL ;
+static char *actualcmds=NULL;
+static int stopcmdlist;
/*-----------------------------------------------------------------*/
-/* commandLoop - the main command loop */
+/* getNextCmdLine get additional lines used by special commands */
/*-----------------------------------------------------------------*/
-void commandLoop()
+char *getNextCmdLine()
{
- char *prompt = "(sdcdb) ";
- char *sim_prompt = "(sim) ";
+ //fprintf(stderr,"getNextCmdLine() actualcmdfile=%p\n",actualcmdfile);
+ if (!actualcmdfile)
+ return NULL;
+ fprintf(stdout,">");
+ fflush(stdout);
+ if (fgets(cmdbuff,sizeof(cmdbuff),actualcmdfile) == NULL)
+ {
+ // fprintf(stderr,"getNextCmdLine() returns null\n");
+ return NULL;
+ }
+ //fprintf(stderr,"getNextCmdLine() returns: %s",cmdbuff);
+ return cmdbuff;
+}
- while (1) {
- if (sim_cmd_mode)
- printf("%s",sim_prompt);
- else
- fprintf(stdout,"%s",prompt);
+void setCmdLine( char *cmds )
+{
+ actualcmds = cmds;
+}
- fflush(stdout);
+void stopCommandList()
+{
+ stopcmdlist = 1;
+}
- if (fgets(cmdbuff,sizeof(cmdbuff),stdin) == NULL)
- break;
+/*-----------------------------------------------------------------*/
+/* commandLoop - the main command loop or loop over command file */
+/*-----------------------------------------------------------------*/
+static void commandLoop(FILE *cmdfile)
+{
+ char *line, save_ch, *s;
+ actualcmdfile = cmdfile;
+ while (1)
+ {
+ if ( cmdfile == stdin )
+ {
+ if (sim_cmd_mode)
+ printf("(sim) ");
+ else
+ fprintf(stdout,"(sdcdb) ");
+ fflush(stdout);
+ }
-#if 0
- /* make a way to go into "ucSim" mode */
- if (cmdbuff[0] == '$') {
- if (sim_cmd_mode) sim_cmd_mode = 0;
- else sim_cmd_mode = 1;
- continue;
- }
-#endif
+ //fprintf(stderr,"commandLoop actualcmdfile=%p cmdfile=%p\n",
+ // actualcmdfile,cmdfile);
+ if (fgets(cmdbuff,sizeof(cmdbuff),cmdfile) == NULL)
+ break;
- if (interpretCmd(cmdbuff))
- break;
- }
+ if (interpretCmd(cmdbuff))
+ break;
+
+ while ( actualcmds )
+ {
+ strcpy(cmdbuff,actualcmds);
+ actualcmds = NULL;
+ stopcmdlist= 0;
+ for ( line = cmdbuff; *line ; line = s )
+ {
+ if ( (s=strchr(line ,'\n')))
+ {
+ save_ch = *++s;
+ *s = '\0';
+ }
+ else
+ {
+ s += strlen( line );
+ save_ch = '\0';
+ }
+ if (interpretCmd( line ))
+ {
+ *s = save_ch;
+ break;
+ }
+ *s = save_ch;
+ if ( stopcmdlist )
+ break;
+ }
+ }
+ }
}
/*-----------------------------------------------------------------*/
int passon_args_flag = 0; /* if true, pass on args to simulator */
Dprintf(D_sdcdb, ("sdcdb: parseCmdLine\n"));
+ contsim=0;
for ( i = 1; i < argc ; i++) {
//fprintf(stdout,"%s\n",argv[i]);
continue;
}
#endif
+ if (strncmp(argv[i],"-contsim",8) == 0) {
+ contsim=1;
+ continue;
+ }
+ if (strncmp(argv[i],"-q",2) == 0) {
+ continue;
+ }
/* model string */
if (strncmp(argv[i],"-m",2) == 0) {
/* XTAL Frequency */
if (strcmp(argv[i],"-X") == 0 ||
- strcmp(argv[i],"-frequency") == 0) {
+ strcmp(argv[i],"-frequency") == 0) {
simArgs[nsimArgs++] = "-X";
simArgs[nsimArgs++] = strdup(argv[++i]);
continue ;
/* serial port */
if ( (strcmp(argv[i],"-S") == 0) ||
(strcmp(argv[i],"-s") == 0)) {
- simArgs[nsimArgs++] = "-s";
+ simArgs[nsimArgs++] = strdup(argv[i]);
+ simArgs[nsimArgs++] = strdup(argv[++i]);
+ continue ;
+ }
+
+ /* network serial port */
+ if ( (strcmp(argv[i],"-k") == 0)) {
+ simArgs[nsimArgs++] = strdup(argv[i]);
simArgs[nsimArgs++] = strdup(argv[++i]);
continue ;
}
{
/* may be interrupt from user: stop debugger and also simulator */
userinterrupt = 1;
- sendSim("\n");
+ if ( !nointerrupt )
+ sendSim("stop\n");
}
/* the only child can be the simulator */
static void
setsignals()
{
- signal(SIGHUP , bad_signal);
+ signal(SIGHUP , SIG_IGN);
+ signal(SIGCONT, SIG_IGN);
signal(SIGINT , sigintr );
signal(SIGTERM, bad_signal);
signal(SIGCHLD, sigchld );
signal(SIGABRT, bad_signal);
signal(SIGALRM, bad_signal);
- signal(SIGFPE, bad_signal);
- signal(SIGILL, bad_signal);
+ //signal(SIGFPE, bad_signal);
+ //signal(SIGILL, bad_signal);
signal(SIGPIPE, bad_signal);
signal(SIGQUIT, bad_signal);
- signal(SIGSEGV, bad_signal);
+ //signal(SIGSEGV, bad_signal);
}
/*-----------------------------------------------------------------*/
setsignals();
parseCmdLine(argc,argv);
- commandLoop();
+ commandLoop(stdin);
return 0;
}
projects / fw / sdcc / blobdiff