Merge pull request #519 from boriel/feature/move_asm_lib_to_CORE_namespace

Feature/move asm lib to core namespace

Author: boriel

src/api/global_.py

@@ -117,6 +117,11 @@
 # ----------------------------------------------------------------------
 SIZE_TYPE = None
 
+# ----------------------------------------------------------------------
+# DATA Labels namespace
+# ----------------------------------------------------------------------
+DATAS_NAMESPACE = '.DATA'
+
 # ----------------------------------------------------------------------
 # Data Type used for string chars index. Must be an integral
 # ----------------------------------------------------------------------

src/api/utils.py

@@ -110,7 +110,7 @@ def current_data_label() -> str:
     """ Returns a data label to which all labels must point to, until
     a new DATA line is declared
     """
-    return '__DATA__{0}'.format(len(global_.DATAS))
+    return f'{global_.DATAS_NAMESPACE}.__DATA__{len(global_.DATAS)}'
 
 
 def flatten_list(x: Iterable[Any], iterables=(list, )) -> List[Any]:

src/arch/zx48k/backend/__init__.py

@@ -2232,8 +2232,8 @@ def emit_start():
 
     heap_init.append('; Defines USER DATA Length in bytes\n' +
                      f'{NAMESPACE}ZXBASIC_USER_DATA_LEN EQU {DATA_END_LABEL} - {DATA_LABEL}')
-    heap_init.append(f'{NAMESPACE}.__LABEL__.ZXBASIC_USER_DATA_LEN EQU {NAMESPACE}ZXBASIC_USER_DATA_LEN')
-    heap_init.append(f'{NAMESPACE}.__LABEL__.ZXBASIC_USER_DATA EQU {DATA_LABEL}')
+    heap_init.append(f'{NAMESPACE}__LABEL__.ZXBASIC_USER_DATA_LEN EQU {NAMESPACE}ZXBASIC_USER_DATA_LEN')
+    heap_init.append(f'{NAMESPACE}__LABEL__.ZXBASIC_USER_DATA EQU {DATA_LABEL}')
 
     output.append('%s:' % START_LABEL)
     if OPTIONS.headerless:

src/arch/zx48k/library-asm/read_restore.asm

@@ -68,7 +68,7 @@ read_restart:
     jr nz, cont
     ;; Signals out of data
 
-    ld hl, __DATA__0
+    ld hl, .DATA.__DATA__0
     ld (__DATA_ADDR), hl
     jr read_restart  ; Start again
 cont:
@@ -339,7 +339,7 @@ __09_decode_float:
     ret
 
 __DATA_ADDR:  ;; Stores current DATA ptr
-    dw __DATA__0
+    dw .DATA.__DATA__0
     ENDP
 
 #undef _str

src/arch/zx48k/library/SP/Fill.bas

@@ -9,6 +9,8 @@ REM Avoid double inclusion
 
 SUB FASTCALL SPFill(xCoord as uByte, yCoord as uByte, fillPatternAddress as uInteger)
 asm
+push namespace core
+
 PROC
 LOCAL SPPFill
 LOCAL SPPFill_start
@@ -27,12 +29,6 @@ ret
 ; SPFill
 ;
 
-#include once <SP/PixelUp.asm>
-#include once <SP/PixelDown.asm>
-#include once <SP/CharLeft.asm>
-#include once <SP/CharRight.asm>
-#include once <SP/GetScrnAddr.asm>
-
 ; Patterned Flood Fill
 ; Alvin Albrecht 2002
 ; Tweaked to work in ZX Basic by Britlion, 2012.
@@ -540,8 +536,16 @@ endapply:
 SPPFill_end:
 LD IX,(SPPFill_IXBuffer)
 ENDP
+
+pop namespace
 END ASM
 END SUB
 
+#require "SP/PixelUp.asm"
+#require "SP/PixelDown.asm"
+#require "SP/CharLeft.asm"
+#require "SP/CharRight.asm"
+#require "SP/GetScrnAddr.asm"
+
 #endif
 

src/arch/zx48k/library/alloc.bas

@@ -1,6 +1,6 @@
 ' ----------------------------------------------------------------
 ' This file is released under the MIT License
-' 
+'
 ' Copyleft (k) 2008
 ' by Jose Rodriguez-Rosa (a.k.a. Boriel) <http://www.boriel.com>
 ' ----------------------------------------------------------------
@@ -20,8 +20,8 @@ REM Avoid recursive / multiple inclusion
 ' Allocates the requested bytes in the heap (dynamic memory) and
 ' returns the address (16 bit, unsigned) of the new bloc. If
 ' no memory, NULL (0) is returned.
-' 
-' Parameters: 
+'
+' Parameters:
 '     n: number of bytes
 '
 ' Returns:
@@ -34,9 +34,11 @@ function FASTCALL allocate(byval n as uinteger) as uinteger
 	'     2.- Can return at any point with "ret"
 	'     3.- The result (16bit) must be returned in HL
 	asm
-	ld b, h
-	ld c, l
-	jp __MEM_ALLOC ; Since malloc is FASTCALL, we can return from there
+    push namespace core
+    ld b, h
+    ld c, l
+    jp __MEM_ALLOC ; Since malloc is FASTCALL, we can return from there
+    pop namespace
 	end asm
 end function
 
@@ -62,9 +64,11 @@ function FASTCALL callocate(byval n as uinteger) as uinteger
 	'     2.- Can return at any point with "ret"
 	'     3.- The result (16bit) must be returned in HL
 	asm
-	ld b, h
-	ld c, l
-	jp __MEM_CALLOC ; Since calloc is FASTCALL, we can return from there
+    push namespace core
+    ld b, h
+    ld c, l
+    jp __MEM_CALLOC ; Since calloc is FASTCALL, we can return from there
+    pop namespace
 	end asm
 end function
 
@@ -80,7 +84,9 @@ sub FASTCALL deallocate(byval addr as integer)
 	'     1.- The 16 bit 'n' parameter is received in hl
 	'     2.- Can return at any point with "ret"
 	asm
-	jp __MEM_FREE
+    push namespace core
+    jp __MEM_FREE
+    pop namespace
 	end asm
 end sub
 
@@ -91,8 +97,8 @@ end sub
 ' Reallocates the requested bytes in the heap (dynamic memory) and
 ' returns the address (16 bit, unsigned) of the new bloc. If
 ' no memory, NULL (0) is returned.
-' 
-' Parameters: 
+'
+' Parameters:
 '     n: number of bytes for the new size to reallocate
 '
 ' Returns:
@@ -102,17 +108,19 @@ end sub
 function FASTCALL reallocate(byval addr as uinteger, byval n as uinteger) as uinteger
 	' This is a FastCall function. This means:
 	'     1.- The 16 bit 'n' parameter is received in hl
-	'     2.- The 2nd parameter is in the stack (16 bit) 
+	'     2.- The 2nd parameter is in the stack (16 bit)
 	'     3.- Can return at any point with "ret"
 	'     4.- The result (16bit) must be returned in HL
 	asm
-	ex de, hl ; saves 'n' parameter in de
-	pop hl    ; return address
-	ex (sp), hl ; hl -> now contains the 2nd parameter (new length)
-	ld b, h
-	ld c, l
-	ex de, hl ; recovers hl (current pointer)
-	jp __REALLOC ; Since realloc is FASTCALL, we can return from there
+    push namespace core
+    ex de, hl ; saves 'n' parameter in de
+    pop hl    ; return address
+    ex (sp), hl ; hl -> now contains the 2nd parameter (new length)
+    ld b, h
+    ld c, l
+    ex de, hl ; recovers hl (current pointer)
+    jp __REALLOC ; Since realloc is FASTCALL, we can return from there
+    pop namespace
 	end asm
 end function
 
@@ -125,6 +133,7 @@ end function
 ' ----------------------------------------------------------------
 function FASTCALL memavail as uInteger
     asm
+    push namespace core
     PROC
 
     LOCAL LOOP
@@ -143,10 +152,10 @@ LOOP:
     ld a, (hl)
     inc hl
     ld h, (hl)
-    ld l, a 
+    ld l, a
 
     ; DE += BC => Accum += Block size
-    ex de, hl 
+    ex de, hl
     add hl, bc
     ex de, hl
 
@@ -156,8 +165,9 @@ LOOP:
     jr nz, LOOP
 
     ex de, hl
-   
-    ENDP 
+
+    ENDP
+    pop namespace
     end asm
 end function
 
@@ -169,6 +179,7 @@ end function
 ' ----------------------------------------------------------------
 function FASTCALL maxavail as uInteger
     asm
+    push namespace core
     PROC
 
     LOCAL LOOP, CONT
@@ -187,19 +198,19 @@ LOOP:
     ld a, (hl)
     inc hl
     ld h, (hl)
-    ld l, a 
+    ld l, a
 
     ; Test if DE >= BC
     ; DE -= BC => Accum -= Block size
-    ex de, hl 
+    ex de, hl
     or a
     sbc hl, bc  ; set C if HL < BC
     add hl, bc  ; Restores current value
     ex de, hl
 
     ; if not C skip this step
     jr nc, CONT
-    ; DE < BC => SET DE = BC 
+    ; DE < BC => SET DE = BC
     ld d, b
     ld e, c
 
@@ -210,8 +221,9 @@ CONT:
     jr nz, LOOP
 
     ex de, hl
-   
-    ENDP 
+
+    ENDP
+    pop namespace
     end asm
 end function
 
@@ -223,5 +235,4 @@ end function
 #require "realloc.asm"
 #require "calloc.asm"
 
-#endif
-
+#endif

src/arch/zx48k/library/attr.bas

@@ -1,6 +1,6 @@
 ' ----------------------------------------------------------------
 ' This file is released under the MIT License
-' 
+'
 ' Copyleft (k) 2008
 ' by Jose Rodriguez-Rosa (a.k.a. Boriel) <http://www.boriel.com>
 ' ----------------------------------------------------------------
@@ -16,8 +16,8 @@ REM Avoid recursive / multiple inclusion
 
 ' ----------------------------------------------------------------
 ' function ATTR
-' 
-' Parameters: 
+'
+' Parameters:
 '     row: screen row
 '     col: screen column
 '
@@ -26,6 +26,7 @@ REM Avoid recursive / multiple inclusion
 ' ----------------------------------------------------------------
 function attr(byval row as ubyte, byval col as ubyte) as ubyte
     asm
+    push namespace core
 
     PROC
     LOCAL __ATTR_END
@@ -41,8 +42,9 @@ function attr(byval row as ubyte, byval col as ubyte) as ubyte
     ld a, (hl)	; byte values are returned in accumulator
 
 __ATTR_END:
-    ENDP 
+    ENDP
 
+    pop namespace
     end asm
 
 end function
@@ -51,8 +53,8 @@ end function
 
 ' ----------------------------------------------------------------
 ' sub SETATTR
-' 
-' Parameters: 
+'
+' Parameters:
 '     row: screen row
 '     col: screen column
 '	  color: 8bit color attribute
@@ -62,6 +64,7 @@ end function
 ' ----------------------------------------------------------------
 sub setattr(byval row as ubyte, byval col as ubyte, byval value as ubyte)
     asm
+    push namespace core
 
     PROC
     LOCAL __ATTR_END
@@ -78,30 +81,33 @@ sub setattr(byval row as ubyte, byval col as ubyte, byval value as ubyte)
     ld (hl), a	; "POKE" attr address, color value)
 
 __ATTR_END:
-    ENDP 
+    ENDP
 
+    pop namespace
     end asm
 
 end sub
 
 
 ' ----------------------------------------------------------------
 ' function fastcall ATTRADDR
-' 
-' Parameters: 
+'
+' Parameters:
 '     row: screen row
 '     col: screen column
 '
 ' Action: Gets the attribute address of screen(row, column)
 ' ----------------------------------------------------------------
 function fastcall attraddr(byval row as ubyte, byval col as ubyte) as uinteger
-    asm   
-                   ; a = row
+    asm
+    push namespace core
+    ; a = row
     pop hl         ; ret address
     ex (sp), hl    ; Callee => H now has the col
     ld d, a        ; row
     ld e, h
     jp __ATTR_ADDR ; Return directly from there
+    pop namespace
     end asm
 end function
 
@@ -115,5 +121,4 @@ end function
 ' The following is required, because it defines the __IN_SCREEN subroutine.
 #require "in_screen.asm"
 
-#endif
-
+#endif

src/arch/zx48k/library/basic.bas

@@ -47,6 +47,7 @@ REM Avoid recursive / multiple inclusion
 
 Function fastcall EvalBASIC(ByVal basic as String) as Uinteger
     ASM
+    push namespace core
     PROC
 
     LOCAL E_LINE
@@ -137,6 +138,7 @@ Function fastcall EvalBASIC(ByVal basic as String) as Uinteger
     ld (CH_ADD),hl     ;
 
     ENDP
+    pop namespace
     END ASM
 End Function