6809 platforms: Trim spaces in assembly operands

lwasm, like most 6809 assemblers, ignores everything
after a space, believing it is comments.

The next version of lwasm will have a pragma to allow
spaces and instead require a semicolon for comments.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>

diff --git a/Kernel/lowlevel-6809.s b/Kernel/lowlevel-6809.s
index b3fad26..f3f3bf3 100644 (file)
--- a/Kernel/lowlevel-6809.s
+++ b/Kernel/lowlevel-6809.s
@@ -391,7 +391,7 @@ nmimsg:     .ascii "[NMI]"
 
 nmi_handler:
        SAM_KERNEL
-       lds #istack_top - 2             ; We aren't coming back so this is ok
+       lds #istack_top-2               ; We aren't coming back so this is ok
        jsr map_kernel
         ldx #nmimsg
        jsr outstring

diff --git a/Kernel/platform-coco2/bootloader.s b/Kernel/platform-coco2/bootloader.s
index ea8e524..b2b64fd 100644 (file)
--- a/Kernel/platform-coco2/bootloader.s
+++ b/Kernel/platform-coco2/bootloader.s
@@ -37,11 +37,11 @@ copy:                                       ; Move the loader somewhere safe
 ; and just leave alone.
 ;
 start:
-               ldd #'B'*256 + 'O'
+               ldd #'B'*256+'O'
                std 0x0200
-               ldd #'O' * 256 + 'T'
+               ldd #'O'*256+'T'
                std 0x0202
-               ldd #':' * 256 + ' '
+               ldd #':'*256+' '
                std 0x0204
                tfr s,u                 ; Save old stack
                lds #$FE00              ; Point the stack somewhere clear of

diff --git a/Kernel/platform-dragon-nx32/scsi_tc3.s b/Kernel/platform-dragon-nx32/scsi_tc3.s
index 2ae255c..2772a19 100644 (file)
--- a/Kernel/platform-dragon-nx32/scsi_tc3.s
+++ b/Kernel/platform-dragon-nx32/scsi_tc3.s
@@ -26,7 +26,7 @@ _si_read:                     ; X is pointer
        tfr s,u                 ; u holds our frame pointer to throw
        bsr waitreq             ; an exception
        ldx #_si_dcb
-       ldy #_si_dcb + 16       ; length word
+       ldy #_si_dcb+16         ; length word
        bita #0x08              ; check CMD asserted
        bne si_busfailw
        lda $FF70
@@ -41,7 +41,7 @@ _si_write:                    ; X is pointer, dcb block gives length
        tfr s,u                 ; u holds our frame pointer to throw
        bsr waitreq             ; an exception
        ldx #_si_dcb
-       ldy _si_dcb + 16                ; length word
+       ldy _si_dcb+16          ; length word
        bita #0x08              ; check CMD asserted
        bne si_busfailw
        lda ,x+

diff --git a/Kernel/platform-dragon-nx32/spi.s b/Kernel/platform-dragon-nx32/spi.s
index 816f87e..ccf9fae 100644 (file)
--- a/Kernel/platform-dragon-nx32/spi.s
+++ b/Kernel/platform-dragon-nx32/spi.s
@@ -103,7 +103,7 @@ _sd_spi_receive_sector:
        pshs y,dp
        lda #0xFF
        tfr a,dp
-       lda _blk_op + 2
+       lda _blk_op+2
        beq rdspi
        jsr map_process_always
 rdspi: ldx _blk_op
@@ -135,7 +135,7 @@ _sd_spi_transmit_sector:
        pshs y,dp
        lda #0xFF
        tfr a,dp
-       lda _blk_op + 2
+       lda _blk_op+2
        beq wrspi
        jsr map_process_always
 wrspi: ldx _blk_op