Added JGE

Author: redfast00

.coveragerc

@@ -11,4 +11,5 @@ exclude_lines =
 ignore_errors = True
 omit =
     tests/*
-    setup.py
+    setup.py
+    RCPU/safe_eval.py

RCPU/assemble.py

@@ -28,6 +28,8 @@ def assemble(lines):
     })
     # Insert references to resourcetable
     text, datasection = assembler.generate_datasection(text, resourcetable)
+    # Replace symbolic arguments
+    text = assembler.eval_expressions(text)
     # Translate instructions into machine code
     binary = assembler.translate_all(text)
     binary += datasection

RCPU/assembler/expanders/conditionalexpander.py

@@ -0,0 +1,31 @@
+from RCPU.assembler.expanders.baseexpander import BaseExpander
+from .helpers import get_free_register, generate_label, fill_instructions
+
+class ConditionalExpander(BaseExpander):
+
+    @BaseExpander.instruction
+    def JGE(arg):
+        '''Jump to memory address pointed at by the source register,
+           if value in the A register is greater than or equal to to
+           the value in destination register
+           '''
+        destination = arg[0]
+        source = arg[1]
+        free_register = get_free_register([destination, source, "A"])
+        failure = generate_label()
+        instructions = [
+            "SWP A, {destination}",
+            "PSH {free_register}",
+            "LDV16 {free_register}, {failure}",
+            "JLT {destination}, {free_register}",
+            # Success, reset everything to how it was and make the jump
+            "POP {free_register}",
+            "SWP A, {destination}",
+            "JMR {source}",
+            # Failure, reset everything to how it was
+            "{failure}",
+            "POP {free_register}",
+            "SWP A, {destination}"
+        ]
+        return fill_instructions(instructions, destination=destination, source=source,
+            free_register=free_register,failure=failure)

RCPU/assembler/expanders/expander.py

@@ -1,9 +1,11 @@
 from RCPU.architecture import instruction_mapping
 import RCPU.assembler.parser as parser
-from . import arithmetic
-from . import utilexpander
 
-_all_classes = [arithmetic.ArithmeticExpander, utilexpander.UtilExpander]
+from .arithmetic import ArithmeticExpander
+from .utilexpander import UtilExpander
+from .conditionalexpander import ConditionalExpander
+
+_all_classes = [ArithmeticExpander, UtilExpander, ConditionalExpander]
 mapping = {}
 for c in _all_classes:
     mapping.update(c.get_instructions())

RCPU/assembler/expanders/helpers.py

@@ -1,4 +1,6 @@
 from RCPU.architecture import register_mapping
+import string
+import random
 
 def get_free_register(registers_used):
     '''Returns a register that is not in use'''
@@ -8,4 +10,8 @@ def get_free_register(registers_used):
 
 def fill_instructions(instructions, **kwargs):
     '''Formats instructions with values given in **kwargs'''
-    return [instruction.format(**kwargs) for instruction in instructions]
+    return [instruction.format(**kwargs) for instruction in instructions]
+
+def generate_label():
+    random_name = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(64))
+    return '{name}:'.format(name=random_name)

tests/assembler/expanders/test_helpers.py

@@ -1,4 +1,5 @@
-from RCPU.assembler.expanders.helpers import get_free_register, fill_instructions
+from RCPU.assembler.expanders.helpers import get_free_register, fill_instructions, generate_label
+from RCPU.assembler.parser import is_label
 
 def test_get_free_register():
     assert get_free_register(["A", "B", "C"]) == "D"
@@ -18,4 +19,8 @@ def test_fill_instructions():
     "ADD A, C",
     "PSH A"
     ]
-    assert fill_instructions(original, P='A', Q='B', R='C') == filled
+    assert fill_instructions(original, P='A', Q='B', R='C') == filled
+
+def test_generate_label():
+    assert is_label(generate_label())
+    assert generate_label() != generate_label()

tests/functional/expanders/__init__.py

@@ -1,4 +1,4 @@
-from .utils import execute_code
+from tests.functional.utils import execute_code
 
 def test_ADD():
     program = '''

tests/functional/test_ath.py tests/functional/expanders/test_ath.py

@@ -0,0 +1,19 @@
+from tests.functional.utils import execute_code
+
+def test_JGE():
+    program = '''
+        .text
+        .global main:
+            main:
+                LDV A, 25
+                LDV B, 10
+                LDV C, positive:
+                JGE B, C
+                HLT
+            positive:
+                LDV C, 16
+                HLT
+    '''
+    c = execute_code(program)
+    for reg, val in enumerate([25, 10, 16, 0]):
+        assert c.registers.get(reg) == val

tests/functional/expanders/test_conditionalexpander.py

@@ -1,4 +1,4 @@
-from .utils import execute_code
+from tests.functional.utils import execute_code
 
 def test_LDV16():
     program = '''