From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3058 invoked by alias); 9 Nov 2004 12:57:05 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 2433 invoked from network); 9 Nov 2004 12:56:48 -0000 Received: from unknown (HELO walton.sibelius.xs4all.nl) (82.92.89.47) by sourceware.org with SMTP; 9 Nov 2004 12:56:48 -0000 Received: from elgar.sibelius.xs4all.nl (elgar.sibelius.xs4all.nl [192.168.0.2]) by walton.sibelius.xs4all.nl (8.13.0/8.13.0) with ESMTP id iA9Cuk5W017914 for ; Tue, 9 Nov 2004 13:56:46 +0100 (CET) Received: from elgar.sibelius.xs4all.nl (localhost [127.0.0.1]) by elgar.sibelius.xs4all.nl (8.12.6p3/8.12.6) with ESMTP id iA9Cujet090593 for ; Tue, 9 Nov 2004 13:56:45 +0100 (CET) (envelope-from kettenis@elgar.sibelius.xs4all.nl) Received: (from kettenis@localhost) by elgar.sibelius.xs4all.nl (8.12.6p3/8.12.6/Submit) id iA9CujKE090590; Tue, 9 Nov 2004 13:56:45 +0100 (CET) Date: Tue, 09 Nov 2004 12:57:00 -0000 Message-Id: <200411091256.iA9CujKE090590@elgar.sibelius.xs4all.nl> From: Mark Kettenis To: gdb-patches@sources.redhat.com Subject: [RFA] Fix mips32_relative_offset() X-SW-Source: 2004-11/txt/msg00151.txt.bz2 The current code assumes that sizeof(long) == 32, which obviously isn't true on LP64 platforms. The attached patch fixes that by using the sign-extension idiom that's also used for SPARC. It still assumes that a long can hold a 18-bit signed integer, but ISO C guarantees that it can. OK? Mark P.S. Incidentally I think the function should return a LONGEST instead of CORE_ADDR. Index: ChangeLog from Mark Kettenis * mips-tdep.c (mips32_relative_offset): Avoid ussumption that sizeof(long) == 32. Index: mips-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/mips-tdep.c,v retrieving revision 1.362 diff -u -p -r1.362 mips-tdep.c --- mips-tdep.c 31 Oct 2004 21:51:58 -0000 1.362 +++ mips-tdep.c 9 Nov 2004 12:51:40 -0000 @@ -881,14 +881,8 @@ mips_fetch_instruction (CORE_ADDR addr) static CORE_ADDR mips32_relative_offset (unsigned long inst) { - long x; - x = itype_immediate (inst); - if (x & 0x8000) /* sign bit set */ - { - x |= 0xffff0000; /* sign extension */ - } - x = x << 2; - return x; + long x = ((itype_immediate (inst) ^ 0x8000) - 0x8000); + return x << 2; } /* Determine whate to set a single step breakpoint while considering