fix global indexing bugs

1 files changed, 10 insertions, 1 deletions

diff --git a/src/parseTools.js b/src/parseTools.js
index 78ff934e..5d0131dc 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -368,10 +368,19 @@ function makeGlobalDef(ident) {
 }
 
 function makeGlobalUse(ident) {
-  if (!NAMED_GLOBALS && isIndexableGlobal(ident)) return getFastValue('GLOBAL_BASE', '+', Variables.indexedGlobals[ident]);
+  if (!NAMED_GLOBALS && isIndexableGlobal(ident)) return '(' + getFastValue('GLOBAL_BASE', '+', Variables.indexedGlobals[ident]) + ')';
   return ident; // TODO: add option for namespacing or offsetting to allow reducing the number of globals
 }
 
+function sortGlobals(globals) {
+  var ks = keys(globals);
+  ks.sort();
+  var inv = invertArray(ks);
+  return values(globals).sort(function(a, b) {
+    return inv[b.ident] - inv[a.ident];
+  });
+}
+
 function finalizeParam(param) {
   if (param.intertype in PARSABLE_LLVM_FUNCTIONS) {
     return finalizeLLVMFunctionCall(param);