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
/
cmdutil.cc
diff --git
a/sim/ucsim/cmd.src/cmdutil.cc
b/sim/ucsim/cmd.src/cmdutil.cc
index 083b84562d73e8d793633e1fd405c61225414b1f..50a90e3e28f2d3b176196385ce3366c30f100994 100644
(file)
--- a/
sim/ucsim/cmd.src/cmdutil.cc
+++ b/
sim/ucsim/cmd.src/cmdutil.cc
@@
-1,5
+1,5
@@
/*
/*
- * Simulator of microcontrollers (cmdutil.cc)
+ * Simulator of microcontrollers (cmd
.src/cmd
util.cc)
*
* Copyright (C) 1999,99 Drotos Daniel, Talker Bt.
*
*
* Copyright (C) 1999,99 Drotos Daniel, Talker Bt.
*
@@
-86,18
+86,18
@@
make_server_socket(unsigned short int port)
* Printing out an integer in binary format
*/
* Printing out an integer in binary format
*/
-void
-print_bin(long data, int bits,
FILE *f
)
+
/*
void
+print_bin(long data, int bits,
class cl_console *con
)
{
long mask= 1;
mask= mask << ((bits >= 1)?(bits-1):0);
while (bits--)
{
{
long mask= 1;
mask= mask << ((bits >= 1)?(bits-1):0);
while (bits--)
{
-
fprintf(f,
"%c", (data&mask)?'1':'0');
+
con->printf(
"%c", (data&mask)?'1':'0');
mask>>= 1;
}
mask>>= 1;
}
-}
+}
*/
/*
/*
@@
-110,6
+110,10
@@
get_name_entry(struct name_entry tabl[], char *name, class cl_uc *uc)
int i= 0;
char *p;
int i= 0;
char *p;
+ if (!tabl ||
+ !name ||
+ !(*name))
+ return(0);
for (p= name; *p; *p= toupper(*p), p++);
while (tabl[i].name &&
(!(tabl[i].cpu_type & uc->type) ||
for (p= name; *p; *p= toupper(*p), p++);
while (tabl[i].name &&
(!(tabl[i].cpu_type & uc->type) ||
@@
-118,7
+122,7
@@
get_name_entry(struct name_entry tabl[], char *name, class cl_uc *uc)
if (tabl[i].name != NULL)
return(&tabl[i]);
else
if (tabl[i].name != NULL)
return(&tabl[i]);
else
- return(
NULL
);
+ return(
0
);
}
}
@@
-126,7
+130,7
@@
get_name_entry(struct name_entry tabl[], char *name, class cl_uc *uc)
* Interpreting a bitname
*/
* Interpreting a bitname
*/
-bool
+
/*
bool
interpret_bitname(char *name, class cl_uc *uc,
uchar **cell, uchar *celladdr,
uchar *bitaddr, uchar *bitmask,
interpret_bitname(char *name, class cl_uc *uc,
uchar **cell, uchar *celladdr,
uchar *bitaddr, uchar *bitmask,
@@
-147,7
+151,7
@@
interpret_bitname(char *name, class cl_uc *uc,
{
dot--;
*dot= '.';
{
dot--;
*dot= '.';
- return(FALSE);
+ return(
DD_
FALSE);
}
}
else
}
}
else
@@
-155,12
+159,12
@@
interpret_bitname(char *name, class cl_uc *uc,
if ((*celladdr < 0x20) ||
((*celladdr > 0x2f) && (*celladdr < 0x80)) ||
((*celladdr > 0x7f) && (*celladdr & 0x07)))
if ((*celladdr < 0x20) ||
((*celladdr > 0x2f) && (*celladdr < 0x80)) ||
((*celladdr > 0x7f) && (*celladdr & 0x07)))
- return(FALSE);
+ return(
DD_
FALSE);
bitnum= strtol(dot, &p, 0);
if ((p && *p) ||
(bitnum < 0) ||
(bitnum > 7))
bitnum= strtol(dot, &p, 0);
if ((p && *p) ||
(bitnum < 0) ||
(bitnum > 7))
- return(FALSE);
+ return(
DD_
FALSE);
if (*celladdr > 0x7f)
*bitaddr= *celladdr + bitnum;
else
if (*celladdr > 0x7f)
*bitaddr= *celladdr + bitnum;
else
@@
-175,7
+179,7
@@
interpret_bitname(char *name, class cl_uc *uc,
*bitaddr= strtol(name, &p, 0);
if ((p && *p) ||
(*bitaddr > 0xff))
*bitaddr= strtol(name, &p, 0);
if ((p && *p) ||
(*bitaddr > 0xff))
- return(FALSE);
+ return(
DD_
FALSE);
}
else
*bitaddr= ne->addr;
}
else
*bitaddr= ne->addr;
@@
-185,11
+189,12
@@
interpret_bitname(char *name, class cl_uc *uc,
*celladdr= (*bitaddr >> 3) + 0x20;
}
// *bitaddr, *celladdr now OK
*celladdr= (*bitaddr >> 3) + 0x20;
}
// *bitaddr, *celladdr now OK
- *cell= uc->get_bit/*FIXME*/(*bitaddr);
+ *cell= uc->get_bit//FIXME
+ (*bitaddr);
*bitmask= BIT_MASK(*bitaddr);
// making symbolic name
if (!symname)
*bitmask= BIT_MASK(*bitaddr);
// making symbolic name
if (!symname)
- return(TRUE);
+ return(
DD_
TRUE);
i= 0;
while (uc->bit_tbl()[i].name &&
(uc->bit_tbl()[i].addr != *bitaddr))
i= 0;
while (uc->bit_tbl()[i].name &&
(uc->bit_tbl()[i].addr != *bitaddr))
@@
-198,7
+203,7
@@
interpret_bitname(char *name, class cl_uc *uc,
{
sym= strdup(uc->bit_tbl()[i].name);
*symname= sym;
{
sym= strdup(uc->bit_tbl()[i].name);
*symname= sym;
- return(TRUE);
+ return(
DD_
TRUE);
}
i= 0;
while (uc->sfr_tbl()[i].name &&
}
i= 0;
while (uc->sfr_tbl()[i].name &&
@@
-216,8
+221,8
@@
interpret_bitname(char *name, class cl_uc *uc,
sprintf(bitnumstr, "%1d", *bitaddr & 0x07);
strcat(sym, bitnumstr);
*symname= sym;
sprintf(bitnumstr, "%1d", *bitaddr & 0x07);
strcat(sym, bitnumstr);
*symname= sym;
- return(TRUE);
-}
+ return(
DD_
TRUE);
+}
*/
/*
/*
@@
-227,8
+232,8
@@
interpret_bitname(char *name, class cl_uc *uc,
char *
proc_escape(char *string, int *len)
{
char *
proc_escape(char *string, int *len)
{
- char spec_chars[]= "fnrtvab";
- char spec[]= "\f\n\r\t\v\a\b";
+ char spec_chars[]= "fnrtvab
\"
";
+ char spec[]= "\f\n\r\t\v\a\b
\"
";
char *s, *str, *p;
s = string;
char *s, *str, *p;
s = string;
@@
-283,4
+288,4
@@
proc_escape(char *string, int *len)
}
}
-/* End of cmdutil.cc */
+/* End of cmd
.src/cmd
util.cc */