* [PATCH] linux-target.c: More MIPS software single step fixes
@ 2003-05-09 22:12 Kevin Buettner
0 siblings, 0 replies; only message in thread
From: Kevin Buettner @ 2003-05-09 22:12 UTC (permalink / raw)
To: rda
I've just committed the patch below.
Thanks to Chris Demetriou for feedback regarding problems with my
earlier patch.
* linux-target.c (mips_singlestep): Don't any consider cop0 or cop1x
instructions to be conditional branches. Expand set of cop1
opcodes considered to be conditional branches.
Index: linux-target.c
===================================================================
RCS file: /cvs/src/src/rda/unix/linux-target.c,v
retrieving revision 1.7
diff -u -p -r1.7 linux-target.c
--- linux-target.c 9 May 2003 05:13:42 -0000 1.7
+++ linux-target.c 9 May 2003 21:48:43 -0000
@@ -2640,18 +2640,29 @@ mips_singlestep (struct gdbserv *serv, p
targ |= (insn.j_format.target << 2);
break;
- /* Some cop instructions are conditional... */
- case cop0_op:
+ /* Some cop1 instructions are conditional branches. */
case cop1_op:
+ if (insn.i_format.rs == bc_op
+ || insn.i_format.rs == bc_op + 1 /* e.g, BC1ANY2 on MIPS-3D */
+ || insn.i_format.rs == bc_op + 2 /* e.g, BC1ANY4 on MIPS-3D */)
+ {
+ is_branch = is_cond = 1;
+ targ += 4 + (insn.i_format.simmediate << 2);
+ }
+ break;
+
+ /* Some cop2 instructions are conditional branches. */
case cop2_op:
- if (insn.i_format.rs != bc_op)
- break;
- else
- ; /* fall through... */
+ /* MIPS32 Architecture For Programmers Volume II, rev 1.90 documents
+ bc2f, bc2fl, bc2t, and bc2tl. */
+ if (insn.i_format.rs == bc_op)
+ {
+ is_branch = is_cond = 1;
+ targ += 4 + (insn.i_format.simmediate << 2);
+ }
+ break;
- /*
- * These are conditional.
- */
+ /* Other conditional branches... */
case beq_op:
case beql_op:
case bne_op:
@@ -2660,7 +2671,6 @@ mips_singlestep (struct gdbserv *serv, p
case blezl_op:
case bgtz_op:
case bgtzl_op:
- case cop1x_op:
is_branch = is_cond = 1;
targ += 4 + (insn.i_format.simmediate << 2);
break;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-05-09 22:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-05-09 22:12 [PATCH] linux-target.c: More MIPS software single step fixes Kevin Buettner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).