migrated to ACME assembler

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

src/basic/wedge/wedge_dos.s

@@ -1,92 +1,92 @@
-// #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
 
 
-#if CONFIG_DOS_WEDGE
+!ifdef CONFIG_DOS_WEDGE {
 
 
-// .X has to contain size of the buffer
+; .X has to contain size of the buffer
 
 wedge_dos:
 
-#if (ROM_LAYOUT_M65 && SEGMENT_BASIC_0)
+!ifdef SEGMENT_M65_BASIC_0 {
 
-	jsr     map_BASIC_1
-	jsr_ind VB1__wedge_dos
-	jmp     map_NORMAL
+	jsr map_BASIC_1
+	jsr (VB1__wedge_dos)
+	jmp map_NORMAL
 
-#else
+} else {
 
-	// Prepare buffer - finish it with '0'
+	; Prepare buffer - finish it with '0'
 
 	lda #$00
 	sta BUF,x
 
-	// Close all the channels, so that wedge has full control
+	; Close all the channels, so that wedge has full control
 	jsr JCLALL
 
-	// Set file parameters,  channel 15 is a typical one for commands
-	jsr SELDEV                                   // sets .X register
+	; Set file parameters,  channel 15 is a typical one for commands
+	jsr SELDEV                                   ; sets .X register
 	lda #$0F
 	ldy #$0F
 	jsr JSETFLS
 
-	// Setup necessary part of BASIC
+	; Setup necessary part of BASIC
 
 	jsr prepare_direct_execution
 	jsr fetch_character
 
-	// Now we have to check what the user wants us to do
+	; Now we have to check what the user wants us to do
 
-	// Check if user asked for a status
+	; Check if user asked for a status
 
 	ldy #$00
 	lda (TXTPTR), y
-	beq_16 wedge_dos_status
+	+beq wedge_dos_status
 
-	// Check if asked for a directory
+	; Check if asked for a directory
 
 	cmp #$24
-	beq_16 wedge_dos_directory
+	+beq wedge_dos_directory
 
-	// Check if asked to change drive number, or if it is a regular command
+	; Check if asked to change drive number, or if it is a regular command
 	
 	jsr is_09
 	bcc wedge_dos_change_drive
 	
-	// FALLTROUGH
+	; FALLTROUGH
 
 wedge_dos_command:
 
-#if !HAS_SMALL_BASIC
+!ifndef HAS_SMALL_BASIC {
 
-	// Check if command needs confirmation
+	; Check if command needs confirmation
 
 	ldy #$00
 	lda (TXTPTR), y
 
-	cmp #$52                                     // 'R' - because 'RD' is a directory removal command
-	bne !+
+	cmp #$52                                     ; 'R' - because 'RD' is a directory removal command
+	bne @1
 
 	iny
 	lda (TXTPTR), y
-	cmp #$44                                     // 'D'
+	cmp #$44                                     ; 'D'
 	bne wedge_dos_command_confirmed
 	beq wedge_dos_command_ask
-!:
-	cmp #$4E                                     // 'N' - for the disk format
-	beq !+
-	cmp #$53                                     // 'S' - for the file scratch
+@1:
+	cmp #$4E                                     ; 'N' - for the disk format
+	beq @2
+	cmp #$53                                     ; 'S' - for the file scratch
 	bne wedge_dos_command_confirmed
-!:
-	// This is probably a dangerous command - check further the syntax,
-	// if 'N:', 'S:', 'Nx:' or 'Sx:' (where 'x' is a digit) - ask for confirmation first
+@2:
+	; This is probably a dangerous command - check further the syntax,
+	; if 'N:', 'S:', 'Nx:' or 'Sx:' (where 'x' is a digit) - ask for confirmation first
 
 	iny
 	lda (TXTPTR), y
-	cmp #$3A                                     // ':' - colon
+	cmp #$3A                                     ; ':' - colon
 	beq wedge_dos_command_ask
 
 	jsr is_09
@@ -94,125 +94,125 @@ wedge_dos_command:
 
 	iny
 	lda (TXTPTR), y
-	cmp #$3A                                     // ':' - colon
+	cmp #$3A                                     ; ':' - colon
 	bne wedge_dos_command_confirmed
 
-	// FALLTROUGH
+	; FALLTROUGH
 
 wedge_dos_command_ask:
 
 	jsr helper_ask_if_sure
-	bcs_16 wedge_dos_clean_exit
+	+bcs wedge_dos_clean_exit
 	
-	// FALLTROUGH
+	; FALLTROUGH
 
 wedge_dos_command_confirmed:
 
-#endif // !HAS_SMALL_BASIC
+} ; !HAS_SMALL_BASIC
 
-	// Provide command name
+	; Provide command name
 
 	jsr wedge_dos_setnam
 	
 	jsr JSETNAM
 	jsr JOPEN
-	bcs_16 wedge_dos_basic_error
+	+bcs wedge_dos_basic_error
 
-	// Retrieve status, print it if not OK
+	; Retrieve status, print it if not OK
 
 	jsr JCLALL
 	jsr wedge_dos_status_get_no_new_line
 
 	lda BUF+0
-	cmp #$30 // '0'
+	cmp #$30 ; '0'
 	bne wedge_dos_status_print
 
 	eor BUF+1
 	bne wedge_dos_status_print
 
-	// Clean-up and exit
+	; Clean-up and exit
 
 	jmp wedge_dos_clean_exit
 
 wedge_dos_change_drive:
 
-	// Fetch new drive number, make sure this is the last part of the command
+	; Fetch new drive number, make sure this is the last part of the command
 
 	jsr fetch_uint8
 	pha
 	jsr fetch_character_skip_spaces
 	cmp #$00
-	bne_16 do_SYNTAX_error
+	+bne do_SYNTAX_error
 	pla
 
-	// Check if device number is valid for IEC drive
+	; Check if device number is valid for IEC drive
 
 	cmp #$08
-	bcc_16 do_ILLEGAL_DEVICE_NUMBER_error
+	+bcc do_ILLEGAL_DEVICE_NUMBER_error
 
-	// Store new device number and return to shell
+	; Store new device number and return to shell
 
 	sta FA
 	jmp shell_main_loop
 
 wedge_dos_status_get:
 
-	// New line - separate status from current display
+	; New line - separate status from current display
 
 	jsr print_return
 
-	// FALLTROUGH
+	; FALLTROUGH
 
 wedge_dos_status_get_no_new_line:
 
-	// Here the flow is mostly the same as in the example from
-	// https://codebase64.org/doku.php?id=base:reading_the_error_channel_of_a_disk_drive
+	; Here the flow is mostly the same as in the example from
+	; https://codebase64.org/doku.php?id=base:reading_the_error_channel_of_a_disk_drive
 
-	// Set remaining file parameters, open the channel
+	; Set remaining file parameters, open the channel
 
-	lda #$00  // empty file name
+	lda #$00  ; empty file name
 	jsr JSETNAM
 	jsr JOPEN
-	bcs_16 wedge_dos_basic_error
+	+bcs wedge_dos_basic_error
 
-	// Set channel for input
+	; Set channel for input
 
 	ldx #$0F
 	jsr JCHKIN
-	bcs_16 wedge_dos_basic_error
+	+bcs wedge_dos_basic_error
 
-	// Fetch the drive status
+	; Fetch the drive status
 
 	ldy #$00
 
-	// FALLTROUGH
+	; FALLTROUGH
 
 wedge_dos_status_get_loop:
 
-	// Check for buffer overflow
+	; Check for buffer overflow
 
 	cpy #$50
-	beq_16 do_OVERFLOW_error
+	+beq do_OVERFLOW_error
 
-	// Check for EOF
+	; Check for EOF
 
 	jsr JREADST
-	// XXX check for transfer errors
+	; XXX check for transfer errors
 	bne wedge_dos_status_get_done
 
-	// Retrieve a byte and put it into the buffer
+	; Retrieve a byte and put it into the buffer
 
 	jsr JCHRIN
-	bcs_16 wedge_dos_basic_error
+	+bcs wedge_dos_basic_error
 
 	sta BUF, y
 	iny
 
-	bne wedge_dos_status_get_loop                // branch always
+	bne wedge_dos_status_get_loop                ; branch always
 
 wedge_dos_status_get_done:
 
-	// Strip ending RETURN
+	; Strip ending RETURN
 
 	dey
 	rts
@@ -220,45 +220,45 @@ wedge_dos_status_get_done:
 wedge_dos_status:
 
 	jsr wedge_dos_status_get
-	jmp_8 wedge_dos_status_print_no_new_line
+	+bra wedge_dos_status_print_no_new_line
 
 wedge_dos_status_print:
 
 	jsr print_return
 
-	// FALLTROUGH
+	; FALLTROUGH
 
 wedge_dos_status_print_no_new_line:
 
-	// Print buffered status
+	; Print buffered status
 
 	ldx #$00
-!:
+@3:
 	dey
-	bmi !+
+	bmi @4
 	lda BUF, x
 	jsr JCHROUT
 	inx
-	bne !-
-!:
-	// Clean-up and exit
+	bne @3
+@4:
+	; Clean-up and exit
 
-	jmp_8 wedge_dos_clean_exit
+	+bra wedge_dos_clean_exit
 
 wedge_dos_directory:
 
-	// First change the secondary address to the one suitable for directory loading
+	; First change the secondary address to the one suitable for directory loading
 
-	lda #$00                                     // logical device number
+	lda #$00                                     ; logical device number
 	ldx FA
 	ldy #$60
 	jsr JSETFLS
 
-	// Provide file name
+	; Provide file name
 
 	jsr wedge_dos_setnam
 
-	// Open the file, set channel for reading
+	; Open the file, set channel for reading
 
 	jsr JOPEN
 	bcs wedge_dos_basic_error
@@ -267,52 +267,52 @@ wedge_dos_directory:
 	jsr JCHKIN
 	bcs wedge_dos_basic_error
 
-	// Ignore start address (2 first bytes) - XXX check for errors
+	; Ignore start address (2 first bytes) - XXX check for errors
 
 	jsr JCHRIN
 	bcs wedge_dos_basic_error
 	jsr JCHRIN
 	bcs wedge_dos_basic_error
 
-	// FALLTROUGH
+	; FALLTROUGH
 
 wedge_dos_directory_line:
 
-	// Load a single line, reuse BASIC input buffer
+	; Load a single line, reuse BASIC input buffer
 
 	ldy #$FF
-!:
+@5:
 	iny
 	jsr JCHRIN
 	bcs wedge_dos_basic_error
 	sta BUF, y
 	cpy #$50
-	beq_16 do_OVERFLOW_error                     // branch if line too long
+	+beq do_OVERFLOW_error                     ; branch if line too long
 	jsr JREADST
-	bne !+ // end of file
-	cpy #$04 // 2 bytes (pointer to next line) + 2 bytes (line number) 
-	bcc !-
+	bne @6 ; end of file
+	cpy #$04 ; 2 bytes (pointer to next line) + 2 bytes (line number) 
+	bcc @5
 	lda BUF, y
-	bne !-
+	bne @5
 
-	// End of line, but not end of file
+	; End of line, but not end of file
 
 	beq wedge_dos_directory_display
-!:
+@6:
 	lda #K_STS_END_OF_FILE
-	sta IOSTATUS // make sure end of file is marked
+	sta IOSTATUS ; make sure end of file is marked
 
-	// FALLTROUGH
+	; FALLTROUGH
 
 wedge_dos_directory_display:
 
-	cpy #$05                                     // protection against malformed directory
+	cpy #$05                                     ; protection against malformed directory
 	bcc wedge_dos_clean_exit
 
-	lda #$00                                     // extra protection agains buffer overflow
+	lda #$00                                     ; extra protection agains buffer overflow
 	sta BUF, y
 
-	// Display line
+	; Display line
 
 	ldx #<BUF
 	stx OLDTXT+0
@@ -321,12 +321,12 @@ wedge_dos_directory_display:
 	ldx #OLDTXT
 	jsr list_single_line
 
-	// Read & display next line or quit
+	; Read & display next line or quit
 
 	lda IOSTATUS
 	beq wedge_dos_directory_line
 
-	// FALLTROUGH
+	; FALLTROUGH
 
 wedge_dos_clean_exit:
 
@@ -342,15 +342,15 @@ wedge_dos_basic_error:
 
 wedge_dos_setnam:
 
-	// Now determine the length of the 'file' name
+	; Now determine the length of the 'file' name
 
 	ldy #$FF
-!:
+@7:
 	iny
 	lda (TXTPTR), y
-	bne !-
+	bne @7
 	
-	// Set the name to open
+	; Set the name to open
 
 	tya
 	ldx TXTPTR+0
@@ -359,6 +359,6 @@ wedge_dos_setnam:
 	jmp JSETNAM
 
 
-#endif // ROM layout
+} ; ROM layout
 
-#endif // CONFIG_DOS_WEDGE
+} ; CONFIG_DOS_WEDGE

src/basic/wedge/wedge_tape.s

@@ -1,59 +1,57 @@
-// #LAYOUT# STD *       #TAKE
-// #LAYOUT# *   BASIC_0 #TAKE
-// #LAYOUT# *   *       #IGNORE
+;; #LAYOUT# STD *       #TAKE
+;; #LAYOUT# *   BASIC_0 #TAKE
+;; #LAYOUT# *   *       #IGNORE
 
 
-#if CONFIG_TAPE_WEDGE
+!ifdef CONFIG_TAPE_WEDGE {
 
 
 wedge_tape:
 
-	// Prepare for execution
+	; Prepare for execution
 
 	jsr prepare_direct_execution
 	jsr fetch_character
 
-	// First character is a 'left arrow', we can ignore it - determine the command
+	; First character is a 'left arrow', we can ignore it - determine the command
 
 	jsr fetch_character
 
-	cmp #$4C                           // 'L'
+	cmp #$4C                           ; 'L'
 	beq wedge_arrow_L
-	cmp #$4D                           // 'M'
+	cmp #$4D                           ; 'M'
 	beq wedge_arrow_M
 
-#if CONFIG_TAPE_HEAD_ALIGN
+!ifdef CONFIG_TAPE_HEAD_ALIGN {
 
-	cmp #$48                           // 'H'
+	cmp #$48                           ; 'H'
 	beq wedge_arrow_H
-
-#endif
+}
 
 	jmp do_SYNTAX_error
 
-#if CONFIG_TAPE_HEAD_ALIGN
+!ifdef CONFIG_TAPE_HEAD_ALIGN {
 
 wedge_arrow_H:
 
-	// Make sure the syntax is correct
+	; Make sure the syntax is correct
 
 	jsr fetch_character_skip_spaces
 
 	cmp #$00
-	bne_16 do_SYNTAX_error
+	+bne do_SYNTAX_error
 
 	jsr tape_head_align
 
 	jsr print_return
 	jmp do_BREAK_error
-
-#endif
+}
 
 wedge_arrow_L:
 
 	jsr wedge_tape_prepare_load
 
-	// Perform loading
+	; Perform loading
 
 	jmp cmd_load_got_params
 
@@ -61,11 +59,10 @@ wedge_arrow_M:
 
 	jsr wedge_tape_prepare_load
 	ldy #$00
-	sty SA                             // for MERGE secondary address has to be 0!
+	sty SA                             ; for MERGE secondary address has to be 0!
 
-	// Perform merging
+	; Perform merging
 
 	jmp cmd_merge_got_params
 
-
-#endif // CONFIG_TAPE_WEDGE
+} ; CONFIG_TAPE_WEDGE

src/basic/wedge/wedge_tape_prepare_load.s

@@ -1,26 +1,26 @@
-// #LAYOUT# STD *       #TAKE
-// #LAYOUT# *   BASIC_0 #TAKE
-// #LAYOUT# *   *       #IGNORE
+;; #LAYOUT# STD *       #TAKE
+;; #LAYOUT# *   BASIC_0 #TAKE
+;; #LAYOUT# *   *       #IGNORE
 
 
-#if CONFIG_TAPE_WEDGE
+!ifdef CONFIG_TAPE_WEDGE {
 
-//
-// Common part for LOAD and MERGE operations via tape wedge
-//
+;
+; Common part for LOAD and MERGE operations via tape wedge
+;
 
 wedge_tape_prepare_load:
 
-	// Make sure the syntax is correct
+	; Make sure the syntax is correct
 
 	jsr fetch_character_skip_spaces
 
 	cmp #$00
-	beq wedge_tape_prepare_load_no_filename      // branch if no file name given
+	beq wedge_tape_prepare_load_no_filename      ; branch if no file name given
 	cmp #$22
-	bne_16 do_SYNTAX_error                       // branch if no opening quote
+	+bne do_SYNTAX_error                       ; branch if no opening quote
 
-	// Fetch the file name
+	; Fetch the file name
 
 	lda TXTPTR+0
 	sta FNADDR+0
@@ -28,17 +28,17 @@ wedge_tape_prepare_load:
 	sta FNADDR+1
 
 	ldx #$00
-!:
+@1:
 	jsr fetch_character
 
 	cmp #$00
-	beq !+
+	beq @2
 	cmp #$22
-	beq !+
+	beq @2
 
 	inx
-	bne !-
-!:
+	bne @1
+@2:
 	stx FNLEN
 
 	lda #$00
@@ -46,22 +46,21 @@ wedge_tape_prepare_load:
 
 wedge_tape_prepare_load_no_filename:
 	
-	sta FNLEN                                    // .A is 0 here, default file name is empty
+	sta FNLEN                                    ; .A is 0 here, default file name is empty
 	
-	// FALLTROUGH
+	; FALLTROUGH
 
-wedge_tape_prepare_load_got_filename:            // .A has to be 0
+wedge_tape_prepare_load_got_filename:            ; .A has to be 0
 
-	sta VERCKB                                   // operation is LOAD, not VERIFY
+	sta VERCKB                                   ; operation is LOAD, not VERIFY
 
 	ldy #$01
-#if CONFIG_TAPE_TURBO
-	ldx #$07                                     // turbo tape device
-#else
-	ldx #$01                                     // normal tape device
-#endif
+!ifdef CONFIG_TAPE_TURBO {
+	ldx #$07                                     ; turbo tape device
+} else {
+	ldx #$01                                     ; normal tape device
+}
 
 	jmp JSETFLS
 
-
-#endif // CONFIG_TAPE_WEDGE
+} ; CONFIG_TAPE_WEDGE