simplify

Author: kripken

system/lib/sbrk.c

@@ -29,18 +29,13 @@
 #define SET_ERRNO()
 #endif
 
-static intptr_t sbrk_val = 0;
-static intptr_t* sbrk_ptr = &sbrk_val;
-
 extern size_t __heap_base;
 
+static intptr_t sbrk_val = (intptr_t)&__heap_base;
+static intptr_t* sbrk_ptr = &sbrk_val;
+
 intptr_t* emscripten_get_sbrk_ptr() {
-  if (sbrk_val == 0) {
-    sbrk_val = (intptr_t)&__heap_base;
-    sbrk_val += 1024; // FIXME FIXME remove this once no JS static allocs
-    sbrk_val = (sbrk_val + 3) & ~3;
-  }
-  return &sbrk_val;
+  return sbrk_ptr;
 }
 
 void *sbrk(intptr_t increment) {
@@ -55,7 +50,6 @@ void *sbrk(intptr_t increment) {
   intptr_t expected;
   while (1) {
 #endif // __EMSCRIPTEN_PTHREADS__
-    intptr_t* sbrk_ptr = emscripten_get_sbrk_ptr(); // TODO remove with above hack
 #if __EMSCRIPTEN_PTHREADS__
     intptr_t old_brk = __c11_atomic_load((_Atomic(intptr_t)*)sbrk_ptr, __ATOMIC_SEQ_CST);
 #else

tests/code_size/hello_webgl2_wasm.json

@@ -3,8 +3,8 @@
   "a.html.gz": 377,
   "a.js": 5044,
   "a.js.gz": 2401,
-  "a.wasm": 10937,
-  "a.wasm.gz": 6947,
+  "a.wasm": 10924,
+  "a.wasm.gz": 6939,
   "total": 16544,
-  "total_gz": 9725
+  "total_gz": 9717
 }

tests/code_size/hello_webgl2_wasm2js.json

@@ -1,10 +1,10 @@
 {
   "a.html": 588,
   "a.html.gz": 386,
-  "a.js": 22203,
-  "a.js.gz": 8491,
-  "a.mem": 3168,
-  "a.mem.gz": 2711,
-  "total": 25938,
-  "total_gz": 11588
+  "a.js": 22166,
+  "a.js.gz": 8477,
+  "a.mem": 3171,
+  "a.mem.gz": 2715,
+  "total": 25922,
+  "total_gz": 11578
 }

tests/code_size/hello_webgl_wasm.json

@@ -3,8 +3,8 @@
   "a.html.gz": 377,
   "a.js": 4529,
   "a.js.gz": 2223,
-  "a.wasm": 10937,
-  "a.wasm.gz": 6947,
+  "a.wasm": 10924,
+  "a.wasm.gz": 6939,
   "total": 16029,
-  "total_gz": 9547
+  "total_gz": 9539
 }

tests/code_size/hello_webgl_wasm2js.json

@@ -1,10 +1,10 @@
 {
   "a.html": 588,
   "a.html.gz": 386,
-  "a.js": 21692,
-  "a.js.gz": 8327,
-  "a.mem": 3168,
-  "a.mem.gz": 2711,
-  "total": 25427,
-  "total_gz": 11424
+  "a.js": 21655,
+  "a.js.gz": 8315,
+  "a.mem": 3171,
+  "a.mem.gz": 2715,
+  "total": 25411,
+  "total_gz": 11416
 }

tests/code_size/random_printf_wasm.json

@@ -1,6 +1,6 @@
 {
   "a.html": 13723,
-  "a.html.gz": 7355,
-  "total": 13727,
-  "total_gz": 7355
+  "a.html.gz": 7354,
+  "total": 13723,
+  "total_gz": 7354
 }

tests/code_size/random_printf_wasm2js.json

@@ -1,6 +1,6 @@
 {
   "a.html": 19379,
-  "a.html.gz": 8066,
-  "total": 19387,
-  "total_gz": 8066
+  "a.html.gz": 8065,
+  "total": 19379,
+  "total_gz": 8065
 }