aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-29 17:25:48 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-29 17:25:48 -0700
commit173d480c2bafcb914fb2cd0be444757e6bcd24b2 (patch)
tree52fadc3fd23cb369d14067d5bc7fda13365f135c /src
parent60960a6a1f5137239af6b11d91d1ca668f54f5f1 (diff)
make sure to align unnamed globals
Diffstat (limited to 'src')
-rw-r--r--src/jsifier.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/jsifier.js b/src/jsifier.js
index 350d2c8b..9207f65d 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -1598,10 +1598,11 @@ function JSify(data, functionsOnly, givenFunctions) {
sortGlobals(globalsData.globalVariables).forEach(function(g) {
var ident = g.ident;
if (!isIndexableGlobal(ident)) return;
+ assert(Variables.nextIndexedOffset % Runtime.STACK_ALIGN == 0);
Variables.indexedGlobals[ident] = Variables.nextIndexedOffset;
Variables.nextIndexedOffset += Runtime.alignMemory(calcAllocatedSize(Variables.globals[ident].type));
if (ident.substr(0, 5) == '__ZTV') { // leave room for null-terminating the vtable
- Variables.nextIndexedOffset += Runtime.getNativeTypeSize('i32');
+ Variables.nextIndexedOffset += Runtime.alignMemory(QUANTUM_SIZE);
}
});
}