fix shift optimizer bugs

1 files changed, 18 insertions, 12 deletions

diff --git a/tools/test-js-optimizer-t2-output.js b/tools/test-js-optimizer-t2-output.js
index 9e237a30..51e2af77 100644
--- a/tools/test-js-optimizer-t2-output.js
+++ b/tools/test-js-optimizer-t2-output.js
@@ -1,22 +1,28 @@
 function shifty($id) {
-  var $id$s2 = $id >> 2;
-  q(HEAP32[$id$s2]);
-  q(HEAP32[$id$s2 + 10]);
-  q(HEAP32[$id$s2 + 20]);
-  q(HEAP32[(unknown1 + unknown2 >> 2) + $id$s2]);
-  q(HEAP32[(unknown1 + unknown2 >> 2) + $id$s2]);
+  var $tp$s2;
+  var $parameters_addr$s2;
+  var $wavelet38$s2;
+  var _dwt_norms_real$s2;
+  var _idents$s2;
+  var $id3$s3;
+  var $id2$s1;
+  q(HEAP32[$id >> 2]);
+  q(HEAP32[$id + 40 >> 2]);
+  q(HEAP32[$id + 80 >> 2]);
+  q(HEAP32[unknown1 + unknown2 + $id >> 2]);
+  q(HEAP32[unknown1 + $id + unknown2 >> 2]);
   var localUnchanged1 = get(1), localUnchanged2 = get(1);
-  q(HEAP32[(localUnchanged1 + localUnchanged2 >> 2) + $id$s2]);
+  q(HEAP32[localUnchanged1 + $id + localUnchanged2 >> 2]);
   q($id >> _something_);
   $id = q("..");
-  $id$s2 = $id >> 2;
   q($id << _somethingElse_);
   pause(-1);
   var $id2;
-  $id2 = get(54) >> 1;
-  q(HEAP32[$id2]);
-  q(HEAP32[$id2 + 20]);
-  q(HEAP32[$id2 + 40]);
+  $id2 = get(54);
+  $id2$s1 = $id2 >> 1;
+  q(HEAP32[$id2$s1]);
+  q(HEAP32[$id2$s1 + 20]);
+  q(HEAP32[$id2$s1 + 40]);
   var $id3 = get(74), $id3$s3 = $id3 >> 3;
   q(HEAP32[$id3$s3]);
   q(HEAP32[$id3$s3 + 5]);