1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
Description: Fix compile failures for newer g++ release
Author: Thomas Sailer <sailer@ife.ee.ethz.ch>
Bug: https://sourceforge.net/p/drawtiming/patches/12/
Bug-Debian: https://bugs.debian.org/984038
Forwarded: https://sourceforge.net/p/drawtiming/patches/12/drawtiming-gcc.patch
--- a/src/parser.yy
+++ b/src/parser.yy
@@ -42,13 +42,13 @@ statements:
statement { $$ = $1; deps.push_back ($1); }
| statements ',' statement { $$ = $3; deps.push_back ($3); }
| statements ';' statement { $$ = $3; deps.clear (); deps.push_back ($3); }
-| statements CAUSE statement { $$ = $3; data.add_dependencies ($3, deps);
+| statements CAUSE statement { $$ = $3; data_.add_dependencies ($3, deps);
deps.clear (); deps.push_back ($3); }
-| statements DELAY statement { $$ = $3; data.add_delay ($3, $1, $2); }
+| statements DELAY statement { $$ = $3; data_.add_delay ($3, $1, $2); }
statement:
-SYMBOL '=' SYMBOL { $$ = $1; data.set_value ($1, n, timing::sigvalue ($3)); }
-| SYMBOL '=' STRING { $$ = $1; data.set_value ($1, n, timing::sigvalue ($3, timing::STATE)); }
+SYMBOL '=' SYMBOL { $$ = $1; data_.set_value ($1, n, timing::sigvalue ($3)); }
+| SYMBOL '=' STRING { $$ = $1; data_.set_value ($1, n, timing::sigvalue ($3, timing::STATE)); }
| SYMBOL { $$ = $1; };
%%
--- a/src/globals.h
+++ b/src/globals.h
@@ -22,7 +22,7 @@
#define YYSTYPE std::string
extern unsigned n;
-extern timing::data data;
+extern timing::data data_;
extern timing::signal_sequence deps;
#endif
--- a/src/timing.cc
+++ b/src/timing.cc
@@ -113,16 +113,16 @@ sigdata &sigdata::operator= (const sigda
// ------------------------------------------------------------
-data::data (void) : maxlen (0) {
+timing::data::data (void) : maxlen (0) {
}
-data::data (const data &d) {
+timing::data::data (const timing::data &d) {
*this = d;
}
// ------------------------------------------------------------
-data &data::operator= (const data &d) {
+timing::data &timing::data::operator= (const timing::data &d) {
maxlen = d.maxlen;
signals = d.signals;
sequence = d.sequence;
@@ -132,7 +132,7 @@ data &data::operator= (const data &d) {
// ------------------------------------------------------------
-sigdata &data::find_signal (const signame &name) {
+sigdata &timing::data::find_signal (const signame &name) {
signal_database::iterator i = signals.find (name);
if (i == signals.end ()) {
i = signals.insert (signal_database::value_type (name, sigdata ())).first;
@@ -143,7 +143,7 @@ sigdata &data::find_signal (const signam
// ------------------------------------------------------------
-const sigdata &data::find_signal (const signame &name) const {
+const sigdata &timing::data::find_signal (const signame &name) const {
signal_database::const_iterator i = signals.find (name);
if (i == signals.end ())
throw not_found (name);
@@ -152,7 +152,7 @@ const sigdata &data::find_signal (const
// ------------------------------------------------------------
-void data::add_dependency (const signame &name, const signame &dep) {
+void timing::data::add_dependency (const signame &name, const signame &dep) {
// find the signal
sigdata &sig = find_signal (name);
sigdata &trigger = find_signal (dep);
@@ -168,14 +168,14 @@ void data::add_dependency (const signame
// ------------------------------------------------------------
-void data::add_dependencies (const signame &name, const signal_sequence &deps) {
+void timing::data::add_dependencies (const signame &name, const signal_sequence &deps) {
for (signal_sequence::const_iterator j = deps.begin (); j != deps.end (); ++ j)
add_dependency (name, *j);
}
// ------------------------------------------------------------
-void data::add_delay (const signame &name, const signame &dep, const string &text) {
+void timing::data::add_delay (const signame &name, const signame &dep, const string &text) {
// a delay always indicates a dependency
// (but would require a way to select which is rendered)
// add_dependency (name, dep);
@@ -206,7 +206,7 @@ void data::add_delay (const signame &nam
// ------------------------------------------------------------
-void data::set_value (const signame &name, unsigned n, const sigvalue &value) {
+void timing::data::set_value (const signame &name, unsigned n, const sigvalue &value) {
// find the signal
sigdata &sig = find_signal (name);
@@ -228,7 +228,7 @@ void data::set_value (const signame &nam
// ------------------------------------------------------------
-void data::pad (unsigned n) {
+void timing::data::pad (unsigned n) {
// pad all sequences to length n
if (n > maxlen)
maxlen = n;
@@ -250,7 +250,7 @@ ostream &operator<< (ostream &f, const s
// ------------------------------------------------------------
-ostream &operator<< (ostream &f, const data &data) {
+ostream &operator<< (ostream &f, const timing::data &data) {
f << "signals: " << endl;
for (signal_sequence::const_iterator i = data.sequence.begin ();
i != data.sequence.end (); ++ i)
@@ -288,7 +288,7 @@ ostream &operator<< (ostream &f, const d
// ------------------------------------------------------------
// calculate the required label width
-static int label_width (const data &d) {
+static int label_width (const timing::data &d) {
int labelWidth = 0;
#ifndef LITE
@@ -319,7 +319,7 @@ static int label_width (const data &d) {
// ------------------------------------------------------------
// calculate the basic height and width required before scaling
-static void base_size (const data &d, int &w, int &h) {
+static void base_size (const timing::data &d, int &w, int &h) {
vCellHsep = vCellHt / 8;
vCellH=vCellHt-vCellHsep;
@@ -596,7 +596,7 @@ static void draw_delay (gc &gc, int x0,
// ------------------------------------------------------------
-static void render_common (gc& gc, const data &d,
+static void render_common (gc& gc, const timing::data &d,
double hscale, double vscale) {
gc.push ();
@@ -650,7 +650,7 @@ static void render_common (gc& gc, const
// ------------------------------------------------------------
-void timing::render (gc &gc, const data &d, double scale) {
+void timing::render (gc &gc, const timing::data &d, double scale) {
int base_width, base_height;
base_size (d, base_width, base_height);
@@ -662,7 +662,7 @@ void timing::render (gc &gc, const data
// ------------------------------------------------------------
-void timing::render (gc &gc, const data &d, int w, int h, bool fixAspect) {
+void timing::render (gc &gc, const timing::data &d, int w, int h, bool fixAspect) {
int base_width, base_height;
base_size (d, base_width, base_height);
--- a/src/main.cc
+++ b/src/main.cc
@@ -44,7 +44,7 @@ static void banner (void);
static void freesoft (void);
unsigned n;
-timing::data data;
+timing::data data_;
timing::signal_sequence deps;
string outfile;
int verbose = 0;
@@ -87,9 +87,9 @@ static void render_it (timing::gc& gc, i
int width, int height, double scale)
{
if (flags & FLAG_PAGESIZE)
- render (gc, data, width, height, (flags & FLAG_ASPECT));
+ render (gc, data_, width, height, (flags & FLAG_ASPECT));
else
- render (gc, data, scale);
+ render (gc, data_, scale);
}
int main (int argc, char *argv[]) {
@@ -193,9 +193,9 @@ int main (int argc, char *argv[]) {
}
}
- data.pad (n);
+ data_.pad (n);
if (verbose)
- cout << data;
+ cout << data_;
if (outfile.empty ())
return 0;
|