[binutils] idk just start doing things

Author: mateoconlechuga

makefile

@@ -55,7 +55,7 @@ install: all $(addprefix install-,$(SRCS)) $(addprefix install-,$(LIBS))
 	$(Q)$(call MKDIR,$(INSTALL_EXAMPLES))
 	$(Q)$(call COPYDIR,$(call NATIVEPATH,examples/*),$(INSTALL_EXAMPLES))
 	$(Q)$(call COPY,$(call NATIVEPATH,src/makefile.mk),$(INSTALL_META))
-	$(Q)$(call COPY,$(call NATIVEPATH,src/linker_script),$(INSTALL_META))
+	$(Q)$(call COPY,$(call NATIVEPATH,src/linker_script.ld),$(INSTALL_META))
 	$(Q)$(call COPY,$(call NATIVEPATH,tools/fasmg/fasmg-ez80/commands.alm),$(INSTALL_META))
 	$(Q)$(call COPY,$(call NATIVEPATH,tools/fasmg/fasmg-ez80/ez80.alm),$(INSTALL_META))
 	$(Q)$(call COPY,$(call NATIVEPATH,tools/fasmg/fasmg-ez80/ld.alm),$(INSTALL_META))
@@ -80,7 +80,6 @@ libs-zip:
 	$(Q)$(foreach library,$(LIBS),$(call COPY,$(call NATIVEPATH,$(call SRCDIR,$(library))/$(library).8xv),clibs) &&) $(call NATIVEEXE,7z) a clibs_separately_in_zip.zip clibs
 
 clean: $(addprefix clean-,$(TOOLS)) $(addprefix clean-,$(SRCS)) $(addprefix clean-,$(LIBS))
-	$(Q)$(call REMOVE,src/linker_script)
 	$(Q)$(call REMOVE,clibs.8xg)
 	$(Q)$(call RMDIR,docs/build)
 	$(Q)$(call RMDIR,docs/doxygen)

src/ce/atomic_load_32.src

@@ -1,30 +1,32 @@
 ; ---
 ; uint32_t atomic_load_32(volatile uint32_t *p)
 ; ---
-	assume	adl=1
+	.assume	adl=1
+
+	.section	.text
+	.global	_atomic_load_32
+	.type	_atomic_load_32, @function
 
-	section	.text
-	public	_atomic_load_32
 _atomic_load_32:
 	pop	hl
-	ex	(sp),iy
+	ex	(sp), iy
 	push	hl
-	ld	c,0
-retry:
+	ld	c, 0
+.L.retry:
 ; Wait for a different (increasing) amount of time before each retry to prevent
 ; getting caught in an endless loop of the value changing between reads with a
 ; fixed period equal to the amount of time it takes for each retry
 	inc	c
 	ld	b,c
-wait:
-	djnz	wait
+.L.wait:
+	djnz	.L.wait
 ; Read the value twice.
-	lea	hl,iy+3
+	lea	hl, iy+3
 					; Time between first and last byte read:
-	ld	de,(iy)			;      2R
-	ld	a,(hl)			; + 1F+1R
-	cp	a,(hl)			; + 1F+1R
-	ld	hl,(iy)			; + 3F+3R
+	ld	de, (iy)			;      2R
+	ld	a, (hl)			; + 1F+1R
+	cp	a, (hl)			; + 1F+1R
+	ld	hl, (iy)			; + 3F+3R
 					; = 5F+7R
 					; = 48cc (assuming F = R = 3)
 					; = 1us (assuming 48MHz clock speed)
@@ -52,10 +54,10 @@ wait:
 ;
 ; (Furthermore, if a change occurs in the middle of both 32-bit reads and the
 ; bytes already read change in both, then both values read become invalid.)
-	jr	nz,retry
-	sbc	hl,de
-	jr	nz,retry
+	jr	nz, .L.retry
+	sbc	hl, de
+	jr	nz, .L.retry
 ; Values don't differ, good to go.
-	add	hl,de
-	ld	e,a			; euhl = value read
+	add	hl, de
+	ld	e, a			; euhl = value read
 	ret

src/ce/atomic_load_decreasing_32.src

@@ -1,33 +1,35 @@
 ; ---
 ; uint32_t atomic_load_decreasing_32(volatile uint32_t *p)
 ; ---
-	assume	adl=1
+	.assume	adl=1
+
+	.section	.text
+	.global	_atomic_load_decreasing_32
+	.type	_atomic_load_decreasing_32, @function
 
-	section	.text
-	public	_atomic_load_decreasing_32
 _atomic_load_decreasing_32:
 	pop	hl
-	ex	(sp),iy
+	ex	(sp), iy
 	push	hl
 ; Temporarily disable interrupts.
-	ld	a,i
+	ld	a, i
 	di
 ; Read the value twice.
 ; first value read = cude, second value read = auhl
 					; Time between first and last byte read:
-	ld	de,(iy)			;      2R
-	ld	c,(iy+3)		; + 3F+1R
-	ld	hl,(iy)			; + 3F+3R
-	ld	a,(iy+3)		; + 3F+1R
+	ld	de, (iy)			;      2R
+	ld	c, (iy+3)		; + 3F+1R
+	ld	hl, (iy)			; + 3F+3R
+	ld	a, (iy+3)		; + 3F+1R
 					; = 9F+7R
 					; = 56cc (assuming F = R = 3)
 					; ~ 1.17us (assuming 48MHz clock speed)
 					; + approximate worst-case LCD + USB DMA
 					; ~ 5us
 ; Re-enable interrupts if they were previously enabled.
-	jp	po,no_ei
+	jp	po, .L.no_ei
 	ei
-no_ei:
+.L.no_ei:
 ; Compare and return the greater of the two values read.
 ;
 ; If the values differ, then the underlying value changed between reading the
@@ -69,21 +71,21 @@ no_ei:
 ;
 ; Combining all of these cases and assumptions, the greater of the two values
 ; read will always be valid.
-	or	a,a
-	sbc	hl,de
-	sbc	a,c			; auhl = second value read
+	or	a, a
+	sbc	hl, de
+	sbc	a, c			; auhl = second value read
 					;         - first value read
-	jr	c,swap
+	jr	c, .L.swap
 ; second value read >= first value read
 ;  ==> second value read is valid
-	add	hl,de
-	adc	a,c
-	ld	e,a			; euhl = second value read
+	add	hl, de
+	adc	a, c
+	ld	e, a			; euhl = second value read
 	ret
 
-swap:
+.L.swap:
 ; second value read < first value read
 ;  ==> first value read is valid
-	ex	de,hl
-	ld	e,c			; euhl = first value read
+	ex	de, hl
+	ld	e, c			; euhl = first value read
 	ret

src/ce/atomic_load_increasing_32.src

@@ -1,42 +1,44 @@
 ; ---
 ; uint32_t atomic_load_increasing_32(volatile uint32_t *p)
 ; ---
-	assume	adl=1
+	.assume	adl=1
+
+	.section	.text
+	.global	_atomic_load_increasing_32
+	.type	_atomic_load_increasing_32, @function
 
-	section	.text
-	public	_atomic_load_increasing_32
 _atomic_load_increasing_32:
 ; CC: 202 + 9 * read_1_invalid + 3 * ie
 ; Timing assumes fetching from RAM (4cc) and reading from non-RAM (3cc).
 
 ; Read the argument.
 	pop	hl
-	ex	(sp),iy			; iy = p
+	ex	(sp), iy			; iy = p
 	push	hl
 ; ^ 48 cc
 ; Temporarily disable interrupts.
-	ld	a,i
+	ld	a, i
 	di
 ; ^ 12 cc
 ; Read from the pointer twice: first into cude, second into auhl.
 					; Time between first and last byte read:
-	ld	de,(iy)			;         2R
+	ld	de, (iy)			;         2R
 ; ^ 21 cc
 ; 48 + 12 + 21 - 6 = 75 cc until first value captured if valid
-	ld	c,(iy+3)		;  + 3F + 1R
-	ld	hl,(iy)			;  + 3F + 3R
+	ld	c, (iy+3)		;  + 3F + 1R
+	ld	hl, (iy)			;  + 3F + 3R
 ; ^ 36 cc
 ; 48 + 12 + 21 + 36 - 5 = 112 cc until second value captured if valid
-	ld	a,(iy+3)		;  + 3F + 1R
+	ld	a, (iy+3)		;  + 3F + 1R
 					; == 9F + 7R
 					; == 57 cc
 					;  + 9 * 19 cc = 171 cc (worst-case DMA)
 					; = 228 cc
 ; ^ 15 cc
 ; Re-enable interrupts if they were previously enabled.
-	jp	po,no_ei
+	jp	po, .L.no_ei
 	ei
-no_ei:
+.L.no_ei:
 ; ^ 17 + 3 * ie cc
 ; Compare and return the lesser of the two values read.
 ;
@@ -81,24 +83,24 @@ no_ei:
 ;
 ; Combining all of these cases and assumptions, the lesser of the two values
 ; read will always be valid.
-	or	a,a
-	sbc	hl,de
-	sbc	a,c			; auhl = second value read
+	or	a, a
+	sbc	hl, de
+	sbc	a, c			; auhl = second value read
 					;         - first value read
 ; ^ 16 cc
-	jr	c,no_swap
+	jr	c, .L.no_swap
 ; second value read >= first value read
 ;  ==> first value read is valid
-	ex	de,hl
-	ld	e,c			; euhl = first value read
+	ex	de, hl
+	ld	e, c			; euhl = first value read
 	ret
 ; ^ 37 cc
 
-no_swap:
+.L.no_swap:
 ; second value read < first value read
 ;  ==> second value read is valid
-	add	hl,de
-	adc	a,c
-	ld	e,a			; euhl = second value read
+	add	hl, de
+	adc	a, c
+	ld	e, a			; euhl = second value read
 	ret
-; ^ 46 cc (including conditional jr into)
+; ^ 46 cc (including conditional jr into)

src/ce/boot_sprintf.src

@@ -1,9 +1,10 @@
-	assume	adl=1
+	.assume	adl=1
 
-	section	.text
+	.section	.text
 
 ; to reduce binary size (or performance in the case of sprintf), ti's routines
 ; can be linked instead of the toolchain's routines
 
-	public	_boot_sprintf
-_boot_sprintf := 0000BCh
+	.global	_boot_sprintf
+	.type	_boot_sprintf, @function
+	.set	_boot_sprintf, 0x0000BC

src/ce/debug.src

@@ -1,52 +1,58 @@
-	assume	adl=1
+	.assume	adl=1
+
+	.section	.text
+	.global	_dbg_Debugger
+	.type	_dbg_Debugger, @function
 
-	section	.text
-	public	_dbg_Debugger
 _dbg_Debugger:
 	scf
 	sbc	hl,hl
 	ld	(hl),2
 	ret
 
-	section .text
-	public	_dbg_WatchpointSet
+	.section .text
+	.global	_dbg_WatchpointSet
+	.type	_dbg_WatchpointSet, @function
+
 _dbg_WatchpointSet:
 	; currently have to do stupid stuff until CEmu is updated to be less dumb
-	ld	iy,0
-	add	iy,sp
+	ld	iy, 0
+	add	iy, sp
 	scf
-	sbc	hl,hl
-	ld	de,(iy + 3)	; addr
-	ld	bc,(iy + 6)	; size (must be 1 right now)
-	ld	a,(iy + 9)	; mask
-	ld	(hl),8
-	ld	(hl),4
-	or	a,a		; 0 = remove
+	sbc	hl, hl
+	ld	de, (iy + 3)	; addr
+	ld	bc, (iy + 6)	; size (must be 1 right now)
+	ld	a, (iy + 9)	; mask
+	ld	(hl), 8
+	ld	(hl), 4
+	or	a, a		; 0 = remove
 	ret	z
-	bit	0,a		; read
-	jr	z,.noread
-	bit	1,a		; write
-	jr	z,.noreadwrite
- 	ld	(hl),7
-	jr	.checkexecute
-.noreadwrite:
-	ld	(hl),5
-	jr	.checkexecute
-.noread:
-	bit	1,a		; write
-	jr	z,.checkexecute
-	ld	(hl),6
-.checkexecute:
-	bit	2,a		; execute
+	bit	0, a		; read
+	jr	z, .L.noread
+	bit	1, a		; write
+	jr	z, .L.noreadwrite
+ 	ld	(hl), 7
+	jr	.L.checkexecute
+.L.noreadwrite:
+	ld	(hl), 5
+	jr	.L.checkexecute
+.L.noread:
+	bit	1, a		; write
+	jr	z, .L.checkexecute
+	ld	(hl), 6
+.L.checkexecute:
+	bit	2, a		; execute
 	ret	z
-	ld	(hl),3
+	ld	(hl), 3
 	ret
 
-	section .text
-	public	_dbg_WatchpointRemoveAll
+	.section .text
+	.global	_dbg_WatchpointRemoveAll
+	.type	_dbg_WatchpointRemoveAll, @function
+
 _dbg_WatchpointRemoveAll:
 	scf
-	sbc	hl,hl
-	ld	(hl),9
-	ld	(hl),10
+	sbc	hl, hl
+	ld	(hl), 9
+	ld	(hl), 10
 	ret