stupidcomputer
38877d36ab
added more tests to the ISA -- covers all the instructions except RST
(reset).
fixed a bug in the ISA -- when comparing two numbers, we really compared
their pointers. in C, it's the difference between
```
int a = 10;
int b = 12;
int *ap = &a;
int *bp = &b;
if (ap < bp) { /* do stuff */ }
```
the problem is that you're comparing the pointers, *not* the values they
refer to. it instead should be like
if (*ap < *bp) { /* do stuff */ }
because you need to *dereference* the value before comparing. that's
what happens in cli/data/computer.py now.
158 lines
4.2 KiB
Python
158 lines
4.2 KiB
Python
import unittest
|
|
import timeout_decorator
|
|
import time
|
|
|
|
from cli.lib.server import DesmosGraphServer
|
|
from cli.lib.graphparser import DesmosGraph, DesmosGraphOverride
|
|
from cli.data.computer import payload as computer_graph_payload
|
|
|
|
def arr_to_override_text(arr):
|
|
arr = [str(i) for i in arr]
|
|
return "B = \\left[{}\\right]".format(
|
|
", ".join(arr)
|
|
)
|
|
|
|
def instruction_test_helper(override_text, expected_output):
|
|
graph = DesmosGraph(computer_graph_payload)
|
|
override = DesmosGraphOverride({
|
|
"testing": arr_to_override_text(override_text)
|
|
})
|
|
|
|
graph.include_override(override)
|
|
|
|
server = DesmosGraphServer()
|
|
server.instructions_to_run = []
|
|
server.append_inst({
|
|
"type": "test_graph",
|
|
"graph": graph,
|
|
"name": "",
|
|
"expectedOutput": expected_output,
|
|
"expression": "B",
|
|
})
|
|
server.start()
|
|
|
|
return server.outputs[-1]["output"] == "true"
|
|
|
|
class ISATest(unittest.TestCase):
|
|
def test_store_positive(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[1, 4, 6, 0, 0, 0], # store lit. 4 to address 6
|
|
[1, 4, 6, 0, 0, 4]
|
|
)
|
|
)
|
|
|
|
def test_addition(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[2, 1, 1, 5, 0], # add addresses 1 and 1 to cell 5
|
|
[2, 1, 1, 5, 4]
|
|
)
|
|
)
|
|
|
|
def test_subtraction(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[12, 1, 2, 5, 0], # 12 - 1 into cell 5
|
|
[12, 1, 2, 5, 11]
|
|
)
|
|
)
|
|
|
|
def test_multiplication(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[13, 1, 3, 5, 0], # 13 * 3
|
|
[13, 1, 3, 5, 39],
|
|
)
|
|
)
|
|
|
|
def test_division(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[14, 1, 6, 5, 0, 7], # 14 / 7
|
|
[14, 1, 6, 5, 2, 7],
|
|
)
|
|
)
|
|
|
|
def test_division_with_decimal(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[14, 1, 6, 5, 0, 4], # 14 / 4 = 3.5
|
|
[14, 1, 6, 5, 3.5, 4],
|
|
)
|
|
)
|
|
|
|
def test_jmp(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[7, 10, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3], # jump to addr 10
|
|
[7, 10, 3, 0, 0, 0, 0, 0, 0, 1, 3, 3]
|
|
)
|
|
)
|
|
|
|
def test_cmp_eq(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
# check if 3 is equal to 3. if so, store 3 into addr 3, otherwise store 1 into address 2
|
|
[3, 1, 1, 8, 10, 1, 1, 2, 0, 1, 3, 3],
|
|
[3, 1, 3, 8, 10, 1, 1, 2, 0, 1, 3, 3],
|
|
)
|
|
)
|
|
|
|
def test_cmp_neq(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
# check if 3 is equal to 1. if not, store 3 into addr 3, otherwise store 1 into address 2
|
|
[3, 1, 2, 9, 10, 1, 1, 2, 0, 1, 3, 3],
|
|
[3, 1, 3, 9, 10, 1, 1, 2, 0, 1, 3, 3],
|
|
)
|
|
)
|
|
|
|
def test_cmp_gt(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[3, 1, 2, 10, 10, 1, 1, 2, 0, 1, 3, 3],
|
|
[3, 1, 3, 10, 10, 1, 1, 2, 0, 1, 3, 3],
|
|
)
|
|
)
|
|
|
|
def test_cmp_lt(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[3, 1, 4, 11, 10, 1, 1, 2, 0, 1, 3, 3],
|
|
[3, 1, 4, 11, 10, 1, 1, 2, 0, 1, 3, 3],
|
|
)
|
|
)
|
|
|
|
def test_eld(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[3, 1, 1, 4, 1],
|
|
[1, 1, 1, 4, 1],
|
|
)
|
|
)
|
|
|
|
def test_gld(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[3, 4, 1, 5, 1],
|
|
[1, 4, 1, 5, 1],
|
|
)
|
|
)
|
|
|
|
def test_lld(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[3, 1, 4, 6, 1],
|
|
[1, 1, 4, 6, 1],
|
|
)
|
|
)
|
|
|
|
def test_mov(self):
|
|
self.assertTrue(
|
|
instruction_test_helper(
|
|
[17, 1, 2],
|
|
[17, 17, 2]
|
|
)
|
|
)
|