diff --git a/doc/Extended-BASIC.md b/doc/Extended-BASIC.md index b6b6f297..44c31c97 100644 --- a/doc/Extended-BASIC.md +++ b/doc/Extended-BASIC.md @@ -96,14 +96,10 @@ Clears the screen content. Runs the garbage collector - disposes outdated strings. -### `NSYS` (MEGA65) +### `GO SYS` (MEGA65) -A 'native' `SYS` - same as `SYS`, but does not switch to C64 compatibility mode. +Same as `SYS`, but does not switch to C64 compatibility mode. ### `GO 64`, `GO 65` (MEGA65) Switches machine to C64 compatibility mode or to MEGA65 native mode. Performs `CLR` - -### `GO SYS` (MEGA65) - -The same as `NSYS`, but does not need tokens unknown to C64 BASIC V2. Intended for usage in 'fat binaries' only. diff --git a/src/basic/basic_commands/cmd_go_goto_run.s b/src/basic/basic_commands/cmd_go_goto_run.s index ce3c6d65..5bfb7281 100644 --- a/src/basic/basic_commands/cmd_go_goto_run.s +++ b/src/basic/basic_commands/cmd_go_goto_run.s @@ -20,7 +20,7 @@ cmd_go_syntax_error: #else cmp #$9E // 'SYS' keyword, for 'GO SYS' - beq_16 cmd_nsys + beq_16 cmd_gosys dew TXTPTR // unconsume character diff --git a/src/basic/basic_commands/cmd_sys.s b/src/basic/basic_commands/cmd_sys.s index f7aba769..f3e63e2c 100644 --- a/src/basic/basic_commands/cmd_sys.s +++ b/src/basic/basic_commands/cmd_sys.s @@ -5,7 +5,7 @@ #if ROM_LAYOUT_M65 -cmd_nsys: +cmd_gosys: // NSYS requires an argument diff --git a/src/basic/basic_commands_03_m65/cmd__jumptable_03.s b/src/basic/basic_commands_03_m65/cmd__jumptable_03.s index c982c4a5..4af16cb7 100644 --- a/src/basic/basic_commands_03_m65/cmd__jumptable_03.s +++ b/src/basic/basic_commands_03_m65/cmd__jumptable_03.s @@ -7,7 +7,7 @@ .const command_03_list = List().add( - cmd_nsys + cmd_rem // XXX just for testing ) diff --git a/src/basic/basic_commands_03_m65/cmd_nsys.s b/src/basic/basic_commands_03_m65/cmd_nsys.s deleted file mode 100644 index 2e8a7c4d..00000000 --- a/src/basic/basic_commands_03_m65/cmd_nsys.s +++ /dev/null @@ -1,7 +0,0 @@ -// #LAYOUT# M65 BASIC_0 #TAKE -// #LAYOUT# * * #IGNORE - - -// PLACEHOLDER for completeness - jumptable contains direct address - -// NSYS command is implemented together with SYS diff --git a/tools/generate_strings.cc b/tools/generate_strings.cc index 73d605fd..4a021996 100644 --- a/tools/generate_strings.cc +++ b/tools/generate_strings.cc @@ -213,7 +213,7 @@ const StringEntryList GLOBAL_Keywords_03_M65 = { ListType::KEYWORDS, "keywords_ { // STD M65 U64 X16 - { false, true, false, false, "K03_01", "NSYS", }, // Not present in CBM BASIC dialects, Open ROMs specific + { false, true, false, false, "K03_01", "TEST", }, // Not present in CBM BASIC dialects, Open ROMs specific } };