aboutsummaryrefslogtreecommitdiff
path: root/tools/shared.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-06-29 18:27:42 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-07-03 15:31:04 -0700
commit0a77a104d3fa7aceeab1e642c4dc07697dc1a234 (patch)
tree0afdd1e9051584ba5f71a16ec7d996b7a072385a /tools/shared.py
parent803b1bcc09aa218efbc6588c9f8e793cb382a192 (diff)
simplify heap initializer merging
Diffstat (limited to 'tools/shared.py')
-rw-r--r--tools/shared.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py
index 3e7bac9d..42dc3d76 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -1351,9 +1351,11 @@ JCache = cache.JCache(Cache)
chunkify = cache.chunkify
class JS:
- memory_initializer_pattern = '/\* memory initializer \*/ allocate\(([\d,\.concat\(\)\[\]\\n ]+)"i8", ALLOC_NONE, Runtime\.GLOBAL_BASE\)'
+ memory_initializer_pattern = '/\* memory initializer \*/ allocate\(([\d,\.concat\(\)\[\]\\n ]+)"i8", ALLOC_NONE, ([\dRuntime\.GLOBAL_BASE+]+)\)'
no_memory_initializer_pattern = '/\* no memory initializer \*/'
+ memory_staticbump_pattern = 'STATICTOP = STATIC_BASE \+ (\d+);'
+
global_initializers_pattern = '/\* global initializers \*/ __ATINIT__.push\((.+)\);'
@staticmethod