Merge pull request #451 from boriel/bugfix/SHR_SHL_0_value

Fix SHL and SHR for 0 rotations

Author: boriel

src/arch/zx48k/backend/__16bit.py

@@ -892,7 +892,7 @@ def _abs16(ins):
 
 
 def _shru16(ins):
-    ''' Logical right shift 16bit unsigned integer.
+    """ Logical right shift 16bit unsigned integer.
     The result is pushed onto the stack.
 
     Optimizations:
@@ -901,7 +901,7 @@ def _shru16(ins):
 
       * If 2nd op is 1
         Shift Right Arithmetic
-    '''
+    """
     op1, op2 = tuple(ins.quad[2:])
     if is_int(op2):
         op = int16(op2)
@@ -922,16 +922,20 @@ def _shru16(ins):
         output.extend(_16bit_oper(op1))
 
     label = tmp_label()
+    label2 = tmp_label()
+    output.append('or a')
+    output.append('jr z, %s' % label2)
     output.append('%s:' % label)
     output.append('srl h')
     output.append('rr l')
     output.append('djnz %s' % label)
+    output.append('%s:' % label2)
     output.append('push hl')
     return output
 
 
 def _shri16(ins):
-    ''' Arithmetical right shift 16bit signed integer.
+    """ Arithmetical right shift 16bit signed integer.
     The result is pushed onto the stack.
 
     Optimizations:
@@ -940,7 +944,7 @@ def _shri16(ins):
 
       * If 2nd op is 1
         Shift Right Arithmetic
-    '''
+    """
     op1, op2 = tuple(ins.quad[2:])
     if is_int(op2):
         op = int16(op2)
@@ -961,16 +965,20 @@ def _shri16(ins):
         output.extend(_16bit_oper(op1))
 
     label = tmp_label()
+    label2 = tmp_label()
+    output.append('or a')
+    output.append('jr z, %s' % label2)
     output.append('%s:' % label)
     output.append('sra h')
     output.append('rr l')
     output.append('djnz %s' % label)
+    output.append('%s:' % label2)
     output.append('push hl')
     return output
 
 
 def _shl16(ins):
-    ''' Logical/aritmetical left shift 16bit (un)signed integer.
+    """ Logical/aritmetical left shift 16bit (un)signed integer.
     The result is pushed onto the stack.
 
     Optimizations:
@@ -979,7 +987,7 @@ def _shl16(ins):
 
       * If 2nd op is lower than 6
         unroll lop
-    '''
+    """
     op1, op2 = tuple(ins.quad[2:])
     if is_int(op2):
         op = int16(op2)
@@ -999,8 +1007,12 @@ def _shl16(ins):
         output.extend(_16bit_oper(op1))
 
     label = tmp_label()
+    label2 = tmp_label()
+    output.append('or a')
+    output.append('jr z, %s' % label2)
     output.append('%s:' % label)
     output.append('add hl, hl')
     output.append('djnz %s' % label)
+    output.append('%s:' % label2)
     output.append('push hl')
     return output

src/arch/zx48k/backend/__32bit.py

@@ -769,9 +769,13 @@ def _shru32(ins):
     output.append('ld b, a')
     output.extend(_32bit_oper(op1))
     label = tmp_label()
+    label2 = tmp_label()
+    output.append('or a')
+    output.append('jr z, %s' % label2)
     output.append('%s:' % label)
     output.append('call __SHRL32')
     output.append('djnz %s' % label)
+    output.append('%s:' % label2)
     output.append('push de')
     output.append('push hl')
     REQUIRES.add('shrl32.asm')
@@ -814,9 +818,13 @@ def _shri32(ins):
     output.append('ld b, a')
     output.extend(_32bit_oper(op1))
     label = tmp_label()
+    label2 = tmp_label()
+    output.append('or a')
+    output.append('jr z, %s' % label2)
     output.append('%s:' % label)
     output.append('call __SHRA32')
     output.append('djnz %s' % label)
+    output.append('%s:' % label2)
     output.append('push de')
     output.append('push hl')
     REQUIRES.add('shra32.asm')
@@ -859,9 +867,13 @@ def _shl32(ins):
     output.append('ld b, a')
     output.extend(_32bit_oper(op1))
     label = tmp_label()
+    label2 = tmp_label()
+    output.append('or a')
+    output.append('jr z, %s' % label2)
     output.append('%s:' % label)
     output.append('call __SHL32')
     output.append('djnz %s' % label)
+    output.append('%s:' % label2)
     output.append('push de')
     output.append('push hl')
     REQUIRES.add('shl32.asm')

tests/runtime/test_all

@@ -1,4 +1,6 @@
 #!/bin/bash
 
-parallel ./test_case ::: cases/*.bas
+for i in cases/*.bas; do ./test_case $i; done
+
+# parallel ./test_case -- cases/*.bas