proper 16 byte alignment test

Author: dcodeIO

Diff for: tests/compiler/memory.optimized.wat

@@ -127,40 +127,62 @@
    call $~lib/builtins/abort
    unreachable
   end
-  i32.const 1120
-  global.set $memory/ptr
+  global.get $memory/ptr
+  i32.const 1119
+  i32.ne
+  if
+   i32.const 0
+   i32.const 1056
+   i32.const 24
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
   i32.const 1136
   global.set $memory/ptr
-  i32.const 1144
+  i32.const 1152
+  global.set $memory/ptr
+  i32.const 1160
   global.set $memory/ptr
-  i32.const 1148
+  i32.const 1164
   global.set $memory/ptr
   global.get $memory/ptr
   i32.const 2
   i32.add
-  i32.const 1150
+  i32.const 1166
   global.set $memory/ptr
-  i32.const 1150
+  i32.const 1166
   i32.ne
   if
    i32.const 0
    i32.const 1056
-   i32.const 36
+   i32.const 37
    i32.const 1
    call $~lib/builtins/abort
    unreachable
   end
   global.get $memory/ptr
   i32.const 1
   i32.add
-  i32.const 1151
+  i32.const 1167
   global.set $memory/ptr
-  i32.const 1151
+  i32.const 1167
   i32.ne
   if
    i32.const 0
    i32.const 1056
-   i32.const 37
+   i32.const 38
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  global.get $memory/ptr
+  i32.const 1167
+  i32.ne
+  if
+   i32.const 0
+   i32.const 1056
+   i32.const 39
    i32.const 1
    call $~lib/builtins/abort
    unreachable

Diff for: tests/compiler/memory.ts

@@ -15,12 +15,13 @@ assert(test() == 2);
 
 // Should be properly aligned
 
-var ptr = memory.data(16, 16);
+var ptr = memory.data(1);
 assert(ptr + 16 == (ptr = memory.data(1, 16)));
 assert(ptr + 8 == (ptr = memory.data(1, 8)));
 assert(ptr + 4 == (ptr = memory.data(1, 4)));
 assert(ptr + 2 == (ptr = memory.data(1, 2)));
 assert(ptr + 1 == (ptr = memory.data(1, 1)));
+assert(ptr + 1 == memory.data(1, 16));
 
 // Should be static and properly aligned per generic instance
 
@@ -29,9 +30,10 @@ function testGeneric<T>(): usize {
   return ptr;
 }
 
-ptr = memory.data(16, 16);
+ptr = memory.data(1);
 assert(ptr + 16 == (ptr = testGeneric<v128>()));
 assert(ptr + 8 == (ptr = testGeneric<i64>()));
 assert(ptr + 4 == (ptr = testGeneric<i32>()));
 assert(ptr + 2 == (ptr = testGeneric<i16>()));
 assert(ptr + 1 == (ptr = testGeneric<i8>()));
+assert(ptr + 1 == memory.data(1, 16));

Diff for: tests/compiler/memory.untouched.wat

@@ -6,18 +6,20 @@
  (memory $0 1)
  (data (i32.const 16) "\00\00\00\00")
  (data (i32.const 32) "\12\00\00\00\01\00\00\00\01\00\00\00\12\00\00\00m\00e\00m\00o\00r\00y\00.\00t\00s\00")
- (data (i32.const 80) "\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
+ (data (i32.const 80) "\00")
  (data (i32.const 96) "\00")
  (data (i32.const 104) "\00")
  (data (i32.const 108) "\00")
  (data (i32.const 110) "\00")
  (data (i32.const 111) "\00")
- (data (i32.const 112) "\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
+ (data (i32.const 112) "\00")
  (data (i32.const 128) "\00")
- (data (i32.const 136) "\00")
- (data (i32.const 140) "\00")
- (data (i32.const 142) "\00")
- (data (i32.const 143) "\00")
+ (data (i32.const 144) "\00")
+ (data (i32.const 152) "\00")
+ (data (i32.const 156) "\00")
+ (data (i32.const 158) "\00")
+ (data (i32.const 159) "\00")
+ (data (i32.const 160) "\00")
  (table $0 1 funcref)
  (global $memory/ptr (mut i32) (i32.const 80))
  (export "memory" (memory $0))
@@ -35,19 +37,19 @@
   local.get $0
  )
  (func $memory/testGeneric<v128> (result i32)
-  i32.const 128
+  i32.const 144
  )
  (func $memory/testGeneric<i64> (result i32)
-  i32.const 136
+  i32.const 152
  )
  (func $memory/testGeneric<i32> (result i32)
-  i32.const 140
+  i32.const 156
  )
  (func $memory/testGeneric<i16> (result i32)
-  i32.const 142
+  i32.const 158
  )
  (func $memory/testGeneric<i8> (result i32)
-  i32.const 143
+  i32.const 159
  )
  (func $start:memory
   call $memory/test
@@ -166,7 +168,21 @@
    call $~lib/builtins/abort
    unreachable
   end
+  global.get $memory/ptr
+  i32.const 1
+  i32.add
   i32.const 112
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 48
+   i32.const 24
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  i32.const 128
   global.set $memory/ptr
   global.get $memory/ptr
   i32.const 16
@@ -179,7 +195,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 33
+   i32.const 34
    i32.const 1
    call $~lib/builtins/abort
    unreachable
@@ -195,7 +211,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 34
+   i32.const 35
    i32.const 1
    call $~lib/builtins/abort
    unreachable
@@ -211,7 +227,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 35
+   i32.const 36
    i32.const 1
    call $~lib/builtins/abort
    unreachable
@@ -227,7 +243,7 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 36
+   i32.const 37
    i32.const 1
    call $~lib/builtins/abort
    unreachable
@@ -243,7 +259,21 @@
   if
    i32.const 0
    i32.const 48
-   i32.const 37
+   i32.const 38
+   i32.const 1
+   call $~lib/builtins/abort
+   unreachable
+  end
+  global.get $memory/ptr
+  i32.const 1
+  i32.add
+  i32.const 160
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 48
+   i32.const 39
    i32.const 1
    call $~lib/builtins/abort
    unreachable