diff options
| author | Michael Snyder <msnyder@vmware.com> | 2005-04-02 00:08:14 +0000 |
|---|---|---|
| committer | Michael Snyder <msnyder@vmware.com> | 2005-04-02 00:08:14 +0000 |
| commit | 9b3c083c83dca517211431bdb3f23fbb6ce5236a (patch) | |
| tree | 87b0846c5f6c1b6b009cf1b80265cc98990b3f74 | |
| parent | ab53d7c7563e707f982dc7e37cee5dd477f57c51 (diff) | |
| download | gdb-9b3c083c83dca517211431bdb3f23fbb6ce5236a.zip gdb-9b3c083c83dca517211431bdb3f23fbb6ce5236a.tar.gz gdb-9b3c083c83dca517211431bdb3f23fbb6ce5236a.tar.bz2 | |
2005-04-01 Michael Snyder <msnyder@redhat.com>
* mn10300-prologue.c (set_movm_offsets): Don't test variable
before setting it.
* mn10300-tdep.c (mn10300_skip_prologue): Use analyze_prologue
instead of skip_prologue_using_sal.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/mn10300-prologue.c | 5 | ||||
| -rw-r--r-- | gdb/mn10300-tdep.c | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ac21981..25f6540 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2005-04-01 Michael Snyder <msnyder@redhat.com> + + * mn10300-prologue.c (set_movm_offsets): Don't test variable + before setting it. + * mn10300-tdep.c (mn10300_skip_prologue): Use analyze_prologue + instead of skip_prologue_using_sal. + 2005-03-31 Kevin Buettner <kevinb@redhat.com> * solib-frv.c (struct lm_info): Add new field ``lm_addr''. diff --git a/gdb/mn10300-prologue.c b/gdb/mn10300-prologue.c index 4875086..aea1608 100644 --- a/gdb/mn10300-prologue.c +++ b/gdb/mn10300-prologue.c @@ -119,10 +119,13 @@ set_movm_offsets (struct frame_info *fi, int offset = 0; CORE_ADDR base; - if (cache == NULL || fi == NULL) + if (fi == NULL || this_cache == NULL) return; cache = mn10300_frame_unwind_cache (fi, this_cache); + if (cache == NULL) + return; + base = trad_frame_get_this_base (cache); if (movm_args & movm_other_bit) { diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index bfa4092..8fa50d0 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -295,9 +295,15 @@ mn10300_breakpoint_from_pc (CORE_ADDR *bp_addr, int *bp_size) static CORE_ADDR mn10300_skip_prologue (CORE_ADDR pc) { +#if 0 + CORE_ADDR ret; /* FIXME: not implemented. */ /* First approximation, try simply using skip_prologue_using_sal. */ - return skip_prologue_using_sal (pc); + ret = skip_prologue_using_sal (pc); + return ret ? ret : pc; +#else + return mn10300_analyze_prologue (NULL, NULL, pc); +#endif } /* Simple frame_unwind_cache. |