about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2015-02-22 01:32:24 -0800
committerKartik K. Agaram <vc@akkartik.com>2015-02-22 01:32:24 -0800
commita55bbd06724ce7f3dc6cf1769420c13ea77d91de (patch)
treeb9148e53f8c4539c29568cda78ccc74bfc105f86
parent0f9e3ebb5120be5aae2128cc9214d29745675b7d (diff)
downloadmu-a55bbd06724ce7f3dc6cf1769420c13ea77d91de.tar.gz
823
-rw-r--r--cpp/.traces/index36
-rw-r--r--cpp/.traces/index_address34
-rw-r--r--cpp/019array84
3 files changed, 154 insertions, 0 deletions
diff --git a/cpp/.traces/index b/cpp/.traces/index
new file mode 100644
index 00000000..a23f11ab
--- /dev/null
+++ b/cpp/.traces/index
@@ -0,0 +1,36 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "3", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "14", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "15", type: 0}
+parse/0:   product: {name: "3", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "16", type: 0}
+parse/0:   product: {name: "4", type: 1}
+parse/0: instruction: 20
+parse/0:   ingredient: {name: "1", type: 6}
+parse/0:   ingredient: {name: "0", type: 0}
+parse/0:   product: {name: "5", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 3
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 14
+mem/0: storing in location 2
+run/0: instruction 2
+run/0: ingredient 0 is 15
+mem/0: storing in location 3
+run/0: instruction 3
+run/0: ingredient 0 is 16
+mem/0: storing in location 4
+run/0: instruction 4
+run/0: ingredient 0 is 1
+run/0: ingredient 1 is 0
+run/0: address to copy is 2
+run/0: its type is 1
+mem/0: location 2 is 14
+run/0: product 0 is 14
+mem/0: storing in location 5
diff --git a/cpp/.traces/index_address b/cpp/.traces/index_address
new file mode 100644
index 00000000..bd407dda
--- /dev/null
+++ b/cpp/.traces/index_address
@@ -0,0 +1,34 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "3", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "14", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "15", type: 0}
+parse/0:   product: {name: "3", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "16", type: 0}
+parse/0:   product: {name: "4", type: 1}
+parse/0: instruction: 21
+parse/0:   ingredient: {name: "1", type: 6}
+parse/0:   ingredient: {name: "0", type: 0}
+parse/0:   product: {name: "5", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 3
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 14
+mem/0: storing in location 2
+run/0: instruction 2
+run/0: ingredient 0 is 15
+mem/0: storing in location 3
+run/0: instruction 3
+run/0: ingredient 0 is 16
+mem/0: storing in location 4
+run/0: instruction 4
+run/0: ingredient 0 is 1
+run/0: ingredient 1 is 0
+run/0: address to copy is 2
+run/0: product 0 is 2
+mem/0: storing in location 5
diff --git a/cpp/019array b/cpp/019array
index d6ae0eae..51b6ea6b 100644
--- a/cpp/019array
+++ b/cpp/019array
@@ -53,3 +53,87 @@ size_t size_of(reagent r) {
   // scalar
   return t.size;
 }
+
+:(before "End Globals")
+// Operator to look at elements of arrays.
+const int INDEX = 20;
+:(before "End Primitive Recipe Numbers")
+Recipe_number["index"] = INDEX;
+Next_recipe_number++;
+:(before "End Primitive Recipe Implementations")
+case INDEX: {
+  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
+  reagent base = canonize(instructions[pc].ingredients[0]);
+  int base_address = to_int(base.name);
+  int base_type = base.types[0];
+  assert(Type[base_type].is_array);
+  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
+  size_t offset = to_int(instructions[pc].ingredients[1].name);
+  int src = base_address + 1 + offset*size_of(reagent(Type[base_type].element[0]));
+  trace("run") << "address to copy is " << src;
+  int src_type = Type[base_type].element[0];
+  trace("run") << "its type is " << src_type;
+  ostringstream s;
+  s << src;
+  reagent tmp(s.str());
+  tmp.types.push_back(src_type);
+  vector<int> result(read_memory(tmp));
+  trace("run") << "product 0 is " << result[0];
+  write_memory(instructions[pc].products[0], result);
+  break;
+}
+
+:(scenario "index")
+recipe main [
+  1:integer <- copy 3:literal
+  2:integer <- copy 14:literal
+  3:integer <- copy 15:literal
+  4:integer <- copy 16:literal
+  5:integer <- index 1:integer-array, 0:literal
+]
++run: instruction 4
++run: ingredient 0 is 1
++run: ingredient 1 is 0
++run: address to copy is 2
++run: its type is 1
++mem: location 2 is 14
++run: product 0 is 14
++mem: storing in location 5
+
+:(before "End Globals")
+// To write to fields of records, you need their address.
+const int INDEX_ADDRESS = 21;
+:(before "End Primitive Recipe Numbers")
+Recipe_number["index-address"] = INDEX_ADDRESS;
+Next_recipe_number++;
+:(before "End Primitive Recipe Implementations")
+case INDEX_ADDRESS: {
+  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
+  reagent base = canonize(instructions[pc].ingredients[0]);
+  int base_address = to_int(base.name);
+  int base_type = base.types[0];
+  assert(Type[base_type].is_array);
+  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
+  size_t offset = to_int(instructions[pc].ingredients[1].name);
+  int src = base_address + 1 + offset*size_of(reagent(Type[base_type].element[0]));
+  trace("run") << "address to copy is " << src;
+  vector<int> result;
+  result.push_back(src);
+  trace("run") << "product 0 is " << result[0];
+  write_memory(instructions[pc].products[0], result);
+  break;
+}
+
+:(scenario "index_address")
+recipe main [
+  1:integer <- copy 3:literal
+  2:integer <- copy 14:literal
+  3:integer <- copy 15:literal
+  4:integer <- copy 16:literal
+  5:integer <- index-address 1:integer-array, 0:literal
+]
++run: instruction 4
++run: ingredient 0 is 1
++run: ingredient 1 is 0
++run: address to copy is 2
++mem: storing in location 5
^
192d59d3 ^
a0fc38c9 ^
192d59d3 ^
a0fc38c9 ^

5f98a10c ^
1ead3562 ^
192d59d3 ^
a0fc38c9 ^
192d59d3 ^
a0fc38c9 ^

5f98a10c ^
1ead3562 ^
192d59d3 ^
a0fc38c9 ^
192d59d3 ^
a0fc38c9 ^

5f98a10c ^
1ead3562 ^
192d59d3 ^
a0fc38c9 ^
192d59d3 ^
a0fc38c9 ^
bb7142db ^
1ead3562 ^
192d59d3 ^

bb7142db ^



3bfd75fc ^
1ead3562 ^
d52406cc ^

3bfd75fc ^



b436291f ^
1ead3562 ^
192d59d3 ^
d52406cc ^
b436291f ^



a0fc38c9 ^
691b529e ^
3bfd75fc ^



b436291f ^
016599f1 ^


4d238fd7 ^
dfdbcbab ^

4d238fd7 ^



dfdbcbab ^
4d238fd7 ^

af023b32 ^

4d238fd7 ^
016599f1 ^
4d238fd7 ^
7f193a0e ^

c1123445 ^

3473c63a ^

4d238fd7 ^
7136ddd5 ^

4d238fd7 ^
dfdbcbab ^
4d238fd7 ^


c6034af3 ^



3473c63a ^
af023b32 ^







4d238fd7 ^
a0fc38c9 ^

d785efe5 ^











58a9f7c3 ^

7136ddd5 ^



3473c63a ^

af023b32 ^

af023b32 ^





a0fc38c9 ^

3473c63a ^

af023b32 ^

af023b32 ^





a0fc38c9 ^
a0d7a155 ^
3473c63a ^

3bfd75fc ^

af023b32 ^
3bfd75fc ^


3473c63a ^

c6034af3 ^
af023b32 ^
67f969b9 ^
c4e143d6 ^
65c905fe ^
67f969b9 ^
795f5244 ^

4e49b29e ^

db69ad7a ^

af023b32 ^






db69ad7a ^

3473c63a ^
af023b32 ^

af023b32 ^






a0d7a155 ^
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
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236