projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* source.c (openp): Skip $cdir in PATH.
[deliverable/binutils-gdb.git]
/
gdb
/
cris-tdep.c
diff --git
a/gdb/cris-tdep.c
b/gdb/cris-tdep.c
index 999231cfe06700bcea37a3097a039ebcdd21b7a4..52a89debf5477dfbcd7643b1758279dc934c437d 100644
(file)
--- a/
gdb/cris-tdep.c
+++ b/
gdb/cris-tdep.c
@@
-1,6
+1,6
@@
/* Target dependent code for CRIS, for GDB, the GNU debugger.
/* Target dependent code for CRIS, for GDB, the GNU debugger.
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
, 2010
Free Software Foundation, Inc.
Contributed by Axis Communications AB.
Free Software Foundation, Inc.
Contributed by Axis Communications AB.
@@
-39,7
+39,6
@@
#include "regcache.h"
#include "gdb_assert.h"
#include "regcache.h"
#include "gdb_assert.h"
-/* To get entry_point_address. */
#include "objfiles.h"
#include "solib.h" /* Support for shared libraries. */
#include "objfiles.h"
#include "solib.h" /* Support for shared libraries. */
@@
-472,7
+471,7
@@
crisv32_single_step_through_delay (struct gdbarch *gdbarch,
{
/* In delay slot - check if there's a breakpoint at the preceding
instruction. */
{
/* In delay slot - check if there's a breakpoint at the preceding
instruction. */
- if (breakpoint_here_p (erp & ~0x1))
+ if (breakpoint_here_p (
get_frame_address_space (this_frame),
erp & ~0x1))
ret = 1;
}
return ret;
ret = 1;
}
return ret;
@@
-2133,6
+2132,7
@@
static int
cris_software_single_step (struct frame_info *frame)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
cris_software_single_step (struct frame_info *frame)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
+ struct address_space *aspace = get_frame_address_space (frame);
inst_env_type inst_env;
/* Analyse the present instruction environment and insert
inst_env_type inst_env;
/* Analyse the present instruction environment and insert
@@
-2150,13
+2150,14
@@
cris_software_single_step (struct frame_info *frame)
and possibly another one for a branch, jump, etc. */
CORE_ADDR next_pc
= (CORE_ADDR) inst_env.reg[gdbarch_pc_regnum (gdbarch)];
and possibly another one for a branch, jump, etc. */
CORE_ADDR next_pc
= (CORE_ADDR) inst_env.reg[gdbarch_pc_regnum (gdbarch)];
- insert_single_step_breakpoint (gdbarch, next_pc);
+ insert_single_step_breakpoint (gdbarch,
aspace,
next_pc);
if (inst_env.branch_found
&& (CORE_ADDR) inst_env.branch_break_address != next_pc)
{
CORE_ADDR branch_target_address
= (CORE_ADDR) inst_env.branch_break_address;
if (inst_env.branch_found
&& (CORE_ADDR) inst_env.branch_break_address != next_pc)
{
CORE_ADDR branch_target_address
= (CORE_ADDR) inst_env.branch_break_address;
- insert_single_step_breakpoint (gdbarch, branch_target_address);
+ insert_single_step_breakpoint (gdbarch,
+ aspace, branch_target_address);
}
}
}
}
@@
-3129,8
+3130,8
@@
move_reg_to_mem_movem_op (unsigned short inst, inst_env_type *inst_env)
{
/* The assign value is the value after the increment. Normally, the
assign value is the value before the increment. */
{
/* The assign value is the value after the increment. Normally, the
assign value is the value before the increment. */
- if ((cris_get_operand1 (inst) == REG_PC)
&&
- (cris_get_mode (inst) == PREFIX_ASSIGN_MODE))
+ if ((cris_get_operand1 (inst) == REG_PC)
+
&&
(cris_get_mode (inst) == PREFIX_ASSIGN_MODE))
{
/* The prefix handles the problem if we are in a delay slot. */
inst_env->reg[REG_PC] = inst_env->prefix_value;
{
/* The prefix handles the problem if we are in a delay slot. */
inst_env->reg[REG_PC] = inst_env->prefix_value;
This page took
0.026042 seconds
and
4
git commands to generate.