Merge pull request #997 from boriel-basic/refact/runtime_lib

Refact/runtime lib

Author: boriel

src/arch/z80/backend/common.py

@@ -13,7 +13,7 @@
 
 # List of modules (in alphabetical order) that, if included, should call MEM_INIT
 MEMINITS = {
-    "alloc.asm",
+    "mem/alloc.asm",
     "loadstr.asm",
     "storestr2.asm",
     "storestr.asm",

src/arch/z80/backend/runtime/core.py

@@ -195,7 +195,7 @@ class CoreLabels:
     CoreLabels.LTI16: "cmp/lti16.asm",
     CoreLabels.LTI8: "cmp/lti8.asm",
     CoreLabels.LTI32: "cmp/lti32.asm",
-    CoreLabels.MEM_FREE: "free.asm",
+    CoreLabels.MEM_FREE: "mem/free.asm",
     CoreLabels.MODF: "arith/modf.asm",
     CoreLabels.MODF16: "arith/modf16.asm",
     CoreLabels.MODI16: "arith/div16.asm",

src/lib/arch/zx48k/runtime/array/arrayalloc.asm

@@ -1,5 +1,5 @@
 
-#include once <calloc.asm>
+#include once <mem/calloc.asm>
 
 
 ; ---------------------------------------------------------------------

src/lib/arch/zx48k/runtime/array/arraystrfree.asm

@@ -2,7 +2,7 @@
 ; HL = Pointer to start of array in memory
 ; Top of the stack = Number of elements of the array
 
-#include once <free.asm>
+#include once <mem/free.asm>
 
     push namespace core
 

src/lib/arch/zx48k/runtime/asc.asm

@@ -1,5 +1,5 @@
 ; Returns the ascii code for the given str
-#include once <free.asm>
+#include once <mem/free.asm>
 
     push namespace core
 

src/lib/arch/zx48k/runtime/chr.asm

@@ -1,7 +1,7 @@
 ; CHR$(x, y, x) returns the string CHR$(x) + CHR$(y) + CHR$(z)
 ;
 
-#include once <alloc.asm>
+#include once <mem/alloc.asm>
 
     push namespace core
 
@@ -76,4 +76,3 @@ __CHR_END:
     ENDP
 
     pop namespace
-

src/lib/arch/zx48k/runtime/io/keyboard/inkey.asm

@@ -3,7 +3,7 @@
 ; containing the string.
 ; An empty string otherwise.
 
-#include once <alloc.asm>
+#include once <mem/alloc.asm>
 
     push namespace core
 

src/lib/arch/zx48k/runtime/letsubstr.asm

@@ -7,7 +7,7 @@
 ;					=> Not 0 if HL must be freed from memory on exit
 ; TOP -3 B$ address
 
-#include once <free.asm>
+#include once <mem/free.asm>
 
     push namespace core
 
@@ -155,4 +155,3 @@ __FREE_STR:
     ENDP
 
     pop namespace
-

src/lib/arch/zx48k/runtime/load.asm

@@ -1,4 +1,4 @@
-#include once <free.asm>
+#include once <mem/free.asm>
 
 #ifndef HIDE_LOAD_MSG
 # include once <print.asm>

src/lib/arch/zx48k/runtime/loadstr.asm

@@ -1,4 +1,4 @@
-#include once <alloc.asm>
+#include once <mem/alloc.asm>
 
 ; Loads a string (ptr) from HL
 ; and duplicates it on dynamic memory again