From a80e63bb420d4ae8dee66703bca59035d672c9fb Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 11 Jan 2011 13:11:00 +0100 Subject: [PATCH] bootromfun: testprogramm angepasst -> bytes empfangen im 'stream' geht nicht ordentlich bug im rs232_rx? --- 2_isa/src/bootrom.s | 35 +++++++-------- cpu/src/rom_b.vhd | 102 ++++++++++++++++++-------------------------- 2 files changed, 57 insertions(+), 80 deletions(-) diff --git a/2_isa/src/bootrom.s b/2_isa/src/bootrom.s index 9ff1bf7..87b7f83 100644 --- a/2_isa/src/bootrom.s +++ b/2_isa/src/bootrom.s @@ -85,11 +85,8 @@ recv_word: ;----- bootrom: call recv_byte - ldi r1, 0x50 ; 'P' - call send_byte - br tehend - xor r1, r1, r1 + cmpi r0, 0x57 ; 'W' breq- bt_W @@ -112,28 +109,26 @@ 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: - call recv_word ; receive addr - stw r0, PADDR(r11) - call recv_word ; receive instr - stw r0, PDATA(r11) - ldi r1, 0x44 ; 'D' - call send_byte + ; call recv_word ; receive addr + ; stw r0, PADDR(r11) + ; call recv_word ; receive instr + ; stw r0, PDATA(r11) + ; ldi r1, 0x44 ; 'D' + ; 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 + ;call recv_word ; receive addr + ;mov r2, r0 + ;ldi r1, 0x46 ; 'F' + ;call send_byte + ;ldx r1, 0(r2) + ;call send_word + ;br bootrom + br tehend bt_Q: call recv_word ; receive addr diff --git a/cpu/src/rom_b.vhd b/cpu/src/rom_b.vhd index 2aae428..82c954b 100644 --- a/cpu/src/rom_b.vhd +++ b/cpu/src/rom_b.vhd @@ -133,7 +133,7 @@ begin when "0000111" => data_out <= x"eb000985"; -- call recv_byte when "0001000" => data_out <= x"e4088800"; -- xor r1, r1, r1 when "0001001" => data_out <= x"ec800240"; -- cmpi r0, 0x48 - when "0001010" => data_out <= x"1b001983"; -- breq+ bt_H + when "0001010" => data_out <= x"1b001803"; -- breq+ bt_H when "0001011" => data_out <= x"eb7ffe01"; -- br poll when "0001100" => data_out <= x"e71d0000"; -- ldw r3, UART_STATUS(r10) when "0001101" => data_out <= x"e2980008"; -- andx r3, UART_TRANS_EMPTY @@ -170,65 +170,47 @@ begin when "0101100" => data_out <= x"e1008000"; -- addi r0, r1, 0 when "0101101" => data_out <= x"eb000008"; -- ret when "0101110" => data_out <= x"eb7ff605"; -- call recv_byte - when "0101111" => data_out <= x"ed080280"; -- ldi r1, 0x50 - when "0110000" => data_out <= x"eb7fee05"; -- call send_byte - when "0110001" => data_out <= x"eb001801"; -- br tehend - when "0110010" => data_out <= x"e4088800"; -- xor r1, r1, r1 - when "0110011" => data_out <= x"ec8002b8"; -- cmpi r0, 0x57 - when "0110100" => data_out <= x"1b000781"; -- breq- bt_W - when "0110101" => data_out <= x"ec800290"; -- cmpi r0, 0x52 - when "0110110" => data_out <= x"1b000a01"; -- breq- bt_R - when "0110111" => data_out <= x"ec800288"; -- cmpi r0, 0x51 - when "0111000" => data_out <= x"1b000c81"; -- breq- bt_Q - when "0111001" => data_out <= x"ec8002a0"; -- cmpi r0, 0x54 - when "0111010" => data_out <= x"1b000f01"; -- breq- bt_T - when "0111011" => data_out <= x"ec800250"; -- cmpi r0, 0x4a - when "0111100" => data_out <= x"1b001181"; -- breq- bt_J - when "0111101" => data_out <= x"ed080278"; -- ldi r1, 0x4f - when "0111110" => data_out <= x"eb7fe705"; -- call send_byte - when "0111111" => data_out <= x"e4088800"; -- xor r1, r1, r1 - when "1000000" => data_out <= x"ed080208"; -- ldi r1, 0x41 - when "1000001" => data_out <= x"eb7fe585"; -- call send_byte - when "1000010" => data_out <= x"eb7ff601"; -- br bootrom - when "1000011" => data_out <= x"eb7fee85"; -- call recv_word - when "1000100" => data_out <= x"e7858004"; -- stw r0, PADDR(r11) - when "1000101" => data_out <= x"eb7fed85"; -- call recv_word - when "1000110" => data_out <= x"e7858008"; -- stw r0, PDATA(r11) - when "1000111" => data_out <= x"ed080220"; -- ldi r1, 0x44 - when "1001000" => data_out <= x"eb7fe205"; -- call send_byte - when "1001001" => data_out <= x"eb7ff281"; -- br bootrom - when "1001010" => data_out <= x"eb7feb05"; -- call recv_word - when "1001011" => data_out <= x"e1100000"; -- mov r2, r0 - when "1001100" => data_out <= x"ed080230"; -- ldi r1, 0x46 - when "1001101" => data_out <= x"eb7fdf85"; -- call send_byte - when "1001110" => data_out <= x"ea090000"; -- ldx r1, 0(r2) - when "1001111" => data_out <= x"eb7fe105"; -- call send_word - when "1010000" => data_out <= x"eb7fef01"; -- br bootrom - when "1010001" => data_out <= x"eb7fe785"; -- call recv_word - when "1010010" => data_out <= x"e1300000"; -- mov r6, r0 - when "1010011" => data_out <= x"eb7fe685"; -- call recv_word - when "1010100" => data_out <= x"e7830000"; -- stw r0, 0(r6) - when "1010101" => data_out <= x"ed080208"; -- ldi r1, 0x41 - when "1010110" => data_out <= x"eb7fdb05"; -- call send_byte - when "1010111" => data_out <= x"eb7feb81"; -- br bootrom - when "1011000" => data_out <= x"eb7fe405"; -- call recv_word - when "1011001" => data_out <= x"e1100000"; -- mov r2, r0 - when "1011010" => data_out <= x"ed080238"; -- ldi r1, 0x47 - when "1011011" => data_out <= x"eb7fd885"; -- call send_byte - when "1011100" => data_out <= x"e7090000"; -- ldw r1, 0(r2) - when "1011101" => data_out <= x"eb7fda05"; -- call send_word - when "1011110" => data_out <= x"eb7fe801"; -- br bootrom - when "1011111" => data_out <= x"eb7fe085"; -- call recv_word - when "1100000" => data_out <= x"eb800000"; -- brr r0 - when "1100001" => data_out <= x"e4088800"; -- xor r1, r1, r1 - when "1100010" => data_out <= x"ed080208"; -- ldi r1, 0x41 - when "1100011" => data_out <= x"eb7fd485"; -- call send_byte - when "1100100" => data_out <= x"e4088800"; -- xor r1, r1, r1 - when "1100101" => data_out <= x"ed080210"; -- ldi r1, 0x42 - when "1100110" => data_out <= x"eb7fd305"; -- call send_byte - when "1100111" => data_out <= x"e4088800"; -- xor r1, r1, r1 - when "1101000" => data_out <= x"ed080218"; -- ldi r1, 0x43 - when "1101001" => data_out <= x"eb7fd185"; -- call send_byte + when "0101111" => data_out <= x"e4088800"; -- xor r1, r1, r1 + when "0110000" => data_out <= x"ec8002b8"; -- cmpi r0, 0x57 + when "0110001" => data_out <= x"1b000601"; -- breq- bt_W + when "0110010" => data_out <= x"ec800290"; -- cmpi r0, 0x52 + when "0110011" => data_out <= x"1b000581"; -- breq- bt_R + when "0110100" => data_out <= x"ec800288"; -- cmpi r0, 0x51 + when "0110101" => data_out <= x"1b000501"; -- breq- bt_Q + when "0110110" => data_out <= x"ec8002a0"; -- cmpi r0, 0x54 + when "0110111" => data_out <= x"1b000781"; -- breq- bt_T + when "0111000" => data_out <= x"ec800250"; -- cmpi r0, 0x4a + when "0111001" => data_out <= x"1b000a01"; -- breq- bt_J + when "0111010" => data_out <= x"ed080278"; -- ldi r1, 0x4f + when "0111011" => data_out <= x"eb7fe885"; -- call send_byte + when "0111100" => data_out <= x"eb7ff901"; -- br bootrom + when "0111101" => data_out <= x"eb7ff881"; -- br bootrom + when "0111110" => data_out <= x"eb000881"; -- br tehend + when "0111111" => data_out <= x"eb7ff085"; -- call recv_word + when "1000000" => data_out <= x"e1300000"; -- mov r6, r0 + when "1000001" => data_out <= x"eb7fef85"; -- call recv_word + when "1000010" => data_out <= x"e7830000"; -- stw r0, 0(r6) + when "1000011" => data_out <= x"ed080208"; -- ldi r1, 0x41 + when "1000100" => data_out <= x"eb7fe405"; -- call send_byte + when "1000101" => data_out <= x"eb7ff481"; -- br bootrom + when "1000110" => data_out <= x"eb7fed05"; -- call recv_word + when "1000111" => data_out <= x"e1100000"; -- mov r2, r0 + when "1001000" => data_out <= x"ed080238"; -- ldi r1, 0x47 + when "1001001" => data_out <= x"eb7fe185"; -- call send_byte + when "1001010" => data_out <= x"e7090000"; -- ldw r1, 0(r2) + when "1001011" => data_out <= x"eb7fe305"; -- call send_word + when "1001100" => data_out <= x"eb7ff101"; -- br bootrom + when "1001101" => data_out <= x"eb7fe985"; -- call recv_word + when "1001110" => data_out <= x"eb800000"; -- brr r0 + when "1001111" => data_out <= x"e4088800"; -- xor r1, r1, r1 + when "1010000" => data_out <= x"ed080208"; -- ldi r1, 0x41 + when "1010001" => data_out <= x"eb7fdd85"; -- call send_byte + when "1010010" => data_out <= x"e4088800"; -- xor r1, r1, r1 + when "1010011" => data_out <= x"ed080210"; -- ldi r1, 0x42 + when "1010100" => data_out <= x"eb7fdc05"; -- call send_byte + when "1010101" => data_out <= x"e4088800"; -- xor r1, r1, r1 + when "1010110" => data_out <= x"ed080218"; -- ldi r1, 0x43 + when "1010111" => data_out <= x"eb7fda85"; -- call send_byte -- just nop until rom end! when others => data_out <= x"fd000000"; end case; -- 2.25.1