all label naming conflicts resolved

c64/kernal/,target_ultimate64/,aliases_ultimate64.s

@@ -4,10 +4,8 @@
 // and ultimate_dos_v1.0.pdf and command_interface_v1.0.pdf by Gideon Zweijtzer
 
 	// Command interface registers
-	.label U64_CONTROL                 = $DF1C // write
-	.label U64_STATUS                  = $DF1C // read
-	.label U64_COMMAND_DATA            = $DF1D // write
-	.label U64_IDENTIFICATION          = $DF1D // read
+	.label U64_CONTROL_STATUS          = $DF1C // write = CONTROL, read = STATUS
+	.label U64_COMMAND_DATA_IDENTIFY   = $DF1D // write = COMMAND_DATA, read = IDENTIFICATION
 	.label U64_RESPONSE_DATA           = $DF1E // read only
 	.label U64_STATUS_DATA             = $DF1F // read only
 

c64/kernal/chrout_real.s

@@ -365,12 +365,12 @@ not_clearscreen:
 	bcc !+
 	
 	and #$7f
-	jmp not_high_char
+	jmp output_literal_char // not high char
 
 !:
 	// Range $20-$3F is unchanged
 	cmp #$40
-	bcc not_high_char
+	bcc output_literal_char // not high char
 
 	// Unshifted letters and symbols from $40-$5F
 	// all end up being -$40
@@ -385,16 +385,12 @@ not_clearscreen:
 
 	// Fix shifted chars by adding $20 again
 	cmp #$20
-	bcc not_high_char
+	bcc output_literal_char // not high char
 	cmp #$40
-	bcs not_high_char
+	bcs output_literal_char // not high char
 	clc
 	adc #$20
 
-not_high_char:
-
-chrout_l1:
-
 output_literal_char:
 	
 	// Write normal character on the screen
@@ -449,7 +445,7 @@ screen_grow_logical_line:
 	// Don't grow line if it is already grown
 	lda LDTBL,y
 	bpl !+
-	jmp done_grow_line
+	jmp not_last_line // doneb grow line
 !:
 	lda #$80
 	sta LDTBL,y
@@ -563,10 +559,9 @@ no_copy_down:
 	dey
 	cpy #40
 	bne !-
-	
+
 	rts
 
-done_grow_line:
 not_last_line:
 	rts
 

c64/kernal/jumptable/fff3.jiobase.s

@@ -12,7 +12,7 @@
 
 // As there is nothing between here and $FFFA, we can just hard code this in place.
 
-iobase:
+// iobase: - commented out to prevent label naming conflict
     ldy #$DC
     ldx #$00
     rts

c64/kernal/udtim.s

@@ -14,14 +14,13 @@ UDTIM:
 	// after this time we have to reset the clock.
 
 	inc TIME+0
-	bne udtim_clock_done
+	bne udtim_update_stkey // done with clock
 	inc TIME+1
 	bne udtim_clock_rollover
 	inc TIME+2
 
 	// FALLTROUGH
 
-udtim_clock_done:
 udtim_update_stkey: // entry to be used when interrupts are disabled
 
 	// Another action we have to perform is to copy the last row of keyboard to RAM,
@@ -44,11 +43,11 @@ udtim_clock_rollover:
 	// At this point TIME+0 contains 0
 	lda TIME+1
 	cmp #$1A
-	bne udtim_clock_done
+	bne udtim_update_stkey // done with clock
 	lda TIME+2
 	cmp #$4F
-	bne udtim_clock_done
+	bne udtim_update_stkey // done with clock
 	lda #$00
 	sta TIME+2
 	sta TIME+1
-	beq udtim_clock_done // will always jump
+	beq udtim_update_stkey // done with clock - will always jump

c64/kernal/under_rom_routines.s

@@ -8,9 +8,9 @@
 
 install_ram_routines:
 	// Copy routines into place
-	ldx #ram_routines_end-ram_routines_start-1
+	ldx #__ram_routines_end-__ram_routines_start-1
 !:
-	lda ram_routines_start,x
+	lda __ram_routines_start,x
 	sta tiny_nmi_handler,x
 	dex
 	bpl !-
@@ -23,7 +23,7 @@ install_ram_routines:
 
 	rts
 
-ram_routines_start:	
+__ram_routines_start:
 
 tiny_nmi_handler_routine:
 	inc missed_nmi_flag
@@ -63,6 +63,6 @@ memmap_allram_routine:
 	pla
 	rts
 
-ram_routines_end:
+__ram_routines_end:
 
 #endif // CONFIG_MEMORY_MODEL_60K