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

packed string support moved to Mega65 extra ROM segment

Browse Source
This commit is contained in:
FeralChild64 committed 2020-02-26 22:20:53 +01:00
1 parent ebf8bf4eb7
commit d1bc38694d
11 files changed
+47 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

c64/basic/assets/packed_chars.s
+2 -1
View File
@@ -1,5 +1,6 @@
// #LAYOUT# STD * #TAKE // #LAYOUT# STD * #TAKE
// #LAYOUT# * BASIC_0 #TAKE // #LAYOUT# M65 BASIC_1 #TAKE
// #LAYOUT# X16 BASIC_0 #TAKE
// #LAYOUT# * * #IGNORE // #LAYOUT# * * #IGNORE
packed_message_chars: packed_message_chars:
c64/basic/assets/packed_keywords.s
+2 -1
View File
@@ -1,5 +1,6 @@
// #LAYOUT# STD * #TAKE // #LAYOUT# STD * #TAKE
// #LAYOUT# * BASIC_0 #TAKE // #LAYOUT# M65 BASIC_1 #TAKE
// #LAYOUT# X16 BASIC_0 #TAKE
// #LAYOUT# * * #IGNORE // #LAYOUT# * * #IGNORE
packed_keywords: packed_keywords:
c64/basic/assets/packed_tokens.s
+2 -1
View File
@@ -1,5 +1,6 @@
// #LAYOUT# STD * #TAKE // #LAYOUT# STD * #TAKE
// #LAYOUT# * BASIC_0 #TAKE // #LAYOUT# M65 BASIC_1 #TAKE
// #LAYOUT# X16 BASIC_0 #TAKE
// #LAYOUT# * * #IGNORE // #LAYOUT# * * #IGNORE
packed_message_tokens: packed_message_tokens:
c64/basic/assets/packed_words.s
+2 -1
View File
@@ -1,5 +1,6 @@
// #LAYOUT# STD * #TAKE // #LAYOUT# STD * #TAKE
// #LAYOUT# * BASIC_0 #TAKE // #LAYOUT# M65 BASIC_1 #TAKE
// #LAYOUT# X16 BASIC_0 #TAKE
// #LAYOUT# * * #IGNORE // #LAYOUT# * * #IGNORE
packed_message_words: packed_message_words:
c64/basic/basic_do_error.s
+6
View File
@@ -5,9 +5,15 @@
// Computes Mapping the 64 p93 // Computes Mapping the 64 p93
basic_do_error: basic_do_error:
// Save error number // Save error number
phx_trash_a phx_trash_a
#if ROM_LAYOUT_M65
// Restore normal memory map
jsr map_NORMAL
#endif
// Print ? at start // Print ? at start
jsr print_return jsr print_return
lda #$3F lda #$3F
c64/basic/board_m65/4000.mega65_vectable_basic_1.s
+5 -1
View File
@@ -12,13 +12,17 @@
// Label definitions // Label definitions
.label VB1__INITMSG = $4000 + 2 * 0 .label VB1__INITMSG = $4000 + 2 * 0
.label VB1__list_single_line = $4000 + 2 * 1 .label VB1__tokenise_line = $4000 + 2 * 1
.label VB1__list_single_line = $4000 + 2 * 2
.label VB1__print_packed_message = $4000 + 2 * 3
#else #else
// Vector table (OpenROMs private!) // Vector table (OpenROMs private!)
.word INITMSG .word INITMSG
.word tokenise_line
.word list_single_line .word list_single_line
.word print_packed_message
#endif #endif
c64/basic/board_m65/mega65_imports.s
+1 -3
View File
@@ -12,11 +12,8 @@
.label JCHROUT = BASIC_0.proxy_B1_JCHROUT .label JCHROUT = BASIC_0.proxy_B1_JCHROUT
.label plot_set = KERNAL_0.plot_set .label plot_set = KERNAL_0.plot_set
.label basic_do_new = BASIC_0.proxy_B1_basic_do_new .label basic_do_new = BASIC_0.proxy_B1_basic_do_new
.label packed_keywords = BASIC_0.packed_keywords
.label packed_word_search = BASIC_0.packed_word_search
.label rom_revision_basic_string = BASIC_0.rom_revision_basic_string .label rom_revision_basic_string = BASIC_0.rom_revision_basic_string
.label print_integer = BASIC_0.proxy_B1_print_integer .label print_integer = BASIC_0.proxy_B1_print_integer
.label print_packed_message = BASIC_0.proxy_B1_print_packed_message
.label print_return = BASIC_0.proxy_B1_print_return .label print_return = BASIC_0.proxy_B1_print_return
.label print_space = BASIC_0.proxy_B1_print_space .label print_space = BASIC_0.proxy_B1_print_space
#if CONFIG_SHOW_PAL_NTSC #if CONFIG_SHOW_PAL_NTSC
@@ -25,3 +22,4 @@
#if CONFIG_SHOW_FEATURES #if CONFIG_SHOW_FEATURES
.label print_features = BASIC_0.proxy_B1_print_features .label print_features = BASIC_0.proxy_B1_print_features
#endif #endif
.label do_STRING_TOO_LONG_error = BASIC_0.do_STRING_TOO_LONG_error
c64/basic/board_m65/mega65_proxies.s
-7
View File
@@ -38,13 +38,6 @@ proxy_B1_print_integer:
jmp map_BASIC_1 jmp map_BASIC_1
proxy_B1_print_packed_message:
jsr map_NORMAL
jsr print_packed_message
jmp map_BASIC_1
proxy_B1_print_return: proxy_B1_print_return:
jsr map_NORMAL jsr map_NORMAL
c64/basic/pack_word.s
+2 -1
View File
@@ -1,5 +1,6 @@
// #LAYOUT# STD * #TAKE // #LAYOUT# STD * #TAKE
// #LAYOUT# * BASIC_0 #TAKE // #LAYOUT# M65 BASIC_1 #TAKE
// #LAYOUT# X16 BASIC_0 #TAKE
// #LAYOUT# * * #IGNORE // #LAYOUT# * * #IGNORE
// Pack a word using the simple compression scheme. // Pack a word using the simple compression scheme.
c64/basic/print/print_packed_message.s
+13 -1
View File
@@ -1,5 +1,6 @@
// #LAYOUT# STD * #TAKE // #LAYOUT# STD * #TAKE
// #LAYOUT# * BASIC_0 #TAKE // #LAYOUT# M65 * #TAKE
// #LAYOUT# X16 BASIC_0 #TAKE
// #LAYOUT# * * #IGNORE // #LAYOUT# * * #IGNORE
// This routine prints messages that have been packed // This routine prints messages that have been packed
@@ -17,6 +18,14 @@
print_packed_message: print_packed_message:
// .X = message number // .X = message number
#if (ROM_LAYOUT_M65 && SEGMENT_BASIC_0)
jsr map_BASIC_1
jsr_ind VB1__print_packed_message
jmp map_NORMAL
#else
lda #$ff lda #$ff
ldy #$ff ldy #$ff
packed_message_search: packed_message_search:
@@ -230,3 +239,6 @@ is_uncommon_char:
phy_trash_a phy_trash_a
jmp has_nybl jmp has_nybl
#endif // ROM layout
c64/basic/tokenise_line.s
+12 -1
View File
@@ -1,5 +1,6 @@
// #LAYOUT# STD * #TAKE // #LAYOUT# STD * #TAKE
// #LAYOUT# * BASIC_0 #TAKE // #LAYOUT# M65 * #TAKE
// #LAYOUT# X16 BASIC_0 #TAKE
// #LAYOUT# * * #IGNORE // #LAYOUT# * * #IGNORE
// Tokenise a line of BASIC // Tokenise a line of BASIC
@@ -8,6 +9,14 @@
tokenise_line: tokenise_line:
#if (ROM_LAYOUT_M65 && SEGMENT_BASIC_0)
jsr map_BASIC_1
jsr_ind VB1__tokenise_line
jmp map_NORMAL
#else
// We need to consider each offset in the string to see if it matches // We need to consider each offset in the string to see if it matches
// a token. No BASIC keyword is > 7 bytes, so we need to start with that // a token. No BASIC keyword is > 7 bytes, so we need to start with that
// length (or remaining length of string) and count our way back down. // length (or remaining length of string) and count our way back down.
@@ -270,3 +279,5 @@ done_searching_for_token:
sec sec
lda #$00 lda #$00
rts rts
#endif // ROM layout