Refact/runtime lib

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

src/lib/arch/zx48k/runtime/alloc.asm → src/lib/arch/zx48k/runtime/mem/alloc.asm

@@ -66,7 +66,7 @@
 ; They will be added automatically if needed.
 
 #include once <error.asm>
-#include once <heapinit.asm>
+#include once <mem/heapinit.asm>
 
 
 ; ---------------------------------------------------------------------

src/lib/arch/zxnext/runtime/calloc.asm → src/lib/arch/zx48k/runtime/mem/calloc.asm

@@ -9,7 +9,7 @@
 ;
 ; Please read the MIT license on the internet
 
-#include once <alloc.asm>
+#include once <mem/alloc.asm>
 
 
 ; ---------------------------------------------------------------------

src/lib/arch/zx48k/runtime/free.asm → src/lib/arch/zx48k/runtime/mem/free.asm

@@ -65,7 +65,7 @@
 ; An init directive is useful for initialization routines.
 ; They will be added automatically if needed.
 
-#include once <heapinit.asm>
+#include once <mem/heapinit.asm>
 
 ; ---------------------------------------------------------------------
 ; MEM_FREE

src/lib/arch/zxnext/runtime/realloc.asm → src/lib/arch/zx48k/runtime/mem/realloc.asm

@@ -67,8 +67,8 @@
 
 
 #include once <error.asm>
-#include once <alloc.asm>
-#include once <free.asm>
+#include once <mem/alloc.asm>
+#include once <mem/free.asm>
 
 
 ; ---------------------------------------------------------------------
@@ -158,4 +158,3 @@ __REALLOC_END:
     ENDP
 
     pop namespace
-

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

@@ -1,7 +1,7 @@
 #include once <print.asm>
 #include once <sposn.asm>
 #include once <attr.asm>
-#include once <free.asm>
+#include once <mem/free.asm>
 
 ; PRINT command routine
 ; Prints string pointed by HL
@@ -57,4 +57,3 @@ __PRINT_STR:
     ENDP
 
     pop namespace
-

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

@@ -25,7 +25,7 @@
 #include once <iloadf.asm>
 #include once <ftof16reg.asm>
 #include once <f16tofreg.asm>
-#include once <free.asm>
+#include once <mem/free.asm>
 
 #define _str 1
 #define _i8  2

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

@@ -4,7 +4,7 @@
 ; YYY and ZZZ are 16 bit on top of the stack.
 
 #include once <error.asm>
-#include once <free.asm>
+#include once <mem/free.asm>
 
     push namespace core
 

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

@@ -5,7 +5,7 @@
 ; DE = address of 2n string. It just copies DE into (HL)
 ; 	freeing (HL) previously.
 
-#include once <free.asm>
+#include once <mem/free.asm>
 
     push namespace core
 
@@ -40,4 +40,3 @@ __STORE_STR2:
     ret
 
     pop namespace
-

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

@@ -4,7 +4,7 @@
 ; Returns a pointer (in HL) to the memory heap
 ; containing the FP number string representation
 
-#include once <alloc.asm>
+#include once <mem/alloc.asm>
 #include once <stackf.asm>
 #include once <sysvars.asm>
 
@@ -78,4 +78,3 @@ STK_END EQU 5C65h
     ENDP
 
     pop namespace
-

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

@@ -1,4 +1,4 @@
-#include once <alloc.asm>
+#include once <mem/alloc.asm>
 #include once <strlen.asm>
 
     push namespace core
@@ -127,4 +127,3 @@ __STRCATEND:
     ENDP
 
     pop namespace
-

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

@@ -1,4 +1,4 @@
-#include once <realloc.asm>
+#include once <mem/realloc.asm>
 
 ; String library
 
@@ -97,4 +97,3 @@ __NOTHING_TO_COPY:
     ENDP
 
     pop namespace
-

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

@@ -1,6 +1,6 @@
 ; String library
 
-#include once <free.asm>
+#include once <mem/free.asm>
 #include once <strlen.asm>
 
     push namespace core

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

@@ -15,8 +15,8 @@
 ;
 
 #include once <strlen.asm>
-#include once <alloc.asm>
-#include once <free.asm>
+#include once <mem/alloc.asm>
+#include once <mem/free.asm>
 
     push namespace core
 
@@ -107,4 +107,3 @@ __FREE_ON_EXIT:
     ENDP
 
     pop namespace
-

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

@@ -7,7 +7,7 @@
 
 #include once <error.asm>
 #include once <sysvars.asm>
-#include once <free.asm>
+#include once <mem/free.asm>
 
     push namespace core
 

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

@@ -1,4 +1,4 @@
-#include once <free.asm>
+#include once <mem/free.asm>
 #include once <stackf.asm>
 #include once <error.asm>
 
@@ -118,4 +118,3 @@ __RET_ZERO:	; Returns 0 Floating point on error
     ENDP
 
     pop namespace
-

src/lib/arch/zx48k/stdlib/alloc.bas

@@ -230,9 +230,9 @@ end function
 
 #pragma pop(case_insensitive)
 
-#require "alloc.asm"
-#require "free.asm"
-#require "realloc.asm"
-#require "calloc.asm"
+#require "mem/alloc.asm"
+#require "mem/free.asm"
+#require "mem/realloc.asm"
+#require "mem/calloc.asm"
 
-#endif
+#endif

src/lib/arch/zx48k/stdlib/hex.bas

@@ -112,6 +112,6 @@ end function
 #pragma pop(case_insensitive)
 
 ' The following is required to allocate dynamic memory for strings
-#require "alloc.asm"
+#require "mem/alloc.asm"
 
 #endif

src/lib/arch/zx48k/stdlib/memcopy.bas

@@ -122,7 +122,7 @@ sub fastcall MemSet(dest as uinteger, value as ubyte, length as uinteger)
 end sub
 
 
-#require "memcopy.asm"
+#require "mem/memcopy.asm"
 
 #pragma pop(case_insensitive)
 

src/lib/arch/zx48k/stdlib/screen.bas

@@ -97,9 +97,9 @@ end function
 
 
 ' The following is required to allocate dynamic memory for strings
-#require "alloc.asm"
+#require "mem/alloc.asm"
 
 ' The following is required to manipulate the FP-CALC stack
 #require "stackf.asm"
 
-#endif
+#endif

src/lib/arch/zx48k/stdlib/spectranet.bas

@@ -427,7 +427,7 @@ End Function
 #undef ERR_NR
 
 #require "spectranet.inc"
-#require "free.asm"
+#require "mem/free.asm"
 
 #pragma pop(case_insensitive)
 #endif

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

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

src/lib/arch/zxnext/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/zxnext/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/zxnext/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/zxnext/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/zxnext/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/zxnext/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/zxnext/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

src/lib/arch/zxnext/runtime/alloc.asm → src/lib/arch/zxnext/runtime/mem/alloc.asm

@@ -66,7 +66,7 @@
 ; They will be added automatically if needed.
 
 #include once <error.asm>
-#include once <heapinit.asm>
+#include once <mem/heapinit.asm>
 
 
 ; ---------------------------------------------------------------------