akkartik
/
mu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
mu/023jump.cc

118 lines
3.1 KiB
C++
Raw Normal View History

1096
2015-04-18 14:50:51 +00:00
//: Jump primitives
1077
2015-04-17 18:22:59 +00:00
1073 - stop fixing the values of primitive recipes In the process I give up trace stability when I move files around, but I gain in exchange the ability to move files around.
2015-04-17 17:31:17 +00:00
:(before "End Primitive Recipe Declarations")
JUMP,
794 - first jump instruction
2015-02-20 01:28:25 +00:00
:(before "End Primitive Recipe Numbers")
Recipe_number["jump"] = JUMP;
:(before "End Primitive Recipe Implementations")
case JUMP: {
1323 - keyboard supports backspace and newline Lots mixed into this commit: some off-by-one errors in display.cc a new transform to translate jump labels that I'd somehow never gotten around to supporting
2015-05-10 15:34:12 +00:00
assert(current_instruction().ingredients.at(0).initialized);
1298 - better ingredient/product handling All primitives now always write to all their products. If a product is not used that's fine, but if an instruction seems to expect too many products mu will complain. In the process, many primitives can operate on more than two ingredients where it seems intuitive. You can add or divide more than two numbers together, copy or negate multiple corresponding locations, etc. There's one remaining bit of ugliness. Some instructions like get/get-address, index/index-address, wait-for-location, these can unnecessarily load values from memory when they don't need to. Useful vim commands: %s/ingredients\[\([^\]]*\)\]/ingredients.at(\1)/gc %s/products\[\([^\]]*\)\]/products.at(\1)/gc .,$s/\[\(.\)]/.at(\1)/gc
2015-05-07 22:06:53 +00:00
assert(ingredients.size() == 1);
assert(ingredients.at(0).size() == 1); // scalar
1357 - temporarily revert floating-point support
2015-05-13 00:00:56 +00:00
instruction_counter += ingredients.at(0).at(0);
1298 - better ingredient/product handling All primitives now always write to all their products. If a product is not used that's fine, but if an instruction seems to expect too many products mu will complain. In the process, many primitives can operate on more than two ingredients where it seems intuitive. You can add or divide more than two numbers together, copy or negate multiple corresponding locations, etc. There's one remaining bit of ugliness. Some instructions like get/get-address, index/index-address, wait-for-location, these can unnecessarily load values from memory when they don't need to. Useful vim commands: %s/ingredients\[\([^\]]*\)\]/ingredients.at(\1)/gc %s/products\[\([^\]]*\)\]/products.at(\1)/gc .,$s/\[\(.\)]/.at(\1)/gc
2015-05-07 22:06:53 +00:00
trace("run") << "jumping to instruction " << instruction_counter+1;
794 - first jump instruction
2015-02-20 01:28:25 +00:00
break;
}
1162
2015-04-24 17:19:03 +00:00
:(scenario jump_can_skip_instructions)
794 - first jump instruction
2015-02-20 01:28:25 +00:00
recipe main [
jump 1:offset
1363 - rename 'integer' to 'number' ..now that we support non-integers.
2015-05-13 17:03:26 +00:00
1:number <- copy 1:literal
794 - first jump instruction
2015-02-20 01:28:25 +00:00
]
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
+run: instruction main/0
794 - first jump instruction
2015-02-20 01:28:25 +00:00
+run: ingredient 0 is 1
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
-run: instruction main/1
968
2015-03-24 06:59:59 +00:00
-mem: storing 1 in location 1
794 - first jump instruction
2015-02-20 01:28:25 +00:00
1162
2015-04-24 17:19:03 +00:00
:(scenario jump_backward)
794 - first jump instruction
2015-02-20 01:28:25 +00:00
recipe main [
939 - c++: fix an old parsing hack
2015-03-17 05:47:28 +00:00
jump 1:offset # 0 -+
jump 1:offset # | +-+ 1
# \/ /\ |
jump -2:offset # 2 +-->+ |
] # \/ 3
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
+run: instruction main/0
+run: instruction main/2
+run: instruction main/1
796 - jump instructions done
2015-02-20 02:25:25 +00:00
1073 - stop fixing the values of primitive recipes In the process I give up trace stability when I move files around, but I gain in exchange the ability to move files around.
2015-04-17 17:31:17 +00:00
:(before "End Primitive Recipe Declarations")
JUMP_IF,
796 - jump instructions done
2015-02-20 02:25:25 +00:00
:(before "End Primitive Recipe Numbers")
Recipe_number["jump-if"] = JUMP_IF;
:(before "End Primitive Recipe Implementations")
case JUMP_IF: {
1323 - keyboard supports backspace and newline Lots mixed into this commit: some off-by-one errors in display.cc a new transform to translate jump labels that I'd somehow never gotten around to supporting
2015-05-10 15:34:12 +00:00
assert(current_instruction().ingredients.at(1).initialized);
1298 - better ingredient/product handling All primitives now always write to all their products. If a product is not used that's fine, but if an instruction seems to expect too many products mu will complain. In the process, many primitives can operate on more than two ingredients where it seems intuitive. You can add or divide more than two numbers together, copy or negate multiple corresponding locations, etc. There's one remaining bit of ugliness. Some instructions like get/get-address, index/index-address, wait-for-location, these can unnecessarily load values from memory when they don't need to. Useful vim commands: %s/ingredients\[\([^\]]*\)\]/ingredients.at(\1)/gc %s/products\[\([^\]]*\)\]/products.at(\1)/gc .,$s/\[\(.\)]/.at(\1)/gc
2015-05-07 22:06:53 +00:00
assert(ingredients.size() == 2);
assert(ingredients.at(0).size() == 1); // scalar
if (!ingredients.at(0).at(0)) {
796 - jump instructions done
2015-02-20 02:25:25 +00:00
trace("run") << "jump-if fell through";
break;
}
1298 - better ingredient/product handling All primitives now always write to all their products. If a product is not used that's fine, but if an instruction seems to expect too many products mu will complain. In the process, many primitives can operate on more than two ingredients where it seems intuitive. You can add or divide more than two numbers together, copy or negate multiple corresponding locations, etc. There's one remaining bit of ugliness. Some instructions like get/get-address, index/index-address, wait-for-location, these can unnecessarily load values from memory when they don't need to. Useful vim commands: %s/ingredients\[\([^\]]*\)\]/ingredients.at(\1)/gc %s/products\[\([^\]]*\)\]/products.at(\1)/gc .,$s/\[\(.\)]/.at(\1)/gc
2015-05-07 22:06:53 +00:00
assert(ingredients.at(1).size() == 1); // scalar
1357 - temporarily revert floating-point support
2015-05-13 00:00:56 +00:00
instruction_counter += ingredients.at(1).at(0);
1298 - better ingredient/product handling All primitives now always write to all their products. If a product is not used that's fine, but if an instruction seems to expect too many products mu will complain. In the process, many primitives can operate on more than two ingredients where it seems intuitive. You can add or divide more than two numbers together, copy or negate multiple corresponding locations, etc. There's one remaining bit of ugliness. Some instructions like get/get-address, index/index-address, wait-for-location, these can unnecessarily load values from memory when they don't need to. Useful vim commands: %s/ingredients\[\([^\]]*\)\]/ingredients.at(\1)/gc %s/products\[\([^\]]*\)\]/products.at(\1)/gc .,$s/\[\(.\)]/.at(\1)/gc
2015-05-07 22:06:53 +00:00
trace("run") << "jumping to instruction " << instruction_counter+1;
796 - jump instructions done
2015-02-20 02:25:25 +00:00
break;
}
1162
2015-04-24 17:19:03 +00:00
:(scenario jump_if)
796 - jump instructions done
2015-02-20 02:25:25 +00:00
recipe main [
1362 Mu allows us to use multiple ingredients/products without commas, but make sure we don't. $ grep "<- [^ ]\+ [^#\[,]* [^#\[,]*$" * $ grep "^[ ]*[^ #,][^#,]* [^#,]* <- " *
2015-05-13 16:09:22 +00:00
jump-if 999:literal, 1:offset
1363 - rename 'integer' to 'number' ..now that we support non-integers.
2015-05-13 17:03:26 +00:00
1:number <- copy 1:literal
796 - jump instructions done
2015-02-20 02:25:25 +00:00
]
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
+run: instruction main/0
796 - jump instructions done
2015-02-20 02:25:25 +00:00
+run: ingredient 1 is 1
+run: jumping to instruction 2
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
-run: instruction main/1
968
2015-03-24 06:59:59 +00:00
-mem: storing 1 in location 1
796 - jump instructions done
2015-02-20 02:25:25 +00:00
1162
2015-04-24 17:19:03 +00:00
:(scenario jump_if_fallthrough)
796 - jump instructions done
2015-02-20 02:25:25 +00:00
recipe main [
1362 Mu allows us to use multiple ingredients/products without commas, but make sure we don't. $ grep "<- [^ ]\+ [^#\[,]* [^#\[,]*$" * $ grep "^[ ]*[^ #,][^#,]* [^#,]* <- " *
2015-05-13 16:09:22 +00:00
jump-if 0:literal, 1:offset
1363 - rename 'integer' to 'number' ..now that we support non-integers.
2015-05-13 17:03:26 +00:00
123:number <- copy 1:literal
796 - jump instructions done
2015-02-20 02:25:25 +00:00
]
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
+run: instruction main/0
796 - jump instructions done
2015-02-20 02:25:25 +00:00
+run: jump-if fell through
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
+run: instruction main/1
968
2015-03-24 06:59:59 +00:00
+mem: storing 1 in location 123
796 - jump instructions done
2015-02-20 02:25:25 +00:00
1073 - stop fixing the values of primitive recipes In the process I give up trace stability when I move files around, but I gain in exchange the ability to move files around.
2015-04-17 17:31:17 +00:00
:(before "End Primitive Recipe Declarations")
JUMP_UNLESS,
796 - jump instructions done
2015-02-20 02:25:25 +00:00
:(before "End Primitive Recipe Numbers")
Recipe_number["jump-unless"] = JUMP_UNLESS;
:(before "End Primitive Recipe Implementations")
case JUMP_UNLESS: {
1323 - keyboard supports backspace and newline Lots mixed into this commit: some off-by-one errors in display.cc a new transform to translate jump labels that I'd somehow never gotten around to supporting
2015-05-10 15:34:12 +00:00
assert(current_instruction().ingredients.at(1).initialized);
1298 - better ingredient/product handling All primitives now always write to all their products. If a product is not used that's fine, but if an instruction seems to expect too many products mu will complain. In the process, many primitives can operate on more than two ingredients where it seems intuitive. You can add or divide more than two numbers together, copy or negate multiple corresponding locations, etc. There's one remaining bit of ugliness. Some instructions like get/get-address, index/index-address, wait-for-location, these can unnecessarily load values from memory when they don't need to. Useful vim commands: %s/ingredients\[\([^\]]*\)\]/ingredients.at(\1)/gc %s/products\[\([^\]]*\)\]/products.at(\1)/gc .,$s/\[\(.\)]/.at(\1)/gc
2015-05-07 22:06:53 +00:00
assert(ingredients.size() == 2);
assert(ingredients.at(0).size() == 1); // scalar
if (ingredients.at(0).at(0)) {
796 - jump instructions done
2015-02-20 02:25:25 +00:00
trace("run") << "jump-unless fell through";
break;
}
1298 - better ingredient/product handling All primitives now always write to all their products. If a product is not used that's fine, but if an instruction seems to expect too many products mu will complain. In the process, many primitives can operate on more than two ingredients where it seems intuitive. You can add or divide more than two numbers together, copy or negate multiple corresponding locations, etc. There's one remaining bit of ugliness. Some instructions like get/get-address, index/index-address, wait-for-location, these can unnecessarily load values from memory when they don't need to. Useful vim commands: %s/ingredients\[\([^\]]*\)\]/ingredients.at(\1)/gc %s/products\[\([^\]]*\)\]/products.at(\1)/gc .,$s/\[\(.\)]/.at(\1)/gc
2015-05-07 22:06:53 +00:00
assert(ingredients.at(1).size() == 1); // scalar
1357 - temporarily revert floating-point support
2015-05-13 00:00:56 +00:00
instruction_counter += ingredients.at(1).at(0);
1298 - better ingredient/product handling All primitives now always write to all their products. If a product is not used that's fine, but if an instruction seems to expect too many products mu will complain. In the process, many primitives can operate on more than two ingredients where it seems intuitive. You can add or divide more than two numbers together, copy or negate multiple corresponding locations, etc. There's one remaining bit of ugliness. Some instructions like get/get-address, index/index-address, wait-for-location, these can unnecessarily load values from memory when they don't need to. Useful vim commands: %s/ingredients\[\([^\]]*\)\]/ingredients.at(\1)/gc %s/products\[\([^\]]*\)\]/products.at(\1)/gc .,$s/\[\(.\)]/.at(\1)/gc
2015-05-07 22:06:53 +00:00
trace("run") << "jumping to instruction " << instruction_counter+1;
796 - jump instructions done
2015-02-20 02:25:25 +00:00
break;
}
1162
2015-04-24 17:19:03 +00:00
:(scenario jump_unless)
796 - jump instructions done
2015-02-20 02:25:25 +00:00
recipe main [
1362 Mu allows us to use multiple ingredients/products without commas, but make sure we don't. $ grep "<- [^ ]\+ [^#\[,]* [^#\[,]*$" * $ grep "^[ ]*[^ #,][^#,]* [^#,]* <- " *
2015-05-13 16:09:22 +00:00
jump-unless 0:literal, 1:offset
1363 - rename 'integer' to 'number' ..now that we support non-integers.
2015-05-13 17:03:26 +00:00
1:number <- copy 1:literal
796 - jump instructions done
2015-02-20 02:25:25 +00:00
]
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
+run: instruction main/0
796 - jump instructions done
2015-02-20 02:25:25 +00:00
+run: ingredient 1 is 1
+run: jumping to instruction 2
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
-run: instruction main/1
968
2015-03-24 06:59:59 +00:00
-mem: storing 1 in location 1
796 - jump instructions done
2015-02-20 02:25:25 +00:00
1162
2015-04-24 17:19:03 +00:00
:(scenario jump_unless_fallthrough)
796 - jump instructions done
2015-02-20 02:25:25 +00:00
recipe main [
1362 Mu allows us to use multiple ingredients/products without commas, but make sure we don't. $ grep "<- [^ ]\+ [^#\[,]* [^#\[,]*$" * $ grep "^[ ]*[^ #,][^#,]* [^#,]* <- " *
2015-05-13 16:09:22 +00:00
jump-unless 999:literal, 1:offset
1363 - rename 'integer' to 'number' ..now that we support non-integers.
2015-05-13 17:03:26 +00:00
123:number <- copy 1:literal
796 - jump instructions done
2015-02-20 02:25:25 +00:00
]
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
+run: instruction main/0
796 - jump instructions done
2015-02-20 02:25:25 +00:00
+run: ingredient 0 is 999
+run: jump-unless fell through
832 - call-stack for C++ version These #defines and references now span many different layers. Let's see if the lack of encapsulation causes problems. Also interesting to run into a case where I need to modify a foundational layer and touch every single scenario/trace. Only alternative was to duplicate all the different layers that add instructions. Sign of problems with this model?
2015-02-25 09:24:11 +00:00
+run: instruction main/1
968
2015-03-24 06:59:59 +00:00
+mem: storing 1 in location 123