X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=2_isa%2Fsrc%2Fbootrom.s;h=bfc81890abd408ba06dc782e3e5249a2b978ad45;hb=5615b8e50fe3adabbdf4da3078245c9e47700ffc;hp=9dcc5411d9c80cfc055f4e5a611b9738e65820fc;hpb=b663427fc426e8b7679534f8043b5530baf9cb17;p=calu.git

diff --git a/2_isa/src/bootrom.s b/2_isa/src/bootrom.s
index 9dcc541..bfc8189 100644
--- a/2_isa/src/bootrom.s
+++ b/2_isa/src/bootrom.s
@@ -1,3 +1,29 @@
+;* bootROM, a very small bootloader for $NAME
+;*
+;* protocol details:
+;* abbrv: H = Host, CPU = C
+;*
+;* value/cmd              | direction | comment
+;* ------------------------------------------------------------
+;* 'H'                    | H -> C    | enter bootROM ("HI")
+;* 'O'                    | C -> H    | ack bootROM entry ("OH HAI")
+;*
+;* 'W'0xZZZZZZZZ0xYYYYYYYY| H -> C    | write instr (0xYY...Y) to
+;*                                    | address (0xZZ...Z)
+;* 'D'                    | C -> H    | instr write done
+;*
+;* 'R'0xZZZZZZZZ          | H -> C    | read instr from address (0xZZ..Z)
+;* 'F'0xYYYYYYYY          | C -> H    | instr read done and return instr
+;*
+;* 'Q'0xZZZZZZZZ0xYYYYYYYY| H -> C    | write data (0xYY...Y) to
+;*                                    | address (0xZZ...Z)
+;* 'A'                    | C -> H    | data write done
+;*
+;* 'T'0xZZZZZZZZ          | H -> C    | read data from address (0xZZ..Z)
+;* 'G'0xYYYYYYYY          | C -> H    | read done and return data
+;*
+;* 'J'0xZZZZZZZZ          | H -> C    | jump to address (0xZZ...Z)
+;*/
 	.data
 
 	.text
@@ -25,15 +51,10 @@ main:
 	ldi r11, PBASE@lo
 	ldih r11, PBASE@hi
 poll:
-	ldw r3, UART_STATUS(r10)
-	andx r3, UART_RECV_NEW
-	brzs+ poll; branch if zero
-	xor r0, r0, r0
-	ldw r0, UART_RECV(r10)
+	call recv_byte
 	; we received the enter bootrom sign
 	xor r1, r1, r1
 	cmpi r0, 0x48 ; 'H'
-	br tehend
 	breq+ bt_H
 	br poll ; else
 
@@ -82,24 +103,21 @@ recv_word:
 
 	call recv_byte
 	lls r1, r1, 8
-	or r1, r0, r1
+	or r0, r0, r1
+	xor r1, r1, r1
 
-	addi r0, r1, 0
 	ret
 
 ;-----
 bootrom:
 	call recv_byte
-	ldi r1, 0x50 ; 'P'
-	call send_byte
-	br tehend
-
 	xor r1, r1, r1
+
 	cmpi r0, 0x57 ; 'W'
 	breq- bt_W
 
-	cmpi r0, 0x52 ; 'R'
-	breq- bt_R
+	;cmpi r0, 0x52 ; 'R'
+	;breq- bt_R
 
 	cmpi r0, 0x51 ; 'Q'
 	breq- bt_Q
@@ -117,12 +135,11 @@ bootrom:
 bt_H:
 	ldi r1, 0x4f ; 'O'
 	call send_byte
-	xor r1, r1, r1
-	ldi r1, 0x41 ; 'A'
-	call send_byte
 	br bootrom
 
 bt_W:
+	ldi r1, 0x57 ; 'W'
+	call send_byte
 	call recv_word ; receive addr
 	stw r0, PADDR(r11)
 	call recv_word ; receive instr
@@ -131,18 +148,20 @@ bt_W:
 	call send_byte
 	br bootrom
 
-bt_R:
-	call recv_word ; receive addr
-	mov r2, r0
-	ldi r1, 0x46 ; 'F'
-	call send_byte
-	ldx r1, 0(r2)
-	call send_word
-	br bootrom
+;bt_R: ;lesen von IRAM wird nicht unterstuetzt
+	;call recv_word ; receive addr
+	;mov r2, r0
+	;ldi r1, 0x46 ; 'F'
+	;call send_byte
+	;ldx r1, 0(r2)
+	;call send_word
+	;br bootrom
 
 bt_Q:
+	ldi r1, 0x51 ; 'Q'
+	call send_byte
 	call recv_word ; receive addr
-	mov r6, r0
+	addi r6, r0, 0
 	call recv_word ; receive data
 	stw r0, 0(r6)
 	ldi r1, 0x41 ; 'A'
@@ -159,7 +178,13 @@ bt_T:
 	br bootrom
 
 bt_J:
-	call recv_word
-	brr r0
-
 tehend:
+	xor r1, r1, r1
+	ldi r1, 0x41 ; 'A'
+	call send_byte
+	xor r1, r1, r1
+	ldi r1, 0x42 ; 'B'
+	call send_byte
+	xor r1, r1, r1
+	ldi r1, 0x43 ; 'C'
+	call send_byte