[parc][amo] Reverting changes to pydgin.utils and use trim_32 for uns…

…igned #32 (comment)
cornell-brg · Mar 28, 2016 · 441aac4 · 441aac4
1 parent 987e505
commit 441aac4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/parc/isa.py b/parc/isa.py
@@ -3,8 +3,8 @@
 #=======================================================================
 
 from        utils import trim_5
-from pydgin.utils import signed , unsigned  , sext_16   , sext_8, \
-                         trim_32, bits2float, float2bits, r_uint
+from pydgin.utils import signed    , sext_16   , sext_8, trim_32, \
+                         bits2float, float2bits, r_uint
 
 from pydgin.misc import create_risc_decoder, FatalError
 
@@ -783,7 +783,7 @@ def execute_amo_xchg( s, inst ):
 #-----------------------------------------------------------------------
 def execute_amo_min( s, inst ):
   temp = s.mem.read( s.rf[ inst.rs ], 4 )
-  s.mem.write( s.rf[inst.rs], 4, unsigned( min( signed( temp ), signed( s.rf[inst.rt] ) ) ) )
+  s.mem.write( s.rf[inst.rs], 4, trim_32( min( signed( temp ), signed( s.rf[inst.rt] ) ) ) )
   s.rf[ inst.rd ] = temp
   s.pc += 4
 

diff --git a/pydgin/utils.py b/pydgin/utils.py
@@ -42,15 +42,6 @@ def signed( value ):
     return -intmask( trim_32( twos_complement ) )
   return intmask( value )
 
-#-----------------------------------------------------------------------
-# unsigned
-#-----------------------------------------------------------------------
-def unsigned( value ):
-  temp = value
-  if temp < 0:
-    temp = (2**32) + temp
-  return intmask( temp )
-
 #-----------------------------------------------------------------------
 # trim_32
 #-----------------------------------------------------------------------