From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Tue, 21 Nov 2000 10:51:53 +0000 (+0000)
Subject: Working on the condes feature
X-Git-Tag: V2.12.0~3068
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8d94ef3fea3bae3fdabf76c189fc6ca6ffbe9df1;p=cc65

Working on the condes feature


git-svn-id: svn://svn.cc65.org/cc65/trunk@464 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/libsrc/runtime/Makefile b/libsrc/runtime/Makefile
index f800c1d0b..3fb6dfca7 100644
--- a/libsrc/runtime/Makefile
+++ b/libsrc/runtime/Makefile
@@ -67,7 +67,6 @@ OBJS = 	add.o		\
 	incsp6.o	\
 	incsp7.o	\
 	incsp8.o	\
-	jmpvec.o	\
        	ladd.o		\
        	laddeq.o	\
        	laddeqsp.o	\
diff --git a/libsrc/runtime/condes.s b/libsrc/runtime/condes.s
index 099c3e4bf..e94097535 100644
--- a/libsrc/runtime/condes.s
+++ b/libsrc/runtime/condes.s
@@ -4,17 +4,62 @@
 ; CC65 runtime: Support for calling module constructors/destructors
 ;
 ; The condes routine must be called with the table address in a/x and the
-; number of vectors in the table in y. The current implementation limits
-; the table size to 128 bytes (64 vectors) but this shouldn't be problem
-; for now and may be changed later.
+; size of the table in y. The current implementation limits the table size
+; to 254 bytes (127 vectors) but this shouldn't be problem for now and may
+; be changed later.
 ;
+; libinit and libdone call condes with the predefined module constructor and
+; destructor tables, they must be called from the platform specific startup
+; code.
+;
+; The function does also export jmpvec as general purpose jump vector that
+; lies in the data segment so it's address may be patched at runtime.
+;
+
+       	.export	libinit, libdone, condes
+       	.export	jmpvec
+
+       	.import	__CONSTRUCTOR_TABLE__, __CONSTRUCTOR_COUNT__
+	.import	__DESTRUCTOR_TABLE__, __DESTRUCTOR_COUNT__
+
 
-       	.export	condes
-       	.import	jmpvec
 
 .code
 
-condes:	sta	getbyt+1
+; --------------------------------------------------------------------------
+; Initialize library modules
+
+.proc	libinit
+
+	lda    	#<__CONSTRUCTOR_TABLE__
+	ldx    	#>__CONSTRUCTOR_TABLE__
+	ldy    	#<(__CONSTRUCTOR_COUNT__*2)
+	bne    	condes
+	rts
+
+.endproc
+
+
+; --------------------------------------------------------------------------
+; Cleanup library modules
+
+.proc	libdone
+
+	lda	#<__DESTRUCTOR_TABLE__
+	ldx	#>__DESTRUCTOR_TABLE__
+	ldy	#<(__DESTRUCTOR_COUNT__*2)
+	bne	condes
+	rts
+
+.endproc
+
+
+; --------------------------------------------------------------------------
+; Generic table call handler
+
+.proc	condes
+
+	sta   	getbyt+1
 	stx	getbyt+2
 	sty	index
 
@@ -32,6 +77,9 @@ loop:	ldy	index
 
 done:	rts
 
+.endproc
+
+
 ; --------------------------------------------------------------------------
 ; Data. The getbyte routine is placed in the data segment cause it's patched
 ; at runtime.
@@ -45,3 +93,6 @@ index:	.byte	0
 getbyt:	lda	$FFFF,y
 	rts
 
+jmpvec:	jmp	$FFFF
+
+