From ece6f10588da52de804ad8d834fabdbbe98d3a0e Mon Sep 17 00:00:00 2001 From: mrdudz Date: Mon, 18 Apr 2022 17:43:56 +0200 Subject: [PATCH 1/2] remove dangling spaces when changing the checker scripts and/or directly comitting to git head, please make sure to also run the checks first so you don't break the autobuilds --- asminc/atari.mac | 2 +- samples/atari2600/Makefile | 2 +- samples/cbm/Makefile | 2 +- samples/geos/Makefile | 2 +- samples/supervision/Makefile | 2 +- samples/tutorial/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/asminc/atari.mac b/asminc/atari.mac index 8e76888d7..3916254d0 100644 --- a/asminc/atari.mac +++ b/asminc/atari.mac @@ -1,5 +1,5 @@ ; Convert characters to screen codes - + ; Helper macro that converts and outputs one character .macro _scrcode char .if (char >= 0) .and (char <= 31) diff --git a/samples/atari2600/Makefile b/samples/atari2600/Makefile index a02ec9e80..bd2ebc41a 100644 --- a/samples/atari2600/Makefile +++ b/samples/atari2600/Makefile @@ -31,7 +31,7 @@ else CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) SP := $(if $(wildcard ../../bin/sp65*),../../bin/sp65,sp65) -endif +endif EXELIST_atari2600 = \ hello diff --git a/samples/cbm/Makefile b/samples/cbm/Makefile index 989710932..03387a061 100644 --- a/samples/cbm/Makefile +++ b/samples/cbm/Makefile @@ -31,7 +31,7 @@ else CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) SP := $(if $(wildcard ../../bin/sp65*),../../bin/sp65,sp65) -endif +endif ifneq ($(filter disk samples.%,$(MAKECMDGOALS)),) ifdef CC65_HOME diff --git a/samples/geos/Makefile b/samples/geos/Makefile index 04de0aaa3..1fc49a873 100644 --- a/samples/geos/Makefile +++ b/samples/geos/Makefile @@ -44,7 +44,7 @@ else CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) SP := $(if $(wildcard ../../bin/sp65*),../../bin/sp65,sp65) -endif +endif DIRLIST = grc diff --git a/samples/supervision/Makefile b/samples/supervision/Makefile index 5829b3f01..097329384 100644 --- a/samples/supervision/Makefile +++ b/samples/supervision/Makefile @@ -31,7 +31,7 @@ else CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) SP := $(if $(wildcard ../../bin/sp65*),../../bin/sp65,sp65) -endif +endif EXELIST_supervision = \ hello diff --git a/samples/tutorial/Makefile b/samples/tutorial/Makefile index 67dd84003..eb8627c29 100644 --- a/samples/tutorial/Makefile +++ b/samples/tutorial/Makefile @@ -29,7 +29,7 @@ else CC := $(if $(wildcard ../../bin/cc65*),../../bin/cc65,cc65) CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) -endif +endif EXELIST_atari2600 = \ notavailable From 47366cbbf6df00d73c154bd9360e70937d03a703 Mon Sep 17 00:00:00 2001 From: Bob Andrews Date: Mon, 18 Apr 2022 17:49:12 +0200 Subject: [PATCH 2/2] use jmp instead of jsr/rts --- libsrc/atari7800/mono_setcursor.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libsrc/atari7800/mono_setcursor.s b/libsrc/atari7800/mono_setcursor.s index fa02b1744..42f9bf466 100644 --- a/libsrc/atari7800/mono_setcursor.s +++ b/libsrc/atari7800/mono_setcursor.s @@ -161,8 +161,8 @@ umula0: jsr mono_gotoy jsr popa - jsr mono_gotox - rts + jmp mono_gotox + .endproc .proc mono_gotoxy @@ -197,8 +197,8 @@ umula0: .segment "ONCE" mono_init_cursor: lda #0 - jsr calccursorzone - rts + jmp calccursorzone + ;----------------------------------------------------------------------------- ; force the init constructor to be imported