Merge pull request #2174 from sunfishcode/incoming

Two minor testsuite cleanups.

2 files changed, 1 insertions, 19 deletions

diff --git a/tests/cases/legalizer_b_ta2.ll b/tests/cases/legalizer_b_ta2.ll
index fcbfda20..ec5e7506 100644
--- a/tests/cases/legalizer_b_ta2.ll
+++ b/tests/cases/legalizer_b_ta2.ll
@@ -92,7 +92,7 @@ entry:
   store i128 %ored, i128* %bundled, align 4
   call i32 (i8*)* @puts(i8* %buffer)
 
-  %ander = trunc i128 18402271027389267967 to i128
+  %ander = bitcast i128 18402271027389267967 to i128
   %anded = and i128 %loaded, %ander ; variable
   store i128 %anded, i128* %bundled, align 4
   call i32 (i8*)* @puts(i8* %buffer)
diff --git a/tests/sqlite/sqlite3.c b/tests/sqlite/sqlite3.c
index d49e1887..2d7c7725 100644
--- a/tests/sqlite/sqlite3.c
+++ b/tests/sqlite/sqlite3.c
@@ -38132,9 +38132,6 @@ static int writeJournalHdr(Pager *pPager){
   u32 nHeader = (u32)pPager->pageSize;/* Size of buffer pointed to by zHeader */
   u32 nWrite;                         /* Bytes of header sector written */
   int ii;                             /* Loop counter */
-#ifdef __EMSCRIPTEN__
-  u8 temp[4];
-#endif
 
   assert( isOpen(pPager->jfd) );      /* Journal file must be open. */
 
@@ -38185,12 +38182,7 @@ static int writeJournalHdr(Pager *pPager){
   }
 
   /* The random check-hash initialiser */ 
-#ifdef __EMSCRIPTEN__
-  sqlite3_randomness(sizeof(pPager->cksumInit), temp);
-  pPager->cksumInit = temp[0] + (((u32)temp[1]) << 8) + (((u32)temp[2]) << 16) + (((u32)temp[3]) << 24);
-#else
   sqlite3_randomness(sizeof(pPager->cksumInit), &pPager->cksumInit);
-#endif
   put32bits(&zHeader[sizeof(aJournalMagic)+4], pPager->cksumInit);
   /* The initial database size */
   put32bits(&zHeader[sizeof(aJournalMagic)+8], pPager->dbOrigSize);
@@ -52942,12 +52934,7 @@ static void dropCell(MemPage *pPage, int idx, int sz, int *pRC){
   endPtr = &data[pPage->cellOffset + 2*pPage->nCell - 2];
   assert( (SQLITE_PTR_TO_INT(ptr)&1)==0 );  /* ptr is always 2-byte aligned */
   while( ptr<endPtr ){
-#ifdef __EMSCRIPTEN__
-    ptr[0] = ptr[2];
-    ptr[1] = ptr[3];
-#else
     *(u16*)ptr = *(u16*)&ptr[2];
-#endif
     ptr += 2;
   }
   pPage->nCell--;
@@ -53043,12 +53030,7 @@ static void insertCell(
     endPtr = &data[ins];
     assert( (SQLITE_PTR_TO_INT(ptr)&1)==0 );  /* ptr is always 2-byte aligned */
     while( ptr>endPtr ){
-#ifdef __EMSCRIPTEN__
-      ptr[0] = ptr[-2];
-      ptr[1] = ptr[-1];
-#else
       *(u16*)ptr = *(u16*)&ptr[-2];
-#endif
       ptr -= 2;
     }
     put2byte(&data[ins], idx);