Renamed should_branch to condition_passed. New name is more consisten…

…t with the Epiphany documentation and does not imply use with a particular instruction.

epiphany/condition_codes.py

@@ -4,7 +4,7 @@
     we_are_translated = lambda : False
 
 
-def should_branch(s, cond):
+def condition_passed(s, cond):
     if cond == 0b0000:    # BEQ
         return bool(s.AZ)
     elif cond == 0b0001:  # BNE

epiphany/execute_branch.py

@@ -1,4 +1,4 @@
-from epiphany.condition_codes import should_branch
+from epiphany.condition_codes import condition_passed
 from epiphany.utils import signed_8, signed_24, sext_8, sext_24
 
 import epiphany.isa
@@ -22,7 +22,7 @@ def execute_bcond(s, inst):
         imm = inst.bcond_imm
         if cond == 0b1111:  # Branch and link (BL).
             s.rf[epiphany.isa.reg_map['LR']] = (s.pc + 2) if is16bit else (s.pc + 4)
-        if should_branch(s, cond):
+        if condition_passed(s, cond):
             s.pc += (sext_8(signed_8(imm)) << 1) if is16bit else (sext_24(signed_24(imm)) << 1)
         else:
             s.pc += 2 if is16bit else 4

epiphany/execute_mov.py

@@ -1,4 +1,4 @@
-from epiphany.condition_codes import should_branch
+from epiphany.condition_codes import condition_passed
 
 
 #-----------------------------------------------------------------------
@@ -14,7 +14,7 @@ def execute_movcond(s, inst):
             inst.bits &= 0xffff
         rd = inst.rd
         rn = inst.rn
-        if should_branch(s, inst.cond):
+        if condition_passed(s, inst.cond):
             s.rf[rd] = s.rf[rn]
         s.pc += 2 if is16bit else 4
     return execute_movcond

epiphany/test/test_condition_passed.py

@@ -0,0 +1,48 @@
+from epiphany.condition_codes import condition_passed
+from epiphany.test.machine import new_state
+
+import pytest
+
+
+def test_condition_passed():
+    state = new_state(AZ=1)
+    assert condition_passed(state, 0b0000)
+    state.AZ = 0
+    assert condition_passed(state, 0b0001)
+    state.AZ = 0
+    state.AC = 1
+    assert condition_passed(state, 0b0010)
+    state.AC = 1
+    assert condition_passed(state, 0b0011)
+    state.AZ = 1
+    state.AC = 0
+    assert condition_passed(state, 0b0100)
+    state.AC = 0
+    assert condition_passed(state, 0b0101)
+    state.AZ = 0
+    state.AV = state.AN = 2
+    assert condition_passed(state, 0b0110)
+    state.AZ = 1
+    state.AV = state.AN = 3
+    assert condition_passed(state, 0b0111)
+    state.AV = 4
+    state.AN = 3
+    assert condition_passed(state, 0b1000)
+    state.AZ = 1
+    state.AV = 3
+    state.AN = 4
+    assert condition_passed(state, 0b1001)
+    state.BZ = 1
+    assert condition_passed(state, 0b1010)
+    state.BZ = 0
+    assert condition_passed(state, 0b1011)
+    state.BN = 1
+    state.BZ = 0
+    assert condition_passed(state, 0b1100)
+    state.BN = 1
+    state.BZ = 1
+    assert condition_passed(state, 0b1101)
+    assert condition_passed(state, 0b1110)
+    assert condition_passed(state, 0b1111)
+    with pytest.raises(ValueError):
+        condition_passed(state, 0b11111)