(crt) Rename exit stack variables

bradstallion · Mar 12, 2024 · cb80d8b · cb80d8b
1 parent cd92276
commit cb80d8b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 21 deletions.
diff --git a/lib/crt/classic/crt_exit_atexit.inc b/lib/crt/classic/crt_exit_atexit.inc
@@ -3,7 +3,7 @@
 
     PUBLIC  __clib_exit_stack_size
 
-    ld      hl,(exitsp)
+    ld      hl,(__exit_atexit_funcs)
 IF __clib_exit_stack_size > 0
     ld      de, +(__clib_exit_stack_size * 2)
     add     hl,de

diff --git a/lib/crt/classic/crt_init_atexit.inc b/lib/crt/classic/crt_init_atexit.inc
@@ -1,6 +1,6 @@
 
     PUBLIC  __clib_exit_stack_size
-    EXTERN  exitsp
+    EXTERN  __exit_atexit_funcs
 
 IF __clib_exit_stack_size > 0
     ld      hl, -(__clib_exit_stack_size * 2)
@@ -11,16 +11,16 @@ IF __CPU_GBZ80__
     ld      hl,sp+0
     ld      d,h
     ld      e,l
-    ld      hl,exitsp
+    ld      hl,__exit_atexit_funcs
     ld      a,l
     ld      (hl+),a
     ld      a,h
     ld      (hl+),a
 ELIF __CPU_INTEL__
     ld      hl,0
     add     hl,sp
-    ld      (exitsp),hl
+    ld      (__exit_atexit_funcs),hl
 ELSE
-    ld      (exitsp),sp
+    ld      (__exit_atexit_funcs),sp
 ENDIF
 
diff --git a/lib/target/z88/classic/z88s5_crt0.asm b/lib/target/z88/classic/z88s5_crt0.asm
@@ -68,8 +68,6 @@ __restore_sp_onexit
 ; Install the error handler
 ;-----------
 doerrhan:
-    xor     a
-    ld      (exitcount),a
     ld      b,0
     ld      hl,errhand
     call_oz(os_erh)

diff --git a/lib/target/z88/classic/z88s_crt0.asm b/lib/target/z88/classic/z88s_crt0.asm
@@ -140,8 +140,6 @@ __restore_sp_onexit	ld	sp,0		;Restore stack to entry value
 ; Install the error handler
 ;-----------
 doerrhan:
-        xor     a
-        ld      (exitcount),a
         ld      b,0
         ld      hl,errhand
         call_oz(os_erh)

diff --git a/libsrc/stdlib/atexit.asm b/libsrc/stdlib/atexit.asm
@@ -19,7 +19,7 @@
     PUBLIC  _atexit_fastcall
 
     EXTERN  __clib_exit_stack_size
-    EXTERN  exitsp, exitcount
+    EXTERN  __exit_atexit_funcs, __exit_atexit_count
 
 
 atexit:
@@ -39,7 +39,7 @@ _atexit_fastcall:
 
     ex      de, hl                      ; de = function to register
 
-    ld      hl, exitcount
+    ld      hl, __exit_atexit_count
     ld      a, (hl)
     cp      __clib_exit_stack_size      ; can only hold 32 levels..
     ret     nc                          ; if full returns with hl!=0
@@ -49,12 +49,12 @@ _atexit_fastcall:
     ld      c, a
     ld      b, 0
 IF  __CPU_GBZ80__
-    ld      hl, exitsp
+    ld      hl, __exit_atexit_funcs
     ld      a, (hl+)
     ld      h, (hl)
     ld      l, a
 ELSE
-    ld      hl, (exitsp)
+    ld      hl, (__exit_atexit_funcs)
 ENDIF
     add     hl, bc
     ld      (hl), e                     ; write atexit function

diff --git a/libsrc/stdlib/exit.asm b/libsrc/stdlib/exit.asm
@@ -19,7 +19,7 @@
     PUBLIC  exit_fastcall
     PUBLIC  _exit_fastcall
 
-    EXTERN  __Exit, exitsp, exitcount
+    EXTERN  __Exit, __exit_atexit_funcs, __exit_atexit_count
 
     EXTERN  l_jphl
 
@@ -44,7 +44,7 @@ asm_exit:
 
     push    hl                          ; save exit value
 
-    ld      a, (exitcount)
+    ld      a, (__exit_atexit_count)
     or      a
     jr      z, end
 
@@ -53,12 +53,12 @@ asm_exit:
     ld      e, a
     ld      d, 0
 IF  __CPU_GBZ80__
-    ld      hl, exitsp
+    ld      hl, __exit_atexit_funcs
     ld      a, (hl+)
     ld      h, (hl)
     ld      l, a
 ELSE
-    ld      hl, (exitsp)                ; hl = & atexit stack
+    ld      hl, (__exit_atexit_funcs)                ; hl = & atexit stack
 ENDIF
     add     hl, de                      ; hl = & last function in exit stack + 2b
 

diff --git a/libsrc/stdlib/exit_vars.asm b/libsrc/stdlib/exit_vars.asm
@@ -2,8 +2,8 @@
 
 SECTION bss_clib
 
-PUBLIC  exitcount
-PUBLIC  exitsp
+PUBLIC  __exit_atexit_count
+PUBLIC  __exit_atexit_funcs
 
-exitcount:  defb    0
-exitsp:     defw    0
+__exit_atexit_count:  defb    0
+__exit_atexit_funcs:     defw    0