diff --git a/Makefile b/Makefile index 7dcd2041..4236d9ce 100644 --- a/Makefile +++ b/Makefile @@ -20,8 +20,9 @@ SRCDIR_BASIC = $(SRCDIR_COMMON) \ src/basic/basic_functions \ src/basic/board_m65 \ src/basic/board_x16 \ - src/basic/editor \ - src/basic/engine \ + src/basic/engine_editor \ + src/basic/engine_runtime \ + src/basic/engine_variables \ src/basic/init \ src/basic/math \ src/basic/math_consts \ diff --git a/src/aliases/,aliases_cpu.s b/src/aliases/,aliases_cpu.s index d0f29fad..3cf72b6a 100644 --- a/src/aliases/,aliases_cpu.s +++ b/src/aliases/,aliases_cpu.s @@ -425,3 +425,17 @@ __l: __l: #endif } + + +// +// Near jump, on some CPUs can be substituted with shorter instruction +// + +.pseudocommand jmp_8 dst +{ +#if HAS_OPCODES_65C02 + bra dst +#else + jmp dst +#endif +} diff --git a/src/basic/basic_commands/cmd__jumptable.s b/src/basic/basic_commands/cmd__jumptable.s index 0a677b14..a23533a4 100644 --- a/src/basic/basic_commands/cmd__jumptable.s +++ b/src/basic/basic_commands/cmd__jumptable.s @@ -19,7 +19,7 @@ cmd_input, cmd_dim, cmd_read, - cmd_let, + assign_variable, // cmd_let cmd_goto, cmd_run, cmd_if, diff --git a/src/basic/basic_operators/oper_add.s b/src/basic/basic_operators/oper_add.s index 1118acbf..52124a25 100644 --- a/src/basic/basic_operators/oper_add.s +++ b/src/basic/basic_operators/oper_add.s @@ -36,13 +36,18 @@ oper_add_strings: pla sta __FAC2+0 - beq oper_add_strings_end // if string 2 is empty, we have nothing to do + + // If string 2 is empty, release it and quit + + beq oper_add_strings_end // If string 1 is empty, just copy the metadata lda __FAC1+0 bne !+ + jsr tmpstr_free_FAC1 + lda __FAC2+0 sta __FAC1+0 lda __FAC2+1 @@ -88,7 +93,7 @@ oper_add_strings: // Increase INDEX pointer by the size of the 1st string tya - jsr varstr_INDEX_up_A + jsr helper_INDEX_up_A // Copy data from the second string @@ -104,7 +109,7 @@ oper_add_strings: #elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K - jsr helper_add_concat + jsr helper_strconcat #else // CONFIG_MEMORY_MODEL_38K @@ -121,7 +126,7 @@ oper_add_strings: // Increase INDEX pointer by the size of the 1st string tya - jsr varstr_INDEX_up_A + jsr helper_INDEX_up_A // Copy data from the second string @@ -135,11 +140,9 @@ oper_add_strings: #endif - // Free old strings - if they are temporary + // Free old FAC1 string - if it was temporary - // XXX - // XXX - // XXX + jsr tmpstr_free_FAC1 // Copy the descriptor to __FAC1 @@ -150,6 +153,9 @@ oper_add_strings: dey bpl !- + // FALLTROUGH + oper_add_strings_end: + jsr tmpstr_free_FAC2 jmp FRMEVL_continue diff --git a/src/basic/engine/tmpstr_free_all.s b/src/basic/engine/tmpstr_free_all.s deleted file mode 100644 index 5746080b..00000000 --- a/src/basic/engine/tmpstr_free_all.s +++ /dev/null @@ -1,10 +0,0 @@ -// #LAYOUT# STD * #TAKE -// #LAYOUT# * BASIC_0 #TAKE -// #LAYOUT# * * #IGNORE - - -tmpstr_free_all: - - // XXX implement this - - rts diff --git a/src/basic/editor/a533.interop b/src/basic/engine_editor/a533.interop similarity index 100% rename from src/basic/editor/a533.interop rename to src/basic/engine_editor/a533.interop diff --git a/src/basic/editor/a533.linkprg.s b/src/basic/engine_editor/a533.linkprg.s similarity index 100% rename from src/basic/editor/a533.linkprg.s rename to src/basic/engine_editor/a533.linkprg.s diff --git a/src/basic/editor/delete_line.s b/src/basic/engine_editor/delete_line.s similarity index 100% rename from src/basic/editor/delete_line.s rename to src/basic/engine_editor/delete_line.s diff --git a/src/basic/editor/find_line.s b/src/basic/engine_editor/find_line.s similarity index 100% rename from src/basic/editor/find_line.s rename to src/basic/engine_editor/find_line.s diff --git a/src/basic/editor/insert_line.s b/src/basic/engine_editor/insert_line.s similarity index 100% rename from src/basic/editor/insert_line.s rename to src/basic/engine_editor/insert_line.s diff --git a/src/basic/editor/shell.s b/src/basic/engine_editor/shell.s similarity index 100% rename from src/basic/editor/shell.s rename to src/basic/engine_editor/shell.s diff --git a/src/basic/editor/shift_txt_down.s b/src/basic/engine_editor/shift_txt_down.s similarity index 100% rename from src/basic/editor/shift_txt_down.s rename to src/basic/engine_editor/shift_txt_down.s diff --git a/src/basic/editor/shift_txt_up.s b/src/basic/engine_editor/shift_txt_up.s similarity index 100% rename from src/basic/editor/shift_txt_up.s rename to src/basic/engine_editor/shift_txt_up.s diff --git a/src/basic/editor/tk_cut_away.s b/src/basic/engine_editor/tk_cut_away.s similarity index 100% rename from src/basic/editor/tk_cut_away.s rename to src/basic/engine_editor/tk_cut_away.s diff --git a/src/basic/editor/tk_pack.s b/src/basic/engine_editor/tk_pack.s similarity index 100% rename from src/basic/editor/tk_pack.s rename to src/basic/engine_editor/tk_pack.s diff --git a/src/basic/editor/tk_search.s b/src/basic/engine_editor/tk_search.s similarity index 100% rename from src/basic/editor/tk_search.s rename to src/basic/engine_editor/tk_search.s diff --git a/src/basic/editor/tk_shorten.s b/src/basic/engine_editor/tk_shorten.s similarity index 100% rename from src/basic/editor/tk_shorten.s rename to src/basic/engine_editor/tk_shorten.s diff --git a/src/basic/editor/tokenise_line.s b/src/basic/engine_editor/tokenise_line.s similarity index 100% rename from src/basic/editor/tokenise_line.s rename to src/basic/engine_editor/tokenise_line.s diff --git a/src/basic/editor/update_vartab_do_clr.s b/src/basic/engine_editor/update_vartab_do_clr.s similarity index 100% rename from src/basic/editor/update_vartab_do_clr.s rename to src/basic/engine_editor/update_vartab_do_clr.s diff --git a/src/basic/engine/ad9e.frmevl.s b/src/basic/engine_runtime/ad9e.frmevl.s similarity index 100% rename from src/basic/engine/ad9e.frmevl.s rename to src/basic/engine_runtime/ad9e.frmevl.s diff --git a/src/basic/engine/ad9e.interop b/src/basic/engine_runtime/ad9e.interop similarity index 100% rename from src/basic/engine/ad9e.interop rename to src/basic/engine_runtime/ad9e.interop diff --git a/src/basic/engine/convert_PETSCII_to_digit.s b/src/basic/engine_runtime/convert_PETSCII_to_digit.s similarity index 100% rename from src/basic/engine/convert_PETSCII_to_digit.s rename to src/basic/engine_runtime/convert_PETSCII_to_digit.s diff --git a/src/basic/engine/do_error.s b/src/basic/engine_runtime/do_error.s similarity index 100% rename from src/basic/engine/do_error.s rename to src/basic/engine_runtime/do_error.s diff --git a/src/basic/engine/do_new_clr_restore.s b/src/basic/engine_runtime/do_new_clr_restore.s similarity index 100% rename from src/basic/engine/do_new_clr_restore.s rename to src/basic/engine_runtime/do_new_clr_restore.s diff --git a/src/basic/engine/end_of_statement.s b/src/basic/engine_runtime/end_of_statement.s similarity index 100% rename from src/basic/engine/end_of_statement.s rename to src/basic/engine_runtime/end_of_statement.s diff --git a/src/basic/engine/execute_line_statements.s b/src/basic/engine_runtime/execute_line_statements.s similarity index 99% rename from src/basic/engine/execute_line_statements.s rename to src/basic/engine_runtime/execute_line_statements.s index eb1cf0ad..40ad1821 100644 --- a/src/basic/engine/execute_line_statements.s +++ b/src/basic/engine_runtime/execute_line_statements.s @@ -250,4 +250,4 @@ execute_statements_var_assign: #else dew TXTPTR #endif - jmp cmd_let + jmp assign_variable diff --git a/src/basic/engine/fetch_line_number.s b/src/basic/engine_runtime/fetch_line_number.s similarity index 100% rename from src/basic/engine/fetch_line_number.s rename to src/basic/engine_runtime/fetch_line_number.s diff --git a/src/basic/engine/fetch_operator.s b/src/basic/engine_runtime/fetch_operator.s similarity index 100% rename from src/basic/engine/fetch_operator.s rename to src/basic/engine_runtime/fetch_operator.s diff --git a/src/basic/engine/fetch_uint16.s b/src/basic/engine_runtime/fetch_uint16.s similarity index 100% rename from src/basic/engine/fetch_uint16.s rename to src/basic/engine_runtime/fetch_uint16.s diff --git a/src/basic/engine/fetch_uint8.s b/src/basic/engine_runtime/fetch_uint8.s similarity index 100% rename from src/basic/engine/fetch_uint8.s rename to src/basic/engine_runtime/fetch_uint8.s diff --git a/src/basic/engine/follow_link_to_next_line.s b/src/basic/engine_runtime/follow_link_to_next_line.s similarity index 100% rename from src/basic/engine/follow_link_to_next_line.s rename to src/basic/engine_runtime/follow_link_to_next_line.s diff --git a/src/basic/engine/helper_frmevl_strdesccpy_46K_50K.s b/src/basic/engine_runtime/helper_frmevl_strdesccpy_46K_50K.s similarity index 100% rename from src/basic/engine/helper_frmevl_strdesccpy_46K_50K.s rename to src/basic/engine_runtime/helper_frmevl_strdesccpy_46K_50K.s diff --git a/src/basic/engine/init_oldtxt.s b/src/basic/engine_runtime/init_oldtxt.s similarity index 100% rename from src/basic/engine/init_oldtxt.s rename to src/basic/engine_runtime/init_oldtxt.s diff --git a/src/basic/engine/injest_assign.s b/src/basic/engine_runtime/injest_assign.s similarity index 100% rename from src/basic/engine/injest_assign.s rename to src/basic/engine_runtime/injest_assign.s diff --git a/src/basic/engine/injest_comma.s b/src/basic/engine_runtime/injest_comma.s similarity index 100% rename from src/basic/engine/injest_comma.s rename to src/basic/engine_runtime/injest_comma.s diff --git a/src/basic/engine/is_alphanumeric.s b/src/basic/engine_runtime/is_alphanumeric.s similarity index 100% rename from src/basic/engine/is_alphanumeric.s rename to src/basic/engine_runtime/is_alphanumeric.s diff --git a/src/basic/engine/is_end_of_statement.s b/src/basic/engine_runtime/is_end_of_statement.s similarity index 100% rename from src/basic/engine/is_end_of_statement.s rename to src/basic/engine_runtime/is_end_of_statement.s diff --git a/src/basic/engine/prepare_direct_execution.s b/src/basic/engine_runtime/prepare_direct_execution.s similarity index 100% rename from src/basic/engine/prepare_direct_execution.s rename to src/basic/engine_runtime/prepare_direct_execution.s diff --git a/src/basic/engine/select_device.s b/src/basic/engine_runtime/select_device.s similarity index 100% rename from src/basic/engine/select_device.s rename to src/basic/engine_runtime/select_device.s diff --git a/src/basic/engine/unconsume_character.s b/src/basic/engine_runtime/unconsume_character.s similarity index 100% rename from src/basic/engine/unconsume_character.s rename to src/basic/engine_runtime/unconsume_character.s diff --git a/src/basic/basic_commands/cmd_let.s b/src/basic/engine_variables/assign_variable.s similarity index 82% rename from src/basic/basic_commands/cmd_let.s rename to src/basic/engine_variables/assign_variable.s index 2a03c68a..d9e24960 100644 --- a/src/basic/basic_commands/cmd_let.s +++ b/src/basic/engine_variables/assign_variable.s @@ -3,8 +3,7 @@ // #LAYOUT# * * #IGNORE - -cmd_let: +assign_variable: // Fetch variable name, should be followed by assign operator @@ -62,14 +61,14 @@ cmd_let: // Determine what to assign pla - bmi cmd_let_assign_string - beq cmd_let_assign_float + bmi assign_string + beq assign_float // FALLTROUGH // XXX integer and float probably have much in common -cmd_let_assign_integer: +assign_integer: lda VALTYP bmi_16 do_TYPE_MISMATCH_error @@ -97,7 +96,7 @@ cmd_let_assign_integer: jmp do_NOT_IMPLEMENTED_error -cmd_let_assign_float: +assign_float: lda VALTYP bmi_16 do_TYPE_MISMATCH_error @@ -125,7 +124,7 @@ cmd_let_assign_float: jmp do_NOT_IMPLEMENTED_error -cmd_let_assign_string: +assign_string: // Check if value type matches @@ -134,12 +133,12 @@ cmd_let_assign_string: // Copy the string descriptor to DSCPNT - jsr helper_let_strdesccpy + jsr helper_strdesccpy // First special case - check if the new string has size 0 lda __FAC1+0 - bne cmd_let_assign_string_not_empty + bne assign_string_not_empty // Yes, it is empty - free the old one @@ -159,41 +158,41 @@ cmd_let_assign_string: rts -cmd_let_assign_string_not_empty: +assign_string_not_empty: // Check if the source and destination strings are the same lda DSCPNT+1 cmp __FAC1+1 - bne cmd_let_assign_string_not_same + bne assign_string_not_same iny lda DSCPNT+2 cmp __FAC1+2 - bne cmd_let_assign_string_not_same + bne assign_string_not_same // If we are here, than both source and destination strings are the same - nothing more to be done rts -cmd_let_assign_string_not_same: +assign_string_not_same: // Strings are not the same - check if the new one is located within the text area, between TXTTAB and VARTAB lda VARTAB+1 cmp __FAC1+2 - bcc cmd_let_assign_string_not_text_area + bcc assign_string_not_text_area bne !+ lda VARTAB+0 cmp __FAC1+1 - bcc cmd_let_assign_string_not_text_area + bcc assign_string_not_text_area !: lda __FAC1+2 cmp TXTTAB+1 - bcc cmd_let_assign_string_not_text_area + bcc assign_string_not_text_area bne !+ lda __FAC1+1 cmp TXTTAB+0 - bcc cmd_let_assign_string_not_text_area + bcc assign_string_not_text_area !: // String is located within text area - great, just copy the descriptor @@ -227,7 +226,7 @@ cmd_let_assign_string_not_same: rts -cmd_let_assign_string_not_text_area: +assign_string_not_text_area: // Check if the new string is a temporary one - if so, reuse alocation @@ -235,12 +234,12 @@ cmd_let_assign_string_not_text_area: // Check if the old string belongs to the string area (is above FRETOP) - jsr varstr_cmp_fretop - bcc cmd_let_assign_string_no_optimizations + jsr helper_cmp_fretop + bcc assign_string_no_optimizations // FALLTROUGH -cmd_let_assign_string_try_reuse: +assign_string_try_reuse: // Check if we can reuse old string memory @@ -249,9 +248,9 @@ cmd_let_assign_string_try_reuse: // If size of both string equals - simply reuse it - beq_16 helper_let_strvarcpy + beq_16 helper_strvarcpy -cmd_let_assign_string_try_reuse_unsuccesful: +assign_string_try_reuse_unsuccesful: // No special case optimization is possible - but first get rid of the old string @@ -259,7 +258,7 @@ cmd_let_assign_string_try_reuse_unsuccesful: // FALLTROUGH -cmd_let_assign_string_no_optimizations: +assign_string_no_optimizations: // Allocate memory for the new string @@ -281,4 +280,4 @@ cmd_let_assign_string_no_optimizations: // Copy the string and quit - jmp helper_let_strvarcpy + jmp helper_strvarcpy diff --git a/src/basic/engine/fetch_variable.s b/src/basic/engine_variables/fetch_variable.s similarity index 100% rename from src/basic/engine/fetch_variable.s rename to src/basic/engine_variables/fetch_variable.s diff --git a/src/basic/engine/fetch_variable_ST.s b/src/basic/engine_variables/fetch_variable_ST.s similarity index 100% rename from src/basic/engine/fetch_variable_ST.s rename to src/basic/engine_variables/fetch_variable_ST.s diff --git a/src/basic/engine/fetch_variable_TI.s b/src/basic/engine_variables/fetch_variable_TI.s similarity index 100% rename from src/basic/engine/fetch_variable_TI.s rename to src/basic/engine_variables/fetch_variable_TI.s diff --git a/src/basic/engine/fetch_variable_TI_string.s b/src/basic/engine_variables/fetch_variable_TI_string.s similarity index 98% rename from src/basic/engine/fetch_variable_TI_string.s rename to src/basic/engine_variables/fetch_variable_TI_string.s index 12971013..753477b9 100644 --- a/src/basic/engine/fetch_variable_TI_string.s +++ b/src/basic/engine_variables/fetch_variable_TI_string.s @@ -11,7 +11,7 @@ fetch_variable_TI_string: lda #$06 jsr tmpstr_alloc - jsr helper_let_strdesccpy + jsr helper_strdesccpy // Fetch the time in a safe way, store it in temporary area diff --git a/src/basic/engine/varstr_free_cmp_fretop.s b/src/basic/engine_variables/helper_cmp_fretop.s similarity index 95% rename from src/basic/engine/varstr_free_cmp_fretop.s rename to src/basic/engine_variables/helper_cmp_fretop.s index d11540bb..2249d8c2 100644 --- a/src/basic/engine/varstr_free_cmp_fretop.s +++ b/src/basic/engine_variables/helper_cmp_fretop.s @@ -10,7 +10,7 @@ // - Carry flag set - this string belongs to the string area -varstr_cmp_fretop: +helper_cmp_fretop: lda DSCPNT+2 cmp FRETOP+1 diff --git a/src/basic/engine/varstr_alloc_fretop.s b/src/basic/engine_variables/helper_fretop.s similarity index 66% rename from src/basic/engine/varstr_alloc_fretop.s rename to src/basic/engine_variables/helper_fretop.s index b108e471..5e13331e 100644 --- a/src/basic/engine/varstr_alloc_fretop.s +++ b/src/basic/engine_variables/helper_fretop.s @@ -3,10 +3,10 @@ // #LAYOUT# * * #IGNORE // -// Helper routines for 'varstr_alloc' +// Helper routines for FRETOP handling // -varstr_FRETOP_down_A: // .A - bytes to lower FRETOP, uses DSCPNT+0 +helper_FRETOP_down_A: // .A - bytes to lower FRETOP, uses DSCPNT+0 sta DSCPNT+0 @@ -19,7 +19,7 @@ varstr_FRETOP_down_A: // .A - bytes to lower FRETOP, uses DSCPN !: // FALLTROUGH -varstr_FRETOP_check: // check if FRETOP > STREND, Carry set if not +helper_FRETOP_check: // check if FRETOP > STREND, Carry set if not lda STREND+1 cmp FRETOP+1 diff --git a/src/basic/engine/varstr_free_fretop.s b/src/basic/engine_variables/helper_fretop_up.s similarity index 65% rename from src/basic/engine/varstr_free_fretop.s rename to src/basic/engine_variables/helper_fretop_up.s index 7cf7d941..de5ee2b2 100644 --- a/src/basic/engine/varstr_free_fretop.s +++ b/src/basic/engine_variables/helper_fretop_up.s @@ -3,11 +3,11 @@ // #LAYOUT# * * #IGNORE // -// Helper routines for 'varstr_free' +// Helper routine for FRETOP handling // -varstr_FRETOP_up: // DSCPNT+0 - bytes to increment FRETO +helper_FRETOP_up: // DSCPNT+0 - bytes to increment FRETO clc lda FRETOP+0 diff --git a/src/basic/engine_variables/helper_index_up_a_38K_60K.s b/src/basic/engine_variables/helper_index_up_a_38K_60K.s new file mode 100644 index 00000000..5e318f25 --- /dev/null +++ b/src/basic/engine_variables/helper_index_up_a_38K_60K.s @@ -0,0 +1,24 @@ +// #LAYOUT# STD * #TAKE +// #LAYOUT# * BASIC_0 #TAKE +// #LAYOUT# * * #IGNORE + +// +// Helper routine, used by garbage collector and string concatenation +// + +#if CONFIG_MEMORY_MODEL_38K || CONFIG_MEMORY_MODEL_60K + +helper_INDEX_up_A: // .A - bytes to increase TXTPTR, uses DSCPNT+0 + + sta DSCPNT+0 + + clc + lda INDEX+0 + adc DSCPNT+0 + sta INDEX+0 + bcc !+ + dec INDEX+1 +!: + rts + +#endif diff --git a/src/basic/engine/varstr_garbage_index_up_a.s b/src/basic/engine_variables/helper_index_up_a_46K_50K.s similarity index 75% rename from src/basic/engine/varstr_garbage_index_up_a.s rename to src/basic/engine_variables/helper_index_up_a_46K_50K.s index 42a661c5..2943073a 100644 --- a/src/basic/engine/varstr_garbage_index_up_a.s +++ b/src/basic/engine_variables/helper_index_up_a_46K_50K.s @@ -8,8 +8,9 @@ // Helper routine, used by garbage collector and string concatenation // +#if CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K -varstr_INDEX_up_A: // .A - bytes to increase TXTPTR, uses DSCPNT+0 +helper_INDEX_up_A: // .A - bytes to increase TXTPTR, uses DSCPNT+0 sta DSCPNT+0 @@ -21,3 +22,5 @@ varstr_INDEX_up_A: // .A - bytes to increase TXTPTR, uses DS dec INDEX+1 !: rts + +#endif diff --git a/src/basic/basic_operators/helper_add_concat_46K_50K.s b/src/basic/engine_variables/helper_strconcat_46K_50K.s similarity index 94% rename from src/basic/basic_operators/helper_add_concat_46K_50K.s rename to src/basic/engine_variables/helper_strconcat_46K_50K.s index f777a3e3..e44ea918 100644 --- a/src/basic/basic_operators/helper_add_concat_46K_50K.s +++ b/src/basic/engine_variables/helper_strconcat_46K_50K.s @@ -11,7 +11,7 @@ #if CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K -helper_add_concat: +helper_strconcat: // Unmap BASIC lower ROM @@ -31,7 +31,7 @@ helper_add_concat: // Increase INDEX pointer by the size of the 1st string tya - jsr varstr_INDEX_up_A + jsr helper_INDEX_up_A // Copy data from the second string diff --git a/src/basic/basic_commands/helper_let_strdesccpy_38K.s b/src/basic/engine_variables/helper_strdesccpy_38K.s similarity index 70% rename from src/basic/basic_commands/helper_let_strdesccpy_38K.s rename to src/basic/engine_variables/helper_strdesccpy_38K.s index 84f33d8a..04870841 100644 --- a/src/basic/basic_commands/helper_let_strdesccpy_38K.s +++ b/src/basic/engine_variables/helper_strdesccpy_38K.s @@ -3,13 +3,13 @@ // #LAYOUT# * * #IGNORE // -// Helper routine to copy string descriptor, for LET command and TI$ variable support +// Helper routine to copy string descriptor // #if CONFIG_MEMORY_MODEL_38K -helper_let_strdesccpy: +helper_strdesccpy: ldy #$00 lda (VARPNT), y diff --git a/src/basic/basic_commands/helper_let_strdesccpy_46K_50K.s b/src/basic/engine_variables/helper_strdesccpy_46K_50K.s similarity index 82% rename from src/basic/basic_commands/helper_let_strdesccpy_46K_50K.s rename to src/basic/engine_variables/helper_strdesccpy_46K_50K.s index 939da07b..2e90d6b0 100644 --- a/src/basic/basic_commands/helper_let_strdesccpy_46K_50K.s +++ b/src/basic/engine_variables/helper_strdesccpy_46K_50K.s @@ -5,13 +5,13 @@ // This has to go $E000 or above - routines below banks out the main BASIC ROM! // -// Helper routine to copy string descriptor, for LET command and TI$ variable support +// Helper routine to copy string descriptor // #if CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K -helper_let_strdesccpy: +helper_strdesccpy: // Unmap BASIC lower ROM diff --git a/src/basic/basic_commands/helper_let_strdesccpy_60K.s b/src/basic/engine_variables/helper_strdesccpy_60K.s similarity index 72% rename from src/basic/basic_commands/helper_let_strdesccpy_60K.s rename to src/basic/engine_variables/helper_strdesccpy_60K.s index ea9a1c88..9e627a18 100644 --- a/src/basic/basic_commands/helper_let_strdesccpy_60K.s +++ b/src/basic/engine_variables/helper_strdesccpy_60K.s @@ -3,13 +3,13 @@ // #LAYOUT# * * #IGNORE // -// Helper routine to copy string descriptor, for LET command and TI$ variable support +// Helper routine to copy string descriptor // #if CONFIG_MEMORY_MODEL_60K -helper_let_strdesccpy: +helper_strdesccpy: ldx #