1 files changed, 74 insertions, 3 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 3e31127b..51b9e357 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -689,6 +689,51 @@ if 'benchmark' not in str(sys.argv) and 'sanity' not in str(sys.argv):
 
         self.do_run(src, '*1,1,0,0,1,0*\n')
 
+    def test_i64_cmp2(self):
+        if Settings.USE_TYPED_ARRAYS != 2: return self.skip('full i64 stuff only in ta2')
+        src = r'''
+          #include <inttypes.h>
+          #include <stdio.h>
+
+          typedef int32_t INT32;
+          typedef int64_t INT64;
+          typedef uint8_t UINT8;
+
+          void interface_clock_changed()
+          {
+	          UINT8 m_divshift;
+	          INT32 m_divisor;
+
+	          //INT64 attos = m_attoseconds_per_cycle;
+	          INT64 attos = 279365114840;
+	          m_divshift = 0;
+	          while (attos >= (1UL << 31))
+	          {
+		          m_divshift++;
+		          printf("m_divshift is %i, on %Ld >?= %lu\n", m_divshift, attos, 1UL << 31);
+		          attos >>= 1;
+	          }
+	          m_divisor = attos;
+
+	          printf("m_divisor is %i\n",m_divisor);
+          }
+
+          int main() {
+	          interface_clock_changed();
+	          return 0;
+          }
+        '''
+        self.do_run(src, '''m_divshift is 1, on 279365114840 >?= 2147483648
+m_divshift is 2, on 139682557420 >?= 2147483648
+m_divshift is 3, on 69841278710 >?= 2147483648
+m_divshift is 4, on 34920639355 >?= 2147483648
+m_divshift is 5, on 17460319677 >?= 2147483648
+m_divshift is 6, on 8730159838 >?= 2147483648
+m_divshift is 7, on 4365079919 >?= 2147483648
+m_divshift is 8, on 2182539959 >?= 2147483648
+m_divisor is 1091269979
+''')
+
     def test_i64_double(self):
         if Settings.USE_TYPED_ARRAYS != 2: return self.skip('full i64 stuff only in ta2')
         src = r'''
@@ -731,6 +776,30 @@ if 'benchmark' not in str(sys.argv) and 'sanity' not in str(sys.argv):
         '''
         self.do_run(src, '*0,0,0,0*\n*1,1,0,0*\n') # same as gcc
 
+    def test_i64_umul(self):
+        if Settings.USE_TYPED_ARRAYS != 2: return self.skip('full i64 stuff only in ta2')
+        src = r'''
+          #include <inttypes.h>
+          #include <stdio.h>
+
+          typedef uint32_t UINT32;
+          typedef uint64_t UINT64;
+
+          int main() {
+          volatile UINT32 testu32a = 2375724032U;
+          UINT32 bigu32 = 0xffffffffU;
+          volatile UINT64 testu64a = 14746250828952703000U;
+
+          while ((UINT64)testu32a * (UINT64)bigu32 < testu64a) {
+	          printf("testu64a is %llu\n", testu64a);
+	          testu64a /= 2;
+          }
+
+          return 0;
+          }
+        '''
+        self.do_run(src, 'testu64a is 14746250828952703000\n')
+
     def test_unaligned(self):
         if Settings.QUANTUM_SIZE == 1: return self.skip('No meaning to unaligned addresses in q1')
 
@@ -2229,18 +2298,20 @@ def process(filename):
               case 'b':
               case 'c':
                   return p-1;
-              case 'd':
+              case 0xfffffff1:
                   return p+1;
             }
             return p;
           }
 
           int main( int argc, const char *argv[] ) {
-            printf("*%d,%d,%d,%d,%d*\\n", switcher('a'), switcher('b'), switcher('c'), switcher('d'), switcher('e'));
+            unsigned int x = 0xfffffff1;
+            x >>= 0; // force it to be unsigned for purpose of checking our switch comparison in signed/unsigned
+            printf("*%d,%d,%d,%d,%d,%d*\\n", switcher('a'), switcher('b'), switcher('c'), switcher(x), switcher(-15), switcher('e'));
             return 0;
           }
           '''
-        self.do_run(src, '*96,97,98,101,101*')
+        self.do_run(src, '*96,97,98,-14,-14,101*')
 
     def test_indirectbr(self):
         src = '''