+2012-08-19 Andrew Pinski <apinski@cavium.com>
+
+ * mips-tdep.c (is_octeon): New function.
+ (is_octeon_bbit_op): New function.
+ (mips32_next_pc): Handle Octeon's bbit instructions.
+ (mips32_instruction_has_delay_slot): Likewise.
+
2012-08-19 Andrew Pinski <apinski@cavium.com>
* mips-tdep.c (mips32_next_pc): Fix line spacing of the comment
return pc;
}
+/* Return nonzero if the gdbarch is an Octeon series. */
+
+static int
+is_octeon (struct gdbarch *gdbarch)
+{
+ const struct bfd_arch_info *info = gdbarch_bfd_arch_info (gdbarch);
+
+ return (info->mach == bfd_mach_mips_octeon
+ || info->mach == bfd_mach_mips_octeonp
+ || info->mach == bfd_mach_mips_octeon2);
+}
+
+/* Return true if the OP represents the Octeon's BBIT instruction. */
+
+static int
+is_octeon_bbit_op (int op, struct gdbarch *gdbarch)
+{
+ if (!is_octeon (gdbarch))
+ return 0;
+ /* BBIT0 is encoded as LWC2: 110 010. */
+ /* BBIT032 is encoded as LDC2: 110 110. */
+ /* BBIT1 is encoded as SWC2: 111 010. */
+ /* BBIT132 is encoded as SDC2: 111 110. */
+ if (op == 50 || op == 54 || op == 58 || op == 62)
+ return 1;
+ return 0;
+}
+
+
/* Determine where to set a single step breakpoint while considering
branch prediction. */
/* Add 1 to indicate 16-bit mode -- invert ISA mode. */
pc = ((pc + 4) & ~(CORE_ADDR) 0x0fffffff) + reg + 1;
}
+ else if (is_octeon_bbit_op (op, gdbarch))
+ {
+ int bit, branch_if;
+
+ branch_if = op == 58 || op == 62;
+ bit = itype_rt (inst);
+
+ /* Take into account the *32 instructions. */
+ if (op == 54 || op == 62)
+ bit += 32;
+
+ if (((get_frame_register_signed (frame,
+ itype_rs (inst)) >> bit) & 1)
+ == branch_if)
+ pc += mips32_relative_offset (inst) + 4;
+ else
+ pc += 8; /* After the delay slot. */
+ }
+
else
pc += 4; /* Not a branch, next instruction is easy. */
}
{
rs = itype_rs (inst);
rt = itype_rt (inst);
- return (op >> 2 == 5 /* BEQL, BNEL, BLEZL, BGTZL: bits 0101xx */
+ return (is_octeon_bbit_op (op, gdbarch)
+ || op >> 2 == 5 /* BEQL, BNEL, BLEZL, BGTZL: bits 0101xx */
|| op == 29 /* JALX: bits 011101 */
|| (op == 17
&& (rs == 8
+012-08-19 Andrew Pinski <apinski@cavium.com>
+
+ * gdb.arch/mips-octeon-bbit.c: New file.
+ * gdb.arch/mips-octeon-bbit.exp: New Test.
+
012-08-19 Keith Seitz <keiths@redhat.com>
PR c++/14365
--- /dev/null
+typedef unsigned long long uint64_t;
+void abort (void);
+
+#define BASE 0x1234567812345678ull
+
+#define DEF_BBIT_TAKEN(BRANCH_IF, BIT) \
+ int bbit_is_taken_##BRANCH_IF##_##BIT (volatile uint64_t *p) \
+ { \
+ int ret; \
+ asm (".set push \n\t" \
+ ".set noreorder \n\t" \
+ "bbit" #BRANCH_IF " %1, " #BIT ", 1f \n\t" \
+ "nop \n\t" \
+ "li %0, 0 \n\t" \
+ "b 2f \n\t" \
+ "nop \n\t" \
+ "1: \n\t" \
+ "li %0, 1 \n\t" \
+ "2: \n\t" \
+ ".set pop" \
+ : "=r"(ret) : "r"(*p)); \
+ return ret; \
+ } \
+ volatile uint64_t taken_##BRANCH_IF##_##BIT = \
+ BASE & (~(1ull << BIT)) | ((uint64_t) BRANCH_IF << BIT); \
+ volatile uint64_t not_taken_##BRANCH_IF##_##BIT = \
+ BASE & (~(1ull << BIT)) | (((uint64_t) !BRANCH_IF) << BIT);
+
+DEF_BBIT_TAKEN (0, 10);
+DEF_BBIT_TAKEN (0, 36);
+DEF_BBIT_TAKEN (1, 20);
+DEF_BBIT_TAKEN (1, 49);
+
+#define EXPECT(X) if (!(X)) abort ();
+
+main ()
+{
+ EXPECT (bbit_is_taken_0_10 (&taken_0_10));
+ EXPECT (!bbit_is_taken_0_10 (¬_taken_0_10));
+
+ EXPECT (bbit_is_taken_0_36 (&taken_0_36));
+ EXPECT (!bbit_is_taken_0_36 (¬_taken_0_36));
+
+ EXPECT (bbit_is_taken_1_20 (&taken_1_20));
+ EXPECT (!bbit_is_taken_1_20 (¬_taken_1_20));
+
+ EXPECT (bbit_is_taken_1_49 (&taken_1_49));
+ EXPECT (!bbit_is_taken_1_49 (¬_taken_1_49));
+}
--- /dev/null
+# Copyright 2007 Cavium Networks, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# Test single-step on bbit.
+
+if ![istarget "*octeon*"] {
+ return -1
+}
+
+proc current_insn {} {
+ global gdb_prompt
+
+ send_gdb "x/i \$pc\n"
+ gdb_expect {
+ -re ".*?:\\s+\(.*?\)\\s*$gdb_prompt $" {
+ set insn $expect_out(1,string)
+ return $insn
+ }
+ }
+ return ""
+}
+
+proc single_step {} {
+ global gdb_prompt
+
+ send_gdb "si\n"
+ gdb_expect {
+ -re "$gdb_prompt \$" {
+ return 1
+ }
+ }
+ return 0;
+}
+
+proc single_step_until { match } {
+ global timeout
+
+ set insn [current_insn]
+ set start [timestamp]
+ while { $insn != "" && [timestamp] - $start < 3*$timeout } {
+ if [regexp $match $insn] {
+ return 1
+ }
+ if {![single_step]} {
+ return 0
+ }
+ set insn [current_insn]
+ }
+ return 0;
+}
+
+proc test_bbit { name taken } {
+ if {![single_step_until "bbit"]} {
+ fail "$name single-step until bbit"
+ return
+ }
+ pass "$name single-step until bbit"
+ gdb_test "si" "" "$name single-step on bbit"
+ if [regexp "li\\s+\[sv\]0,$taken" [current_insn]] {
+ pass "$name check insn after bbit"
+ } else {
+ send_log "expected: li\\s+\[sv\]0,$taken found [current_insn]\n"
+ fail "$name check insn after bbit"
+ }
+}
+
+set testfile "mips-octeon-bbit"
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
+
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
+ {debug nowarnings}] != "" } {
+ fail "compilation"
+ return
+}
+
+pass "compilation"
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+# Native needs run.
+runto_main
+
+set tests ""
+foreach n [list "0_10" "0_36" "1_20" "1_49"] {
+ lappend tests "bbit_is_taken_$n"
+}
+foreach func $tests {
+ gdb_test "break $func" "Breakpoint.*at.*" "set breakpoint on $func"
+}
+
+foreach func $tests {
+ gdb_test "continue" "Continuing.*Breakpoint.*$func.*" "hit $func first"
+ test_bbit "$func branch taken" 1
+ gdb_test "continue" "Continuing.*Breakpoint.*$func.*" "hit $func second"
+ test_bbit "$func branch not taken" 0
+}
projects / binutils-gdb.git / commitdiff