globals mutability fixes

1 files changed, 36 insertions, 30 deletions

diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts
index bdc00ad43..48340942f 100644
--- a/test/emcc_O2_hello_world.fromasm.no-opts
+++ b/test/emcc_O2_hello_world.fromasm.no-opts
@@ -7,12 +7,12 @@
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import "env" "STACKTOP" (global $STACKTOP i32))
-  (import "env" "STACK_MAX" (global $STACK_MAX i32))
-  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
-  (import "env" "ABORT" (global $ABORT i32))
-  (import "global" "NaN" (global $nan f64))
-  (import "global" "Infinity" (global $inf f64))
+  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
+  (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32))
+  (import "env" "ABORT" (global $ABORT$asm2wasm$import i32))
+  (import "global" "NaN" (global $nan$asm2wasm$import f64))
+  (import "global" "Infinity" (global $inf$asm2wasm$import f64))
   (import "env" "abort" (func $abort (param i32)))
   (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32)))
   (import "env" "_pthread_self" (func $_pthread_self (result i32)))
@@ -51,30 +51,36 @@
   (export "dynCall_ii" (func $dynCall_ii))
   (export "dynCall_iiii" (func $dynCall_iiii))
   (export "dynCall_vi" (func $dynCall_vi))
-  (global $__THREW__ i32 (i32.const 0))
-  (global $threwValue i32 (i32.const 0))
-  (global $setjmpId i32 (i32.const 0))
-  (global $undef i32 (i32.const 0))
-  (global $tempInt i32 (i32.const 0))
-  (global $tempBigInt i32 (i32.const 0))
-  (global $tempBigIntP i32 (i32.const 0))
-  (global $tempBigIntS i32 (i32.const 0))
-  (global $tempBigIntR f64 (f64.const 0))
-  (global $tempBigIntI i32 (i32.const 0))
-  (global $tempBigIntD i32 (i32.const 0))
-  (global $tempValue i32 (i32.const 0))
-  (global $tempDouble f64 (f64.const 0))
-  (global $tempRet0 i32 (i32.const 0))
-  (global $tempRet1 i32 (i32.const 0))
-  (global $tempRet2 i32 (i32.const 0))
-  (global $tempRet3 i32 (i32.const 0))
-  (global $tempRet4 i32 (i32.const 0))
-  (global $tempRet5 i32 (i32.const 0))
-  (global $tempRet6 i32 (i32.const 0))
-  (global $tempRet7 i32 (i32.const 0))
-  (global $tempRet8 i32 (i32.const 0))
-  (global $tempRet9 i32 (i32.const 0))
-  (global $tempFloat f64 (f64.const 0))
+  (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import))
+  (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import))
+  (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import))
+  (global $ABORT (mut i32) (get_global $ABORT$asm2wasm$import))
+  (global $__THREW__ (mut i32) (i32.const 0))
+  (global $threwValue (mut i32) (i32.const 0))
+  (global $setjmpId (mut i32) (i32.const 0))
+  (global $undef (mut i32) (i32.const 0))
+  (global $nan (mut f64) (get_global $nan$asm2wasm$import))
+  (global $inf (mut f64) (get_global $inf$asm2wasm$import))
+  (global $tempInt (mut i32) (i32.const 0))
+  (global $tempBigInt (mut i32) (i32.const 0))
+  (global $tempBigIntP (mut i32) (i32.const 0))
+  (global $tempBigIntS (mut i32) (i32.const 0))
+  (global $tempBigIntR (mut f64) (f64.const 0))
+  (global $tempBigIntI (mut i32) (i32.const 0))
+  (global $tempBigIntD (mut i32) (i32.const 0))
+  (global $tempValue (mut i32) (i32.const 0))
+  (global $tempDouble (mut f64) (f64.const 0))
+  (global $tempRet0 (mut i32) (i32.const 0))
+  (global $tempRet1 (mut i32) (i32.const 0))
+  (global $tempRet2 (mut i32) (i32.const 0))
+  (global $tempRet3 (mut i32) (i32.const 0))
+  (global $tempRet4 (mut i32) (i32.const 0))
+  (global $tempRet5 (mut i32) (i32.const 0))
+  (global $tempRet6 (mut i32) (i32.const 0))
+  (global $tempRet7 (mut i32) (i32.const 0))
+  (global $tempRet8 (mut i32) (i32.const 0))
+  (global $tempRet9 (mut i32) (i32.const 0))
+  (global $tempFloat (mut f64) (f64.const 0))
   (table 18 18 anyfunc)
   (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
   (func $_malloc (param $i1 i32) (result i32)