Commit 82cf2bcf authored by Sven Schnelle's avatar Sven Schnelle Committed by Paolo Bonzini
Browse files

lsi: use SCSI phase names instead of numbers in trace 



This makes trace logs much easier to read, especially for
people who are not fluent in SCSI.

Signed-off-by: default avatarSven Schnelle <svens@stackframe.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190305195519.24303-5-svens@stackframe.org>
parent 4ae63d37

hw/scsi/lsi53c895a.c

+23 −8
Original line number Diff line number Diff line
@@ -306,6 +306,22 @@ typedef struct { 
#define LSI53C895A(obj) \

    OBJECT_CHECK(LSIState, (obj), TYPE_LSI53C895A)



static const char *scsi_phases[] = {

    "DOUT",

    "DIN",

    "CMD",

    "STATUS",

    "RSVOUT",

    "RSVIN",

    "MSGOUT",

    "MSGIN"

};



static const char *scsi_phase_name(int phase)

{

    return scsi_phases[phase & PHASE_MASK];

}



static inline int lsi_irq_on_rsl(LSIState *s)

{

    return (s->sien0 & LSI_SIST0_RSL) && (s->scid & LSI_SCID_RRE);
@@ -1201,8 +1217,9 @@ again: 
            s->ia = s->dsp - 12;

        }

        if ((s->sstat1 & PHASE_MASK) != ((insn >> 24) & 7)) {

            trace_lsi_execute_script_blockmove_badphase(s->sstat1 & PHASE_MASK,

                                                        (insn >> 24) & 7);

            trace_lsi_execute_script_blockmove_badphase(

                    scsi_phase_name(s->sstat1),

                    scsi_phase_name(insn >> 24));

            lsi_script_scsi_interrupt(s, LSI_SIST0_MA, 0);

            break;

        }
@@ -1234,8 +1251,8 @@ again: 
            lsi_do_msgin(s);

            break;

        default:

            qemu_log_mask(LOG_UNIMP, "lsi_scsi: Unimplemented phase %d\n",

                          s->sstat1 & PHASE_MASK);

            qemu_log_mask(LOG_UNIMP, "lsi_scsi: Unimplemented phase %s\n",

                          scsi_phase_name(s->sstat1));

        }

        s->dfifo = s->dbc & 0xff;

        s->ctest5 = (s->ctest5 & 0xfc) | ((s->dbc >> 8) & 3);
@@ -1463,10 +1480,8 @@ again: 
                cond = s->carry != 0;

            }

            if (cond == jmp && (insn & (1 << 17))) {

                trace_lsi_execute_script_tc_compp(

                        (s->sstat1 & PHASE_MASK),

                        jmp ? '=' : '!',

                        ((insn >> 24) & 7));

                trace_lsi_execute_script_tc_compp(scsi_phase_name(s->sstat1),

                        jmp ? '=' : '!', scsi_phase_name(insn >> 24));

                cond = (s->sstat1 & PHASE_MASK) == ((insn >> 24) & 7);

            }

            if (cond == jmp && (insn & (1 << 18))) {

hw/scsi/trace-events

+3 −3
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ lsi_memcpy(uint32_t dest, uint32_t src, int count) "memcpy dest 0x%"PRIx32" src 
lsi_wait_reselect(void) "Wait Reselect"

lsi_execute_script(uint32_t dsp, uint32_t insn, uint32_t addr) "SCRIPTS dsp=0x%"PRIx32" opcode 0x%"PRIx32" arg 0x%"PRIx32

lsi_execute_script_blockmove_delayed(void) "Delayed select timeout"

lsi_execute_script_blockmove_badphase(uint8_t phase, uint8_t expected) "Wrong phase got %d expected %d"

lsi_execute_script_blockmove_badphase(const char *phase, const char *expected) "Wrong phase got %s expected %s"

lsi_execute_script_io_alreadyreselected(void) "Already reselected, jumping to alternative address"

lsi_execute_script_io_selected(uint8_t id, const char *atn) "Selected target %d%s"

lsi_execute_script_io_disconnect(void) "Wait Disconnect"
@@ -278,8 +278,8 @@ lsi_execute_script_io_opcode(const char *opcode, int reg, const char *opname, ui 
lsi_execute_script_tc_nop(void) "NOP"

lsi_execute_script_tc_delayedselect_timeout(void) "Delayed select timeout"

lsi_execute_script_tc_compc(int result) "Compare carry %d"

lsi_execute_script_tc_compp(uint8_t phase, int op, uint8_t insn_phase) "Compare phase %d %c= %d"

lsi_execute_script_tc_compd(uint32_t sfbr, uint8_t mask, int op, int result) "Compare data 0x%"PRIx32" & 0x%x %c= 0x%x"

lsi_execute_script_tc_compp(const char *phase, char op, const char *insn_phase) "Compare phase %s %c= %s"

lsi_execute_script_tc_compd(uint32_t sfbr, uint8_t mask, char op, int result) "Compare data 0x%"PRIx32" & 0x%x %c= 0x%x"

lsi_execute_script_tc_jump(uint32_t addr) "Jump to 0x%"PRIx32

lsi_execute_script_tc_call(uint32_t addr) "Call 0x%"PRIx32

lsi_execute_script_tc_return(uint32_t addr) "Return to 0x%"PRIx32