diff options
| author | Thiago Jung Bauermann <bauerman@br.ibm.com> | 2011-04-06 03:24:24 +0000 |
|---|---|---|
| committer | Thiago Jung Bauermann <bauerman@br.ibm.com> | 2011-04-06 03:24:24 +0000 |
| commit | e7db58eadeb8f88e2388aa3be9bdb1ca0971580c (patch) | |
| tree | 47080ac97e266698e89068f8fdd0987e9466ac2d /gdb | |
| parent | 9f743ef6ffbfd6cb5c135a7dfef27b637b894084 (diff) | |
| download | gdb-e7db58eadeb8f88e2388aa3be9bdb1ca0971580c.zip gdb-e7db58eadeb8f88e2388aa3be9bdb1ca0971580c.tar.gz gdb-e7db58eadeb8f88e2388aa3be9bdb1ca0971580c.tar.bz2 | |
* ppc-linux-nat.c (check_condition): Add len output parameter.
Set it based on the memory region referenced in the condition
expression. Update all callers.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/ppc-linux-nat.c | 26 |
2 files changed, 26 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 848a072..031e53a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-04-06 Thiago Jung Bauermann <bauerman@br.ibm.com> + + * ppc-linux-nat.c (check_condition): Add len output parameter. + Set it based on the memory region referenced in the condition + expression. Update all callers. + 2011-04-06 Jan Kratochvil <jan.kratochvil@redhat.com> Fix crash regression on systems featuring .gdb_index. diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c index f0c7f61..6f11715 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c @@ -1865,10 +1865,11 @@ num_memory_accesses (struct value *v) DVC (Data Value Compare) register in BookE processors. The expression must test the watch value for equality with a constant expression. If the function returns 1, DATA_VALUE will contain the constant against - which the watch value should be compared. */ + which the watch value should be compared and LEN will contain the size + of the constant. */ static int check_condition (CORE_ADDR watch_addr, struct expression *cond, - CORE_ADDR *data_value) + CORE_ADDR *data_value, int *len) { int pc = 1, num_accesses_left, num_accesses_right; struct value *left_val, *right_val, *left_chain, *right_chain; @@ -1900,11 +1901,23 @@ check_condition (CORE_ADDR watch_addr, struct expression *cond, if (num_accesses_left == 1 && num_accesses_right == 0 && VALUE_LVAL (left_val) == lval_memory && value_address (left_val) == watch_addr) - *data_value = value_as_long (right_val); + { + *data_value = value_as_long (right_val); + + /* DATA_VALUE is the constant in RIGHT_VAL, but actually has + the same type as the memory region referenced by LEFT_VAL. */ + *len = TYPE_LENGTH (check_typedef (value_type (left_val))); + } else if (num_accesses_left == 0 && num_accesses_right == 1 && VALUE_LVAL (right_val) == lval_memory && value_address (right_val) == watch_addr) - *data_value = value_as_long (left_val); + { + *data_value = value_as_long (left_val); + + /* DATA_VALUE is the constant in LEFT_VAL, but actually has + the same type as the memory region referenced by RIGHT_VAL. */ + *len = TYPE_LENGTH (check_typedef (value_type (right_val))); + } else { free_value_chain (left_chain); @@ -1930,7 +1943,7 @@ ppc_linux_can_accel_watchpoint_condition (CORE_ADDR addr, int len, int rw, return (have_ptrace_booke_interface () && booke_debug_info.num_condition_regs > 0 - && check_condition (addr, cond, &data_value)); + && check_condition (addr, cond, &data_value, &len)); } /* Set up P with the parameters necessary to request a watchpoint covering @@ -1950,7 +1963,8 @@ create_watchpoint_request (struct ppc_hw_breakpoint *p, CORE_ADDR addr, use_condition = (insert? can_use_watchpoint_cond_accel () : booke_debug_info.num_condition_regs > 0); - if (cond && use_condition && check_condition (addr, cond, &data_value)) + if (cond && use_condition && check_condition (addr, cond, + &data_value, &len)) calculate_dvc (addr, len, data_value, &p->condition_mode, &p->condition_value); else |