about summary refs log tree commit diff stats
path: root/cpp/.traces
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/.traces')
-rw-r--r--cpp/.traces/add6
-rw-r--r--cpp/.traces/add_literal2
-rw-r--r--cpp/.traces/and6
-rw-r--r--cpp/.traces/copy4
-rw-r--r--cpp/.traces/copy_array10
-rw-r--r--cpp/.traces/copy_indirect6
-rw-r--r--cpp/.traces/copy_literal2
-rw-r--r--cpp/.traces/copy_multiple_locations6
-rw-r--r--cpp/.traces/divide6
-rw-r--r--cpp/.traces/divide_literal2
-rw-r--r--cpp/.traces/divide_with_remainder6
-rw-r--r--cpp/.traces/divide_with_remainder_literal2
-rw-r--r--cpp/.traces/equal6
-rw-r--r--cpp/.traces/equal26
-rw-r--r--cpp/.traces/get6
-rw-r--r--cpp/.traces/get_address6
-rw-r--r--cpp/.traces/get_address_indirect8
-rw-r--r--cpp/.traces/get_handles_record_fields8
-rw-r--r--cpp/.traces/get_indirect8
-rw-r--r--cpp/.traces/greater_or_equal6
-rw-r--r--cpp/.traces/greater_or_equal26
-rw-r--r--cpp/.traces/greater_or_equal36
-rw-r--r--cpp/.traces/greater_than6
-rw-r--r--cpp/.traces/greater_than26
-rw-r--r--cpp/.traces/index10
-rw-r--r--cpp/.traces/index_address10
-rw-r--r--cpp/.traces/jump_backward6
-rw-r--r--cpp/.traces/jump_can_skip_instructions2
-rw-r--r--cpp/.traces/jump_if2
-rw-r--r--cpp/.traces/jump_if_fallthrough4
-rw-r--r--cpp/.traces/jump_unless2
-rw-r--r--cpp/.traces/jump_unless_fallthrough4
-rw-r--r--cpp/.traces/lesser_or_equal6
-rw-r--r--cpp/.traces/lesser_or_equal26
-rw-r--r--cpp/.traces/lesser_or_equal36
-rw-r--r--cpp/.traces/lesser_than6
-rw-r--r--cpp/.traces/lesser_than26
-rw-r--r--cpp/.traces/multiply6
-rw-r--r--cpp/.traces/multiply_literal2
-rw-r--r--cpp/.traces/not4
-rw-r--r--cpp/.traces/or6
-rw-r--r--cpp/.traces/store_indirect4
-rw-r--r--cpp/.traces/subtract6
-rw-r--r--cpp/.traces/subtract_literal2
44 files changed, 118 insertions, 118 deletions
diff --git a/cpp/.traces/add b/cpp/.traces/add
index 365c75f0..eaa94f85 100644
--- a/cpp/.traces/add
+++ b/cpp/.traces/add
@@ -8,13 +8,13 @@ parse/0: instruction: 2
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 23
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 34
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 23
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/add_literal b/cpp/.traces/add_literal
index fcbb611f..e695a9a0 100644
--- a/cpp/.traces/add_literal
+++ b/cpp/.traces/add_literal
@@ -2,7 +2,7 @@ parse/0: instruction: 2
 parse/0:   ingredient: {name: "23", type: 0}
 parse/0:   ingredient: {name: "34", type: 0}
 parse/0:   product: {name: "1", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 23
 run/0: ingredient 1 is 34
 run/0: product 0 is 57
diff --git a/cpp/.traces/and b/cpp/.traces/and
index 61fe4a64..4bbf11c3 100644
--- a/cpp/.traces/and
+++ b/cpp/.traces/and
@@ -8,13 +8,13 @@ parse/0: instruction: 7
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 1
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 0
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 1
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/copy b/cpp/.traces/copy
index 965b5f2a..507bf92a 100644
--- a/cpp/.traces/copy
+++ b/cpp/.traces/copy
@@ -4,10 +4,10 @@ parse/0:   product: {name: "1", type: 1}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   product: {name: "2", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 23
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 1
 mem/0: location 1 is 23
 mem/0: storing in location 2
diff --git a/cpp/.traces/copy_array b/cpp/.traces/copy_array
index 62253d3e..7350b04e 100644
--- a/cpp/.traces/copy_array
+++ b/cpp/.traces/copy_array
@@ -13,19 +13,19 @@ parse/0:   product: {name: "4", type: 1}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "1", type: 6}
 parse/0:   product: {name: "5", type: 6}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 3
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 14
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 15
 mem/0: storing in location 3
-run/0: instruction 3
+run/0: instruction main/3
 run/0: ingredient 0 is 16
 mem/0: storing in location 4
-run/0: instruction 4
+run/0: instruction main/4
 run/0: ingredient 0 is 1
 mem/0: location 1 is 3
 mem/0: location 2 is 14
diff --git a/cpp/.traces/copy_indirect b/cpp/.traces/copy_indirect
index f757f05a..357d1498 100644
--- a/cpp/.traces/copy_indirect
+++ b/cpp/.traces/copy_indirect
@@ -7,13 +7,13 @@ parse/0:   product: {name: "2", type: 1}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "1", type: 2-1, property: deref:}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 2
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 34
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 2
 mem/0: location 2 is 34
diff --git a/cpp/.traces/copy_literal b/cpp/.traces/copy_literal
index 94d56f2e..06a6b997 100644
--- a/cpp/.traces/copy_literal
+++ b/cpp/.traces/copy_literal
@@ -1,6 +1,6 @@
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "23", type: 0}
 parse/0:   product: {name: "1", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 23
 mem/0: storing in location 1
diff --git a/cpp/.traces/copy_multiple_locations b/cpp/.traces/copy_multiple_locations
index 9804de88..4ba0d565 100644
--- a/cpp/.traces/copy_multiple_locations
+++ b/cpp/.traces/copy_multiple_locations
@@ -7,13 +7,13 @@ parse/0:   product: {name: "2", type: 1}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "1", type: 4}
 parse/0:   product: {name: "3", type: 4}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 35
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 34
 mem/0: location 2 is 35
diff --git a/cpp/.traces/divide b/cpp/.traces/divide
index d713a512..4cd49db4 100644
--- a/cpp/.traces/divide
+++ b/cpp/.traces/divide
@@ -8,13 +8,13 @@ parse/0: instruction: 5
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 27
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 3
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 27
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/divide_literal b/cpp/.traces/divide_literal
index 47f8690f..3d29139b 100644
--- a/cpp/.traces/divide_literal
+++ b/cpp/.traces/divide_literal
@@ -2,7 +2,7 @@ parse/0: instruction: 5
 parse/0:   ingredient: {name: "8", type: 0}
 parse/0:   ingredient: {name: "2", type: 0}
 parse/0:   product: {name: "1", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 8
 run/0: ingredient 1 is 2
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/divide_with_remainder b/cpp/.traces/divide_with_remainder
index 330141db..62993a82 100644
--- a/cpp/.traces/divide_with_remainder
+++ b/cpp/.traces/divide_with_remainder
@@ -9,13 +9,13 @@ parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
 parse/0:   product: {name: "4", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 27
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 11
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 27
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/divide_with_remainder_literal b/cpp/.traces/divide_with_remainder_literal
index aa3b6478..bcc2451b 100644
--- a/cpp/.traces/divide_with_remainder_literal
+++ b/cpp/.traces/divide_with_remainder_literal
@@ -3,7 +3,7 @@ parse/0:   ingredient: {name: "9", type: 0}
 parse/0:   ingredient: {name: "2", type: 0}
 parse/0:   product: {name: "1", type: 1}
 parse/0:   product: {name: "2", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 9
 run/0: ingredient 1 is 2
 run/0: product 0 is 4
diff --git a/cpp/.traces/equal b/cpp/.traces/equal
index 6d03ccfb..9abcdde6 100644
--- a/cpp/.traces/equal
+++ b/cpp/.traces/equal
@@ -8,13 +8,13 @@ parse/0: instruction: 13
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 33
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 34
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/equal2 b/cpp/.traces/equal2
index bb52e968..b1d02785 100644
--- a/cpp/.traces/equal2
+++ b/cpp/.traces/equal2
@@ -8,13 +8,13 @@ parse/0: instruction: 13
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 34
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 34
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/get b/cpp/.traces/get
index 3f5a996e..fed4a487 100644
--- a/cpp/.traces/get
+++ b/cpp/.traces/get
@@ -8,13 +8,13 @@ parse/0: instruction: 18
 parse/0:   ingredient: {name: "12", type: 4}
 parse/0:   ingredient: {name: "1", type: 0}
 parse/0:   product: {name: "15", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 12
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 35
 mem/0: storing in location 13
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 12
 run/0: ingredient 1 is 1
 run/0: address to copy is 13
diff --git a/cpp/.traces/get_address b/cpp/.traces/get_address
index 296fd6c0..59da3a6d 100644
--- a/cpp/.traces/get_address
+++ b/cpp/.traces/get_address
@@ -8,13 +8,13 @@ parse/0: instruction: 19
 parse/0:   ingredient: {name: "12", type: 4}
 parse/0:   ingredient: {name: "1", type: 0}
 parse/0:   product: {name: "15", type: 2-1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 12
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 35
 mem/0: storing in location 13
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 12
 run/0: ingredient 1 is 1
 run/0: address to copy is 13
diff --git a/cpp/.traces/get_address_indirect b/cpp/.traces/get_address_indirect
index 6d7b2c24..27591476 100644
--- a/cpp/.traces/get_address_indirect
+++ b/cpp/.traces/get_address_indirect
@@ -11,16 +11,16 @@ parse/0: instruction: 19
 parse/0:   ingredient: {name: "1", type: 2-4, property: deref:}
 parse/0:   ingredient: {name: "0", type: 0}
 parse/0:   product: {name: "4", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 2
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 34
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 35
 mem/0: storing in location 3
-run/0: instruction 3
+run/0: instruction main/3
 run/0: ingredient 0 is 1
 mem/0: location 1 is 2
 run/0: ingredient 1 is 0
diff --git a/cpp/.traces/get_handles_record_fields b/cpp/.traces/get_handles_record_fields
index 6e2f065e..0c1eb7d9 100644
--- a/cpp/.traces/get_handles_record_fields
+++ b/cpp/.traces/get_handles_record_fields
@@ -11,16 +11,16 @@ parse/0: instruction: 18
 parse/0:   ingredient: {name: "12", type: 5}
 parse/0:   ingredient: {name: "1", type: 0}
 parse/0:   product: {name: "15", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 12
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 35
 mem/0: storing in location 13
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 36
 mem/0: storing in location 14
-run/0: instruction 3
+run/0: instruction main/3
 run/0: ingredient 0 is 12
 run/0: ingredient 1 is 1
 run/0: address to copy is 14
diff --git a/cpp/.traces/get_indirect b/cpp/.traces/get_indirect
index 60ddfd9b..6aaf660d 100644
--- a/cpp/.traces/get_indirect
+++ b/cpp/.traces/get_indirect
@@ -11,16 +11,16 @@ parse/0: instruction: 18
 parse/0:   ingredient: {name: "1", type: 2-4, property: deref:}
 parse/0:   ingredient: {name: "0", type: 0}
 parse/0:   product: {name: "4", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 2
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 34
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 35
 mem/0: storing in location 3
-run/0: instruction 3
+run/0: instruction main/3
 run/0: ingredient 0 is 1
 mem/0: location 1 is 2
 run/0: ingredient 1 is 0
diff --git a/cpp/.traces/greater_or_equal b/cpp/.traces/greater_or_equal
index d01859ca..d347b751 100644
--- a/cpp/.traces/greater_or_equal
+++ b/cpp/.traces/greater_or_equal
@@ -8,13 +8,13 @@ parse/0: instruction: 16
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 33
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 34
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/greater_or_equal2 b/cpp/.traces/greater_or_equal2
index 6ce24011..4777cecc 100644
--- a/cpp/.traces/greater_or_equal2
+++ b/cpp/.traces/greater_or_equal2
@@ -8,13 +8,13 @@ parse/0: instruction: 16
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 34
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 34
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/greater_or_equal3 b/cpp/.traces/greater_or_equal3
index 7cba95fb..4e5986ec 100644
--- a/cpp/.traces/greater_or_equal3
+++ b/cpp/.traces/greater_or_equal3
@@ -8,13 +8,13 @@ parse/0: instruction: 16
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 35
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 34
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/greater_than b/cpp/.traces/greater_than
index aea0dbda..58654c92 100644
--- a/cpp/.traces/greater_than
+++ b/cpp/.traces/greater_than
@@ -8,13 +8,13 @@ parse/0: instruction: 14
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 33
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 34
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/greater_than2 b/cpp/.traces/greater_than2
index 52c4019b..cc0494ee 100644
--- a/cpp/.traces/greater_than2
+++ b/cpp/.traces/greater_than2
@@ -8,13 +8,13 @@ parse/0: instruction: 14
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 34
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 34
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/index b/cpp/.traces/index
index a23f11ab..9809b808 100644
--- a/cpp/.traces/index
+++ b/cpp/.traces/index
@@ -14,19 +14,19 @@ 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: instruction main/0
 run/0: ingredient 0 is 3
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 14
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 15
 mem/0: storing in location 3
-run/0: instruction 3
+run/0: instruction main/3
 run/0: ingredient 0 is 16
 mem/0: storing in location 4
-run/0: instruction 4
+run/0: instruction main/4
 run/0: ingredient 0 is 1
 run/0: ingredient 1 is 0
 run/0: address to copy is 2
diff --git a/cpp/.traces/index_address b/cpp/.traces/index_address
index bd407dda..76b99827 100644
--- a/cpp/.traces/index_address
+++ b/cpp/.traces/index_address
@@ -14,19 +14,19 @@ 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: instruction main/0
 run/0: ingredient 0 is 3
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 14
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 15
 mem/0: storing in location 3
-run/0: instruction 3
+run/0: instruction main/3
 run/0: ingredient 0 is 16
 mem/0: storing in location 4
-run/0: instruction 4
+run/0: instruction main/4
 run/0: ingredient 0 is 1
 run/0: ingredient 1 is 0
 run/0: address to copy is 2
diff --git a/cpp/.traces/jump_backward b/cpp/.traces/jump_backward
index 033b1dfd..6d9e433f 100644
--- a/cpp/.traces/jump_backward
+++ b/cpp/.traces/jump_backward
@@ -15,9 +15,9 @@ parse/0:   ingredient: {name: "//", type: }
 parse/0:   ingredient: {name: "2", type: }
 parse/0:   ingredient: {name: "+-->+", type: }
 parse/0:   ingredient: {name: "|", type: }
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 1
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is -2
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 1
diff --git a/cpp/.traces/jump_can_skip_instructions b/cpp/.traces/jump_can_skip_instructions
index e1c0f664..b8bc85e9 100644
--- a/cpp/.traces/jump_can_skip_instructions
+++ b/cpp/.traces/jump_can_skip_instructions
@@ -3,5 +3,5 @@ parse/0:   ingredient: {name: "1", type: 0}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "1", type: 0}
 parse/0:   product: {name: "1", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 1
diff --git a/cpp/.traces/jump_if b/cpp/.traces/jump_if
index a496582e..707dfd81 100644
--- a/cpp/.traces/jump_if
+++ b/cpp/.traces/jump_if
@@ -4,7 +4,7 @@ parse/0:   ingredient: {name: "1", type: 0}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "1", type: 0}
 parse/0:   product: {name: "1", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 999
 run/0: ingredient 1 is 1
 run/0: jumping to instruction 2
diff --git a/cpp/.traces/jump_if_fallthrough b/cpp/.traces/jump_if_fallthrough
index 894392ec..f95c99bb 100644
--- a/cpp/.traces/jump_if_fallthrough
+++ b/cpp/.traces/jump_if_fallthrough
@@ -4,9 +4,9 @@ parse/0:   ingredient: {name: "1", type: 0}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "1", type: 0}
 parse/0:   product: {name: "123", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 0
 run/0: jump-if fell through
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 1
 mem/0: storing in location 123
diff --git a/cpp/.traces/jump_unless b/cpp/.traces/jump_unless
index 68a57639..a0978ed4 100644
--- a/cpp/.traces/jump_unless
+++ b/cpp/.traces/jump_unless
@@ -4,7 +4,7 @@ parse/0:   ingredient: {name: "1", type: 0}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "1", type: 0}
 parse/0:   product: {name: "1", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 0
 run/0: ingredient 1 is 1
 run/0: jumping to instruction 2
diff --git a/cpp/.traces/jump_unless_fallthrough b/cpp/.traces/jump_unless_fallthrough
index 5d6a5d9e..c1981cd7 100644
--- a/cpp/.traces/jump_unless_fallthrough
+++ b/cpp/.traces/jump_unless_fallthrough
@@ -4,9 +4,9 @@ parse/0:   ingredient: {name: "1", type: 0}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "1", type: 0}
 parse/0:   product: {name: "123", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 999
 run/0: jump-unless fell through
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 1
 mem/0: storing in location 123
diff --git a/cpp/.traces/lesser_or_equal b/cpp/.traces/lesser_or_equal
index df518a0a..cfd78e25 100644
--- a/cpp/.traces/lesser_or_equal
+++ b/cpp/.traces/lesser_or_equal
@@ -8,13 +8,13 @@ parse/0: instruction: 17
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 32
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 33
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 32
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/lesser_or_equal2 b/cpp/.traces/lesser_or_equal2
index d87c8a37..02874d2f 100644
--- a/cpp/.traces/lesser_or_equal2
+++ b/cpp/.traces/lesser_or_equal2
@@ -8,13 +8,13 @@ parse/0: instruction: 17
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 33
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 33
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 33
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/lesser_or_equal3 b/cpp/.traces/lesser_or_equal3
index 9576ddf9..cc6828fc 100644
--- a/cpp/.traces/lesser_or_equal3
+++ b/cpp/.traces/lesser_or_equal3
@@ -8,13 +8,13 @@ parse/0: instruction: 17
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 33
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 34
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/lesser_than b/cpp/.traces/lesser_than
index 5583f5fa..d1d02a6d 100644
--- a/cpp/.traces/lesser_than
+++ b/cpp/.traces/lesser_than
@@ -8,13 +8,13 @@ parse/0: instruction: 15
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 32
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 33
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 32
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/lesser_than2 b/cpp/.traces/lesser_than2
index 735b78b0..f0a593f5 100644
--- a/cpp/.traces/lesser_than2
+++ b/cpp/.traces/lesser_than2
@@ -8,13 +8,13 @@ parse/0: instruction: 15
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 33
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 34
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/multiply b/cpp/.traces/multiply
index 4d9c5008..d73c18ae 100644
--- a/cpp/.traces/multiply
+++ b/cpp/.traces/multiply
@@ -8,13 +8,13 @@ parse/0: instruction: 4
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 4
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 6
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 4
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/multiply_literal b/cpp/.traces/multiply_literal
index e27a4fa9..25449167 100644
--- a/cpp/.traces/multiply_literal
+++ b/cpp/.traces/multiply_literal
@@ -2,7 +2,7 @@ parse/0: instruction: 4
 parse/0:   ingredient: {name: "2", type: 0}
 parse/0:   ingredient: {name: "3", type: 0}
 parse/0:   product: {name: "1", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 2
 run/0: ingredient 1 is 3
 run/0: ingredient 1 is 3
diff --git a/cpp/.traces/not b/cpp/.traces/not
index 69459c1b..30f2b4b9 100644
--- a/cpp/.traces/not
+++ b/cpp/.traces/not
@@ -4,10 +4,10 @@ parse/0:   product: {name: "1", type: 1}
 parse/0: instruction: 9
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   product: {name: "2", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 1
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 1
 mem/0: location 1 is 1
 run/0: product 0 is 0
diff --git a/cpp/.traces/or b/cpp/.traces/or
index 73c46b6d..3f266ea0 100644
--- a/cpp/.traces/or
+++ b/cpp/.traces/or
@@ -8,13 +8,13 @@ parse/0: instruction: 8
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 1
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 0
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 1
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/store_indirect b/cpp/.traces/store_indirect
index 259685d1..da8f4aff 100644
--- a/cpp/.traces/store_indirect
+++ b/cpp/.traces/store_indirect
@@ -4,10 +4,10 @@ parse/0:   product: {name: "1", type: 2-1}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "34", type: 0}
 parse/0:   product: {name: "1", type: 2-1, property: deref:}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 2
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 34
 mem/0: location 1 is 2
 mem/0: storing in location 2
diff --git a/cpp/.traces/subtract b/cpp/.traces/subtract
index 73b675e9..72497a6e 100644
--- a/cpp/.traces/subtract
+++ b/cpp/.traces/subtract
@@ -8,13 +8,13 @@ parse/0: instruction: 3
 parse/0:   ingredient: {name: "1", type: 1}
 parse/0:   ingredient: {name: "2", type: 1}
 parse/0:   product: {name: "3", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 23
 mem/0: storing in location 1
-run/0: instruction 1
+run/0: instruction main/1
 run/0: ingredient 0 is 34
 mem/0: storing in location 2
-run/0: instruction 2
+run/0: instruction main/2
 run/0: ingredient 0 is 1
 mem/0: location 1 is 23
 run/0: ingredient 1 is 2
diff --git a/cpp/.traces/subtract_literal b/cpp/.traces/subtract_literal
index 73bfce31..c4981839 100644
--- a/cpp/.traces/subtract_literal
+++ b/cpp/.traces/subtract_literal
@@ -2,7 +2,7 @@ parse/0: instruction: 3
 parse/0:   ingredient: {name: "5", type: 0}
 parse/0:   ingredient: {name: "2", type: 0}
 parse/0:   product: {name: "1", type: 1}
-run/0: instruction 0
+run/0: instruction main/0
 run/0: ingredient 0 is 5
 run/0: ingredient 1 is 2
 run/0: product 0 is 3