diff options
| author | Mark Cave-Ayland | 2021-03-04 23:10:27 +0100 |
|---|---|---|
| committer | Mark Cave-Ayland | 2021-03-07 11:39:05 +0100 |
| commit | b630c075a24ee6b20890b32118de7ead4025a633 (patch) | |
| tree | c062683d6e8892ce4e0eebdc6e72a705950a1c75 /hw/scsi | |
| parent | esp: add trace event when receiving a TI command (diff) | |
| download | qemu-b630c075a24ee6b20890b32118de7ead4025a633.tar.gz qemu-b630c075a24ee6b20890b32118de7ead4025a633.tar.xz qemu-b630c075a24ee6b20890b32118de7ead4025a633.zip | |
esp: fix esp_reg_read() trace event
Move the trace event to the end of the function so that it correctly reports
the returned value if it doesn't come directly from the rregs array.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210304221103.6369-7-mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'hw/scsi')
| -rw-r--r-- | hw/scsi/esp.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 73700550f2..16c1853577 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -594,9 +594,8 @@ static void parent_esp_reset(ESPState *s, int irq, int level) uint64_t esp_reg_read(ESPState *s, uint32_t saddr) { - uint32_t old_val; + uint32_t val; - trace_esp_mem_readb(saddr, s->rregs[saddr]); switch (saddr) { case ESP_FIFO: if ((s->rregs[ESP_RSTAT] & STAT_PIO_MASK) == 0) { @@ -611,13 +610,14 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr) s->ti_rptr = 0; s->ti_wptr = 0; } + val = s->rregs[ESP_FIFO]; break; case ESP_RINTR: /* * Clear sequence step, interrupt register and all status bits * except TC */ - old_val = s->rregs[ESP_RINTR]; + val = s->rregs[ESP_RINTR]; s->rregs[ESP_RINTR] = 0; s->rregs[ESP_RSTAT] &= ~STAT_TC; s->rregs[ESP_RSEQ] = SEQ_CD; @@ -626,16 +626,22 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr) esp_report_command_complete(s, s->deferred_status); s->deferred_complete = false; } - return old_val; + break; case ESP_TCHI: /* Return the unique id if the value has never been written */ if (!s->tchi_written) { - return s->chip_id; + val = s->chip_id; + } else { + val = s->rregs[saddr]; } + break; default: + val = s->rregs[saddr]; break; } - return s->rregs[saddr]; + + trace_esp_mem_readb(saddr, val); + return val; } void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val) |