From 9dde73a14ba021a97a060a102c4307f3cfe0770f Mon Sep 17 00:00:00 2001
From: Rikard Nordgren <hrn@posteo.net>
Date: Sun, 20 Apr 2025 13:08:09 +0200
Subject: [PATCH] Add config option for transcendental BASIC functions

Also move all transcendental functions to a separate source directory
Turn off these functions for all configurations for now
---
 Makefile                                           | 1 +
 src/,,config_custom.s                              | 5 +++++
 src/,,config_cx16.s                                | 5 +++++
 src/,,config_generic_crt.s                         | 5 +++++
 src/,,config_mega65.s                              | 5 +++++
 src/,,config_testing_38K.s                         | 5 +++++
 src/,,config_testing_60K.s                         | 5 +++++
 src/,,config_ultimate64.s                          | 5 +++++
 src/,,config_ultimate64_crt.s                      | 5 +++++
 src/basic/{math => math_trans}/b9ea.interop        | 0
 src/basic/{math => math_trans}/b9ea.log_FAC1.s     | 5 +++++
 src/basic/{math => math_trans}/bf71.interop        | 0
 src/basic/{math => math_trans}/bf71.sqr_FAC1.s     | 6 ++++++
 src/basic/{math => math_trans}/bf78.interop        | 0
 src/basic/{math => math_trans}/bf78.pwr_FAC2_MEM.s | 6 ++++++
 src/basic/{math => math_trans}/e043.interop        | 0
 src/basic/{math => math_trans}/e043.poly1_FAC1.s   | 6 ++++++
 src/basic/{math => math_trans}/e059.interop        | 0
 src/basic/{math => math_trans}/e059.poly2_FAC1.s   | 6 ++++++
 src/basic/{math => math_trans}/e264.cos_FAC1.s     | 7 +++++++
 src/basic/{math => math_trans}/e264.interop        | 0
 src/basic/{math => math_trans}/e26b.interop        | 0
 src/basic/{math => math_trans}/e26b.sin_FAC1.s     | 5 +++++
 src/basic/{math => math_trans}/e2b4.interop        | 0
 src/basic/{math => math_trans}/e2b4.tan_FAC1.s     | 7 +++++++
 src/basic/{math => math_trans}/e30e.atn_FAC1.s     | 6 ++++++
 src/basic/{math => math_trans}/e30e.interop        | 0
 src/basic/{math => math_trans}/poly_atn.s          | 7 +++++++
 src/basic/{math => math_trans}/poly_exp.s          | 7 +++++++
 src/basic/{math => math_trans}/poly_log.s          | 7 +++++++
 src/basic/{math => math_trans}/poly_sin.s          | 6 ++++++
 strings/A390034C                                   | 3 +++
 strings/A6A9012CA9                                 | 3 +++
 strings/B0A90085                                   | 3 +++
 strings/E0A90020                                   | 3 +++
 35 files changed, 134 insertions(+)
 rename src/basic/{math => math_trans}/b9ea.interop (100%)
 rename src/basic/{math => math_trans}/b9ea.log_FAC1.s (97%)
 rename src/basic/{math => math_trans}/bf71.interop (100%)
 rename src/basic/{math => math_trans}/bf71.sqr_FAC1.s (91%)
 rename src/basic/{math => math_trans}/bf78.interop (100%)
 rename src/basic/{math => math_trans}/bf78.pwr_FAC2_MEM.s (92%)
 rename src/basic/{math => math_trans}/e043.interop (100%)
 rename src/basic/{math => math_trans}/e043.poly1_FAC1.s (95%)
 rename src/basic/{math => math_trans}/e059.interop (100%)
 rename src/basic/{math => math_trans}/e059.poly2_FAC1.s (97%)
 rename src/basic/{math => math_trans}/e264.cos_FAC1.s (91%)
 rename src/basic/{math => math_trans}/e264.interop (100%)
 rename src/basic/{math => math_trans}/e26b.interop (100%)
 rename src/basic/{math => math_trans}/e26b.sin_FAC1.s (96%)
 rename src/basic/{math => math_trans}/e2b4.interop (100%)
 rename src/basic/{math => math_trans}/e2b4.tan_FAC1.s (94%)
 rename src/basic/{math => math_trans}/e30e.atn_FAC1.s (96%)
 rename src/basic/{math => math_trans}/e30e.interop (100%)
 rename src/basic/{math => math_trans}/poly_atn.s (92%)
 rename src/basic/{math => math_trans}/poly_exp.s (90%)
 rename src/basic/{math => math_trans}/poly_log.s (87%)
 rename src/basic/{math => math_trans}/poly_sin.s (91%)
 create mode 100644 strings/A390034C
 create mode 100644 strings/A6A9012CA9
 create mode 100644 strings/B0A90085
 create mode 100644 strings/E0A90020

diff --git a/Makefile b/Makefile
index 3df903d9..a06a6849 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,7 @@ SRCDIR_BASIC   = $(SRCDIR_COMMON) \
                  src/basic/math \
                  src/basic/math_consts \
                  src/basic/math_mov \
+                 src/basic/math_trans \
                  src/basic/memory \
                  src/basic/print \
                  src/basic/rom_revision \
diff --git a/src/,,config_custom.s b/src/,,config_custom.s
index 6c33a923..a35a5866 100644
--- a/src/,,config_custom.s
+++ b/src/,,config_custom.s
@@ -114,6 +114,11 @@
 ;; #CONFIG# BCD_SAFE_INTERRUPTS        YES
 
 
+; --- BASIC features
+
+;; #CONFIG# TRANSCENDENTAL_FUNCTIONS   NO
+
+
 ; --- Eye candy
 
 ;; #CONFIG# COLORS_BRAND               NO
diff --git a/src/,,config_cx16.s b/src/,,config_cx16.s
index f5605fd9..b848b562 100644
--- a/src/,,config_cx16.s
+++ b/src/,,config_cx16.s
@@ -51,6 +51,11 @@
 ;; #CONFIG# BCD_SAFE_INTERRUPTS        YES
 
 
+; --- BASIC features
+
+;; #CONFIG# TRANSCENDENTAL_FUNCTIONS   NO
+
+
 ; --- Eye candy
 
 ;; #CONFIG# COLORS_BRAND               NO
diff --git a/src/,,config_generic_crt.s b/src/,,config_generic_crt.s
index 37dc7deb..c50faf6d 100644
--- a/src/,,config_generic_crt.s
+++ b/src/,,config_generic_crt.s
@@ -105,6 +105,11 @@
 ;; #CONFIG# BCD_SAFE_INTERRUPTS        YES
 
 
+; --- BASIC features
+
+;; #CONFIG# TRANSCENDENTAL_FUNCTIONS   NO
+
+
 ; --- Eye candy
 
 ;; #CONFIG# COLORS_BRAND               YES
diff --git a/src/,,config_mega65.s b/src/,,config_mega65.s
index 07bdd2ca..d9f34a9d 100644
--- a/src/,,config_mega65.s
+++ b/src/,,config_mega65.s
@@ -88,6 +88,11 @@
 ;; #CONFIG# BCD_SAFE_INTERRUPTS        YES
 
 
+; --- BASIC features
+
+;; #CONFIG# TRANSCENDENTAL_FUNCTIONS   NO
+
+
 ; --- Built-in DOS configuration
 
 ;; #CONFIG# UNIT_SDCARD                27
diff --git a/src/,,config_testing_38K.s b/src/,,config_testing_38K.s
index 3371fb6e..bf008a0d 100644
--- a/src/,,config_testing_38K.s
+++ b/src/,,config_testing_38K.s
@@ -103,6 +103,11 @@
 ;; #CONFIG# BCD_SAFE_INTERRUPTS        YES
 
 
+; --- BASIC features
+
+;; #CONFIG# TRANSCENDENTAL_FUNCTIONS   NO
+
+
 ; --- Eye candy
 
 ;; #CONFIG# COLORS_BRAND               NO
diff --git a/src/,,config_testing_60K.s b/src/,,config_testing_60K.s
index f2b60b78..73001456 100644
--- a/src/,,config_testing_60K.s
+++ b/src/,,config_testing_60K.s
@@ -103,6 +103,11 @@
 ;; #CONFIG# BCD_SAFE_INTERRUPTS        YES
 
 
+; --- BASIC features
+
+;; #CONFIG# TRANSCENDENTAL_FUNCTIONS   NO
+
+
 ; --- Eye candy
 
 ;; #CONFIG# COLORS_BRAND               NO
diff --git a/src/,,config_ultimate64.s b/src/,,config_ultimate64.s
index e292e4b0..fa223469 100644
--- a/src/,,config_ultimate64.s
+++ b/src/,,config_ultimate64.s
@@ -93,6 +93,11 @@
 ;; #CONFIG# BCD_SAFE_INTERRUPTS        YES
 
 
+; --- BASIC features
+
+;; #CONFIG# TRANSCENDENTAL_FUNCTIONS   NO
+
+
 ; --- Eye candy
 
 ;; #CONFIG# COLORS_BRAND               YES
diff --git a/src/,,config_ultimate64_crt.s b/src/,,config_ultimate64_crt.s
index 710d5077..062d3124 100644
--- a/src/,,config_ultimate64_crt.s
+++ b/src/,,config_ultimate64_crt.s
@@ -95,6 +95,11 @@
 ;; #CONFIG# BCD_SAFE_INTERRUPTS        YES
 
 
+; --- BASIC features
+
+;; #CONFIG# TRANSCENDENTAL_FUNCTIONS   NO
+
+
 ; --- Eye candy
 
 ;; #CONFIG# COLORS_BRAND               YES
diff --git a/src/basic/math/b9ea.interop b/src/basic/math_trans/b9ea.interop
similarity index 100%
rename from src/basic/math/b9ea.interop
rename to src/basic/math_trans/b9ea.interop
diff --git a/src/basic/math/b9ea.log_FAC1.s b/src/basic/math_trans/b9ea.log_FAC1.s
similarity index 97%
rename from src/basic/math/b9ea.log_FAC1.s
rename to src/basic/math_trans/b9ea.log_FAC1.s
index 9f2f609d..5c9f7e2e 100644
--- a/src/basic/math/b9ea.log_FAC1.s
+++ b/src/basic/math_trans/b9ea.log_FAC1.s
@@ -22,6 +22,8 @@
 ; 5. Multiply by LOG(2) giving LOG(X)
 
 
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
 
 log_FAC1:
     lda FAC1_exponent           ; Store exponent for later
@@ -62,3 +64,6 @@ log_FAC1:
     ldy #>const_LOG_2           ; FAC1 <- FAC1 * log(2.0)
     lda #<const_LOG_2
     jmp mul_MEM_FAC1
+
+
+}
diff --git a/src/basic/math/bf71.interop b/src/basic/math_trans/bf71.interop
similarity index 100%
rename from src/basic/math/bf71.interop
rename to src/basic/math_trans/bf71.interop
diff --git a/src/basic/math/bf71.sqr_FAC1.s b/src/basic/math_trans/bf71.sqr_FAC1.s
similarity index 91%
rename from src/basic/math/bf71.sqr_FAC1.s
rename to src/basic/math_trans/bf71.sqr_FAC1.s
index aa43da5e..a306389c 100644
--- a/src/basic/math/bf71.sqr_FAC1.s
+++ b/src/basic/math_trans/bf71.sqr_FAC1.s
@@ -15,8 +15,14 @@
 ; - https://codebase64.org/doku.php?id=base:kernal_floating_point_mathematics
 ;
 
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 sqr_FAC1:
 
 	jsr mov_FAC1_FAC2
 	
 	; FALLLTROUGH to sqr_FAC2
+
+
+}
diff --git a/src/basic/math/bf78.interop b/src/basic/math_trans/bf78.interop
similarity index 100%
rename from src/basic/math/bf78.interop
rename to src/basic/math_trans/bf78.interop
diff --git a/src/basic/math/bf78.pwr_FAC2_MEM.s b/src/basic/math_trans/bf78.pwr_FAC2_MEM.s
similarity index 92%
rename from src/basic/math/bf78.pwr_FAC2_MEM.s
rename to src/basic/math_trans/bf78.pwr_FAC2_MEM.s
index eebadd3a..26739c5d 100644
--- a/src/basic/math/bf78.pwr_FAC2_MEM.s
+++ b/src/basic/math_trans/bf78.pwr_FAC2_MEM.s
@@ -17,8 +17,14 @@
 ; - https://codebase64.org/doku.php?id=base:kernal_floating_point_mathematics
 ;
 
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 pwr_FAC2_MEM:
 
 	jsr mov_MEM_FAC1
 
 	; FALLTROUGH to pwr_FAC2_FAC1
+
+
+}
diff --git a/src/basic/math/e043.interop b/src/basic/math_trans/e043.interop
similarity index 100%
rename from src/basic/math/e043.interop
rename to src/basic/math_trans/e043.interop
diff --git a/src/basic/math/e043.poly1_FAC1.s b/src/basic/math_trans/e043.poly1_FAC1.s
similarity index 95%
rename from src/basic/math/e043.poly1_FAC1.s
rename to src/basic/math_trans/e043.poly1_FAC1.s
index 6272cbd0..f1b3f46c 100644
--- a/src/basic/math/e043.poly1_FAC1.s
+++ b/src/basic/math_trans/e043.poly1_FAC1.s
@@ -21,6 +21,9 @@
 ; - https://www.c64-wiki.com/wiki/POLY1
 
 
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 poly1_FAC1:
     jsr store_YA_in_ZP              ; Store YA in second INDEX pointer
     jsr mov_r_FAC1_TMP1             ; TMPF1 <- FAC1  (rounds)
@@ -30,3 +33,6 @@ poly1_FAC1:
     ldy #$00                        ; FAC1 <- FAC1 * TEMPF1
     lda #TEMPF1
     jmp mul_MEM_FAC1
+
+
+}
diff --git a/src/basic/math/e059.interop b/src/basic/math_trans/e059.interop
similarity index 100%
rename from src/basic/math/e059.interop
rename to src/basic/math_trans/e059.interop
diff --git a/src/basic/math/e059.poly2_FAC1.s b/src/basic/math_trans/e059.poly2_FAC1.s
similarity index 97%
rename from src/basic/math/e059.poly2_FAC1.s
rename to src/basic/math_trans/e059.poly2_FAC1.s
index 56b40bf9..f98081a4 100644
--- a/src/basic/math/e059.poly2_FAC1.s
+++ b/src/basic/math_trans/e059.poly2_FAC1.s
@@ -24,6 +24,9 @@
 ;
 
 
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 poly2_FAC1:
     jsr store_YA_in_ZP
 
@@ -67,3 +70,6 @@ store_YA_in_ZP:     ; Used also by poly1
     sty INDEX+3     ; Store YA in second INDEX pointer
     sta INDEX+2
     rts
+
+
+}
diff --git a/src/basic/math/e264.cos_FAC1.s b/src/basic/math_trans/e264.cos_FAC1.s
similarity index 91%
rename from src/basic/math/e264.cos_FAC1.s
rename to src/basic/math_trans/e264.cos_FAC1.s
index c81f32f7..cdb002cc 100644
--- a/src/basic/math/e264.cos_FAC1.s
+++ b/src/basic/math_trans/e264.cos_FAC1.s
@@ -13,9 +13,16 @@
 ; - https://codebase64.org/doku.php?id=base:kernal_floating_point_mathematics
 ;
 
+
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 COS:
     ldy #>const_HALF_PI
     lda #<const_HALF_PI
     jsr add_MEM_FAC1
     
     ; FALLTHROUGH to SIN
+
+
+}
diff --git a/src/basic/math/e264.interop b/src/basic/math_trans/e264.interop
similarity index 100%
rename from src/basic/math/e264.interop
rename to src/basic/math_trans/e264.interop
diff --git a/src/basic/math/e26b.interop b/src/basic/math_trans/e26b.interop
similarity index 100%
rename from src/basic/math/e26b.interop
rename to src/basic/math_trans/e26b.interop
diff --git a/src/basic/math/e26b.sin_FAC1.s b/src/basic/math_trans/e26b.sin_FAC1.s
similarity index 96%
rename from src/basic/math/e26b.sin_FAC1.s
rename to src/basic/math_trans/e26b.sin_FAC1.s
index 65c48f0f..23792f2c 100644
--- a/src/basic/math/e26b.sin_FAC1.s
+++ b/src/basic/math_trans/e26b.sin_FAC1.s
@@ -12,6 +12,8 @@
 ; - https://www.c64-wiki.com/wiki/SIN
 
 
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
 
 sin_FAC1:
 
@@ -53,3 +55,6 @@ sin_next:
     ldy #>poly_sin
     lda #<poly_sin
     jmp poly1_FAC1
+    
+
+}
diff --git a/src/basic/math/e2b4.interop b/src/basic/math_trans/e2b4.interop
similarity index 100%
rename from src/basic/math/e2b4.interop
rename to src/basic/math_trans/e2b4.interop
diff --git a/src/basic/math/e2b4.tan_FAC1.s b/src/basic/math_trans/e2b4.tan_FAC1.s
similarity index 94%
rename from src/basic/math/e2b4.tan_FAC1.s
rename to src/basic/math_trans/e2b4.tan_FAC1.s
index 7a9c6538..e2958993 100644
--- a/src/basic/math/e2b4.tan_FAC1.s
+++ b/src/basic/math_trans/e2b4.tan_FAC1.s
@@ -13,6 +13,10 @@
 
 ; tan(x) = sin(x) / cos(x)
 
+
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 tan_FAC1:
     jsr mov_r_FAC1_TMP1         ; TMP1 = x
     jsr sin_FAC1                ; FAC1 = sin(x)
@@ -25,3 +29,6 @@ tan_FAC1:
     ldy #0
     jsr mov_MEM_FAC2            ; FAC2 = sin(x)
     jmp div_FAC2_FAC1           ; FAC1 = tan(x)
+
+
+}
diff --git a/src/basic/math/e30e.atn_FAC1.s b/src/basic/math_trans/e30e.atn_FAC1.s
similarity index 96%
rename from src/basic/math/e30e.atn_FAC1.s
rename to src/basic/math_trans/e30e.atn_FAC1.s
index 9b4d27b1..08ebda58 100644
--- a/src/basic/math/e30e.atn_FAC1.s
+++ b/src/basic/math_trans/e30e.atn_FAC1.s
@@ -19,6 +19,9 @@
 ; 5. Adjust sign of result and offset with pi/2 if needed as per above
 
 
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 atn_FAC1:
     lda FAC1_sign               ; Save sign of FAC1 on the stack
     pha
@@ -55,3 +58,6 @@ atn_skipoffset:
     
 atn_out:
     rts
+
+
+}
diff --git a/src/basic/math/e30e.interop b/src/basic/math_trans/e30e.interop
similarity index 100%
rename from src/basic/math/e30e.interop
rename to src/basic/math_trans/e30e.interop
diff --git a/src/basic/math/poly_atn.s b/src/basic/math_trans/poly_atn.s
similarity index 92%
rename from src/basic/math/poly_atn.s
rename to src/basic/math_trans/poly_atn.s
index da8a2bbc..11e2e898 100644
--- a/src/basic/math/poly_atn.s
+++ b/src/basic/math_trans/poly_atn.s
@@ -5,6 +5,10 @@
 
 ; Polynomial for the atn function
 
+
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 poly_atn:
 
     !byte $0B                          ; series length - 1
@@ -21,3 +25,6 @@ poly_atn:
     +PUT_CONST_POLY_ATN_10
     +PUT_CONST_POLY_ATN_11
     +PUT_CONST_POLY_ATN_12
+
+
+}
diff --git a/src/basic/math/poly_exp.s b/src/basic/math_trans/poly_exp.s
similarity index 90%
rename from src/basic/math/poly_exp.s
rename to src/basic/math_trans/poly_exp.s
index 5ee89256..d585ff3c 100644
--- a/src/basic/math/poly_exp.s
+++ b/src/basic/math_trans/poly_exp.s
@@ -5,6 +5,10 @@
 
 ; Polynomial for the exponential function
 
+
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 poly_exp:
 
     !byte $07                          ; series length - 1
@@ -17,3 +21,6 @@ poly_exp:
     +PUT_CONST_POLY_EXP_6
     +PUT_CONST_POLY_EXP_7
     +PUT_CONST_POLY_EXP_8
+
+
+}
diff --git a/src/basic/math/poly_log.s b/src/basic/math_trans/poly_log.s
similarity index 87%
rename from src/basic/math/poly_log.s
rename to src/basic/math_trans/poly_log.s
index 494ab76a..3f770ac9 100644
--- a/src/basic/math/poly_log.s
+++ b/src/basic/math_trans/poly_log.s
@@ -5,6 +5,10 @@
 
 ; Polynomial for the logarithm function
 
+
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 poly_log:
 
     !byte $03                          ; series length - 1
@@ -13,3 +17,6 @@ poly_log:
     +PUT_CONST_POLY_LOG_2
     +PUT_CONST_POLY_LOG_3
     +PUT_CONST_POLY_LOG_4
+
+
+}
diff --git a/src/basic/math/poly_sin.s b/src/basic/math_trans/poly_sin.s
similarity index 91%
rename from src/basic/math/poly_sin.s
rename to src/basic/math_trans/poly_sin.s
index 1f37c2e6..4b4f466f 100644
--- a/src/basic/math/poly_sin.s
+++ b/src/basic/math_trans/poly_sin.s
@@ -6,6 +6,9 @@
 ; Polynomial for the sine function
 
 
+!ifdef CONFIG_TRANSCENDENTAL_FUNCTIONS {
+
+
 poly_sin:
 
 	!byte $05                          ; series length - 1
@@ -21,3 +24,6 @@ poly_sin:
 ; Constant 0.75 needed for sine calculation
 sin_three_quarters:
     !byte $80, $40, $00, $00, $00
+
+
+}
diff --git a/strings/A390034C b/strings/A390034C
new file mode 100644
index 00000000..af6c08ac
--- /dev/null
+++ b/strings/A390034C
@@ -0,0 +1,3 @@
+$A3 + BCC $03 + JMP fragment
+
+Fragments
diff --git a/strings/A6A9012CA9 b/strings/A6A9012CA9
new file mode 100644
index 00000000..80dddf3b
--- /dev/null
+++ b/strings/A6A9012CA9
@@ -0,0 +1,3 @@
+$A6 + LDA #$01 + BIT fragment
+
+Fragments
diff --git a/strings/B0A90085 b/strings/B0A90085
new file mode 100644
index 00000000..f05bab5d
--- /dev/null
+++ b/strings/B0A90085
@@ -0,0 +1,3 @@
+$B0 + LDA #$00 + STA fragment
+
+Fragments
diff --git a/strings/E0A90020 b/strings/E0A90020
new file mode 100644
index 00000000..fdb6d4e0
--- /dev/null
+++ b/strings/E0A90020
@@ -0,0 +1,3 @@
+$E0 + LDA #$00 + JSR fragment
+
+Fragments