OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* sky-pke.c(read_pke_pc): return source address of current pc

Browse Source 
* sky-pke.c(read_pke_pcx): return index of current pc
        * sky-pke.h: export read_pke_pcx
        * interp.c(sim_fetch_registers): read pke pc/pcx
        * sky-libvpe.c: track name change from GDB
        * sim-main.h: add vif memory based pc
          - extend gdb comm area for fifo breakpoints
          - define SIM_ENGINE_RESTART_HOOK
        * sky-gdb.c: add support for VIF breakpoints
This commit is contained in:
Ron Unrau 1998-06-16 20:30:20 +00:00
parent d80e0c96ef
commit 2905d173c5
4 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sim/mips/interp.c
View File

@ -1045,20 +1045,24 @@ sim_fetch_register (sd,rn,memory,length)
if (rn < NUM_VIF_REGS)
{
if (rn < NUM_VIF_REGS-1)
if (rn < NUM_VIF_REGS-2)
return read_pke_reg (&pke0_device, rn, memory);
else
else if (rn == NUM_VIF_REGS-2)
return read_pke_pc (&pke0_device, memory);
else
return read_pke_pcx (&pke0_device, memory);
}
rn -= NUM_VIF_REGS; /* VIF1 registers are last */
if (rn < NUM_VIF_REGS)
{
if (rn < NUM_VIF_REGS-1)
if (rn < NUM_VIF_REGS-2)
return read_pke_reg (&pke1_device, rn, memory);
else
else if (rn == NUM_VIF_REGS-2)
return read_pke_pc (&pke1_device, memory);
else
return read_pke_pcx (&pke1_device, memory);
}
sim_io_eprintf( sd, "Invalid VU register (register fetch ignored)\n" );

17
sim/mips/sim-main.h
View File

@ -565,7 +565,7 @@ struct _sim_cpu {
#define NUM_VU_REGS 153
#define NUM_VU_INTEGER_REGS 16
#define NUM_VIF_REGS 25
#define NUM_VIF_REGS 26
#define FIRST_VEC_REG 25
#define NUM_R5900_REGS 128
@ -991,6 +991,13 @@ char* pr_uword64 PARAMS ((uword64 addr));
void sky_sim_engine_halt PARAMS ((SIM_DESC sd, sim_cpu *last, sim_cia cia));
#define SIM_ENGINE_HALT_HOOK(sd, last, cia) sky_sim_engine_halt(sd, last, cia);
#ifdef SIM_ENGINE_RESTART_HOOK
#undef SIM_ENGINE_RESTART_HOOK
#endif
void sky_sim_engine_restart PARAMS ((SIM_DESC sd, sim_cpu *last, sim_cia cia));
#define SIM_ENGINE_RESTART_HOOK(sd, L, pc) sky_sim_engine_restart(sd, L, pc);
#ifndef TM_TXVU_H /* In case GDB hasn't been configured yet */
enum txvu_cpu_context
{
@ -1010,7 +1017,13 @@ enum txvu_cpu_context
/* Memory address containing last device to execute */
#define LAST_DEVICE GDB_COMM_AREA
#define BREAK_MASK 0x02 /* Breakpoint bit is #57 */
/* The FIFO breakpoint count and table */
#define FIFO_BPT_CNT (GDB_COMM_AREA + 4)
#define FIFO_BPT_TBL (GDB_COMM_AREA + 8)
#define TXVU_VU_BRK_MASK 0x02 /* Breakpoint bit is #57 for VU insns */
#define TXVU_VIF_BRK_MASK 0x0f /* Breakpoint opcode for VIF insns */
#endif /* !TM_TXVU_H */
#endif /* TARGET_SKY */
/* end-sanitize-sky */

30
sim/mips/sky-pke.c
View File

@ -198,11 +198,30 @@ pke_attach(SIM_DESC sd, struct pke_device* me)
}
/* Read PKE Pseudo-PC into buf in target order */
/* Read PKE Pseudo-PC index into buf in target order */
int
read_pke_pcx (struct pke_device *me, void *buf)
{
*((int *) buf) = H2T_4( (me->fifo_pc << 2) | me->qw_pc );
return 4;
}
/* Read PKE Pseudo-PC source address into buf in target order */
int
read_pke_pc (struct pke_device *me, void *buf)
{
*((int *) buf) = H2T_4( (me->fifo_pc << 2) | me->qw_pc );
struct fifo_quadword* fqw = pke_fifo_access(& me->fifo, me->fifo_pc);
unsigned_4 addr;
if (fqw == NULL)
*((int *) buf) = 0;
else
{
addr = (fqw->source_address & ~15) | (me->qw_pc << 2);
*((unsigned_4 *) buf) = H2T_4( addr );
}
return 4;
}
@ -686,6 +705,13 @@ pke_issue(SIM_DESC sd, struct pke_device* me)
pke_code_directhl(me, fw);
else if(IS_PKE_CMD(cmd, UNPACK))
pke_code_unpack(me, fw);
else if(cmd == TXVU_VIF_BRK_MASK)
{
sim_cpu *cpu = STATE_CPU (sd, 0);
unsigned_4 pc_addr = (fqw->source_address & ~15) | (me->qw_pc << 2);
sim_engine_halt (sd, cpu, NULL, pc_addr, sim_stopped, SIM_SIGTRAP);
}
/* ... no other commands ... */
else
pke_code_error(me, fw);

1
sim/mips/sky-pke.h
View File

@ -421,6 +421,7 @@ extern struct pke_device pke1_device;
int read_pke_reg (struct pke_device *device, int regno, void *buf);
int write_pke_reg (struct pke_device *device, int regno, const void *buf);
int read_pke_pc (struct pke_device *device, void *buf);
int read_pke_pcx (struct pke_device *device, void *buf);
/* Flags for PKE.flags */