From e16fbe4b4309dba43c8a8ea71270f3d57675aeec Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Tue, 20 Apr 2021 08:57:11 -0500
Subject: [PATCH] using bh_align where I can

---
 src/onyxwasm.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/onyxwasm.c b/src/onyxwasm.c
index 0975b55a..2166e567 100644
--- a/src/onyxwasm.c
+++ b/src/onyxwasm.c
@@ -135,17 +135,16 @@ static u64 local_allocate(LocalAllocator* la, AstTyped* local) {
         u32 size = type_size_of(local->type);
         u32 alignment = type_alignment_of(local->type);
 
-        if (la->curr_stack % alignment != 0)
-            la->curr_stack += alignment - (la->curr_stack % alignment);
+        bh_align(la->curr_stack, alignment);
 
         if (la->max_stack < la->curr_stack)
             la->max_stack = la->curr_stack;
 
-        if (size % alignment != 0)
-            size += alignment - (size % alignment);
+        bh_align(size, alignment);
 
         if (la->max_stack - la->curr_stack >= (i32) size) {
             la->curr_stack += size;
+
         } else {
             la->max_stack += size - (la->max_stack - la->curr_stack);
             la->curr_stack = la->max_stack;
@@ -163,8 +162,7 @@ static void local_free(LocalAllocator* la, AstTyped* local) {
     } else {
         u32 size = type_size_of(local->type);
         u32 alignment = type_alignment_of(local->type);
-        if (size % alignment != 0)
-            size += alignment - (size % alignment);
+        bh_align(size, alignment);
 
         la->curr_stack -= size;
     }
@@ -2629,7 +2627,7 @@ EMIT_FUNC(zero_value_for_type, Type* type, OnyxToken* where) {
     else if (type->kind == Type_Kind_Function) {
         // CLEANUP ROBUSTNESS: This should use the 'null_proc' instead of whatever is at
         // function index 0.
-        WID(WI_I32_CONST, 0);
+        WID(WI_I32_CONST, mod->null_proc_func_idx);
     }
     else {
         WasmType wt = onyx_type_to_wasm_type(type);
@@ -3061,9 +3059,7 @@ static void emit_memory_reservation(OnyxWasmModule* mod, AstMemRes* memres) {
     u64 size = type_size_of(effective_type);
 
     u32 offset = mod->next_datum_offset;
-    if (offset % alignment != 0) {
-        offset += alignment - (offset % alignment);
-    }
+    bh_align(offset, alignment);
 
     if (memres->initial_value != NULL) {
         u8* data = bh_alloc(global_heap_allocator, size);
-- 
2.25.1