minor fixes

321d7cce · George Hotz · 2f5f2e1f · 321d7cce
Commit 321d7cce authored Oct 04, 2021 by George Hotz
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

MIPS.sol contracts/MIPS.sol +4 -4

No files found.
--- a/contracts/MIPS.sol
+++ b/contracts/MIPS.sol
@@ -38,7 +38,7 @@ contract MIPS {
  }
  function WriteMemory(bytes32 stateHash, uint32 addr, uint32 value) internal returns (bytes32) {
-    if (m != MIPSMemory(0)) {
+    if (address(m) != address(0)) {
      return m.WriteMemory(stateHash, addr, value);
    } else {
      assembly {
@@ -50,7 +50,7 @@ contract MIPS {
  }
  function ReadMemory(bytes32 stateHash, uint32 addr) internal view returns (uint32 ret) {
-    if (m != MIPSMemory(0)) {
+    if (address(m) != address(0)) {
      ret = m.ReadMemory(stateHash, addr);
    } else {
      assembly {
@@ -200,8 +200,8 @@ contract MIPS {
      }
      if (shouldBranch) {
-        uint32 val = pc + 4 + (SE(insn&0xFFFF, 16)<<2);
+        return branchDelay(stateHash, nextPC,
-        return branchDelay(stateHash, nextPC, val, false);
+          pc + 4 + (SE(insn&0xFFFF, 16)<<2), false);
      } else {
        // branch not taken
        return branchDelay(stateHash, nextPC, nextPC+4, false);