Merge bf7f5b6 into 8ac688c

.landscape.yml

@@ -2,4 +2,4 @@ pylint:
   disable:
     - too-many-arguments
     - unused-argument
-    - unused-import      
+

revelation/instruction.py

@@ -1,7 +1,7 @@
 class Instruction(object):
-    def __init__(self, bits, str):
+    def __init__(self, bits, name):
         self.bits = bits
-        self.str  = str
+        self.name  = name
 
     @property
     def rd(self):

revelation/isa.py

@@ -8,11 +8,6 @@
 
 from pydgin.misc import create_risc_decoder
 
-try:
-    from rpython.rlib.objectmodel import we_are_translated
-except ImportError:
-    we_are_translated = lambda : False
-
 
 reg_map = {
     'r0'   :  0,   'r1'   :  1,   'r2'   :  2,   'r3'   :  3,

revelation/machine.py

@@ -1,14 +1,11 @@
 from revelation.isa import reg_map
 from revelation.storage import MemoryMappedRegisterFile
 
-try:
-    from rpython.rlib.rarithmetic import intmask
-except ImportError:
-    intmask = lambda x : x
 
 RESET_ADDR = 0
 PC_ADDRESS = 0xf0408
 
+
 class State(object):
     _virtualizable_ = ['num_insts']
 

revelation/utils.py

@@ -4,18 +4,6 @@
 
 import math
 
-try:
-    from rpython.rlib.rarithmetic import r_uint, intmask
-    from rpython.rlib.objectmodel import specialize
-except ImportError:
-    r_uint = lambda x : x
-    intmask = lambda x : x
-    class Specialize(object):
-        def argtype(self, fun, *args):
-            return lambda fun : fun
-    specialize = Specialize()
-
-
 def get_mmr_address(rn, m0m1):
     """Return address of an memory-mapped register and its size in bits.
     """
@@ -31,8 +19,8 @@ def get_mmr_address(rn, m0m1):
 def signed(value):
     if value & 0x8000000:
         twos_complement = ~value + 1
-        return -intmask(trim_32(twos_complement))
-    return intmask(value)
+        return -pydgin.utils.intmask(trim_32(twos_complement))
+    return pydgin.utils.intmask(value)
 
 
 def reg_or_simm(state, inst, is16bit):
@@ -74,7 +62,7 @@ def sext_24(value):
     return value
 
 
-@specialize.argtype(0)
+@pydgin.utils.specialize.argtype(0)
 def trim_32(value):
     return value & 0xffffffff