finish updating .s tests

9 files changed, 11 insertions, 10 deletions

diff --git a/auto_update_tests.py b/auto_update_tests.py
index c3b9742b5..566967640 100755
--- a/auto_update_tests.py
+++ b/auto_update_tests.py
@@ -29,7 +29,7 @@ for t in sorted(os.listdir('test')):
 
 for s in sorted(os.listdir(os.path.join('test', 'dot_s'))) + sorted(os.listdir(os.path.join('test', 'experimental', 'prototype-wasmate', 'test'))):
   if not s.endswith('.s'): continue
-  if s in ['inline-asm.s', 'userstack.s', 'offset-folding.s']: continue
+  if s in ['inline-asm.s', 'userstack.s', 'offset-folding.s', 'legalize.s']: continue
   print '..', s
   wasm = s.replace('.s', '.wast')
   full = os.path.join('test', 'dot_s', s)
diff --git a/check.py b/check.py
index 7525d24fb..4c3f72228 100755
--- a/check.py
+++ b/check.py
@@ -236,7 +236,7 @@ print '\n[ checking .s testcases... ]\n'
 
 for s in sorted(os.listdir(os.path.join('test', 'dot_s'))) + sorted(os.listdir(os.path.join('test', 'experimental', 'prototype-wasmate', 'test'))):
   if not s.endswith('.s'): continue
-  if s in ['inline-asm.s', 'userstack.s', 'offset-folding.s']: continue
+  if s in ['inline-asm.s', 'userstack.s', 'offset-folding.s', 'legalize.s']: continue
   print '..', s
   wasm = s.replace('.s', '.wast')
   full = os.path.join('test', 'dot_s', s)
diff --git a/test/dot_s/offset.wast b/test/dot_s/offset.wast
index 432216519..e32ab2b6e 100644
--- a/test/dot_s/offset.wast
+++ b/test/dot_s/offset.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 0 4294967295 (segment 4 "\00\00\00\00"))
+  (memory 8 4294967295 (segment 4 "\00\00\00\00"))
   (export "load_i32_with_folded_offset" $load_i32_with_folded_offset)
   (export "load_i32_with_unfolded_offset" $load_i32_with_unfolded_offset)
   (export "load_i64_with_folded_offset" $load_i64_with_folded_offset)
diff --git a/test/dot_s/permute.wast b/test/dot_s/permute.wast
index 2af67ec99..23447fc4a 100644
--- a/test/dot_s/permute.wast
+++ b/test/dot_s/permute.wast
@@ -1,4 +1,4 @@
 (module
-  (memory 0 4294967295 (segment 16 "hE?\8ds\0e7\db[g\8f\955it\c4k\0b\e2\ef\bcld\e0\fd\8c\9e\86&~\d8\94\89+\c8\a4\c2\f2\fb\12\1cej\d99\b7\b3W\c6w\af\ae\caM>\92ub\96\84\b6\b0N\ec;q\11\f7\bf\e31\e6\a7\90\fc\03\e4\aa\d7\cc- \15\83DH\80r\fa\01X\eb:_\00A\cd\e9o`n\ac(\ad\ba0\dcyS#\f4$\"\82\7f}\8e\f6\93L\'\bb\bdZ\ed4\18\f3\c0\cf\ff\a3\f8\07\05\9c\d3\0f\a0\06m%\\\f9^B<\e7\b1\17\98]\0c\dd\c5\f5p\e5\fezJ\ab,F\a5@\08R\85!\b8\1a\ce\d5\04\nI\a6\d1\9f\8a\c9\a9|\97\9aG\be8Y\8b\c1\1b\d4\ea\b9\19\14\9b\9163\d0\1d\d2\df=C\1f\0dc\e1\c7QUv\02\b5aK\b4\tV\c3x\e8\a1\1e\81\de/{\da\d6Pf\10T\f0)\88\16\ee\a8\9d\f1\cbO*\b2\99\132\87.\a2"))
+  (memory 272 4294967295 (segment 16 "hE?\8ds\0e7\db[g\8f\955it\c4k\0b\e2\ef\bcld\e0\fd\8c\9e\86&~\d8\94\89+\c8\a4\c2\f2\fb\12\1cej\d99\b7\b3W\c6w\af\ae\caM>\92ub\96\84\b6\b0N\ec;q\11\f7\bf\e31\e6\a7\90\fc\03\e4\aa\d7\cc- \15\83DH\80r\fa\01X\eb:_\00A\cd\e9o`n\ac(\ad\ba0\dcyS#\f4$\"\82\7f}\8e\f6\93L\'\bb\bdZ\ed4\18\f3\c0\cf\ff\a3\f8\07\05\9c\d3\0f\a0\06m%\\\f9^B<\e7\b1\17\98]\0c\dd\c5\f5p\e5\fezJ\ab,F\a5@\08R\85!\b8\1a\ce\d5\04\nI\a6\d1\9f\8a\c9\a9|\97\9aG\be8Y\8b\c1\1b\d4\ea\b9\19\14\9b\9163\d0\1d\d2\df=C\1f\0dc\e1\c7QUv\02\b5aK\b4\tV\c3x\e8\a1\1e\81\de/{\da\d6Pf\10T\f0)\88\16\ee\a8\9d\f1\cbO*\b2\99\132\87.\a2"))
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 271 }
diff --git a/test/dot_s/relocation.wast b/test/dot_s/relocation.wast
index 3f667f823..a25baee17 100644
--- a/test/dot_s/relocation.wast
+++ b/test/dot_s/relocation.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 0 4294967295 (segment 4 "\08\00\00\00") (segment 8 "\04\00\00\00"))
+  (memory 12 4294967295 (segment 4 "\08\00\00\00") (segment 8 "\04\00\00\00"))
   (export "main" $main)
   (func $main (result i32)
     (local $$0 i32)
diff --git a/test/dot_s/returned.wast b/test/dot_s/returned.wast
index e63c40964..60ec69e6e 100644
--- a/test/dot_s/returned.wast
+++ b/test/dot_s/returned.wast
@@ -23,9 +23,9 @@
       (block
         (br $fake_return_waka123
           (call_import $memcpy
-            (get_local $$2)
-            (get_local $$1)
             (get_local $$0)
+            (get_local $$1)
+            (get_local $$2)
           )
         )
       )
diff --git a/test/dot_s/store-results.wast b/test/dot_s/store-results.wast
index 7001cd0e7..2b5ccf2ec 100644
--- a/test/dot_s/store-results.wast
+++ b/test/dot_s/store-results.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 0 4294967295)
+  (memory 16 4294967295)
   (export "single_block" $single_block)
   (export "foo" $foo)
   (export "bar" $bar)
diff --git a/test/dot_s/symbolic-offset.wast b/test/dot_s/symbolic-offset.wast
index 4dc52e77f..f8e3cc56e 100644
--- a/test/dot_s/symbolic-offset.wast
+++ b/test/dot_s/symbolic-offset.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 0 4294967295 (segment 4 "\01\00\00\00\00\00\00\00\00\00\00\00"))
+  (memory 16 4294967295 (segment 4 "\01\00\00\00\00\00\00\00\00\00\00\00"))
   (export "f" $f)
   (func $f (param $$0 i32) (param $$1 i32)
     (block $fake_return_waka123
diff --git a/test/dot_s/vtable.wast b/test/dot_s/vtable.wast
index e578ae7d0..199add992 100644
--- a/test/dot_s/vtable.wast
+++ b/test/dot_s/vtable.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 0 4294967295 (segment 16 "1A\00") (segment 32 "1B\00") (segment 48 "1C\00") (segment 64 "1D\00") (segment 68 "\00\00\00\00\98\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00") (segment 88 "\00\00\00\00\a0\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00") (segment 108 "\00\00\00\00\b0\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00") (segment 128 "\00\00\00\00\c0\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00") (segment 152 "\00\00\00\00\10\00\00\00") (segment 160 "\00\00\00\00 \00\00\00\98\00\00\00") (segment 176 "\00\00\00\000\00\00\00\98\00\00\00") (segment 192 "\00\00\00\00@\00\00\00\a0\00\00\00") (segment 204 "\00\00\00\00"))
+  (memory 208 4294967295 (segment 16 "1A\00") (segment 32 "1B\00") (segment 48 "1C\00") (segment 64 "1D\00") (segment 68 "\00\00\00\00\98\00\00\00\00\00\00\00\01\00\00\00\02\00\00\00") (segment 88 "\00\00\00\00\a0\00\00\00\00\00\00\00\03\00\00\00\04\00\00\00") (segment 108 "\00\00\00\00\b0\00\00\00\00\00\00\00\05\00\00\00\06\00\00\00") (segment 128 "\00\00\00\00\c0\00\00\00\00\00\00\00\07\00\00\00\08\00\00\00") (segment 152 "\00\00\00\00\10\00\00\00") (segment 160 "\00\00\00\00 \00\00\00\98\00\00\00") (segment 176 "\00\00\00\000\00\00\00\98\00\00\00") (segment 192 "\00\00\00\00@\00\00\00\a0\00\00\00") (segment 204 "\00\00\00\00"))
   (import $_ZdlPv "env" "_ZdlPv")
   (export "_ZN1A3fooEv" $_ZN1A3fooEv)
   (export "_ZN1B3fooEv" $_ZN1B3fooEv)
@@ -10,6 +10,7 @@
   (export "_ZN1CD0Ev" $_ZN1CD0Ev)
   (export "_ZN1AD2Ev" $_ZN1AD2Ev)
   (export "_ZN1DD0Ev" $_ZN1DD0Ev)
+  (table $_ZN1AD2Ev $_ZN1AD0Ev $_ZN1A3fooEv $_ZN1BD0Ev $_ZN1B3fooEv $_ZN1CD0Ev $_ZN1C3fooEv $_ZN1DD0Ev $_ZN1D3fooEv)
   (func $_ZN1A3fooEv (param $$0 i32)
     (block $fake_return_waka123
       (block