#include "ddconfig.h"
+// prj
#include "i_string.h"
-
-#include "globals.h"
#include "utils.h"
+#include "globals.h"
-// sim
+// sim.src
#include "simcl.h"
-// local
+// local, cmd.src
#include "cmdsetcl.h"
#include "cmdutil.h"
-/*
- * Command: state
- *----------------------------------------------------------------------------
- */
-
-int
-cl_state_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- //con->printf("sim state= %d\n", sim->state);
- con->printf("CPU state= %s PC= 0x%06x XTAL= %g\n",
- get_id_string(cpu_states, sim->uc->state),
- sim->uc->PC,
- sim->uc->xtal);
- con->printf("Total time since last reset= %g sec (%lu clks)\n",
- sim->uc->get_rtime(), sim->uc->ticks->ticks);
- con->printf("Time in isr = %g sec (%lu clks) %3.2g%%\n",
- sim->uc->isr_ticks->get_rtime(sim->uc->xtal),
- sim->uc->isr_ticks->ticks,
- (sim->uc->ticks->ticks == 0)?0.0:
- (100.0*((double)(sim->uc->isr_ticks->ticks)/
- (double)(sim->uc->ticks->ticks))));
- con->printf("Time in idle= %g sec (%lu clks) %3.2g%%\n",
- sim->uc->idle_ticks->get_rtime(sim->uc->xtal),
- sim->uc->idle_ticks->ticks,
- (sim->uc->ticks->ticks == 0)?0.0:
- (100.0*((double)(sim->uc->idle_ticks->ticks)/
- (double)(sim->uc->ticks->ticks))));
- con->printf("Max value of stack pointer= 0x%06x, avg= 0x%06x\n",
- sim->uc->sp_max, sim->uc->sp_avg);
- return(0);
-}
-
-
-/*
- * Command: file
- *----------------------------------------------------------------------------
- */
-
-int
-cl_file_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- char *fname= 0;
- long l;
-
- if ((cmdline->param(0) == 0) ||
- ((fname= cmdline->param(0)->get_svalue()) == NULL))
- {
- con->printf("File name is missing.\n");
- return(0);
- }
- if ((l= sim->uc->read_hex_file(fname)) >= 0)
- con->printf("%ld words read from %s\n", l, fname);
-
- return(0);
-}
-
-
-/*
- * Command: download
- *----------------------------------------------------------------------------
- */
-
-int
-cl_dl_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- long l;
-
- if ((l= sim->uc->read_hex_file(NULL)) >= 0)
- con->printf("%ld words loaded\n", l);
-
- return(0);
-}
-
-
/*
* Command: run
*----------------------------------------------------------------------------
*/
-int
-cl_run_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
+//int
+//cl_run_cmd::do_work(class cl_sim *sim,
+// class cl_cmdline *cmdline, class cl_console *con)
+COMMAND_DO_WORK_SIM(cl_run_cmd)
{
class cl_brk *b;
t_addr start, end;
cmdline->param(3) };
if (params[0])
- if (!(params[0]->get_address(&start)))
+ if (!(params[0]->get_address(sim->uc, &start)))
{
- con->printf("Error: wrong start address\n");
+ con->dd_printf("Error: wrong start address\n");
return(DD_FALSE);
}
if (params[1])
- if (!(params[1]->get_address(&end)))
+ if (!(params[1]->get_address(sim->uc, &end)))
{
- con->printf("Error: wromg end address\n");
+ con->dd_printf("Error: wromg end address\n");
return(DD_FALSE);
}
if (params[0])
{
if (!sim->uc->inst_at(start))
- con->printf("Warning: maybe not instruction at 0x%06lx\n", start);
+ con->dd_printf("Warning: maybe not instruction at 0x%06lx\n", start);
sim->uc->PC= start;
if (params[1])
{
if (start == end)
{
- con->printf("Addresses must be different.\n");
+ con->dd_printf("Addresses must be different.\n");
return(DD_FALSE);
}
if ((b= sim->uc->fbrk_at(end)))
}
else
{
- b= new cl_fetch_brk(sim->uc->make_new_brknr(), end,
+ b= new cl_fetch_brk(sim->uc->mem(MEM_ROM),
+ sim->uc->make_new_brknr(), end,
brkDYNAMIC, 1);
sim->uc->fbrk->add_bp(b);
}
}
}
- con->printf("Simulation started, PC=0x%06x\n", sim->uc->PC);
- if (sim->uc->fbrk_at(start))
+ con->dd_printf("Simulation started, PC=0x%06x\n", sim->uc->PC);
+ if (sim->uc->fbrk_at(sim->uc->PC))
sim->uc->do_inst(1);
+
sim->start(con);
return(DD_FALSE);
}
*----------------------------------------------------------------------------
*/
-int
-cl_stop_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
+//int
+//cl_stop_cmd::do_work(class cl_sim *sim,
+// class cl_cmdline *cmdline, class cl_console *con)
+COMMAND_DO_WORK_SIM(cl_stop_cmd)
{
sim->stop(resUSER);
sim->uc->print_disass(sim->uc->PC, con);
*----------------------------------------------------------------------------
*/
-int
-cl_step_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
+//int
+//cl_step_cmd::do_work(class cl_sim *sim,
+// class cl_cmdline *cmdline, class cl_console *con)
+COMMAND_DO_WORK_UC(cl_step_cmd)
{
- sim->uc->do_inst(1);
- sim->uc->print_regs(con);
+ //printf("step %x\n",uc->PC);
+ uc->do_inst(1);
+ //printf("step done %x\n",uc->PC);
+ uc->print_regs(con);
return(0);
}
*----------------------------------------------------------------------------
*/
-int
-cl_next_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
+//int
+//cl_next_cmd::do_work(class cl_sim *sim,
+// class cl_cmdline *cmdline, class cl_console *con)
+COMMAND_DO_WORK_SIM(cl_next_cmd)
{
class cl_brk *b;
t_addr next;
- struct dis_entry *de;
+ int branch;
+ int inst_len;
+#if 0
+ struct dis_entry *de;
t_mem code= sim->uc->get_mem(MEM_ROM, sim->uc->PC);
int i= 0;
de= &(sim->uc->dis_tbl()[i]);
i++;
de= &(sim->uc->dis_tbl()[i]);
}
- if ((de->branch == 'a') ||
- (de->branch == 'l'))
+#endif
+
+ branch = sim->uc->inst_branch(sim->uc->PC);
+ inst_len = sim->uc->inst_length(sim->uc->PC);
+
+ if ((branch == 'a') || (branch == 'l'))
{
- next= sim->uc->PC + de->length;
+ next= sim->uc->PC + inst_len;
if (!sim->uc->fbrk_at(next))
{
- b= new cl_fetch_brk(sim->uc->make_new_brknr(),
+ b= new cl_fetch_brk(sim->uc->mem(MEM_ROM),
+ sim->uc->make_new_brknr(),
next, brkDYNAMIC, 1);
+
+ b->init();
+// sim->uc->fbrk->add_bp(b);
+
sim->uc->fbrk->add(b);
+ b->activate();
}
+ if (sim->uc->fbrk_at(sim->uc->PC))
+ sim->uc->do_inst(1);
sim->start(con);
//sim->uc->do_inst(-1);
}
}
-/*
- * Command: pc
- *----------------------------------------------------------------------------
- */
-
-int
-cl_pc_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- t_addr addr;
- class cl_cmd_arg *params[1]= { cmdline->param(0) };
-
- if (params[0])
- {
- if (!(params[0]->get_address(&addr)))
- {
- con->printf("Error: wrong parameter\n");
- return(DD_FALSE);
- }
- if (addr >= sim->uc->get_mem_size(MEM_ROM))
- addr= 0;
- if (!sim->uc->inst_at(addr))
- con->printf("Warning: maybe not instruction at 0x%06x\n", addr);
- sim->uc->PC= addr;
- }
- sim->uc->print_disass(sim->uc->PC, con);
- return(DD_FALSE);
-}
-
-
-/*
- * Command: reset
- *----------------------------------------------------------------------------
- */
-
-int
-cl_reset_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- sim->uc->reset();
- return(0);
-}
-
-
-/*
- * Command: dump
- *----------------------------------------------------------------------------
- */
-
-int
-cl_dump_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- class cl_mem *mem= 0;
- long bpl= 8;
- t_addr start= 0, end;
- class cl_cmd_arg *params[4]= { cmdline->param(0),
- cmdline->param(1),
- cmdline->param(2),
- cmdline->param(3) };
-
- if (params[0] &&
- params[0]->as_bit(sim->uc))
- {
- int i= 0;
- while (params[0] &&
- params[0]->as_bit(sim->uc))
- {
- t_mem m;
- mem= params[0]->value.bit.mem;
- m= mem->read(params[0]->value.bit.mem_address);
- char *sn=
- sim->uc->symbolic_bit_name((t_addr)-1,
- mem,
- params[0]->value.bit.mem_address,
- params[0]->value.bit.mask);
- con->printf("%10s ", sn?sn:"");
- con->printf(mem->addr_format, params[0]->value.bit.mem_address);
- con->printf(" ");
- con->printf(mem->data_format, m);
- con->printf(" %c\n", (m&(params[0]->value.bit.mask))?'1':'0');
- i++;
- params[0]= cmdline->param(i);
- }
- if (params[0])
- con->printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
- }
- else if (cmdline->syntax_match(sim, MEMORY))
- {
- mem= params[0]->value.memory;
- mem->dump(con);
- }
- else if (cmdline->syntax_match(sim, MEMORY ADDRESS)) {
- mem = params[0]->value.memory;
- start= params[1]->value.address;
- end = start+10*8-1;
- mem->dump(start, end, bpl, con);
- }
- else if (cmdline->syntax_match(sim, MEMORY ADDRESS ADDRESS)) {
- mem = params[0]->value.memory;
- start= params[1]->value.address;
- end = params[2]->value.address;
- mem->dump(start, end, bpl, con);
- }
- else if (cmdline->syntax_match(sim, MEMORY ADDRESS ADDRESS NUMBER)) {
- mem = params[0]->value.memory;
- start= params[1]->value.address;
- end = params[2]->value.address;
- bpl = params[3]->value.number;
- mem->dump(start, end, bpl, con);
- }
- else
- con->printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
-
- return(DD_FALSE);;
-}
-
-
-/*
- * Command: di
- *----------------------------------------------------------------------------
- */
-
-int
-cl_di_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- cmdline->insert_param(0, new cl_cmd_sym_arg(sim->uc, "i"));
- cl_dump_cmd::do_work(sim, cmdline, con);
- return(0);
-}
-
-
-/*
- * Command: dx
- *----------------------------------------------------------------------------
- */
-
-int
-cl_dx_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- cmdline->insert_param(0, new cl_cmd_sym_arg(sim->uc, "x"));
- cl_dump_cmd::do_work(sim, cmdline, con);
- return(0);
-}
-
-
-/*
- * Command: dch
- *----------------------------------------------------------------------------
- */
-
-int
-cl_dch_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- cmdline->insert_param(0, new cl_cmd_sym_arg(sim->uc, "r"));
- cl_dump_cmd::do_work(sim, cmdline, con);
- return(0);
-}
-
-
-/*
- * Command: ds
- *----------------------------------------------------------------------------
- */
-
-int
-cl_ds_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- cmdline->insert_param(0, new cl_cmd_sym_arg(sim->uc, "s"));
- cl_dump_cmd::do_work(sim, cmdline, con);
- return(0);
-}
-
-
-/*
- * Command: dc
- *----------------------------------------------------------------------------
- */
-
-int
-cl_dc_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- t_addr start= last, end= last+20;
- class cl_cmd_arg *params[2]= { cmdline->param(0),
- cmdline->param(1) };
- class cl_mem *rom= sim->uc->mem(MEM_ROM);
-
- if (!rom)
- return(DD_FALSE);
- if (params[0] == 0)
- ;
- else if (cmdline->syntax_match(sim, ADDRESS)) {
- start= params[0]->value.address;
- end= start+20;
- }
- else if (cmdline->syntax_match(sim, ADDRESS ADDRESS)) {
- start= params[0]->value.address;
- end= params[1]->value.address;
- }
- if (start >= rom->size)
- {
- con->printf("Error: start address is wrong\n");
- return(DD_FALSE);
- }
- if (end >= rom->size)
- {
- con->printf("Error: end address is wrong\n");
- return(DD_FALSE);
- }
-
- for (;
- start <= end;
- start+= sim->uc->inst_length(rom->get(start)))
- sim->uc->print_disass(start, con);
- last= start;
- return(DD_FALSE);
-}
-
-
-/*
- * Command: disassemble
- *----------------------------------------------------------------------------
- */
-
-static int disass_last_stop= 0;
-
-int
-cl_disassemble_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- t_addr start, realstart;
- int offset= -1, dir, lines= 20;
- class cl_cmd_arg *params[4]= { cmdline->param(0),
- cmdline->param(1),
- cmdline->param(2),
- cmdline->param(3) };
-
- start= disass_last_stop;
- if (params[0] == 0) ;
- else if (cmdline->syntax_match(sim, ADDRESS)) {
- start= params[0]->value.address;
- }
- else if (cmdline->syntax_match(sim, ADDRESS NUMBER)) {
- start= params[0]->value.address;
- offset= params[1]->value.number;
- }
- else if (cmdline->syntax_match(sim, ADDRESS NUMBER NUMBER)) {
- start= params[0]->value.address;
- offset= params[1]->value.number;
- lines= params[2]->value.number;
- }
- else
- {
- con->printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
- return(DD_FALSE);
- }
-
- if (lines < 1)
- {
- con->printf("Error: wrong `lines' parameter\n");
- return(DD_FALSE);
- }
- if (!sim->uc->there_is_inst())
- return(DD_FALSE);
- realstart= start;
- class cl_mem *rom= sim->uc->mem(MEM_ROM);
- if (!rom)
- return(DD_FALSE);
- while (realstart < rom->size &&
- !sim->uc->inst_at(realstart))
- realstart= realstart+1;
- if (offset)
- {
- dir= (offset < 0)?-1:+1;
- while (offset)
- {
- realstart= (realstart+dir) % rom->size;
- while (!sim->uc->inst_at(realstart))
- realstart= (realstart+dir) % rom->size;
- offset+= -dir;
- }
- }
-
- while (lines)
- {
- sim->uc->print_disass(realstart, sim->cmd->actual_console);
- realstart= (realstart+1) % rom->size;
- while (!sim->uc->inst_at(realstart))
- realstart= (realstart+1) % rom->size;
- lines--;
- }
-
- disass_last_stop= realstart;
-
- return(DD_FALSE);;
-}
-
-
-/*
- * Command: fill
- *----------------------------------------------------------------------------
- */
-
-int
-cl_fill_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- class cl_mem *mem= 0;
- t_mem what= 0;
- t_addr start= 0, end;
- class cl_cmd_arg *params[4]= { cmdline->param(0),
- cmdline->param(1),
- cmdline->param(2),
- cmdline->param(3) };
-
- if (cmdline->syntax_match(sim, MEMORY ADDRESS ADDRESS NUMBER)) {
- mem = params[0]->value.memory;
- start= params[1]->value.address;
- end = params[2]->value.address;
- what = params[3]->value.number;
- t_addr i;
- for (i= start; i <= end; i++)
- {
- t_mem d;
- d= what;
- mem->write(i, &d);
- }
- }
- else
- con->printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
-
- return(DD_FALSE);;
-}
-
-
-/*
- * Command: where
- *----------------------------------------------------------------------------
- */
-
-int
-cl_where_cmd::do_real_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con,
- bool case_sensitive)
-{
- class cl_mem *mem= 0;
- class cl_cmd_arg *params[2]= { cmdline->param(0),
- cmdline->param(1) };
-
- if (cmdline->syntax_match(sim, MEMORY DATALIST)) {
- mem= params[0]->value.memory;
- t_mem *array= params[1]->value.data_list.array;
- int len= params[1]->value.data_list.len;
- if (!len)
- {
- con->printf("Error: nothing to search for\n");
- return(DD_FALSE);
- }
- t_addr addr= 0;
- bool found= mem->search_next(case_sensitive, array, len, &addr);
- while (found)
- {
- mem->dump(addr, addr+len-1, 8, con);
- addr++;
- found= mem->search_next(case_sensitive, array, len, &addr);
- }
- }
- else
- con->printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
-
- return(DD_FALSE);
-}
-
-int
-cl_where_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- return(do_real_work(sim, cmdline, con, DD_FALSE));
-}
-
-int
-cl_Where_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
-{
- return(do_real_work(sim, cmdline, con, DD_TRUE));
-}
-
-
/*
* Command: help
*----------------------------------------------------------------------------
*/
-int
-cl_help_cmd::do_work(class cl_sim *sim,
- class cl_cmdline *cmdline, class cl_console *con)
+//int
+//cl_help_cmd::do_work(class cl_sim *sim,
+// class cl_cmdline *cmdline, class cl_console *con)
+COMMAND_DO_WORK_APP(cl_help_cmd)
{
+ class cl_sim *sim;
+ class cl_commander *cmd;
+ class cl_cmdset *cmdset= 0;
class cl_cmd *c;
int i;
class cl_cmd_arg *parm= cmdline->param(0);
+ sim= app->get_sim();
+ if ((cmd= app->get_commander()) != 0)
+ cmdset= cmd->cmdset;
+ if (!cmdset)
+ return(DD_FALSE);
if (!parm) {
- for (i= 0; i < sim->cmd->cmdset->count; i++)
+ for (i= 0; i < cmdset->count; i++)
{
- c= (class cl_cmd *)(sim->cmd->cmdset->at(i));
+ c= (class cl_cmd *)(cmdset->at(i));
if (c->short_help)
- con->printf("%s\n", c->short_help);
+ con->dd_printf("%s\n", c->short_help);
else
- con->printf("%s\n", (char*)(c->names->at(0)));
+ con->dd_printf("%s\n", (char*)(c->names->at(0)));
}
}
- else if (cmdline->syntax_match(sim, STRING)) {
+ else if (cmdline->syntax_match(/*sim*/0, STRING)) {
int matches= 0;
- for (i= 0; i < sim->cmd->cmdset->count; i++)
+ for (i= 0; i < cmdset->count; i++)
{
- c= (class cl_cmd *)(sim->cmd->cmdset->at(i));
+ c= (class cl_cmd *)(cmdset->at(i));
if (c->name_match(parm->value.string.string, DD_FALSE))
matches++;
}
if (!matches)
- con->printf("No such command\n");
+ con->dd_printf("No such command\n");
else if (matches > 1)
- for (i= 0; i < sim->cmd->cmdset->count; i++)
+ for (i= 0; i < cmdset->count; i++)
{
- c= (class cl_cmd *)(sim->cmd->cmdset->at(i));
+ c= (class cl_cmd *)(cmdset->at(i));
if (!c->name_match(parm->value.string.string, DD_FALSE))
continue;
if (c->short_help)
- con->printf("%s\n", c->short_help);
+ con->dd_printf("%s\n", c->short_help);
else
- con->printf("%s\n", (char*)(c->names->at(0)));
+ con->dd_printf("%s\n", (char*)(c->names->at(0)));
}
else
- for (i= 0; i < sim->cmd->cmdset->count; i++)
+ for (i= 0; i < cmdset->count; i++)
{
- c= (class cl_cmd *)(sim->cmd->cmdset->at(i));
+ c= (class cl_cmd *)(cmdset->at(i));
if (!c->name_match(parm->value.string.string, DD_FALSE))
continue;
if (c->short_help)
- con->printf("%s\n", c->short_help);
+ con->dd_printf("%s\n", c->short_help);
else
- con->printf("%s\n", (char*)(c->names->at(0)));
+ con->dd_printf("%s\n", (char*)(c->names->at(0)));
int names;
- con->printf("Names of command:");
+ con->dd_printf("Names of command:");
for (names= 0; names < c->names->count; names++)
- con->printf(" %s", (char*)(c->names->at(names)));
- con->printf("\n");
+ con->dd_printf(" %s", (char*)(c->names->at(names)));
+ con->dd_printf("\n");
if (c->long_help)
- con->printf("%s\n", c->long_help);
+ con->dd_printf("%s\n", c->long_help);
else
- con->printf("%s\n", (char*)(c->names->at(0)));
+ con->dd_printf("%s\n", (char*)(c->names->at(0)));
}
}
else
- con->printf("%s\n", short_help?short_help:"Error: wrong syntax");
+ con->dd_printf("%s\n", short_help?short_help:"Error: wrong syntax");
return(0);
}
*----------------------------------------------------------------------------
*/
-int
-cl_quit_cmd::do_work(class cl_sim *sim,
- class cl_cmdline */*cmdline*/, class cl_console */*con*/)
+//int
+//cl_quit_cmd::do_work(class cl_sim *sim,
+// class cl_cmdline */*cmdline*/, class cl_console */*con*/)
+COMMAND_DO_WORK(cl_quit_cmd)
{
return(1);
}
*----------------------------------------------------------------------------
*/
-int
-cl_kill_cmd::do_work(class cl_sim *sim,
- class cl_cmdline */*cmdline*/, class cl_console */*con*/)
+//int
+//cl_kill_cmd::do_work(class cl_sim *sim,
+// class cl_cmdline */*cmdline*/, class cl_console */*con*/)
+COMMAND_DO_WORK_APP(cl_kill_cmd)
{
- sim->state|= SIM_QUIT;
+ app->going= 0;
+ if (app->sim)
+ app->sim->state|= SIM_QUIT;
return(1);
}
projects / fw / sdcc / blobdiff