From d8971499016681a180f5ac08f6b5f8bcbea902b7 Mon Sep 17 00:00:00 2001 From: Terence Boldt Date: Wed, 2 Mar 2022 21:46:45 -0500 Subject: [PATCH 1/2] Verify generated binaries --- .github/workflows/asm.yml | 7 ++++- Apple2/compare.sh | 57 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100755 Apple2/compare.sh diff --git a/.github/workflows/asm.yml b/.github/workflows/asm.yml index 6e08b2b..a4ac1a6 100644 --- a/.github/workflows/asm.yml +++ b/.github/workflows/asm.yml @@ -18,4 +18,9 @@ jobs: export PATH=$PATH:$(pwd)/.cicd cd Apple2 ./assemble.sh - + + - name: Compare binaries + run: | + export PATH=$PATH:$(pwd)/.cicd + cd Apple2 + ./compare.sh \ No newline at end of file diff --git a/Apple2/compare.sh b/Apple2/compare.sh new file mode 100755 index 0000000..8507c30 --- /dev/null +++ b/Apple2/compare.sh @@ -0,0 +1,57 @@ +#!/bin/sh +ca65 DriveFirmware.asm -D SLOT=0 -o DriveSlot0.o || exit 1 +ca65 DriveFirmware.asm -D SLOT=1 -o DriveSlot1.o || exit 1 +ca65 DriveFirmware.asm -D SLOT=2 -o DriveSlot2.o || exit 1 +ca65 DriveFirmware.asm -D SLOT=3 -o DriveSlot3.o || exit 1 +ca65 DriveFirmware.asm -D SLOT=4 -o DriveSlot4.o || exit 1 +ca65 DriveFirmware.asm -D SLOT=5 -o DriveSlot5.o || exit 1 +ca65 DriveFirmware.asm -D SLOT=6 -o DriveSlot6.o || exit 1 +ca65 DriveFirmware.asm -D SLOT=7 -o DriveSlot7.o --listing DriveFirmware.lst.new --list-bytes 255 || exit 1 +ld65 DriveSlot0.o DriveSlot1.o DriveSlot2.o DriveSlot3.o DriveSlot4.o DriveSlot5.o DriveSlot6.o DriveSlot7.o -o DriveFirmware.bin.new -C ../.cicd/none.cfg || exit 1 + +ca65 MenuFirmware.asm -D SLOT=0 -o MenuSlot0.o || exit 1 +ca65 MenuFirmware.asm -D SLOT=1 -o MenuSlot1.o || exit 1 +ca65 MenuFirmware.asm -D SLOT=2 -o MenuSlot2.o || exit 1 +ca65 MenuFirmware.asm -D SLOT=3 -o MenuSlot3.o || exit 1 +ca65 MenuFirmware.asm -D SLOT=4 -o MenuSlot4.o || exit 1 +ca65 MenuFirmware.asm -D SLOT=5 -o MenuSlot5.o || exit 1 +ca65 MenuFirmware.asm -D SLOT=6 -o MenuSlot6.o || exit 1 +ca65 MenuFirmware.asm -D SLOT=7 -o MenuSlot7.o --listing MenuFirmware.lst.new --list-bytes 255 || exit 1 +ld65 MenuSlot0.o MenuSlot1.o MenuSlot2.o MenuSlot3.o MenuSlot4.o MenuSlot5.o MenuSlot6.o MenuSlot7.o -o MenuFirmware.bin.new -C ../.cicd/none.cfg || exit 1 + +ca65 CommandFirmware.asm -D SLOT=0 -o CommandSlot0.o || exit 1 +ca65 CommandFirmware.asm -D SLOT=1 -o CommandSlot1.o || exit 1 +ca65 CommandFirmware.asm -D SLOT=2 -o CommandSlot2.o || exit 1 +ca65 CommandFirmware.asm -D SLOT=3 -o CommandSlot3.o || exit 1 +ca65 CommandFirmware.asm -D SLOT=4 -o CommandSlot4.o || exit 1 +ca65 CommandFirmware.asm -D SLOT=5 -o CommandSlot5.o || exit 1 +ca65 CommandFirmware.asm -D SLOT=6 -o CommandSlot6.o || exit 1 +ca65 CommandFirmware.asm -D SLOT=7 -o CommandSlot7.o --listing CommandFirmware.lst.new --list-bytes 255 || exit 1 +ld65 CommandSlot0.o CommandSlot1.o CommandSlot2.o CommandSlot3.o CommandSlot4.o CommandSlot5.o CommandSlot6.o CommandSlot7.o -o CommandFirmware.bin.new -C ../.cicd/none.cfg || exit 1 + +ca65 FileAccessFirmware.asm -D SLOT=0 -o FileAccessSlot0.o || exit 1 +ca65 FileAccessFirmware.asm -D SLOT=1 -o FileAccessSlot1.o || exit 1 +ca65 FileAccessFirmware.asm -D SLOT=2 -o FileAccessSlot2.o || exit 1 +ca65 FileAccessFirmware.asm -D SLOT=3 -o FileAccessSlot3.o || exit 1 +ca65 FileAccessFirmware.asm -D SLOT=4 -o FileAccessSlot4.o || exit 1 +ca65 FileAccessFirmware.asm -D SLOT=5 -o FileAccessSlot5.o || exit 1 +ca65 FileAccessFirmware.asm -D SLOT=6 -o FileAccessSlot6.o || exit 1 +ca65 FileAccessFirmware.asm -D SLOT=7 -o FileAccessSlot7.o --listing FileAccessFirmware.lst.new --list-bytes 255 || exit 1 +ld65 FileAccessSlot0.o FileAccessSlot1.o FileAccessSlot2.o FileAccessSlot3.o FileAccessSlot4.o FileAccessSlot5.o FileAccessSlot6.o FileAccessSlot7.o -o FileAccessFirmware.bin.new -C ../.cicd/none.cfg || exit 1 + +cat \ +DriveFirmware.bin.new CommandFirmware.bin.new FileAccessFirmware.bin.new MenuFirmware.bin.new \ +> AT28C64B.bin.new + +ca65 Shell.asm -o Shell.o --listing Shell.lst.new || exit 1 +ld65 Shell.o -o Shell.bin.new -C ../.cicd/none.cfg || exit 1 + +ca65 RPi.Command.asm -o RPi.Command.o --listing RPi.Command.lst.new || exit 1 +ld65 RPi.Command.o -o RPi.Command.bin.new -C ../.cicd/none.cfg || exit 1 + +rm ./*.o +diff RPi.Command.bin RPi.Command.bin.new || exit 1 +diff AT28C64B.bin AT28C64B.bin.new || exit 1 +diff Shell.bin Shell.bin.new || exit 1 + +rm *.new \ No newline at end of file From d33264edf545f31932217c9fbe3bf3ff4b991f60 Mon Sep 17 00:00:00 2001 From: Terence Boldt Date: Wed, 2 Mar 2022 21:54:28 -0500 Subject: [PATCH 2/2] Fix Codacy warning --- Apple2/compare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apple2/compare.sh b/Apple2/compare.sh index 8507c30..5588001 100755 --- a/Apple2/compare.sh +++ b/Apple2/compare.sh @@ -54,4 +54,4 @@ diff RPi.Command.bin RPi.Command.bin.new || exit 1 diff AT28C64B.bin AT28C64B.bin.new || exit 1 diff Shell.bin Shell.bin.new || exit 1 -rm *.new \ No newline at end of file +rm ./*.new