webapps.wiki: adding search bar

[factor.git] / vm / byte_arrays.cpp

diff --git a/vm/byte_arrays.cpp b/vm/byte_arrays.cpp
index acaf85b66670f31f6164ebf6de670b29fb80434e..4c83a9de7464ee8feb9d52f8d975da9ee0d44902 100644 (file)
--- a/vm/byte_arrays.cpp
+++ b/vm/byte_arrays.cpp
@@ -2,26 +2,26 @@
 
 namespace factor {
 
-/* Allocates memory */
+// Allocates memory
 byte_array* factor_vm::allot_byte_array(cell size) {
   byte_array* array = allot_uninitialized_array<byte_array>(size);
   memset(array + 1, 0, size);
   return array;
 }
 
-/* Allocates memory */
+// Allocates memory
 void factor_vm::primitive_byte_array() {
   cell size = unbox_array_size();
   ctx->push(tag<byte_array>(allot_byte_array(size)));
 }
 
-/* Allocates memory */
+// Allocates memory
 void factor_vm::primitive_uninitialized_byte_array() {
   cell size = unbox_array_size();
   ctx->push(tag<byte_array>(allot_uninitialized_array<byte_array>(size)));
 }
 
-/* Allocates memory */
+// Allocates memory
 void factor_vm::primitive_resize_byte_array() {
   data_root<byte_array> array(ctx->pop(), this);
   check_tagged(array);
@@ -29,39 +29,46 @@ void factor_vm::primitive_resize_byte_array() {
   ctx->push(tag<byte_array>(reallot_array(array.untagged(), capacity)));
 }
 
-/* Allocates memory */
+// Allocates memory
+void growable_byte_array::reallot_array(cell count) {
+  byte_array *ba_old = elements.untagged();
+  byte_array *ba_new = elements.parent->reallot_array(ba_old, count);
+  elements.set_untagged(ba_new);
+}
+
+// Allocates memory
 void growable_byte_array::grow_bytes(cell len) {
   count += len;
-  if (count >= array_capacity(elements.untagged()))
-    elements = elements.parent->reallot_array(elements.untagged(), count * 2);
+  if (count >= array_capacity(elements.untagged())) {
+    reallot_array(2 * count);
+  }
 }
 
-/* Allocates memory */
+// Allocates memory
 void growable_byte_array::append_bytes(void* elts, cell len) {
   cell old_count = count;
   grow_bytes(len);
   memcpy(&elements->data<uint8_t>()[old_count], elts, len);
 }
 
-/* Allocates memory */
+// Allocates memory
 void growable_byte_array::append_byte_array(cell byte_array_) {
   data_root<byte_array> byte_array(byte_array_, elements.parent);
 
   cell len = array_capacity(byte_array.untagged());
   cell new_size = count + len;
-  factor_vm* parent = elements.parent;
-  if (new_size >= array_capacity(elements.untagged()))
-    elements = parent->reallot_array(elements.untagged(), new_size * 2);
+  if (new_size >= array_capacity(elements.untagged())) {
+    reallot_array(2 * new_size);
+  }
 
   memcpy(&elements->data<uint8_t>()[count], byte_array->data<uint8_t>(), len);
 
   count += len;
 }
 
-/* Allocates memory */
+// Allocates memory
 void growable_byte_array::trim() {
-  factor_vm* parent = elements.parent;
-  elements = parent->reallot_array(elements.untagged(), count);
+  reallot_array(count);
 }
 
 }