projects
/
fw
/
sdcc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch ucsim-034-pre3 to main trunk; new version 0.4
[fw/sdcc]
/
sim
/
ucsim
/
cmd.src
/
newcmd.cc
diff --git
a/sim/ucsim/cmd.src/newcmd.cc
b/sim/ucsim/cmd.src/newcmd.cc
index 580af58db95796281acfa31a813f067ac3844124..57c45cac02020ed245f82916e8630f8789f47a93 100644
(file)
--- a/
sim/ucsim/cmd.src/newcmd.cc
+++ b/
sim/ucsim/cmd.src/newcmd.cc
@@
-638,7
+638,7
@@
int
cl_cmd::do_work(class cl_cmdline *cmdline, class cl_console *con)
{
con->dd_printf("Command \"%s\" does nothing.\n",
cl_cmd::do_work(class cl_cmdline *cmdline, class cl_console *con)
{
con->dd_printf("Command \"%s\" does nothing.\n",
- (char*)(names->at(0)));
+
(char*)(names->at(0)));
return(0);
}
return(0);
}
@@
-647,7
+647,7
@@
cl_cmd::do_work(class cl_app *app,
class cl_cmdline *cmdline, class cl_console *con)
{
con->dd_printf("Command \"%s\" does nothing on application.\n",
class cl_cmdline *cmdline, class cl_console *con)
{
con->dd_printf("Command \"%s\" does nothing on application.\n",
- (char*)(names->at(0)));
+
(char*)(names->at(0)));
return(0);
}
return(0);
}
@@
-656,7
+656,7
@@
cl_cmd::do_work(class cl_sim *sim,
class cl_cmdline *cmdline, class cl_console *con)
{
con->dd_printf("Command \"%s\" does nothing on simulator.\n",
class cl_cmdline *cmdline, class cl_console *con)
{
con->dd_printf("Command \"%s\" does nothing on simulator.\n",
- (char*)(names->at(0)));
+
(char*)(names->at(0)));
return(0);
}
return(0);
}
@@
-665,7
+665,7
@@
cl_cmd::do_work(class cl_uc *uc,
class cl_cmdline *cmdline, class cl_console *con)
{
con->dd_printf("Command \"%s\" does nothing on microcontroller.\n",
class cl_cmdline *cmdline, class cl_console *con)
{
con->dd_printf("Command \"%s\" does nothing on microcontroller.\n",
- (char*)(names->at(0)));
+
(char*)(names->at(0)));
return(0);
}
return(0);
}
@@
-1349,12
+1349,19
@@
cl_commander::dd_printf(char *format, ...)
{
va_list ap;
int ret= 0;
{
va_list ap;
int ret= 0;
+ FILE *f;
- if (actual_console &&
- actual_console->out)
+ if (actual_console)
+ f= actual_console->out;
+ else if (frozen_console)
+ f= frozen_console->out;
+ else
+ f= 0;
+ if (/*actual_console &&
+ actual_console->out*/f)
{
va_start(ap, format);
{
va_start(ap, format);
- ret= cmd_do_print(
actual_console->out
, format, ap);
+ ret= cmd_do_print(
f/*actual_console->out*/
, format, ap);
va_end(ap);
}
return(ret);
va_end(ap);
}
return(ret);