diff options
Diffstat (limited to 'gdb/arch')
-rw-r--r-- | gdb/arch/arm-get-next-pcs.c | 6 | ||||
-rw-r--r-- | gdb/arch/arm-get-next-pcs.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/gdb/arch/arm-get-next-pcs.c b/gdb/arch/arm-get-next-pcs.c index 137df1d..6b8f38a 100644 --- a/gdb/arch/arm-get-next-pcs.c +++ b/gdb/arch/arm-get-next-pcs.c @@ -30,13 +30,13 @@ arm_get_next_pcs_ctor (struct arm_get_next_pcs *self, struct arm_get_next_pcs_ops *ops, int byte_order, int byte_order_for_code, - const gdb_byte *arm_thumb2_breakpoint, + int has_thumb2_breakpoint, struct regcache *regcache) { self->ops = ops; self->byte_order = byte_order; self->byte_order_for_code = byte_order_for_code; - self->arm_thumb2_breakpoint = arm_thumb2_breakpoint; + self->has_thumb2_breakpoint = has_thumb2_breakpoint; self->regcache = regcache; } @@ -297,7 +297,7 @@ thumb_get_next_pcs_raw (struct arm_get_next_pcs *self, CORE_ADDR pc) flags, affecting the execution of further instructions, we may need to set two breakpoints. */ - if (self->arm_thumb2_breakpoint != NULL) + if (self->has_thumb2_breakpoint) { if ((inst1 & 0xff00) == 0xbf00 && (inst1 & 0x000f) != 0) { diff --git a/gdb/arch/arm-get-next-pcs.h b/gdb/arch/arm-get-next-pcs.h index 895e866..4a0fc16 100644 --- a/gdb/arch/arm-get-next-pcs.h +++ b/gdb/arch/arm-get-next-pcs.h @@ -41,8 +41,9 @@ struct arm_get_next_pcs int byte_order; /* Byte order for code. */ int byte_order_for_code; - /* Thumb2 breakpoint instruction. */ - const gdb_byte *arm_thumb2_breakpoint; + /* Whether the target has 32-bit thumb-2 breakpoint defined or + not. */ + int has_thumb2_breakpoint; /* Registry cache. */ struct regcache *regcache; }; @@ -52,7 +53,7 @@ void arm_get_next_pcs_ctor (struct arm_get_next_pcs *self, struct arm_get_next_pcs_ops *ops, int byte_order, int byte_order_for_code, - const gdb_byte *arm_thumb2_breakpoint, + int has_thumb2_breakpoint, struct regcache *regcache); /* Find the next possible PCs after the current instruction executes. */ |