This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[PATCH] Whitespace diddling...
- From: Michael Snyder <msnyder at cygnus dot com>
- To: gdb-patches at sources dot redhat dot com
- Cc: rearnsha at arm dot com
- Date: Tue, 30 Apr 2002 17:46:07 -0700
- Subject: [PATCH] Whitespace diddling...
2002-04-30 Michael Snyder <msnyder@redhat.com>
* arm-tdep.c: Whitespace clean-ups.
Index: arm-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/arm-tdep.c,v
retrieving revision 1.56
diff -p -r1.56 arm-tdep.c
*** arm-tdep.c 1 May 2002 00:30:02 -0000 1.56
--- arm-tdep.c 1 May 2002 00:56:26 -0000
***************
*** 93,100 ****
#define MSYMBOL_SIZE(msym) \
((long) MSYMBOL_INFO (msym) & 0x7fffffff)
! /* This table matches the indicees assigned to enum arm_abi. Keep
! them in sync. */
static const char * const arm_abi_names[] =
{
--- 93,100 ----
#define MSYMBOL_SIZE(msym) \
((long) MSYMBOL_INFO (msym) & 0x7fffffff)
! /* This table matches the indicees assigned to enum arm_abi.
! Keep them in sync. */
static const char * const arm_abi_names[] =
{
*************** static const char * const arm_abi_names[
*** 110,124 ****
NULL
};
! /* Number of different reg name sets (options). */
static int num_flavor_options;
/* We have more registers than the disassembler as gdb can print the value
of special registers as well.
The general register names are overwritten by whatever is being used by
! the disassembler at the moment. We also adjust the case of cpsr and fps. */
! /* Initial value: Register names used in ARM's ISA documentation. */
static char * arm_register_name_strings[] =
{"r0", "r1", "r2", "r3", /* 0 1 2 3 */
"r4", "r5", "r6", "r7", /* 4 5 6 7 */
--- 110,124 ----
NULL
};
! /* Number of different reg name sets (options). */
static int num_flavor_options;
/* We have more registers than the disassembler as gdb can print the value
of special registers as well.
The general register names are overwritten by whatever is being used by
! the disassembler at the moment. We also adjust the case of cpsr and fps. */
! /* Initial value: Register names used in ARM's ISA documentation. */
static char * arm_register_name_strings[] =
{"r0", "r1", "r2", "r3", /* 0 1 2 3 */
"r4", "r5", "r6", "r7", /* 4 5 6 7 */
*************** static char * arm_register_name_strings[
*** 126,140 ****
"r12", "sp", "lr", "pc", /* 12 13 14 15 */
"f0", "f1", "f2", "f3", /* 16 17 18 19 */
"f4", "f5", "f6", "f7", /* 20 21 22 23 */
! "fps", "cpsr" }; /* 24 25 */
static char **arm_register_names = arm_register_name_strings;
/* Valid register name flavors. */
static const char **valid_flavors;
! /* Disassembly flavor to use. Default to "std" register names. */
static const char *disassembly_flavor;
! /* Index to that option in the opcodes table. */
static int current_option;
/* This is used to keep the bfd arch_info in sync with the disassembly
--- 126,140 ----
"r12", "sp", "lr", "pc", /* 12 13 14 15 */
"f0", "f1", "f2", "f3", /* 16 17 18 19 */
"f4", "f5", "f6", "f7", /* 20 21 22 23 */
! "fps", "cpsr" }; /* 24 25 */
static char **arm_register_names = arm_register_name_strings;
/* Valid register name flavors. */
static const char **valid_flavors;
! /* Disassembly flavor to use. Default to "std" register names. */
static const char *disassembly_flavor;
! /* Index to that option in the opcodes table. */
static int current_option;
/* This is used to keep the bfd arch_info in sync with the disassembly
*************** static void convert_from_extended (void
*** 149,155 ****
all saved registers, 'cause we need 'em a lot! We also keep the
current size of the stack frame, and the offset of the frame
pointer from the stack pointer (for frameless functions, and when
! we're still in the prologue of a function with a frame) */
struct frame_extra_info
{
--- 149,155 ----
all saved registers, 'cause we need 'em a lot! We also keep the
current size of the stack frame, and the offset of the frame
pointer from the stack pointer (for frameless functions, and when
! we're still in the prologue of a function with a frame). */
struct frame_extra_info
{
*************** arm_frame_chain_valid (CORE_ADDR chain,
*** 170,176 ****
return (chain != 0 && (FRAME_SAVED_PC (thisframe) >= LOWEST_PC));
}
! /* Set to true if the 32-bit mode is in use. */
int arm_apcs_32 = 1;
--- 170,176 ----
return (chain != 0 && (FRAME_SAVED_PC (thisframe) >= LOWEST_PC));
}
! /* Set to true if the 32-bit mode is in use. */
int arm_apcs_32 = 1;
*************** arm_pc_is_thumb_dummy (CORE_ADDR memaddr
*** 226,232 ****
We hope the current stack pointer is not so far alway from the dummy
frame location (true if we have not pushed large data structures or
gone too many levels deep) and that our 1024 is not enough to consider
! code regions as part of the stack (true for most practical purposes) */
if (PC_IN_CALL_DUMMY (memaddr, sp, sp + 1024))
return caller_is_thumb;
else
--- 226,232 ----
We hope the current stack pointer is not so far alway from the dummy
frame location (true if we have not pushed large data structures or
gone too many levels deep) and that our 1024 is not enough to consider
! code regions as part of the stack (true for most practical purposes). */
if (PC_IN_CALL_DUMMY (memaddr, sp, sp + 1024))
return caller_is_thumb;
else
*************** arm_frameless_function_invocation (struc
*** 289,295 ****
/* There are some frameless functions whose first two instructions
follow the standard APCS form, in which case after_prologue will
! be func_start + 8. */
frameless = (after_prologue < func_start + 12);
return frameless;
--- 289,295 ----
/* There are some frameless functions whose first two instructions
follow the standard APCS form, in which case after_prologue will
! be func_start + 8. */
frameless = (after_prologue < func_start + 12);
return frameless;
*************** thumb_skip_prologue (CORE_ADDR pc, CORE_
*** 356,386 ****
*/
int findmask = 0;
! for (current_pc = pc;
! current_pc + 2 < func_end && current_pc < pc + 40;
current_pc += 2)
{
unsigned short insn = read_memory_unsigned_integer (current_pc, 2);
! if ((insn & 0xfe00) == 0xb400) /* push { rlist } */
{
! findmask |= 1; /* push found */
}
else if ((insn & 0xff00) == 0xb000) /* add sp, #simm OR
sub sp, #simm */
{
! if ((findmask & 1) == 0) /* before push ? */
continue;
else
! findmask |= 4; /* add/sub sp found */
}
else if ((insn & 0xff00) == 0xaf00) /* add r7, sp, #imm */
{
! findmask |= 2; /* setting of r7 found */
}
else if (insn == 0x466f) /* mov r7, sp */
{
! findmask |= 2; /* setting of r7 found */
}
else if (findmask == (4+2+1))
{
--- 356,386 ----
*/
int findmask = 0;
! for (current_pc = pc;
! current_pc + 2 < func_end && current_pc < pc + 40;
current_pc += 2)
{
unsigned short insn = read_memory_unsigned_integer (current_pc, 2);
! if ((insn & 0xfe00) == 0xb400) /* push { rlist } */
{
! findmask |= 1; /* push found */
}
else if ((insn & 0xff00) == 0xb000) /* add sp, #simm OR
sub sp, #simm */
{
! if ((findmask & 1) == 0) /* before push ? */
continue;
else
! findmask |= 4; /* add/sub sp found */
}
else if ((insn & 0xff00) == 0xaf00) /* add r7, sp, #imm */
{
! findmask |= 2; /* setting of r7 found */
}
else if (insn == 0x466f) /* mov r7, sp */
{
! findmask |= 2; /* setting of r7 found */
}
else if (findmask == (4+2+1))
{
*************** thumb_skip_prologue (CORE_ADDR pc, CORE_
*** 388,396 ****
break;
}
else
! /* something in the prolog that we don't care about or some
instruction from outside the prolog scheduled here for
! optimization */
continue;
}
--- 388,396 ----
break;
}
else
! /* Something in the prolog that we don't care about or some
instruction from outside the prolog scheduled here for
! optimization. */
continue;
}
*************** arm_skip_prologue (CORE_ADDR pc)
*** 431,437 ****
sym = lookup_symbol (func_name, NULL, VAR_NAMESPACE, NULL, NULL);
if (sym && SYMBOL_LANGUAGE (sym) != language_asm)
{
! /* Don't use this trick for assembly source files. */
sal = find_pc_line (func_addr, 0);
if ((sal.line != 0) && (sal.end < func_end))
return sal.end;
--- 431,437 ----
sym = lookup_symbol (func_name, NULL, VAR_NAMESPACE, NULL, NULL);
if (sym && SYMBOL_LANGUAGE (sym) != language_asm)
{
! /* Don't use this trick for assembly source files. */
sal = find_pc_line (func_addr, 0);
if ((sal.line != 0) && (sal.end < func_end))
return sal.end;
*************** arm_skip_prologue (CORE_ADDR pc)
*** 443,460 ****
return thumb_skip_prologue (pc, func_end);
/* Can't find the prologue end in the symbol table, try it the hard way
! by disassembling the instructions. */
skip_pc = pc;
inst = read_memory_integer (skip_pc, 4);
/* "mov ip, sp" is no longer a required part of the prologue. */
! if (inst == 0xe1a0c00d) /* mov ip, sp */
{
skip_pc += 4;
inst = read_memory_integer (skip_pc, 4);
}
/* Some prologues begin with "str lr, [sp, #-4]!". */
! if (inst == 0xe52de004) /* str lr, [sp, #-4]! */
{
skip_pc += 4;
inst = read_memory_integer (skip_pc, 4);
--- 443,460 ----
return thumb_skip_prologue (pc, func_end);
/* Can't find the prologue end in the symbol table, try it the hard way
! by disassembling the instructions. */
skip_pc = pc;
inst = read_memory_integer (skip_pc, 4);
/* "mov ip, sp" is no longer a required part of the prologue. */
! if (inst == 0xe1a0c00d) /* mov ip, sp */
{
skip_pc += 4;
inst = read_memory_integer (skip_pc, 4);
}
/* Some prologues begin with "str lr, [sp, #-4]!". */
! if (inst == 0xe52de004) /* str lr, [sp, #-4]! */
{
skip_pc += 4;
inst = read_memory_integer (skip_pc, 4);
*************** arm_skip_prologue (CORE_ADDR pc)
*** 474,480 ****
/* Any insns after this point may float into the code, if it makes
for better instruction scheduling, so we skip them only if we
! find them, but still consdier the function to be frame-ful. */
/* We may have either one sfmfd instruction here, or several stfe
insns, depending on the version of floating point code we
--- 474,480 ----
/* Any insns after this point may float into the code, if it makes
for better instruction scheduling, so we skip them only if we
! find them, but still consider the function to be frame-ful. */
/* We may have either one sfmfd instruction here, or several stfe
insns, depending on the version of floating point code we
*************** arm_skip_prologue (CORE_ADDR pc)
*** 505,511 ****
inst = read_memory_integer (skip_pc, 4);
}
! while ((inst & 0xffffcfc0) == 0xe50b0000) /* str r(0123), [r11, #-nn] */
{
skip_pc += 4;
inst = read_memory_integer (skip_pc, 4);
--- 505,511 ----
inst = read_memory_integer (skip_pc, 4);
}
! while ((inst & 0xffffcfc0) == 0xe50b0000) /* str r(0123), [r11, #-nn] */
{
skip_pc += 4;
inst = read_memory_integer (skip_pc, 4);
*************** arm_skip_prologue (CORE_ADDR pc)
*** 513,518 ****
--- 513,519 ----
return skip_pc;
}
+
/* *INDENT-OFF* */
/* Function: thumb_scan_prologue (helper function for arm_scan_prologue)
This function decodes a Thumb function prologue to determine:
*************** thumb_scan_prologue (struct frame_info *
*** 542,548 ****
CORE_ADDR prologue_start;
CORE_ADDR prologue_end;
CORE_ADDR current_pc;
! /* Which register has been copied to register n? */
int saved_reg[16];
/* findmask:
bit 0 - push { rlist }
--- 543,549 ----
CORE_ADDR prologue_start;
CORE_ADDR prologue_end;
CORE_ADDR current_pc;
! /* Which register has been copied to register n? */
int saved_reg[16];
/* findmask:
bit 0 - push { rlist }
*************** thumb_scan_prologue (struct frame_info *
*** 556,565 ****
{
struct symtab_and_line sal = find_pc_line (prologue_start, 0);
! if (sal.line == 0) /* no line info, use current PC */
prologue_end = fi->pc;
else if (sal.end < prologue_end) /* next line begins after fn end */
! prologue_end = sal.end; /* (probably means no prologue) */
}
else
/* We're in the boondocks: allow for
--- 557,566 ----
{
struct symtab_and_line sal = find_pc_line (prologue_start, 0);
! if (sal.line == 0) /* no line info, use current PC */
prologue_end = fi->pc;
else if (sal.end < prologue_end) /* next line begins after fn end */
! prologue_end = sal.end; /* (probably means no prologue) */
}
else
/* We're in the boondocks: allow for
*************** thumb_scan_prologue (struct frame_info *
*** 591,597 ****
if ((insn & 0xfe00) == 0xb400) /* push { rlist } */
{
int mask;
! findmask |= 1; /* push found */
/* Bits 0-7 contain a mask for registers R0-R7. Bit 8 says
whether to save LR (R14). */
mask = (insn & 0xff) | ((insn & 0x100) << 6);
--- 592,598 ----
if ((insn & 0xfe00) == 0xb400) /* push { rlist } */
{
int mask;
! findmask |= 1; /* push found */
/* Bits 0-7 contain a mask for registers R0-R7. Bit 8 says
whether to save LR (R14). */
mask = (insn & 0xff) | ((insn & 0x100) << 6);
*************** thumb_scan_prologue (struct frame_info *
*** 610,622 ****
else if ((insn & 0xff00) == 0xb000) /* add sp, #simm OR
sub sp, #simm */
{
! if ((findmask & 1) == 0) /* before push ? */
continue;
else
! findmask |= 4; /* add/sub sp found */
! offset = (insn & 0x7f) << 2; /* get scaled offset */
! if (insn & 0x80) /* is it signed? (==subtracting) */
{
fi->extra_info->frameoffset += offset;
offset = -offset;
--- 611,623 ----
else if ((insn & 0xff00) == 0xb000) /* add sp, #simm OR
sub sp, #simm */
{
! if ((findmask & 1) == 0) /* before push? */
continue;
else
! findmask |= 4; /* add/sub sp found */
! offset = (insn & 0x7f) << 2; /* get scaled offset */
! if (insn & 0x80) /* is it signed? (==subtracting) */
{
fi->extra_info->frameoffset += offset;
offset = -offset;
*************** thumb_scan_prologue (struct frame_info *
*** 625,638 ****
}
else if ((insn & 0xff00) == 0xaf00) /* add r7, sp, #imm */
{
! findmask |= 2; /* setting of r7 found */
fi->extra_info->framereg = THUMB_FP_REGNUM;
/* get scaled offset */
fi->extra_info->frameoffset = (insn & 0xff) << 2;
}
else if (insn == 0x466f) /* mov r7, sp */
{
! findmask |= 2; /* setting of r7 found */
fi->extra_info->framereg = THUMB_FP_REGNUM;
fi->extra_info->frameoffset = 0;
saved_reg[THUMB_FP_REGNUM] = ARM_SP_REGNUM;
--- 626,639 ----
}
else if ((insn & 0xff00) == 0xaf00) /* add r7, sp, #imm */
{
! findmask |= 2; /* setting of r7 found */
fi->extra_info->framereg = THUMB_FP_REGNUM;
/* get scaled offset */
fi->extra_info->frameoffset = (insn & 0xff) << 2;
}
else if (insn == 0x466f) /* mov r7, sp */
{
! findmask |= 2; /* setting of r7 found */
fi->extra_info->framereg = THUMB_FP_REGNUM;
fi->extra_info->frameoffset = 0;
saved_reg[THUMB_FP_REGNUM] = ARM_SP_REGNUM;
*************** thumb_scan_prologue (struct frame_info *
*** 641,647 ****
{
int lo_reg = insn & 7; /* dest. register (r0-r7) */
int hi_reg = ((insn >> 3) & 7) + 8; /* source register (r8-15) */
! saved_reg[lo_reg] = hi_reg; /* remember hi reg was saved */
}
else
/* Something in the prolog that we don't care about or some
--- 642,648 ----
{
int lo_reg = insn & 7; /* dest. register (r0-r7) */
int hi_reg = ((insn >> 3) & 7) + 8; /* source register (r8-15) */
! saved_reg[lo_reg] = hi_reg; /* remember hi reg was saved */
}
else
/* Something in the prolog that we don't care about or some
*************** arm_scan_prologue (struct frame_info *fi
*** 779,785 ****
LONGEST return_value;
CORE_ADDR prologue_start, prologue_end, current_pc;
! /* Check if this function is already in the cache of frame information. */
if (check_prologue_cache (fi))
return;
--- 780,786 ----
LONGEST return_value;
CORE_ADDR prologue_start, prologue_end, current_pc;
! /* Check if this function is already in the cache of frame information. */
if (check_prologue_cache (fi))
return;
*************** arm_scan_prologue (struct frame_info *fi
*** 830,852 ****
is a suitable endpoint since it accounts for the largest
possible prologue plus up to five instructions inserted by
! the scheduler. */
if (prologue_end > prologue_start + 64)
{
! prologue_end = prologue_start + 64; /* See above. */
}
}
else
{
! /* Get address of the stmfd in the prologue of the callee; the saved
! PC is the address of the stmfd + 8. */
if (!safe_read_memory_integer (fi->frame, 4, &return_value))
return;
else
{
prologue_start = ADDR_BITS_REMOVE (return_value) - 8;
! prologue_end = prologue_start + 64; /* See above. */
}
}
--- 831,853 ----
is a suitable endpoint since it accounts for the largest
possible prologue plus up to five instructions inserted by
! the scheduler. */
if (prologue_end > prologue_start + 64)
{
! prologue_end = prologue_start + 64; /* See above. */
}
}
else
{
! /* Get address of the stmfd in the prologue of the callee;
! the saved PC is the address of the stmfd + 8. */
if (!safe_read_memory_integer (fi->frame, 4, &return_value))
return;
else
{
prologue_start = ADDR_BITS_REMOVE (return_value) - 8;
! prologue_end = prologue_start + 64; /* See above. */
}
}
*************** arm_scan_prologue (struct frame_info *fi
*** 873,889 ****
sp_offset = fp_offset = 0;
! for (current_pc = prologue_start;
! current_pc < prologue_end;
current_pc += 4)
{
unsigned int insn = read_memory_unsigned_integer (current_pc, 4);
! if (insn == 0xe1a0c00d) /* mov ip, sp */
{
continue;
}
! else if (insn == 0xe52de004) /* str lr, [sp, #-4]! */
{
/* Function is frameless: extra_info defaults OK? */
continue;
--- 874,890 ----
sp_offset = fp_offset = 0;
! for (current_pc = prologue_start;
! current_pc < prologue_end;
current_pc += 4)
{
unsigned int insn = read_memory_unsigned_integer (current_pc, 4);
! if (insn == 0xe1a0c00d) /* mov ip, sp */
{
continue;
}
! else if (insn == 0xe52de004) /* str lr, [sp, #-4]! */
{
/* Function is frameless: extra_info defaults OK? */
continue;
*************** arm_scan_prologue (struct frame_info *fi
*** 895,901 ****
{
int mask = insn & 0xffff;
! /* Calculate offsets of saved registers. */
for (regno = ARM_PC_REGNUM; regno >= 0; regno--)
if (mask & (1 << regno))
{
--- 896,902 ----
{
int mask = insn & 0xffff;
! /* Calculate offsets of saved registers. */
for (regno = ARM_PC_REGNUM; regno >= 0; regno--)
if (mask & (1 << regno))
{
*************** arm_scan_prologue (struct frame_info *fi
*** 903,925 ****
fi->saved_regs[regno] = sp_offset;
}
}
! else if ((insn & 0xffffcfc0) == 0xe50b0000) /* str rx, [r11, -n] */
{
/* No need to add this to saved_regs -- it's just an arg reg. */
continue;
}
else if ((insn & 0xfffff000) == 0xe24cb000) /* sub fp, ip #n */
{
! unsigned imm = insn & 0xff; /* immediate value */
! unsigned rot = (insn & 0xf00) >> 7; /* rotate amount */
imm = (imm >> rot) | (imm << (32 - rot));
fp_offset = -imm;
fi->extra_info->framereg = ARM_FP_REGNUM;
}
else if ((insn & 0xfffff000) == 0xe24dd000) /* sub sp, sp #n */
{
! unsigned imm = insn & 0xff; /* immediate value */
! unsigned rot = (insn & 0xf00) >> 7; /* rotate amount */
imm = (imm >> rot) | (imm << (32 - rot));
sp_offset -= imm;
}
--- 904,926 ----
fi->saved_regs[regno] = sp_offset;
}
}
! else if ((insn & 0xffffcfc0) == 0xe50b0000) /* str rx, [r11, -n] */
{
/* No need to add this to saved_regs -- it's just an arg reg. */
continue;
}
else if ((insn & 0xfffff000) == 0xe24cb000) /* sub fp, ip #n */
{
! unsigned imm = insn & 0xff; /* immediate value */
! unsigned rot = (insn & 0xf00) >> 7; /* rotate amount */
imm = (imm >> rot) | (imm << (32 - rot));
fp_offset = -imm;
fi->extra_info->framereg = ARM_FP_REGNUM;
}
else if ((insn & 0xfffff000) == 0xe24dd000) /* sub sp, sp #n */
{
! unsigned imm = insn & 0xff; /* immediate value */
! unsigned rot = (insn & 0xf00) >> 7; /* rotate amount */
imm = (imm >> rot) | (imm << (32 - rot));
sp_offset -= imm;
}
*************** arm_scan_prologue (struct frame_info *fi
*** 934,940 ****
int n_saved_fp_regs;
unsigned int fp_start_reg, fp_bound_reg;
! if ((insn & 0x800) == 0x800) /* N0 is set */
{
if ((insn & 0x40000) == 0x40000) /* N1 is set */
n_saved_fp_regs = 3;
--- 935,941 ----
int n_saved_fp_regs;
unsigned int fp_start_reg, fp_bound_reg;
! if ((insn & 0x800) == 0x800) /* N0 is set */
{
if ((insn & 0x40000) == 0x40000) /* N1 is set */
n_saved_fp_regs = 3;
*************** arm_scan_prologue (struct frame_info *fi
*** 958,975 ****
}
}
else if ((insn & 0xf0000000) != 0xe0000000)
! break; /* Condition not true, exit early */
else if ((insn & 0xfe200000) == 0xe8200000) /* ldm? */
! break; /* Don't scan past a block load */
else
/* The optimizer might shove anything into the prologue,
! so we just skip what we don't recognize. */
continue;
}
! /* The frame size is just the negative of the offset (from the original SP)
! of the last thing thing we pushed on the stack. The frame offset is
! [new FP] - [new SP]. */
fi->extra_info->framesize = -sp_offset;
if (fi->extra_info->framereg == ARM_FP_REGNUM)
fi->extra_info->frameoffset = fp_offset - sp_offset;
--- 959,976 ----
}
}
else if ((insn & 0xf0000000) != 0xe0000000)
! break; /* Condition not true, exit early */
else if ((insn & 0xfe200000) == 0xe8200000) /* ldm? */
! break; /* Don't scan past a block load */
else
/* The optimizer might shove anything into the prologue,
! so we just skip what we don't recognize. */
continue;
}
! /* The frame size is just the negative of the offset (from the
! original SP) of the last thing thing we pushed on the stack.
! The frame offset is [new FP] - [new SP]. */
fi->extra_info->framesize = -sp_offset;
if (fi->extra_info->framereg == ARM_FP_REGNUM)
fi->extra_info->frameoffset = fp_offset - sp_offset;
*************** arm_frame_chain (struct frame_info *fi)
*** 1013,1027 ****
#if 0 /* FIXME: enable this code if we convert to new call dummy scheme. */
CORE_ADDR fn_start, callers_pc, fp;
! /* is this a dummy frame? */
if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
return fi->frame; /* dummy frame same as caller's frame */
! /* is caller-of-this a dummy frame? */
callers_pc = FRAME_SAVED_PC (fi); /* find out who called us: */
fp = arm_find_callers_reg (fi, ARM_FP_REGNUM);
if (PC_IN_CALL_DUMMY (callers_pc, fp, fp))
! return fp; /* dummy frame's frame may bear no relation to ours */
if (find_pc_partial_function (fi->pc, 0, &fn_start, 0))
if (fn_start == entry_point_address ())
--- 1014,1028 ----
#if 0 /* FIXME: enable this code if we convert to new call dummy scheme. */
CORE_ADDR fn_start, callers_pc, fp;
! /* Is this a dummy frame? */
if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
return fi->frame; /* dummy frame same as caller's frame */
! /* Is caller-of-this a dummy frame? */
callers_pc = FRAME_SAVED_PC (fi); /* find out who called us: */
fp = arm_find_callers_reg (fi, ARM_FP_REGNUM);
if (PC_IN_CALL_DUMMY (callers_pc, fp, fp))
! return fp; /* dummy frame's frame may bear no relation to ours */
if (find_pc_partial_function (fi->pc, 0, &fn_start, 0))
if (fn_start == entry_point_address ())
*************** arm_frame_chain (struct frame_info *fi)
*** 1042,1048 ****
/* If the caller is Thumb and the caller is ARM, or vice versa,
the frame register of the caller is different from ours.
So we must scan the prologue of the caller to determine its
! frame register number. */
/* XXX Fixme, we should try to do this without creating a temporary
caller_fi. */
if (arm_pc_is_thumb (caller_pc) != arm_pc_is_thumb (fi->pc))
--- 1043,1049 ----
/* If the caller is Thumb and the caller is ARM, or vice versa,
the frame register of the caller is different from ours.
So we must scan the prologue of the caller to determine its
! frame register number. */
/* XXX Fixme, we should try to do this without creating a temporary
caller_fi. */
if (arm_pc_is_thumb (caller_pc) != arm_pc_is_thumb (fi->pc))
*************** arm_init_extra_frame_info (int fromleaf,
*** 1148,1154 ****
for (reg = 0; reg < NUM_REGS; reg++)
fi->saved_regs[reg] = SIGCONTEXT_REGISTER_ADDRESS (sp, fi->pc, reg);
! /* FIXME: What about thumb mode? */
fi->extra_info->framereg = ARM_SP_REGNUM;
fi->frame =
read_memory_integer (fi->saved_regs[fi->extra_info->framereg],
--- 1149,1155 ----
for (reg = 0; reg < NUM_REGS; reg++)
fi->saved_regs[reg] = SIGCONTEXT_REGISTER_ADDRESS (sp, fi->pc, reg);
! /* FIXME: What about thumb mode? */
fi->extra_info->framereg = ARM_SP_REGNUM;
fi->frame =
read_memory_integer (fi->saved_regs[fi->extra_info->framereg],
*************** arm_init_extra_frame_info (int fromleaf,
*** 1185,1204 ****
arm_scan_prologue (fi);
if (!fi->next)
! /* this is the innermost frame? */
fi->frame = read_register (fi->extra_info->framereg);
else if (fi->extra_info->framereg == ARM_FP_REGNUM
|| fi->extra_info->framereg == THUMB_FP_REGNUM)
{
/* not the innermost frame */
! /* If we have an FP, the callee saved it. */
if (fi->next->saved_regs[fi->extra_info->framereg] != 0)
fi->frame =
read_memory_integer (fi->next
->saved_regs[fi->extra_info->framereg], 4);
else if (fromleaf)
/* If we were called by a frameless fn. then our frame is
! still in the frame pointer register on the board... */
fi->frame = read_fp ();
}
--- 1186,1205 ----
arm_scan_prologue (fi);
if (!fi->next)
! /* This is the innermost frame? */
fi->frame = read_register (fi->extra_info->framereg);
else if (fi->extra_info->framereg == ARM_FP_REGNUM
|| fi->extra_info->framereg == THUMB_FP_REGNUM)
{
/* not the innermost frame */
! /* If we have an FP, the callee saved it. */
if (fi->next->saved_regs[fi->extra_info->framereg] != 0)
fi->frame =
read_memory_integer (fi->next
->saved_regs[fi->extra_info->framereg], 4);
else if (fromleaf)
/* If we were called by a frameless fn. then our frame is
! still in the frame pointer register on the board... */
fi->frame = read_fp ();
}
*************** arm_fix_call_dummy (char *dummy, CORE_AD
*** 1364,1370 ****
};
static unsigned long arm_bx_r4 = 0xe12fff14; /* bx r4 instruction */
! /* Set flag indicating whether the current PC is in a Thumb function. */
caller_is_thumb = arm_pc_is_thumb (read_pc ());
arm_set_call_dummy_breakpoint_offset ();
--- 1365,1371 ----
};
static unsigned long arm_bx_r4 = 0xe12fff14; /* bx r4 instruction */
! /* Set flag indicating whether the current PC is in a Thumb function. */
caller_is_thumb = arm_pc_is_thumb (read_pc ());
arm_set_call_dummy_breakpoint_offset ();
*************** arm_fix_call_dummy (char *dummy, CORE_AD
*** 1397,1403 ****
}
/* Put the target address in r4; the call dummy will copy this to
! the PC. */
write_register (4, fun);
}
--- 1398,1404 ----
}
/* Put the target address in r4; the call dummy will copy this to
! the PC. */
write_register (4, fun);
}
*************** arm_push_arguments (int nargs, struct va
*** 1418,1424 ****
stack is required. Need to take care here as structs may be
passed on the stack, and we have to to push them. */
nstack_size = -4 * REGISTER_SIZE; /* Some arguments go into A1-A4. */
! if (struct_return) /* The struct address goes in A1. */
nstack_size += REGISTER_SIZE;
/* Walk through the arguments and add their size to nstack_size. */
--- 1419,1425 ----
stack is required. Need to take care here as structs may be
passed on the stack, and we have to to push them. */
nstack_size = -4 * REGISTER_SIZE; /* Some arguments go into A1-A4. */
! if (struct_return) /* The struct address goes in A1. */
nstack_size += REGISTER_SIZE;
/* Walk through the arguments and add their size to nstack_size. */
*************** arm_push_arguments (int nargs, struct va
*** 1470,1476 ****
#if 1
/* I don't know why this code was disable. The only logical use
for a function pointer is to call that function, so setting
! the mode bit is perfectly fine. FN */
/* If the argument is a pointer to a function, and it is a Thumb
function, set the low bit of the pointer. */
if (TYPE_CODE_PTR == typecode
--- 1471,1477 ----
#if 1
/* I don't know why this code was disable. The only logical use
for a function pointer is to call that function, so setting
! the mode bit is perfectly fine. FN */
/* If the argument is a pointer to a function, and it is a Thumb
function, set the low bit of the pointer. */
if (TYPE_CODE_PTR == typecode
*************** thumb_get_next_pc (CORE_ADDR pc)
*** 1779,1785 ****
{
unsigned long pc_val = ((unsigned long) pc) + 4; /* PC after prefetch */
unsigned short inst1 = read_memory_integer (pc, 2);
! CORE_ADDR nextpc = pc + 2; /* default is next instruction */
unsigned long offset;
if ((inst1 & 0xff00) == 0xbd00) /* pop {rlist, pc} */
--- 1780,1786 ----
{
unsigned long pc_val = ((unsigned long) pc) + 4; /* PC after prefetch */
unsigned short inst1 = read_memory_integer (pc, 2);
! CORE_ADDR nextpc = pc + 2; /* default is next instruction */
unsigned long offset;
if ((inst1 & 0xff00) == 0xbd00) /* pop {rlist, pc} */
*************** thumb_get_next_pc (CORE_ADDR pc)
*** 1799,1805 ****
{
unsigned long status = read_register (ARM_PS_REGNUM);
unsigned long cond = bits (inst1, 8, 11);
! if (cond != 0x0f && condition_true (cond, status)) /* 0x0f = SWI */
nextpc = pc_val + (sbits (inst1, 0, 7) << 1);
}
else if ((inst1 & 0xf800) == 0xe000) /* unconditional branch */
--- 1800,1806 ----
{
unsigned long status = read_register (ARM_PS_REGNUM);
unsigned long cond = bits (inst1, 8, 11);
! if (cond != 0x0f && condition_true (cond, status)) /* 0x0f = SWI */
nextpc = pc_val + (sbits (inst1, 0, 7) << 1);
}
else if ((inst1 & 0xf800) == 0xe000) /* unconditional branch */
*************** arm_get_next_pc (CORE_ADDR pc)
*** 1837,1843 ****
switch (bits (this_instr, 24, 27))
{
case 0x0:
! case 0x1: /* data processing */
case 0x2:
case 0x3:
{
--- 1838,1844 ----
switch (bits (this_instr, 24, 27))
{
case 0x0:
! case 0x1: /* data processing */
case 0x2:
case 0x3:
{
*************** arm_get_next_pc (CORE_ADDR pc)
*** 2043,2055 ****
single-step support. We find the target of the coming instruction
and breakpoint it.
! single_step is also called just after the inferior stops. If we had
! set up a simulated single-step, we undo our damage. */
static void
arm_software_single_step (enum target_signal sig, int insert_bpt)
{
! static int next_pc; /* State between setting and unsetting. */
static char break_mem[BREAKPOINT_MAX]; /* Temporary storage for mem@bpt */
if (insert_bpt)
--- 2044,2056 ----
single-step support. We find the target of the coming instruction
and breakpoint it.
! single_step() is also called just after the inferior stops. If we
! had set up a simulated single-step, we undo our damage. */
static void
arm_software_single_step (enum target_signal sig, int insert_bpt)
{
! static int next_pc; /* State between setting and unsetting. */
static char break_mem[BREAKPOINT_MAX]; /* Temporary storage for mem@bpt */
if (insert_bpt)
*************** static const char arm_default_thumb_be_b
*** 2165,2171 ****
/* XXX ??? from old tm-arm.h: if we're using RDP, then we're inserting
breakpoints and storing their handles instread of what was in
memory. It is nice that this is the same size as a handle -
! otherwise remote-rdp will have to change. */
static const unsigned char *
arm_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
--- 2166,2172 ----
/* XXX ??? from old tm-arm.h: if we're using RDP, then we're inserting
breakpoints and storing their handles instread of what was in
memory. It is nice that this is the same size as a handle -
! otherwise remote-rdp will have to change. */
static const unsigned char *
arm_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
*************** arm_store_return_value (struct type *typ
*** 2363,2369 ****
}
/* Store the address of the place in which to copy the structure the
! subroutine will return. This is called from call_function. */
static void
arm_store_struct_return (CORE_ADDR addr, CORE_ADDR sp)
--- 2364,2370 ----
}
/* Store the address of the place in which to copy the structure the
! subroutine will return. This is called from call_function. */
static void
arm_store_struct_return (CORE_ADDR addr, CORE_ADDR sp)
*************** arm_in_call_stub (CORE_ADDR pc, char *na
*** 2397,2403 ****
/* Find the starting address of the function containing the PC. If
the caller didn't give us a name, look it up at the same time. */
! if (find_pc_partial_function (pc, name ? NULL : &name, &start_addr, NULL) == 0)
return 0;
return strncmp (name, "_call_via_r", 11) == 0;
--- 2398,2405 ----
/* Find the starting address of the function containing the PC. If
the caller didn't give us a name, look it up at the same time. */
! if (0 == find_pc_partial_function (pc, name ? NULL : &name,
! &start_addr, NULL))
return 0;
return strncmp (name, "_call_via_r", 11) == 0;
*************** arm_skip_stub (CORE_ADDR pc)
*** 2440,2446 ****
/* If the user changes the register disassembly flavor used for info
register and other commands, we have to also switch the flavor used
in opcodes for disassembly output. This function is run in the set
! disassembly_flavor command, and does that. */
static void
set_disassembly_flavor_sfunc (char *args, int from_tty,
--- 2442,2448 ----
/* If the user changes the register disassembly flavor used for info
register and other commands, we have to also switch the flavor used
in opcodes for disassembly output. This function is run in the set
! disassembly_flavor command, and does that. */
static void
set_disassembly_flavor_sfunc (char *args, int from_tty,
*************** set_disassembly_flavor (void)
*** 2462,2468 ****
const char *setname, *setdesc, **regnames;
int numregs, j;
! /* Find the flavor that the user wants in the opcodes table. */
int current = 0;
numregs = get_arm_regnames (current, &setname, &setdesc, ®names);
while ((disassembly_flavor != setname)
--- 2464,2470 ----
const char *setname, *setdesc, **regnames;
int numregs, j;
! /* Find the flavor that the user wants in the opcodes table. */
int current = 0;
numregs = get_arm_regnames (current, &setname, &setdesc, ®names);
while ((disassembly_flavor != setname)
*************** set_disassembly_flavor (void)
*** 2470,2480 ****
get_arm_regnames (++current, &setname, &setdesc, ®names);
current_option = current;
! /* Fill our copy. */
for (j = 0; j < numregs; j++)
arm_register_names[j] = (char *) regnames[j];
! /* Adjust case. */
if (isupper (*regnames[ARM_PC_REGNUM]))
{
arm_register_names[ARM_FPS_REGNUM] = "FPS";
--- 2472,2482 ----
get_arm_regnames (++current, &setname, &setdesc, ®names);
current_option = current;
! /* Fill our copy. */
for (j = 0; j < numregs; j++)
arm_register_names[j] = (char *) regnames[j];
! /* Adjust case. */
if (isupper (*regnames[ARM_PC_REGNUM]))
{
arm_register_names[ARM_FPS_REGNUM] = "FPS";
*************** set_disassembly_flavor (void)
*** 2486,2508 ****
arm_register_names[ARM_PS_REGNUM] = "cpsr";
}
! /* Synchronize the disassembler. */
set_arm_regname_option (current);
}
/* arm_othernames implements the "othernames" command. This is kind
of hacky, and I prefer the set-show disassembly-flavor which is
also used for the x86 gdb. I will keep this around, however, in
! case anyone is actually using it. */
static void
arm_othernames (char *names, int n)
{
! /* Circle through the various flavors. */
current_option = (current_option + 1) % num_flavor_options;
disassembly_flavor = valid_flavors[current_option];
! set_disassembly_flavor ();
}
/* Fetch, and possibly build, an appropriate link_map_offsets structure
--- 2488,2510 ----
arm_register_names[ARM_PS_REGNUM] = "cpsr";
}
! /* Synchronize the disassembler. */
set_arm_regname_option (current);
}
/* arm_othernames implements the "othernames" command. This is kind
of hacky, and I prefer the set-show disassembly-flavor which is
also used for the x86 gdb. I will keep this around, however, in
! case anyone is actually using it. */
static void
arm_othernames (char *names, int n)
{
! /* Circle through the various flavors. */
current_option = (current_option + 1) % num_flavor_options;
disassembly_flavor = valid_flavors[current_option];
! set_disassembly_flavor ();
}
/* Fetch, and possibly build, an appropriate link_map_offsets structure
*************** arm_othernames (char *names, int n)
*** 2511,2517 ****
Instead, the relevant structs offsets were obtained from examining
link.h. (We can't refer to link.h from this file because the host
system won't necessarily have it, or if it does, the structs which
! it defines will refer to the host system, not the target.) */
struct link_map_offsets *
arm_linux_svr4_fetch_link_map_offsets (void)
--- 2513,2519 ----
Instead, the relevant structs offsets were obtained from examining
link.h. (We can't refer to link.h from this file because the host
system won't necessarily have it, or if it does, the structs which
! it defines will refer to the host system, not the target). */
struct link_map_offsets *
arm_linux_svr4_fetch_link_map_offsets (void)
*************** arm_linux_svr4_fetch_link_map_offsets (v
*** 2524,2536 ****
lmp = &lmo;
lmo.r_debug_size = 8; /* Actual size is 20, but this is all we
! need. */
lmo.r_map_offset = 4;
lmo.r_map_size = 4;
lmo.link_map_size = 20; /* Actual size is 552, but this is all we
! need. */
lmo.l_addr_offset = 0;
lmo.l_addr_size = 4;
--- 2526,2538 ----
lmp = &lmo;
lmo.r_debug_size = 8; /* Actual size is 20, but this is all we
! need. */
lmo.r_map_offset = 4;
lmo.r_map_size = 4;
lmo.link_map_size = 20; /* Actual size is 552, but this is all we
! need. */
lmo.l_addr_offset = 0;
lmo.l_addr_size = 4;
*************** arm_gdbarch_init (struct gdbarch_info in
*** 2889,2895 ****
/* This should be low enough for everything. */
tdep->lowest_pc = 0x20;
! tdep->jb_pc = -1; /* Longjump support not enabled by default. */
set_gdbarch_use_generic_dummy_frames (gdbarch, 0);
--- 2891,2897 ----
/* This should be low enough for everything. */
tdep->lowest_pc = 0x20;
! tdep->jb_pc = -1; /* Longjump support not enabled by default. */
set_gdbarch_use_generic_dummy_frames (gdbarch, 0);
*************** arm_gdbarch_init (struct gdbarch_info in
*** 2954,2960 ****
/* Information about registers, etc. */
set_gdbarch_print_float_info (gdbarch, arm_print_float_info);
! set_gdbarch_fp_regnum (gdbarch, ARM_FP_REGNUM); /* ??? */
set_gdbarch_sp_regnum (gdbarch, ARM_SP_REGNUM);
set_gdbarch_pc_regnum (gdbarch, ARM_PC_REGNUM);
set_gdbarch_register_byte (gdbarch, arm_register_byte);
--- 2956,2962 ----
/* Information about registers, etc. */
set_gdbarch_print_float_info (gdbarch, arm_print_float_info);
! set_gdbarch_fp_regnum (gdbarch, ARM_FP_REGNUM); /* ??? */
set_gdbarch_sp_regnum (gdbarch, ARM_SP_REGNUM);
set_gdbarch_pc_regnum (gdbarch, ARM_PC_REGNUM);
set_gdbarch_register_byte (gdbarch, arm_register_byte);
*************** _initialize_arm_tdep (void)
*** 3142,3159 ****
tm_print_insn = gdb_print_insn_arm;
! /* Get the number of possible sets of register names defined in opcodes. */
num_flavor_options = get_arm_regname_num_options ();
! /* Sync the opcode insn printer with our register viewer: */
parse_arm_disassembler_option ("reg-names-std");
! /* Begin creating the help text. */
stb = mem_fileopen ();
fprintf_unfiltered (stb, "Set the disassembly flavor.\n\
The valid values are:\n");
! /* Initialize the array that will be passed to add_set_enum_cmd(). */
valid_flavors = xmalloc ((num_flavor_options + 1) * sizeof (char *));
for (i = 0; i < num_flavor_options; i++)
{
--- 3144,3161 ----
tm_print_insn = gdb_print_insn_arm;
! /* Get the number of possible sets of register names defined in opcodes. */
num_flavor_options = get_arm_regname_num_options ();
! /* Sync the opcode insn printer with our register viewer. */
parse_arm_disassembler_option ("reg-names-std");
! /* Begin creating the help text. */
stb = mem_fileopen ();
fprintf_unfiltered (stb, "Set the disassembly flavor.\n\
The valid values are:\n");
! /* Initialize the array that will be passed to add_set_enum_cmd(). */
valid_flavors = xmalloc ((num_flavor_options + 1) * sizeof (char *));
for (i = 0; i < num_flavor_options; i++)
{
*************** The valid values are:\n");
*** 3161,3167 ****
valid_flavors[i] = setname;
fprintf_unfiltered (stb, "%s - %s\n", setname,
setdesc);
! /* Copy the default names (if found) and synchronize disassembler. */
if (!strcmp (setname, "std"))
{
disassembly_flavor = setname;
--- 3163,3169 ----
valid_flavors[i] = setname;
fprintf_unfiltered (stb, "%s - %s\n", setname,
setdesc);
! /* Copy the default names (if found) and synchronize disassembler. */
if (!strcmp (setname, "std"))
{
disassembly_flavor = setname;
*************** The valid values are:\n");
*** 3171,3185 ****
set_arm_regname_option (i);
}
}
! /* Mark the end of valid options. */
valid_flavors[num_flavor_options] = NULL;
! /* Finish the creation of the help text. */
fprintf_unfiltered (stb, "The default is \"std\".");
helptext = ui_file_xstrdup (stb, &length);
ui_file_delete (stb);
! /* Add the disassembly-flavor command */
new_cmd = add_set_enum_cmd ("disassembly-flavor", no_class,
valid_flavors,
&disassembly_flavor,
--- 3173,3187 ----
set_arm_regname_option (i);
}
}
! /* Mark the end of valid options. */
valid_flavors[num_flavor_options] = NULL;
! /* Finish the creation of the help text. */
fprintf_unfiltered (stb, "The default is \"std\".");
helptext = ui_file_xstrdup (stb, &length);
ui_file_delete (stb);
! /* Add the disassembly-flavor command. */
new_cmd = add_set_enum_cmd ("disassembly-flavor", no_class,
valid_flavors,
&disassembly_flavor,
*************** The valid values are:\n");
*** 3194,3200 ****
"Set usage of ARM 32-bit mode.\n", &setlist),
&showlist);
! /* Add the deprecated "othernames" command */
add_com ("othernames", class_obscure, arm_othernames,
"Switch to the next set of register names.");
--- 3196,3202 ----
"Set usage of ARM 32-bit mode.\n", &setlist),
&showlist);
! /* Add the deprecated "othernames" command. */
add_com ("othernames", class_obscure, arm_othernames,
"Switch to the next set of register names.");