[binutils] idk just start doing things

Author: mateoconlechuga

.github/workflows/branch.yml

@@ -11,6 +11,7 @@ env:
   AUTOTESTER_ROM: ${{github.workspace}}/secrets/83pce_515_530.rom
   CEDEV: ${{github.workspace}}/CEdev
   CEDEV_BIN: ${{github.workspace}}/CEdev/bin
+  CEDEV_BINUTILS_BIN: ${{github.workspace}}/CEdev/binutils/bin
   CEDEV_EXAMPLES: ${{github.workspace}}/CEdev/examples
   CEDEV_TEST: ${{github.workspace}}/toolchain/test
   CEMU_PATH: ${{github.workspace}}/CEmu
@@ -33,24 +34,30 @@ jobs:
             fasmg: /source/macos/x64/fasmg
             arch-suffix: "-intel"
             ez80-bins-suffix: macOS_intel
+            binutils-suffix: macos_intel
           - runs-on: macos-14
             fasmg: /source/macos/x64/fasmg
             arch-suffix: "-arm"
             ez80-bins-suffix: macOS_arm
+            binutils-suffix: macos_arm
           - runs-on: windows-latest
             fasmg: /fasmg.exe
             ez80-bins-suffix: windows
+            binutils-suffix: windows
             env: "env:"
             exe: .exe
             nul: nul
             ldflags: LDFLAGS="-static-libgcc -static-libstdc++ -static"
           - runs-on: ubuntu-22.04
             ez80-bins-suffix: ubuntu
+            binutils-suffix: ubuntu
             fasmg: /fasmg.x64
     runs-on: ${{matrix.runs-on}}
     steps:
       - name: Prepare Build Environment
-        run: cmake -E echo >> $${{matrix.env}}GITHUB_PATH ${{env.CEDEV_BIN}}
+        run: |
+          cmake -E echo >> $${{matrix.env}}GITHUB_PATH ${{env.CEDEV_BIN}}
+          cmake -E echo >> $${{matrix.env}}GITHUB_PATH ${{env.CEDEV_BINUTILS_BIN}}
 
       - name: Download ez80-clang and ez80-link
         id: ez80-bins
@@ -63,6 +70,17 @@ jobs:
           pathSource: ${{steps.ez80-bins.outputs.file-path}}
           pathTarget: ${{env.CEDEV_BIN}}
 
+      - name: Download binutils
+        id: binutils
+        uses: carlosperate/[email protected]
+        with:
+          file-url: https://github.com/CE-Programming/binutils-gdb/releases/download/nightly/binutils_${{matrix.binutils-suffix}}_nightly.zip
+      - name: Extract binutils
+        uses: DuckSoft/[email protected]
+        with:
+          pathSource: ${{steps.binutils.outputs.file-path}}
+          pathTarget: ${{env.CEDEV}}
+
       - name: Add fasmg website to /etc/hosts since DNS seems to be broken
         if: runner.os == 'macOS'
         run: |
@@ -109,7 +127,9 @@ jobs:
 
       - name: Make Binaries Executable
         if: runner.os != 'Windows'
-        run: chmod +x ${{env.CEDEV_BIN}}/*
+        run: |
+          chmod +x ${{env.CEDEV_BIN}}/*
+          chmod +x ${{env.CEDEV_BINUTILS_BIN}}/*
       - name: Test Build Dependencies
         run: |
           ez80-clang --version
@@ -137,7 +157,9 @@ jobs:
 
       - name: Make Binaries Executable
         if: runner.os != 'Windows'
-        run: chmod +x ${{env.CEDEV_BIN}}/*
+        run: |
+          chmod +x ${{env.CEDEV_BIN}}/*
+          chmod +x ${{env.CEDEV_BINUTILS_BIN}}/*
 
       - name: Build Test Graphics
         run: make -j4 -C ${{env.CEDEV_TEST}} COMPRESSED=${{matrix.compressed}} V=1 gfx

makefile

@@ -21,7 +21,8 @@ include $(CURDIR)/src/common.mk
 
 LIBS := libload graphx fontlibc keypadc fileioc usbdrvce srldrvce msddrvce fatdrvce lcddrvce
 SRCS := ce crt libc libcxx softfloat
-TOOLS := fasmg convbin convimg convfont cedev-config
+TOOLS := fasmg convbin convimg convfont cedev-config cedev-obj
+
 
 ifeq ($(OS),Windows_NT)
 WINDOWS_COPY := $(call COPY,resources\windows\make.exe,$(INSTALL_BIN)) && $(call COPY,resources\windows\cedev.bat,$(INSTALL_DIR))
@@ -44,7 +45,6 @@ $(LIBS): fasmg
 	$(Q)$(MAKE) -C $(call SRCDIR,$@)
 
 install: all $(addprefix install-,$(SRCS)) $(addprefix install-,$(LIBS))
-	$(Q)$(MAKE) -f linker.mk -C src -B
 	$(Q)$(call MKDIR,$(INSTALL_DIR))
 	$(Q)$(call MKDIR,$(INSTALL_BIN))
 	$(Q)$(call MKDIR,$(INSTALL_H))
@@ -55,14 +55,12 @@ 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,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))
+	$(Q)$(call COPY,$(call NATIVEPATH,src/linker_script.ld),$(INSTALL_META))
 	$(Q)$(call COPY,$(call NATIVEEXE,tools/convfont/convfont),$(INSTALL_BIN))
 	$(Q)$(call COPY,$(call NATIVEEXE,tools/convimg/bin/convimg),$(INSTALL_BIN))
 	$(Q)$(call COPY,$(call NATIVEEXE,tools/convbin/bin/convbin),$(INSTALL_BIN))
 	$(Q)$(call COPY,$(call NATIVEEXE,tools/cedev-config/bin/cedev-config),$(INSTALL_BIN))
+	$(Q)$(call COPY,$(call NATIVEEXE,tools/cedev-obj/bin/cedev-obj),$(INSTALL_BIN))
 	$(Q)$(WINDOWS_COPY)
 
 $(addprefix install-,$(SRCS)): $(TOOLS)
@@ -73,14 +71,13 @@ $(addprefix install-,$(LIBS)): $(TOOLS)
 
 libs: $(LIBS) $(TOOLS)
 	$(Q)$(call NATIVEEXE,tools/convbin/bin/convbin) --oformat 8xg-auto-extract \
-		$(foreach library,$(LIBS),$(addprefix --input ,$(call SRCDIR,$(library))/$(library).8xv)) --output $(call NATIVEPATH,clibs.8xg)
+		$(foreach library,$(LIBS),$(addprefix --input ,$(call SRCDIR,$(library))/$(library).8xv)) --output clibs.8xg
 
 libs-zip:
 	$(Q)$(call MKDIR,clibs)
 	$(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)