1 files changed, 7 insertions, 7 deletions
diff --git a/src/preamble.js b/src/preamble.js
index 27a98422..3f724562 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -187,23 +187,23 @@ function SAFE_HEAP_STORE(dest, value, bytes, isFloat) {
   Module.print('SAFE_HEAP store: ' + [dest, value, bytes, isFloat]);
 #endif
   assert(dest > 0, 'segmentation fault');
-  assert(dest % bytes === 0);
-  assert(dest < Math.max(DYNAMICTOP, STATICTOP));
+  assert(dest % bytes === 0, 'alignment error');
+  assert(dest < Math.max(DYNAMICTOP, STATICTOP), 'segmentation fault (high)');
   assert(DYNAMICTOP <= TOTAL_MEMORY);
   setValue(dest, value, getSafeHeapType(bytes, isFloat), 1);
 }
 
 function SAFE_HEAP_LOAD(dest, bytes, isFloat, unsigned) {
-#if SAFE_HEAP_LOG
-  Module.print('SAFE_HEAP load: ' + [dest, bytes, isFloat, unsigned]);
-#endif
   assert(dest > 0, 'segmentation fault');
-  assert(dest % bytes === 0);
-  assert(dest < Math.max(DYNAMICTOP, STATICTOP));
+  assert(dest % bytes === 0, 'alignment error');
+  assert(dest < Math.max(DYNAMICTOP, STATICTOP), 'segmentation fault (high)');
   assert(DYNAMICTOP <= TOTAL_MEMORY);
   var type = getSafeHeapType(bytes, isFloat);
   var ret = getValue(dest, type, 1);
   if (unsigned) ret = unSign(ret, parseInt(type.substr(1)), 1);
+#if SAFE_HEAP_LOG
+  Module.print('SAFE_HEAP load: ' + [dest, ret, bytes, isFloat, unsigned]);
+#endif
   return ret;
 }