From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21072 invoked by alias); 1 Sep 2004 23:49:53 -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 21060 invoked from network); 1 Sep 2004 23:49:51 -0000 Received: from unknown (HELO takamaka.act-europe.fr) (142.179.108.108) by sourceware.org with SMTP; 1 Sep 2004 23:49:51 -0000 Received: by takamaka.act-europe.fr (Postfix, from userid 507) id 1A9B847D91; Wed, 1 Sep 2004 16:49:51 -0700 (PDT) Date: Wed, 01 Sep 2004 23:49:00 -0000 From: Joel Brobecker To: gdb-patches@sources.redhat.com Subject: [RFA] mips-tdep.c small cleanup Message-ID: <20040901234951.GN969@gnat.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="fXStkuK2IQBfcDe+" Content-Disposition: inline User-Agent: Mutt/1.4i X-SW-Source: 2004-09/txt/msg00031.txt.bz2 --fXStkuK2IQBfcDe+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 661 I removed some dead code, did some reformatting, and also did one little code factoring, to make the code look prettier. That's actually the last part of the change that made me choose a RFA rather than a PATCH. It looks obvious, and tests ok, but I'd appreciate a second pair of eyes looking at the change too. The idea is to clean this code up a little bit, so I can see better how to implement Andrew's suggestion re- inlining. 2004-09-01 Joel Brobecker * mips-tdep.c (mips_insn32_frame_cache): Remove some dead code. Minor reformatting. Some code factoring. tested on mips-irix 6.5. OK to apply? Thanks, -- Joel --fXStkuK2IQBfcDe+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="mips32-cleanup.diff" Content-length: 4005 --- mips-tdep.c.new_ref 2004-09-01 17:38:33.996866250 -0400 +++ mips-tdep.c 2004-09-01 18:27:47.336020442 -0400 @@ -2118,28 +2118,16 @@ mips_insn32_frame_cache (struct frame_in /* Bitmasks; set if we have found a save for the register. */ unsigned long gen_save_found = 0; unsigned long float_save_found = 0; - int mips16; - /* If the address is odd, assume this is MIPS16 code. */ addr = PROC_LOW_ADDR (proc_desc); - mips16 = pc_is_mips16 (addr); /* Scan through this function's instructions preceding the current PC, and look for those that save registers. */ while (addr < frame_pc_unwind (next_frame)) { - if (mips16) - { - mips16_decode_reg_save (mips16_fetch_instruction (addr), - &gen_save_found); - addr += MIPS16_INSTLEN; - } - else - { - mips32_decode_reg_save (mips32_fetch_instruction (addr), - &gen_save_found, &float_save_found); - addr += MIPS_INSTLEN; - } + mips32_decode_reg_save (mips32_fetch_instruction (addr), + &gen_save_found, &float_save_found); + addr += MIPS_INSTLEN; } gen_mask = gen_save_found; float_mask = float_save_found; @@ -2159,48 +2147,20 @@ mips_insn32_frame_cache (struct frame_in } } - /* The MIPS16 entry instruction saves $s0 and $s1 in the reverse - order of that normally used by gcc. Therefore, we have to fetch - the first instruction of the function, and if it's an entry - instruction that saves $s0 or $s1, correct their saved addresses. */ - if (pc_is_mips16 (PROC_LOW_ADDR (proc_desc))) - { - ULONGEST inst = mips16_fetch_instruction (PROC_LOW_ADDR (proc_desc)); - if ((inst & 0xf81f) == 0xe809 && (inst & 0x700) != 0x700) - /* entry */ - { - int reg; - int sreg_count = (inst >> 6) & 3; - - /* Check if the ra register was pushed on the stack. */ - CORE_ADDR reg_position = (cache->base - + PROC_REG_OFFSET (proc_desc)); - if (inst & 0x20) - reg_position -= mips_abi_regsize (gdbarch); - - /* Check if the s0 and s1 registers were pushed on the - stack. */ - /* NOTE: cagney/2004-02-08: Huh? This is doing no such - check. */ - for (reg = 16; reg < sreg_count + 16; reg++) - { - cache->saved_regs[NUM_REGS + reg].addr = reg_position; - reg_position -= mips_abi_regsize (gdbarch); - } - } - } - /* Fill in the offsets for the registers which float_mask says were saved. */ { - CORE_ADDR reg_position = (cache->base - + PROC_FREG_OFFSET (proc_desc)); + CORE_ADDR reg_position = (cache->base + PROC_FREG_OFFSET (proc_desc)); int ireg; + /* Fill in the offsets for the float registers which float_mask says were saved. */ for (ireg = MIPS_NUMREGS - 1; float_mask; --ireg, float_mask <<= 1) if (float_mask & 0x80000000) { + const int regno = + NUM_REGS + mips_regnum (current_gdbarch)->fp0 + ireg; + if (mips_abi_regsize (gdbarch) == 4 && TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) { @@ -2227,15 +2187,14 @@ mips_insn32_frame_cache (struct frame_in reg_position is decremented each time through the loop). */ if ((ireg & 1)) - cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->fp0 + ireg] - .addr = reg_position - mips_abi_regsize (gdbarch); + cache->saved_regs[regno].addr = + reg_position - mips_abi_regsize (gdbarch); else - cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->fp0 + ireg] - .addr = reg_position + mips_abi_regsize (gdbarch); + cache->saved_regs[regno].addr = + reg_position + mips_abi_regsize (gdbarch); } else - cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->fp0 + ireg] - .addr = reg_position; + cache->saved_regs[regno].addr = reg_position; reg_position -= mips_abi_regsize (gdbarch); } --fXStkuK2IQBfcDe+--