diff options
| author | Daniel Jacobowitz <drow@false.org> | 2006-03-15 16:55:05 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2006-03-15 16:55:05 +0000 |
| commit | 5b652102972168ebffbd7f48c8a9aacaeb94f8d5 (patch) | |
| tree | 103d12f1634d6762fcbbf3d59976323961521f9d | |
| parent | d05f682671b41368ad31d683d32571dd672fefda (diff) | |
| download | binutils-gdb-5b652102972168ebffbd7f48c8a9aacaeb94f8d5.tar.gz | |
* mips-tdep.c (is_mips16_addr, mips32_next_pc, add_offset_16):
Correct arithmetic for 64-bit CORE_ADDR.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/mips-tdep.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f1e678a3d29..41aeb00546d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2006-03-15 Daniel Jacobowitz <dan@codesourcery.com> + * mips-tdep.c (is_mips16_addr, mips32_next_pc, add_offset_16): + Correct arithmetic for 64-bit CORE_ADDR. + +2006-03-15 Daniel Jacobowitz <dan@codesourcery.com> + * mips-linux-tdep.c: Include "floatformat.h". (mips_linux_init_abi): Use 128-bit long double for N32 and N64. (mips_n32n64_return_value): Support 128-bit long double. diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 9b3935f5459..8ea209f05b0 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -202,7 +202,7 @@ is_mips16_addr (CORE_ADDR addr) static CORE_ADDR unmake_mips16_addr (CORE_ADDR addr) { - return ((addr) & ~1); + return ((addr) & ~(CORE_ADDR) 1); } /* Return the contents of register REGNUM as a signed integer. */ @@ -989,14 +989,14 @@ mips32_next_pc (CORE_ADDR pc) unsigned long reg; reg = jtype_target (inst) << 2; /* Upper four bits get never changed... */ - pc = reg + ((pc + 4) & 0xf0000000); + pc = reg + ((pc + 4) & ~(CORE_ADDR) 0x0fffffff); } break; /* FIXME case JALX : */ { unsigned long reg; reg = jtype_target (inst) << 2; - pc = reg + ((pc + 4) & 0xf0000000) + 1; /* yes, +1 */ + pc = reg + ((pc + 4) & ~(CORE_ADDR) 0x0fffffff) + 1; /* yes, +1 */ /* Add 1 to indicate 16 bit mode - Invert ISA mode */ } break; /* The new PC will be alternate mode */ @@ -1202,7 +1202,7 @@ unpack_mips16 (CORE_ADDR pc, static CORE_ADDR add_offset_16 (CORE_ADDR pc, int offset) { - return ((offset << 2) | ((pc + 2) & (0xf0000000))); + return ((offset << 2) | ((pc + 2) & (~(CORE_ADDR) 0x0fffffff))); } static CORE_ADDR |