Merge branch 'memcontainer'

Author: voliva

src/wsa/lib/memcontainer.wsa

@@ -0,0 +1,65 @@
+include memory
+
+jump memcontainer_lib_end
+
+; args capacity
+; returns &M
+label memcontainer_new
+  push 1
+  call malloc
+  ; [cap,&M]
+  swap
+  call malloc
+  ; [&M,&D]
+  copy 1
+  swap
+  store
+ret
+
+; args &M
+label memcontainer_destroy
+  dup
+  retrieve
+  ; [&M,&D]
+  call mfree
+  pop
+  call mfree
+  pop
+ret
+
+; args &M
+; returns cap
+label memcontainer_get_capacity
+  retrieve
+  ; assuming internal stuff from memory but... who cares
+  sub 1
+  retrieve
+ret
+
+; args &M cap
+label memcontainer_ensure_capacity
+  swap
+  dup
+  retrieve
+  copy 1
+  call memcontainer_get_capacity
+  ; [minCap, &M, &D, cap]
+  copy 3
+  sub
+  jumpn __memcontainer_ensure_capacity_move
+    slide 2
+    pop
+    ret
+  label __memcontainer_ensure_capacity_move
+  ; [minCap, &M, &D]
+  copy 2
+  dup
+  div 2
+  add
+  call realloc
+  ; [minCap, &M, &D]
+  store
+  pop
+ret
+
+label memcontainer_lib_end

src/wsa/lib/vector.wsa

@@ -1,84 +1,75 @@
 include memory
+include memcontainer
 
 jump lib_vector_end
 
 ; args capacity
 ; returns &V
 label vector_new
-  ; Vec = [&data,cap,len]
-  push 3
-  call malloc
-  swap
-  ; [&V, cap]
-  dup
-  call malloc
-  ; [&V, cap, &data]
-  copy 2
-  swap
-  store
-  ; [&V, cap]
-  copy 1
   add 1
-  swap
-  store
-
+  call memcontainer_new
   dup
-  add 2
+
+  ; set length to 0
+  retrieve
   push 0
   store
 ret
 
 ; args &V
 label vector_destroy
-  dup
-  call vector_get_addr
-  call mfree
-  pop
-  call mfree
-  pop
+  call memcontainer_destroy
 ret
 
 ; args &V length value
 label vector_fill
   copy 2
   copy 2
-  call __vector_ensure_capacity
+  add 1
+  call memcontainer_ensure_capacity
 
   copy 2
-  call vector_get_addr
-  ; [&V,length,value,&dest]
+  retrieve
+  add 1
+  ; [&V,length,value,&D]
   swap
   copy 2
-  ; [&V,length,&dest,value,size]
+  ; [&V,length,&D,value,size]
   call memset
 
   ; [&V,length]
-  swap
-  add 2
-  swap
-  store
+  call vector_truncate ; aka set_length
 ret
 
 ; args &V
 ; returns &data
 label vector_get_addr
   retrieve
+  add 1
 ret
 
 ; args &V
 ; returns capacity
 label vector_get_capacity
-  add 1
-  retrieve
+  call memcontainer_get_capacity
 ret
 
 ; args &V
 ; returns length
 label vector_get_length
-  add 2
+  retrieve
   retrieve
 ret
 
+; args &V length
+; aka set_length
+label vector_truncate
+  swap
+  retrieve
+  swap
+  store
+ret
+
 ; args &V value
 label vector_push
   swap
@@ -87,15 +78,16 @@ label vector_push
   add 1
   copy 1
   copy 1
-  call __vector_ensure_capacity
+  add 1
+  call memcontainer_ensure_capacity
 
   ; [value, &V, len+1]
-  dup
-  copy 2
-  add 2
-  swap
+  copy 1
+  retrieve
+  copy 1
   store
 
+  ; [value, &V, len+1]
   sub 1
   swap
   call vector_get_addr
@@ -120,22 +112,15 @@ label vector_pop
   ; in case of out-of-bounds we don't have exceptions :( undefined behaviour, but keep length to 0 to avoid other complications
   jumpn __vector_pop_exit
     copy 2
-    add 2
+    retrieve
     copy 2
     store
   label __vector_pop_exit
   slide 2
 ret
 
-; args &V length
-label vector_truncate
-  swap
-  add 2
-  swap
-  store
-ret
 
-; args &V offset length
+; args: &V offset length
 ; returns &Vslice
 label vector_slice
   dup
@@ -155,14 +140,13 @@ label vector_slice
   call memcpy
 
   dup
-  add 2
   copy 2
-  store
+  call vector_truncate ; aka set length
   slide 3
 ret
 
 ; args &Vtarget &Vsrc
-label vector_concat
+label vector_push_all
   copy 1
   call vector_get_length
   copy 1
@@ -171,7 +155,7 @@ label vector_concat
   dup
   copy 3
   swap
-  call __vector_ensure_capacity
+  call memcontainer_ensure_capacity
 
   ; [&V,&Vsrc,len]
   ; memcpy args: source, dest, size
@@ -190,11 +174,9 @@ label vector_concat
   swap
   call memcpy
 
+  ; [&V,&Vsrc,len]
   slide 1
-  swap
-  add 2
-  swap
-  store
+  call vector_truncate ; aka set length
 ret
 
 ; args &V offset length
@@ -234,52 +216,14 @@ label vector_splice
   pop
   ; [&V,offset,len,&Vspliced]
 
-  ; set the length of &Vspliced
-  copy 3
+  dup
+  copy 4
   call vector_get_length
-  copy 2
+  copy 3
   sub
-  copy 1
-  add 2
-  swap
-  store
+  call vector_truncate ; aka set length
 
   slide 3
 ret
 
-; args &V capacity
-label __vector_ensure_capacity
-  swap
-  dup
-  retrieve
-  copy 1
-  add 1
-  retrieve
-  ; [minCap, &V, &addr, cap]
-  copy 3
-  sub
-  jumpn __vector_ensure_capacity_move
-    slide 2
-    pop
-    ret
-  label __vector_ensure_capacity_move
-  ; [minCap, &V, &addr]
-  copy 2
-  dup
-  div 2
-  add
-  swap
-  copy 1
-  call realloc
-  ; [minCap, &V, cap, &addr]
-  copy 2
-  swap
-  store
-  swap
-  add 1
-  swap
-  store
-  pop
-ret
-
 label lib_vector_end

src/wsa/wsa.ts

@@ -1,11 +1,14 @@
-import lib_bitwise_extensions from "./lib/bitwise.extensions.wsa?raw" with { type: "text" };
 import lib_bitwise from "./lib/bitwise.wsa?raw" with { type: "text" };
+import lib_bitwise_extensions from "./lib/bitwise.extensions.wsa?raw" with { type: "text" };
 import lib_io from "./lib/io.wsa?raw" with { type: "text" };
 import lib_math from "./lib/math.wsa?raw" with { type: "text" };
+import lib_memcontainer from "./lib/memcontainer.wsa?raw" with { type: "text" };
 import lib_memory from "./lib/memory.wsa?raw" with { type: "text" };
 import lib_memory_stack from "./lib/memory_stack.wsa?raw" with { type: "text" };
 import lib_vector from "./lib/vector.wsa?raw" with { type: "text" };
 
+const libraries: Record<string, string> = { lib_bitwise_extensions, lib_bitwise, lib_io, lib_math, lib_memory, lib_memory_stack, lib_vector, lib_memcontainer };
+
 type Opcode =
   | { params: "none"; constr: () => string }
   | { params: "integer"; constr: (x: bigint) => string }
@@ -238,29 +241,13 @@ async function include(
   if (includedFiles.has(filename)) return "";
   includedFiles.add(filename);
 
-  if (filename === "io") {
-    return compile(stringToLineStream(lib_io), getIncludedStream);
-  }
-  if (filename === "memory") {
-    return compile(stringToLineStream(lib_memory), getIncludedStream);
-  }
-  if (filename === "memory_stack") {
-    return compile(stringToLineStream(lib_memory_stack), getIncludedStream);
-  }
-  if (filename === "bitwise") {
-    return compile(
-      stringToLineStream(
-        extensions ? lib_bitwise_extensions : lib_bitwise
-      ),
-      getIncludedStream
-    );
-  }
-  if (filename === "math") {
-    return compile(stringToLineStream(lib_math), getIncludedStream);
-  }
-  if (filename === "vector") {
-    return compile(stringToLineStream(lib_vector), getIncludedStream);
+  const libName = `lib_${filename}`;
+  if (libName in libraries) {
+    const content = extensions && (`${libName}_extensions` in libraries) ? libraries[`${filename}_extensions`] : libraries[libName]
+    return compile(stringToLineStream(content), getIncludedStream);
   }
+  console.log(libName, libraries);
+
   return compile(getIncludedStream(filename), getIncludedStream);
 }
 function ret() {

wsa-tests/heap.wsa

@@ -15,12 +15,5 @@ push 5
 retrieve
 outn
 
-push 100
-store 0
-push 123
-store 101
-retrieve +1
-outn
-
 ;EXPECTED
-;553123
+;553