diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2015-05-05 17:20:11 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2015-05-05 17:34:18 -0700 |
commit | 6673e1fc4527147da453435203434394bbeaa513 (patch) | |
tree | 4d2fa9f732c2b229939bd450511b4c329085d036 /cpp/021arithmetic.cc | |
parent | ca12558ef7f0678cd7b4aee9e8dda459e61f1bc1 (diff) | |
download | mu-6673e1fc4527147da453435203434394bbeaa513.tar.gz |
1265
Diffstat (limited to 'cpp/021arithmetic.cc')
-rw-r--r-- | cpp/021arithmetic.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/cpp/021arithmetic.cc b/cpp/021arithmetic.cc index 7f7ab0f0..e9496248 100644 --- a/cpp/021arithmetic.cc +++ b/cpp/021arithmetic.cc @@ -7,12 +7,12 @@ Recipe_number["add"] = ADD; :(before "End Primitive Recipe Implementations") case ADD: { trace("run") << "ingredient 0 is " << current_instruction().ingredients[0].name; - vector<int> arg0 = read_memory(current_instruction().ingredients[0]); + vector<long long int> arg0 = read_memory(current_instruction().ingredients[0]); assert(arg0.size() == 1); trace("run") << "ingredient 1 is " << current_instruction().ingredients[1].name; - vector<int> arg1 = read_memory(current_instruction().ingredients[1]); + vector<long long int> arg1 = read_memory(current_instruction().ingredients[1]); assert(arg1.size() == 1); - vector<int> result; + vector<long long int> result; result.push_back(arg0[0] + arg1[0]); trace("run") << "product 0 is " << result[0]; write_memory(current_instruction().products[0], result); @@ -50,12 +50,12 @@ Recipe_number["subtract"] = SUBTRACT; :(before "End Primitive Recipe Implementations") case SUBTRACT: { trace("run") << "ingredient 0 is " << current_instruction().ingredients[0].name; - vector<int> arg0 = read_memory(current_instruction().ingredients[0]); + vector<long long int> arg0 = read_memory(current_instruction().ingredients[0]); assert(arg0.size() == 1); trace("run") << "ingredient 1 is " << current_instruction().ingredients[1].name; - vector<int> arg1 = read_memory(current_instruction().ingredients[1]); + vector<long long int> arg1 = read_memory(current_instruction().ingredients[1]); assert(arg1.size() == 1); - vector<int> result; + vector<long long int> result; result.push_back(arg0[0] - arg1[0]); trace("run") << "product 0 is " << result[0]; write_memory(current_instruction().products[0], result); @@ -93,13 +93,13 @@ Recipe_number["multiply"] = MULTIPLY; :(before "End Primitive Recipe Implementations") case MULTIPLY: { trace("run") << "ingredient 0 is " << current_instruction().ingredients[0].name; - vector<int> arg0 = read_memory(current_instruction().ingredients[0]); + vector<long long int> arg0 = read_memory(current_instruction().ingredients[0]); assert(arg0.size() == 1); trace("run") << "ingredient 1 is " << current_instruction().ingredients[1].name; - vector<int> arg1 = read_memory(current_instruction().ingredients[1]); + vector<long long int> arg1 = read_memory(current_instruction().ingredients[1]); assert(arg1.size() == 1); trace("run") << "ingredient 1 is " << arg1[0]; - vector<int> result; + vector<long long int> result; result.push_back(arg0[0] * arg1[0]); trace("run") << "product 0 is " << result[0]; write_memory(current_instruction().products[0], result); @@ -137,13 +137,13 @@ Recipe_number["divide"] = DIVIDE; :(before "End Primitive Recipe Implementations") case DIVIDE: { trace("run") << "ingredient 0 is " << current_instruction().ingredients[0].name; - vector<int> arg0 = read_memory(current_instruction().ingredients[0]); + vector<long long int> arg0 = read_memory(current_instruction().ingredients[0]); assert(arg0.size() == 1); trace("run") << "ingredient 1 is " << current_instruction().ingredients[1].name; - vector<int> arg1 = read_memory(current_instruction().ingredients[1]); + vector<long long int> arg1 = read_memory(current_instruction().ingredients[1]); assert(arg1.size() == 1); trace("run") << "ingredient 1 is " << arg1[0]; - vector<int> result; + vector<long long int> result; result.push_back(arg0[0] / arg1[0]); trace("run") << "product 0 is " << result[0]; write_memory(current_instruction().products[0], result); @@ -181,16 +181,16 @@ Recipe_number["divide-with-remainder"] = DIVIDE_WITH_REMAINDER; :(before "End Primitive Recipe Implementations") case DIVIDE_WITH_REMAINDER: { trace("run") << "ingredient 0 is " << current_instruction().ingredients[0].name; - vector<int> arg0 = read_memory(current_instruction().ingredients[0]); + vector<long long int> arg0 = read_memory(current_instruction().ingredients[0]); assert(arg0.size() == 1); trace("run") << "ingredient 1 is " << current_instruction().ingredients[1].name; - vector<int> arg1 = read_memory(current_instruction().ingredients[1]); + vector<long long int> arg1 = read_memory(current_instruction().ingredients[1]); assert(arg1.size() == 1); - vector<int> result0; + vector<long long int> result0; result0.push_back(arg0[0] / arg1[0]); trace("run") << "product 0 is " << result0[0]; write_memory(current_instruction().products[0], result0); - vector<int> result1; + vector<long long int> result1; result1.push_back(arg0[0] % arg1[0]); trace("run") << "product 1 is " << result1[0]; write_memory(current_instruction().products[1], result1); |