chris/open-roms
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small cleanup in BASIC

Browse Source
This commit is contained in:
FeralChild64 committed 2020-06-05 22:26:08 +02:00
1 parent 580cd65941
commit 0436b5c62e
13 files changed
+319 -278
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

c64/basic/commands/cmd_load_verify.s
+3 -88
View File
@@ -27,18 +27,14 @@ cmd_load:
ldy #$00 // secondary address
jsr JSETFLS
// Check if file name is supplied
jsr basic_end_of_statement_check
bcs cmd_load_no_filename
// Fetch the file name
jsr cmd_load_fetch_filename
jsr fetch_filename
bcs cmd_load_no_filename
// Try to fetch secondary address
jsr cmd_load_fetch_dev_secondary
jsr fetch_device_secondary
jmp cmd_load_got_params
cmd_load_no_filename:
@@ -108,84 +104,3 @@ cmd_load_no_error:
// XXX move functions below to separate files, change names to neuytral
cmd_load_fetch_filename:
// Search for opening quote
jsr basic_fetch_and_consume_character
cmp #$22
bne_16 do_SYNTAX_error
!:
// Filename starts here so set pointer
lda TXTPTR+0
sta FNADDR+0
lda TXTPTR+1
sta FNADDR+1
// Now search for end of line or closing quote
// so that we know the length of the filename
lda #$00
sta FNLEN
!:
jsr basic_fetch_and_consume_character
cmp #$22
beq cmd_load_fetch_filename_done
cmp #$00
beq !+
inc FNLEN
bne !-
!:
jsr basic_unconsume_character
// FALLTROUGH
cmd_load_fetch_filename_done:
rts
cmd_load_fetch_dev_secondary:
// Fetch the device number
jsr injest_comma
bcs cmd_load_fetch_dev_secondary
jsr basic_parse_line_number
lda LINNUM+1
bne_16 do_ILLEGAL_QUANTITY_error
lda LINNUM+0
sta FA
// FALLTROUGH
cmd_load_fetch_secondary:
// Fetch secondary address
jsr injest_comma
bcs cmd_load_fetch_dev_secondary_done
jsr basic_parse_line_number
lda LINNUM+1
bne_16 do_ILLEGAL_QUANTITY_error
lda LINNUM+0
sta SA
// FALLTROUGH
cmd_load_fetch_dev_secondary_done:
rts
c64/basic/commands/cmd_run.s
+1 -1
View File
@@ -14,7 +14,7 @@ cmd_goto:
// Reset line pointer to first line of program.
jsr init_oldtxt
jsr basic_end_of_statement_check
jsr end_of_statement_check
bcs !+
jsr basic_parse_line_number
c64/basic/commands/cmd_save.s
+2 -6
View File
@@ -11,14 +11,10 @@ cmd_save:
ldy #$00 // secondary address
jsr JSETFLS
// Check if file name is supplied
jsr basic_end_of_statement_check
bcs_16 do_MISSING_FILENAME_error
// Fetch the file name
jsr cmd_load_fetch_filename
jsr fetch_filename
bcs_16 do_MISSING_FILENAME_error
c64/basic/commands/cmd_sys.s
+1 -1
View File
@@ -5,7 +5,7 @@
cmd_sys:
jsr basic_end_of_statement_check
jsr end_of_statement_check
bcc !+
// SYS requires an argument
c64/basic/commands/command_jumptable.s
+155
View File
@@ -0,0 +1,155 @@
// #LAYOUT# STD * #TAKE
// #LAYOUT# * BASIC_0 #TAKE
// #LAYOUT# * * #IGNORE
//
// Jumptable for all known BASIC commands and functions
//
command_jumptable:
// $80 - $8F
.word cmd_end-1
.word cmd_for-1
.word cmd_next-1
.word cmd_data-1
.word cmd_inputhash-1
.word cmd_input-1
.word cmd_dim-1
.word cmd_read-1
.word cmd_let-1
.word cmd_goto-1
.word cmd_run-1
.word cmd_if-1
.word cmd_restore-1
.word cmd_gosub-1
.word cmd_return-1
.word cmd_rem-1
// $90-$9F
.word cmd_stop-1
.word cmd_on-1
.word cmd_wait-1
.word cmd_load-1
.word cmd_save-1
.word cmd_verify-1
.word cmd_def-1
.word cmd_poke-1
.word cmd_printhash-1
.word cmd_print-1
.word cmd_cont-1
.word cmd_list-1
.word cmd_clr-1
.word cmd_cmd-1
.word cmd_sys-1
.word cmd_open-1
// $A0-$AF
.word cmd_close-1
.word cmd_get-1
.word cmd_new-1
.word cmd_tab-1
.word cmd_to-1
.word cmd_fn-1
.word cmd_spc-1
.word cmd_then-1
.word cmd_not-1
.word cmd_step-1
.word cmd_plus-1
.word cmd_minus-1
.word cmd_mult-1
.word cmd_div-1
.word cmd_exponent-1
.word cmd_and-1
// $B0-$BF
.word cmd_or-1
.word cmd_greater-1
.word cmd_equal-1
.word cmd_less-1
.word cmd_sgn-1
.word cmd_int-1
.word cmd_abs-1
.word cmd_usr-1
.word cmd_fre-1
.word cmd_pos-1
.word cmd_sqr-1
.word cmd_rnd-1
.word cmd_log-1
.word cmd_exp-1
.word cmd_cos-1
.word cmd_sin-1
// $C0-$CF
.word cmd_tan-1
.word cmd_atn-1
.word cmd_peek-1
.word cmd_len-1
.word cmd_str-1
.word cmd_val-1
.word cmd_asc-1
.word cmd_chr-1
.word cmd_left-1
.word cmd_right-1
.word cmd_mid-1
.word cmd_go-1
// Undefined tokens
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
// $D0-$DF
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
// $E0-$EF
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
// $F0-$FF
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1
.word cmd_unimplemented-1