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

migrated to ACME assembler

Browse Source 
commit 145d64aa6e78838ed07cefed372f0ad6a4687e97
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 20:16:57 2020 +0200

    ACME adaptation

commit 885209d7822286744ea53232ae7461472a01d5d6
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 19:57:25 2020 +0200

    ACME adaptation

commit 334d84486bc603551887e7cbeb59d329f2224cc7
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 18:29:15 2020 +0200

    ACME adaptation

commit b5966f49bcd8f0ca79cbec93819a31238924707e
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 18:09:31 2020 +0200

    ACME adaptation

commit 786536a93a5eab5e676fca99625b4eb094a554e7
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 17:24:48 2020 +0200

    ACME adaptation

commit 704c70dfb1f5d68775d6f3da220803b8a3990f56
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 15:07:12 2020 +0200

    ACME adaptation

commit 136874964c9083b375f151475310f9636871fc72
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 14:45:14 2020 +0200

    ACME adaptation

commit 8eca0d5700b72d04336e72c5cd3a68e18b85f96d
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 14:06:52 2020 +0200

    ACME adaptation

commit 11d29eb7ee318239d782f85498b6d0524624d5c4
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 13:56:45 2020 +0200

    ACME apaptation

commit c9b5e5e04cceb92c66bc027e6440bc0f7c5a499f
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 13:49:04 2020 +0200

    ACME adaptation

commit f5cc254cbc921f07863807468cb3fe26b410b409
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 20 13:01:18 2020 +0200

    ACME adaptation

commit e135a27bf9c30cc0965379c954564e06406303b1
Author: FeralChild64 <you@example.com>
Date:   Sat Sep 19 21:55:01 2020 +0200

    ACME adaptation

commit e9dfddf90d9e2795e88b7da40ae050d733faeb56
Author: FeralChild64 <you@example.com>
Date:   Sat Sep 19 21:48:47 2020 +0200

    Makefile fix

commit 07030104c65cf5e5beeacf6d629ccb9245e58657
Author: FeralChild64 <you@example.com>
Date:   Sat Sep 19 21:42:00 2020 +0200

    ACME adaptation

commit f824362ee5bcfbffca86c430b57773b2ffd65655
Author: FeralChild64 <you@example.com>
Date:   Sat Sep 19 20:14:56 2020 +0200

    ACME adaptation

commit 3a3c59007dcd4940d89b8669f34ca56b61c25fdf
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 18 21:51:45 2020 +0200

    ACME adaptation

commit 6790ef7bc88a41de2881c69b7524dd4ab8c74b5d
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 18 20:35:23 2020 +0200

    ACME adaptation

commit 38ad18b90e9ec713aa7ca49576b3388ce1733357
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 18 18:46:20 2020 +0200

    ACME adaptation

commit 541340371122a9702f7b2d9771c298223cffd0e9
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 18 16:49:46 2020 +0200

    ACME adaptation

commit 25cfd5e186459be1a260d3eb8cfff767838de370
Author: FeralChild64 <you@example.com>
Date:   Thu Sep 17 20:13:33 2020 +0200

    ACME adaptation

commit f61599444d5b1d03d8fd8e4a6a7c3b85069bedb3
Author: FeralChild64 <you@example.com>
Date:   Thu Sep 17 19:29:23 2020 +0200

    ACME adaptation

commit b290be31ec7bb2e5723607697da1bbc621c84429
Author: FeralChild64 <you@example.com>
Date:   Thu Sep 17 17:20:14 2020 +0200

    ACME adaptation

commit 877be9e856880d98fd4bcb25b42aaaacda9dc463
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 16 21:47:38 2020 +0200

    ACME adaptation

commit bb20edaf85d386e41d5c2f715b745b68fbd3362e
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 16 21:31:30 2020 +0200

    ACME adaptation

commit c5d31bd8685abce37c8e254d15aac20bd1570d9f
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 16 18:40:49 2020 +0200

    ACME adaptation

commit 29349826b38f8a89649171559dc8cf24c560aff1
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 23:35:47 2020 +0200

    ACME adaptation

commit 8bcd6a621c4b11766d0cf34f79858ba90a67248e
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 22:52:25 2020 +0200

    ACME adaptation

commit e87a69edc2ce4bfcc460c31e08dcc352a985f88d
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 22:43:27 2020 +0200

    ACME adaptation

commit f49a097bd52e96d00b866c02bda7121e4543233c
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 19:02:07 2020 +0200

    ACME adaptation

commit fa0e9214a633b8e8f867cc70925b390940dcd426
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 17:47:19 2020 +0200

    ACME adaptation

commit 1b763b91e7a03e426227129c7f22f0ce57a4c197
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 17:17:10 2020 +0200

    ACME adaptation

commit e92a4b57b232cd85eb1e71090b8a89c7c8461ebc
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 17:15:37 2020 +0200

    ACME adaptation

commit de3c693e8a7e73ea5289198946058e3240894e6a
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 14 17:10:05 2020 +0200

    ACME adaptation

commit f9bd7ae0f04e932d613be9ed5cb19af9be5d338e
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 13 14:34:44 2020 +0200

    ACME adaptation

commit 694dee52555dbfc2b1f7f452a9671ff51106c057
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 13 14:16:14 2020 +0200

    ACME adaptation

commit 0af2c55edfcd22942d9f25417eb0d35f55b71604
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 11 17:38:09 2020 +0200

    ACME adaptation

commit 2015e17334bd56a1e8a13a5abc098d9c2e7ea44f
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 11 16:46:05 2020 +0200

    ACME adaptation

commit b1e972162798d60f4483cd6cc261e856c20c2c8c
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 11 16:24:31 2020 +0200

    ACME adaptation

commit 9d027e868466901ba53bf074a79ec8cf16273021
Author: FeralChild64 <you@example.com>
Date:   Fri Sep 11 15:04:31 2020 +0200

    ACME adaptation

commit 957186deddd1aa4f3b4f1aa1f421e4239a584e57
Author: FeralChild64 <you@example.com>
Date:   Thu Sep 10 22:49:07 2020 +0200

    ACME adaptation

commit b8060f67a455cfac109f08d96b62c360d693b931
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 23:07:28 2020 +0200

    ACME adaptation

commit e54d004568f44bbfe5c070ef1d7cf3544112e497
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 22:58:20 2020 +0200

    ACME adaptation

commit f90b77f073c5a605cb31c6ee451f65c8a8aff7d8
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 22:12:09 2020 +0200

    ACME adaptation

commit b211bb4afcd9c58fe1f5c92f3007717d611cd531
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 22:01:40 2020 +0200

    ACME adaptation

commit 8d7ea343b07e9e08e5f77f3c414758a6cffd0440
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 21:38:34 2020 +0200

    ACME adaptation

commit 46413eb0d92d6400aba0ff8dfe556e61e8a44d78
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 21:07:47 2020 +0200

    ACME adaptation

commit 9f98f69ecc21f7b74a5eb89e247f5a2c6fcb655d
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 20:05:03 2020 +0200

    ACME adaptation

commit 7bb9f1cadc682c7e0a4a6796739d860d473ca110
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 19:55:12 2020 +0200

    ACME adaptation

commit 5fc115392b5bdca6b56f67ad866b1884d2d2bdf8
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 19:31:10 2020 +0200

    ACME adaptation

commit b7940fc60e568d859df9e3156f6bacc6d685b2cc
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 19:16:09 2020 +0200

    ACME adaptation

commit 56288cb97197561afa0816b29c134ec1190e8eab
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 18:48:23 2020 +0200

    ACME adaptation

commit 10401a60fc7922a53d782120ef6795d889140218
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 16:34:16 2020 +0200

    ACME adaptation

commit 8ce76e4d2b56837a691ae84b1a412a2ae32a157b
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 16:20:44 2020 +0200

    ACME adaptation

commit 33fade899fa6172ea6b5b5f6683bb61f544429fd
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 15:28:46 2020 +0200

    ACME adaptation

commit a416f04734402fcfbc57a933731376df2e0180a1
Author: FeralChild64 <you@example.com>
Date:   Wed Sep 9 12:40:03 2020 +0200

    ACME adaptation

commit f8daee005b1d29f6912723be2ac94bc5fbeb0508
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 7 23:29:54 2020 +0200

    ACME adaptation

commit 83fe6bdd0b08a44fdbfc6eefe323a4b194ccaf5b
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 7 22:23:16 2020 +0200

    ACME adaptation

commit cb1f75620b9c83000a15c9c7f7acefdfee79a979
Author: FeralChild64 <you@example.com>
Date:   Mon Sep 7 19:23:12 2020 +0200

    ACME adaptation

commit e524d517c933ae1f0aeb49764d307fadb4845025
Author: FeralChild64 <you@example.com>
Date:   Sun Sep 6 08:24:25 2020 +0200

    ACME adaptation - replaced comments

commit 2ab572c3a21f4a78a7312d0e684bc11d91d1717a
Author: FeralChild64 <you@example.com>
Date:   Sat Sep 5 17:59:10 2020 +0200

    ACME adaptation - replaced the assembler
This commit is contained in:
FeralChild64 committed 2020-09-20 20:22:36 +02:00
1 parent bfc8291e41
commit c8d255130c
685 files changed
+15835 -16296
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/basic/engine_runtime/do_error.s
+107 -107
View File
@@ -1,209 +1,209 @@
// #LAYOUT# STD * #TAKE
// #LAYOUT# M65 BASIC_1 #TAKE
// #LAYOUT# * BASIC_0 #TAKE
// #LAYOUT# * * #IGNORE
;; #LAYOUT# STD * #TAKE
;; #LAYOUT# M65 BASIC_1 #TAKE
;; #LAYOUT# * BASIC_0 #TAKE
;; #LAYOUT# * * #IGNORE
// As many errors are triggered from many places in the BASIC
// interprettor, it is important to have an efficicent means of
// calling them.
// LDX #$nn / jmp do_basic_error
// is the simplest, but takes 5 bytes.
// Having a direct JMP address for each error is preferable, as
// it reduces the overhead to 3 bytes, but at the cost of having
// a jump table of some sort. The .byte $2C method can be used
// to have a set of addresses that each execute a different
// LDX #$nn command, reducing the cost of the jump table to 3
// bytes per error number.
// But we can do better with a bit of scullduggery and carnal
// knowledge of ZP usage.
// The INC $nn opcode is $E6. ZP location $E6 is one of the screen
// link addresses. In the original KERNAL, the lower bits of those
// addresses have meaning, but in our KERNAL, we ignore them, and just
// have them all zeroes. So.... We can have a sequence of $E6 bytes,
// and know exactly how many of them have been executed, by checking
// the value of $E6. Then all we need to worry about is if an odd
// number is required, then we have to have an exit that has a $E6
// opcode with some other address as target, but where the byte value
// of that argument can be safely executed as a CPU instruction.
// NOP = $EA is the obvious choice, as if used as an argument to
// $E6 will increment location $EA, which is another of the screen
// link addresses.
; As many errors are triggered from many places in the BASIC
; interprettor, it is important to have an efficicent means of
; calling them.
; LDX #$nn / jmp do_basic_error
; is the simplest, but takes 5 bytes.
; Having a direct JMP address for each error is preferable, as
; it reduces the overhead to 3 bytes, but at the cost of having
; a jump table of some sort. The .byte $2C method can be used
; to have a set of addresses that each execute a different
; LDX #$nn command, reducing the cost of the jump table to 3
; bytes per error number.
; But we can do better with a bit of scullduggery and carnal
; knowledge of ZP usage.
; The INC $nn opcode is $E6. ZP location $E6 is one of the screen
; link addresses. In the original KERNAL, the lower bits of those
; addresses have meaning, but in our KERNAL, we ignore them, and just
; have them all zeroes. So.... We can have a sequence of $E6 bytes,
; and know exactly how many of them have been executed, by checking
; the value of $E6. Then all we need to worry about is if an odd
; number is required, then we have to have an exit that has a $E6
; opcode with some other address as target, but where the byte value
; of that argument can be safely executed as a CPU instruction.
; NOP = $EA is the obvious choice, as if used as an argument to
; $E6 will increment location $EA, which is another of the screen
; link addresses.
// This gives a total overhead of 18 bytes + 1 byte per error
// message. This compares favourably to the 3 bytes per error
// message that the $2C method would result in.
; This gives a total overhead of 18 bytes + 1 byte per error
; message. This compares favourably to the 3 bytes per error
; message that the $2C method would result in.
// Error messages reported by KERNAL
; Error messages reported by KERNAL
do_kernal_error: // .A = KERNAL error code, also almost matches BASIC error codes
do_kernal_error: ; .A = KERNAL error code, also almost matches BASIC error codes
// Convert to BASIC error code
; Convert to BASIC error code
tax
beq do_BREAK_error // XXX is 0 really a proper error code?
beq do_BREAK_error ; XXX is 0 really a proper error code?
dex
#if (ROM_LAYOUT_M65 && SEGMENT_BASIC_1)
!ifdef SEGMENT_M65_BASIC_1 {
jmp do_basic_error
#else
bpl do_basic_error // branch always
#endif
} else {
bpl do_basic_error ; branch always
}
// Error messages specific to Open ROMs BASIC dialect
; Error messages specific to Open ROMs BASIC dialect
do_MEMORY_CORRUPT_error:
.byte $E6
!byte $E6
// Error messages compatible with CBM BASIC V7 dialect
; Error messages compatible with CBM BASIC V7 dialect
do_FILE_READ_error:
.byte $E6
!byte $E6
do_NOT_IMPLEMENTED_error:
.byte $E6
!byte $E6
do_UNRESOLVED_REFERENCE_error:
.byte $E6
!byte $E6
do_LINE_NUMBER_TOO_LARGE_error:
.byte $E6
!byte $E6
do_BEND_NOT_FOUND_error:
.byte $E6
!byte $E6
do_BAD_DISK_error:
.byte $E6
!byte $E6
do_NO_GRAPHICS_AREA_error:
.byte $E6
!byte $E6
do_DIRECT_MODE_ONLY_error:
.byte $E6
!byte $E6
do_LOOP_WITHOUT_DO_error:
.byte $E6
!byte $E6
do_LOOP_NOT_FOUND_error:
.byte $E6
!byte $E6
do_CANT_RESUME_error:
.byte $E6
!byte $E6
// Error messages compatible with CBM BASIC V2 dialect
; Error messages compatible with CBM BASIC V2 dialect
do_BREAK_error:
.byte $E6
!byte $E6
do_LOAD_error:
.byte $E6
!byte $E6
do_VERIFY_error:
.byte $E6
!byte $E6
do_UNDEFD_FUNCTION_error:
.byte $E6
!byte $E6
do_CANT_CONTINUE_error:
.byte $E6
!byte $E6
do_FORMULA_TOO_COMPLEX_error:
.byte $E6
!byte $E6
do_FILE_DATA_error:
.byte $E6
!byte $E6
do_STRING_TOO_LONG_error:
.byte $E6
!byte $E6
do_TYPE_MISMATCH_error:
.byte $E6
!byte $E6
do_ILLEGAL_DIRECT_error:
.byte $E6
!byte $E6
do_DIVISION_BY_ZERO_error:
.byte $E6
!byte $E6
do_REDIMD_ARRAY_error:
.byte $E6
!byte $E6
do_BAD_SUBSCRIPT_error:
.byte $E6
!byte $E6
do_UNDEFD_STATEMENT_error:
.byte $E6
!byte $E6
do_OUT_OF_MEMORY_error:
.byte $E6
!byte $E6
do_OVERFLOW_error:
.byte $E6
!byte $E6
do_ILLEGAL_QUANTITY_error:
.byte $E6
!byte $E6
do_OUT_OF_DATA_error:
.byte $E6
!byte $E6
do_RETURN_WITHOUT_GOSUB_error:
.byte $E6
!byte $E6
do_SYNTAX_error:
.byte $E6
!byte $E6
do_NEXT_WITHOUT_FOR_error:
.byte $E6
!byte $E6
do_ILLEGAL_DEVICE_NUMBER_error:
.byte $E6
!byte $E6
do_MISSING_FILENAME_error:
.byte $E6
!byte $E6
do_NOT_OUTPUT_FILE_error:
.byte $E6
!byte $E6
do_NOT_INPUT_FILE_error:
.byte $E6
!byte $E6
do_DEVICE_NOT_PRESENT_error:
.byte $E6
!byte $E6
do_FILE_NOT_FOUND_error:
.byte $E6
!byte $E6
do_FILE_NOT_OPEN_error:
.byte $E6
!byte $E6
do_FILE_OPEN_error:
.byte $E6
!byte $E6
do_TO_MANY_FILES_error:
.byte $EA
!byte $EA
#if (ROM_LAYOUT_M65 && SEGMENT_BASIC_1)
!ifdef SEGMENT_M65_BASIC_1 {
jmp do_error_fetch
#else
} else {
// FALLTROUGH
; FALLTROUGH
do_error_fetch:
// Now get the error id and restore $E6 to its correct value
; Now get the error id and restore $E6 to its correct value
lda $E6
pha
and #$80
sta $E6
pla
// $E6 has even part
; $E6 has even part
asl
ora $EA
and #$7F
tax
// Restore $EA to correct value in case the NOP above is used
// as an argument to the preceeding INC $nn (opcode $E6).
; Restore $EA to correct value in case the NOP above is used
; as an argument to the preceeding INC $nn (opcode $E6).
lda $EA
and #$80
sta $EA
// FALLTHROUGH
; FALLTHROUGH
do_basic_error: // error code in .X
do_basic_error: ; error code in .X
#if ROM_LAYOUT_M65
// Make sure we are back with normal memory map
!ifdef ROM_LAYOUT_M65 {
; Make sure we are back with normal memory map
jsr map_NORMAL
#endif
}
// Clear all temporary variables, print "?"
; Clear all temporary variables, print "?"
phx_trash_a
+phx_trash_a
jsr tmpstr_free_all
ldx #IDX__STR_RET_QM
jsr print_packed_misc_str
plx_trash_a
+plx_trash_a
// Error message text + " ERROR"
; Error message text + " ERROR"
jsr print_packed_error
ldx #IDX__STR_ERROR
jsr print_packed_misc_str
// Check if direct mode
; Check if direct mode
lda CURLIN+1
cmp #$FF
beq !+
beq @1
// We were in a program, so show IN <line>
; We were in a program, so show IN <line>
ldx #IDX__STR_IN
jsr print_packed_misc_str
@@ -211,12 +211,12 @@ do_basic_error: // error code in .X
lda CURLIN+1
ldx CURLIN+0
jsr print_integer
!:
// Reset stack, and go back to main loop
@1:
; Reset stack, and go back to main loop
ldx #$FE
txs
jmp shell_main_loop
#endif // ROM layout
} ; ROM layout