Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Mon Oct 31 08:23:51 CET 2005
Subject: [cvs-checkins] MODIFIED: or1k ...
Date: 00/05/10 31:08:23

Modified: or1k/or1ksim/support debug.c
Log:
Make -d channel be equivalent to -d +channel




Revision Changes Path
1.6 or1k/or1ksim/support/debug.c

http://www.opencores.org/cvsweb.shtml/or1k/or1ksim/support/debug.c.diff?r1=1.5&r2=1.6

(In the diff below, changes in quantity of whitespace are not shown.)

Index: debug.c
===================================================================
RCS file: /cvsroot/nogj/or1k/or1ksim/support/debug.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- debug.c 6 Sep 2005 16:32:53 -0000 1.5
+++ debug.c 31 Oct 2005 07:23:50 -0000 1.6
@@ -92,9 +92,20 @@
int disen;
int all;
const char *cend;
+ const char *chan_end;

while(*str) {
cend = strpbrk(str, "+-");
+ chan_end = strchr(str, ',');
+ if(!chan_end)
+ chan_end = str + strlen(str);
+
+ if(!cend || (cend > chan_end)) {
+ disen = 1;
+ cend = --str;
+ } else
+ disen = *cend == '+' ? 1 : 0;
+
if(cend == str) {
all = 1;
} else {
@@ -108,13 +119,10 @@
fprintf(stderr, "Unknown class specified\n");
all = 0;
}
- disen = *cend == '+' ? 1 : 0;
- str = cend + 1;
- cend = strchr(str, ',');
- if(!cend)
- cend = str + strlen(str);
+ cend++;
+
for(i = 0; __orsim_dbchs[i]; i++)
- if(!strncmp(str, __orsim_dbchs[i] + 1, cend - str))
+ if(!strncmp(cend, __orsim_dbchs[i] + 1, chan_end - cend))
break;

if(!__orsim_dbchs[i])
@@ -126,9 +134,9 @@
orsim_dbcl_set(__ORSIM_DBCL_ERR, __orsim_dbchs[i], disen);
} else
orsim_dbcl_set(dbcl, __orsim_dbchs[i], disen);
- if(*cend)
- str = cend + 1;
+ if(*chan_end)
+ str = chan_end + 1;
else
- str = cend;
+ str = chan_end;
}
}