From 686cf00877292783dcdc62eaf93334427909c0f6 Mon Sep 17 00:00:00 2001 From: dfffffff Date: Tue, 8 Nov 2016 08:37:40 -0500 Subject: [PATCH] 6809: improve compatibility with other assembler --- Kernel/lowlevel-6809.s | 4 ++-- Library/libs/fuzix6809/syscall6809.s | 8 ++++---- Library/libs/setjmp_6809.s | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Kernel/lowlevel-6809.s b/Kernel/lowlevel-6809.s index 0df9bd4c..edce99df 100644 --- a/Kernel/lowlevel-6809.s +++ b/Kernel/lowlevel-6809.s @@ -462,9 +462,9 @@ outcharhex: outnibble: anda #0x0f ; mask off low four bits cmpa #9 - ble numeral ; less than 10? + ble num ; less than 10? adda #0x07 ; start at 'A' (10+7+0x30=0x41='A') -numeral:adda #0x30 ; start at '0' (0x30='0') +num: adda #0x30 ; start at '0' (0x30='0') jsr outchar rts diff --git a/Library/libs/fuzix6809/syscall6809.s b/Library/libs/fuzix6809/syscall6809.s index 55100424..12b8f3de 100644 --- a/Library/libs/fuzix6809/syscall6809.s +++ b/Library/libs/fuzix6809/syscall6809.s @@ -7,9 +7,9 @@ __syscall: swi cmpd #0 ; D holds errno, if any - beq @noerr + beq noerr1 std _errno ; X is -1 in this case -@noerr: +noerr1: rts ; for variadic functions: @@ -17,9 +17,9 @@ __syscall: __syscall_mangled: swi cmpd #0 - beq @noerr + beq noerr2 std _errno -@noerr: +noerr2: puls d ; get return address pshs d,x ; inject a word on stack, e.g. X rts diff --git a/Library/libs/setjmp_6809.s b/Library/libs/setjmp_6809.s index a0a53252..8faa4e3c 100644 --- a/Library/libs/setjmp_6809.s +++ b/Library/libs/setjmp_6809.s @@ -21,9 +21,9 @@ _setjmp: _longjmp: ; read back Y,U,S and return address ldd 2,s ; second argument - bne @nz ; must not be 0 + bne nz ; must not be 0 incb -@nz ldy ,x++ +nz ldy ,x++ ldu ,x++ lds ,x++ ; points to clobbered return address ldx ,x -- 2.34.1