3a_asm/2_isa: fixed our examples

[calu.git] / 2_isa / src / bootrom.s

diff --git a/2_isa/src/bootrom.s b/2_isa/src/bootrom.s
index 6732e260d62d200263044b6d5acfac429d24da64..a18b1a68c6713e1432a9d14e9621b54a87c046d9 100644 (file)
--- a/2_isa/src/bootrom.s
+++ b/2_isa/src/bootrom.s
@@ -1,12 +1,11 @@
        .data
 
        .text
-       ; TODO: will the assembler be able to evaluate these expressions?
        .define UART_BASE, 0x1000
-       .define UART_STATUS, (UART_BASE+0x4)
-       .define UART_RECV, (UART_BASE+0x8)
-       .define UART_TRANS, (UART_BASE+0xC)
-       .define UART_BAUD, (UART_BAUD+0x10)
+       .define UART_STATUS, UART_BASE+0x4
+       .define UART_RECV, UART_BASE+0x8
+       .define UART_TRANS, UART_BASE+0xC
+       .define UART_BAUD, UART_BASE+0x10
 
        .define UART_TRANS_EMPTY, 0
        .define UART_RECV_NEW, 1
@@ -28,30 +27,30 @@ timeout_loop:
        ldil r3, UART_STATUS@lo
        ldih r3, UART_STATUS@hi
        ldw r3, 0(r3)
-       andi r3, r3, 1 << UART_RECV_NEW
-       branchzs+ next; branch if zero
+       andx r3, 1 << UART_RECV_NEW
+       brzs+ next; branch if zero
 
        call recv_byte
        ; we received the enter bootrom sign
-       cmp r0, 0x48 ; 'H'
-       brancheq- bt_H
+       cmpi r0, 0x48 ; 'H'
+       breq- bt_H
 
 next:
        subi r3, r3, 1
-       branchnz+ timeout_loop
+       brnz+ timeout_loop
 
        ; call to default entry point
        ldil r0, DEFAULT_PROG_START@lo
        ldih r0, DEFAULT_PROG_START@hi
-       branchreg r0
+       brr r0
 
 ;-----
 send_byte:
        ldil r3, UART_STATUS@lo 
        ldih r3, UART_STATUS@hi
        ldw r3, 0(r3)
-       andi r3, r3, 1 << UART_TRANS_EMPTY
-       branchzs+ send_byte ; branch if zero
+       andx r3, 1 << UART_TRANS_EMPTY
+       brzs+ send_byte ; branch if zero
        ldil r3, UART_TRANS@lo  
        ldih r3, UART_TRANS@hi
        stb r1, 0(r3)
@@ -59,7 +58,6 @@ send_byte:
 
 ;-----
 send_word:
-       ; TODO: loop? (less codesize...)
        lrs r0, r1, 0
        call send_byte
        lrs r0, r1, 8
@@ -75,11 +73,11 @@ recv_byte:
        ldil r3, UART_STATUS@lo 
        ldih r3, UART_STATUS@hi
        ldw r3, 0(r3)
-       andi r3, r3, 1 << UART_RECV_NEW
-       branchzs+ send_byte ; branch if zero
+       andx r3, 1 << UART_RECV_NEW
+       brzs+ send_byte ; branch if zero
        ldil r3, UART_RECV@lo   
        ldih r3, UART_RECV@hi
-       lwb r0, 0(r3)
+       ldb r0, 0(r3)
        ret
 
 ;-----
@@ -89,47 +87,46 @@ recv_word:
        or r0, r0, r1
 
        call recv_byte
-       sll r1, r1, 8
+       lls r1, r1, 8
        or r0, r0, r1
 
        call recv_byte
-       sll r1, r1, 16
+       lls r1, r1, 16
        or r0, r0, r1
 
        call recv_byte
-       sll r1, r1, 24
+       lls r1, r1, 24
        or r0, r0, r1
 
        ret
 
-
 ;-----
 bootrom:
        call recv_byte
 
        cmpi r0, 0x57 ; 'W'
-       brancheq- bt_W
+       breq- bt_W
 
        cmpi r0, 0x52 ; 'R'
-       brancheq- bt_R
+       breq- bt_R
 
        cmpi r0, 0x51 ; 'Q'
-       brancheq- bt_Q
+       breq- bt_Q
 
        cmpi r0, 0x54 ; 'T'
-       brancheq- bt_T
+       breq- bt_T
 
        cmpi r0, 0x4a ; 'J'
-       brancheq- bt_J
+       breq- bt_J
 
        ; cmpi r0, 0x48 ; 'H'
-       ; brancheq bt_H
+       ; breq bt_H
        ; FALL THROUGH ;)
 
 bt_H:
        ldisl r1, 0x4f ; 'O'
        call send_byte
-       branch bootrom
+       br bootrom
 
 bt_W:
        call recv_word ; receive addr
@@ -138,7 +135,7 @@ bt_W:
        stx r0, 0(r6)
        ldisl r1, 0x44 ; 'D'
        call send_byte
-       branch bootrom
+       br bootrom
 
 bt_R:
        call recv_word ; receive addr
@@ -147,7 +144,7 @@ bt_R:
        call send_byte
        ldx r1, 0(r2)
        call send_word
-       branch bootrom
+       br bootrom
 
 bt_Q:
        call recv_word ; receive addr
@@ -156,7 +153,7 @@ bt_Q:
        stw r0, 0(r6)
        ldisl r1, 0x41 ; 'A'
        call send_byte
-       branch bootrom
+       br bootrom
 
 bt_T:
        call recv_word ; receive addr
@@ -165,10 +162,10 @@ bt_T:
        call send_byte
        ldw r1, 0(r2)
        call send_word
-       branch bootrom
+       br bootrom
 
 bt_J:
        call recv_word
-       branchreg r0
+       brr r0
 
 ; 102 instr. please update after modification