Merge pull request #1002 from monaka/pr-extract-stack-zero-filling

Extract stack zero filling into new function.

1 files changed, 16 insertions, 9 deletions

diff --git a/src/vm.c b/src/vm.c
index dd8edf4bc..65e2f9c65 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -55,12 +55,20 @@ The value below allows about 60000 recursive calls in the simplest case. */
 #endif
 
 static inline void
-stack_copy(mrb_value *dst, const mrb_value *src, size_t size)
+stack_clear(mrb_value *from, size_t count)
 {
-  size_t i;
+  const mrb_value mrb_value_zero = { { 0 } };
+
+  while(count-- > 0) {
+    *from++ = mrb_value_zero;
+  }
+}
 
-  for (i = 0; i < size; i++) {
-    dst[i] = src[i];
+static inline void
+stack_copy(mrb_value *dst, const mrb_value *src, size_t size)
+{
+  while (size-- > 0) {
+    *dst++ = *src++;
   }
 }
 
@@ -130,15 +138,14 @@ stack_extend(mrb_state *mrb, int room, int keep)
   }
 
   if (room > keep) {
-    int i;
-    for (i=keep; i<room; i++) {
 #ifndef MRB_NAN_BOXING
-      static const mrb_value mrb_value_zero = { { 0 } };
-      mrb->stack[i] = mrb_value_zero;
+    stack_clear(&(mrb->stack[keep]), room - keep);
 #else
+    int i;
+    for (i=keep; i<room; i++) {
       SET_NIL_VALUE(mrb->stack[i]);
-#endif
     }
+#endif
   }
 }