CARP: Convert macro definitions of USE_STRUCT_CONVENTION into target

specific functions.

1 files changed, 242 insertions, 147 deletions

diff --git a/gdb/config/arm/tm-arm.h b/gdb/config/arm/tm-arm.h
index 7775ea2..202a815 100644
--- a/gdb/config/arm/tm-arm.h
+++ b/gdb/config/arm/tm-arm.h
@@ -1,5 +1,5 @@
-/* Definitions to make GDB target for an ARM under RISCiX (4.3bsd).
-   Copyright 1986, 1987, 1989, 1991, 1993 Free Software Foundation, Inc.
+/* Definitions to make GDB target for an ARM
+   Copyright 1986, 1987, 1989, 1991, 1993, 1997, 1998 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -15,17 +15,36 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#define TARGET_BYTE_ORDER LITTLE_ENDIAN
+#ifdef __STDC__		/* Forward decls for prototypes */
+struct type;
+struct value;
+#endif
+
+#define TARGET_BYTE_ORDER_SELECTABLE
 
 /* IEEE format floating point */
 
 #define IEEE_FLOAT
 
-/* I provide my own xfer_core_file to cope with shared libraries */
+/* FIXME: may need a floatformat_ieee_double_bigbyte_littleword format for
+   BIG_ENDIAN use. -fnf */
+
+#define TARGET_DOUBLE_FORMAT (target_byte_order == BIG_ENDIAN \
+			      ? &floatformat_ieee_double_big \
+			      : &floatformat_ieee_double_littlebyte_bigword)
+
+/* When reading symbols, we need to zap the low bit of the address, which
+   may be set to 1 for Thumb functions.  */
+
+#define SMASH_TEXT_ADDRESS(addr) ((addr) &= ~0x1)
+
+/* Remove useless bits from addresses in a running program.  */
 
-#define XFER_CORE_FILE
+CORE_ADDR arm_addr_bits_remove PARAMS ((CORE_ADDR));
+
+#define ADDR_BITS_REMOVE(val) (arm_addr_bits_remove (val))
 
 /* Offset from address of function to start of its code.
    Zero on most machines.  */
@@ -35,14 +54,18 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Advance PC across any function entry prologue instructions
    to reach some "real" code.  */
 
-#define SKIP_PROLOGUE(pc) pc = skip_prologue(pc)
+extern CORE_ADDR arm_skip_prologue PARAMS ((CORE_ADDR pc));
+
+#define SKIP_PROLOGUE(pc) { pc = arm_skip_prologue (pc); }
 
 /* Immediately after a function call, return the saved pc.
    Can't always go through the frames for this because on some machines
    the new frame is not set up until the new function executes
    some instructions.  */
 
-#define SAVED_PC_AFTER_CALL(frame) (read_register (LR_REGNUM) & 0x03fffffc)
+#define SAVED_PC_AFTER_CALL(frame) arm_saved_pc_after_call (frame)
+struct frame_info;
+extern CORE_ADDR arm_saved_pc_after_call PARAMS ((struct frame_info *));
 
 /* I don't know the real values for these.  */
 #define TARGET_UPAGES UPAGES
@@ -58,7 +81,30 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Sequence of bytes for breakpoint instruction.  */
 
-#define BREAKPOINT {0x00,0x00,0x18,0xef} /* BKPT_SWI from <sys/ptrace.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. */
+
+#define ARM_LE_BREAKPOINT {0x00,0x00,0x18,0xef} /* BKPT_SWI from <sys/ptrace.h> */
+#define ARM_BE_BREAKPOINT {0xef,0x18,0x00,0x00} /* BKPT_SWI from <sys/ptrace.h> */
+#define THUMB_LE_BREAKPOINT {0x18,0xdf}       /* swi 24 */
+#define THUMB_BE_BREAKPOINT {0xdf,0x18}       /* swi 24 */
+
+/* The following has been superseded by BREAKPOINT_FOR_PC, but
+   is defined merely to keep mem-break.c happy.  */
+#define LITTLE_BREAKPOINT ARM_LE_BREAKPOINT
+#define BIG_BREAKPOINT    ARM_BE_BREAKPOINT
+
+/* BREAKPOINT_FROM_PC uses the program counter value to determine whether a
+   16- or 32-bit breakpoint should be used.  It returns a pointer
+   to a string of bytes that encode a breakpoint instruction, stores
+   the length of the string to *lenptr, and adjusts the pc (if necessary) to
+   point to the actual memory location where the breakpoint should be
+   inserted.  */
+
+unsigned char * arm_breakpoint_from_pc PARAMS ((CORE_ADDR * pcptr, int * lenptr));
+#define BREAKPOINT_FROM_PC(pcptr, lenptr) arm_breakpoint_from_pc (pcptr, lenptr)
 
 /* Amount PC must be decremented by after a breakpoint.
    This is often the number of bytes in BREAKPOINT
@@ -72,20 +118,17 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
       ((read_memory_integer(pc, 4) & 0x0fffffff == 0x01b0f00e) || \
        (read_memory_integer(pc, 4) & 0x0ffff800 == 0x09eba800))
 
-/* Return 1 if P points to an invalid floating point value.
-   LEN is the length in bytes.  */
-
-#define INVALID_FLOAT(p, len) 0
-
 /* code to execute to print interesting information about the
  * floating point processor (if any)
  * No need to define if there is nothing to do.
  */
 #define FLOAT_INFO { arm_float_info (); }
 
-/* Say how long (ordinary) registers are.  */
+/* Say how long (ordinary) registers are.  This is a piece of bogosity
+   used in push_word and a few other places; REGISTER_RAW_SIZE is the
+   real way to know how big a register is.  */
 
-#define REGISTER_TYPE long
+#define REGISTER_SIZE 4
 
 /* Number of machine registers */
 
@@ -97,11 +140,32 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Initializer for an array of names of registers.
    There should be NUM_REGS strings in this initializer.  */
 
-#define REGISTER_NAMES \
-      { "a1", "a2", "a3", "a4",					\
-	"v1", "v2", "v3", "v4", "v5", "v6",			\
-        "sl", "fp", "ip", "sp", "lr", "pc",			\
-        "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "fps", "ps" }
+#define ORIGINAL_REGISTER_NAMES \
+{ "a1", "a2", "a3", "a4", /*  0  1  2  3 */ \
+  "v1", "v2", "v3", "v4", /*  4  5  6  7 */ \
+  "v5", "v6", "sl", "fp", /*  8  9 10 11 */ \
+  "ip", "sp", "lr", "pc", /* 12 13 14 15 */ \
+  "f0", "f1", "f2", "f3", /* 16 17 18 19 */ \
+  "f4", "f5", "f6", "f7", /* 20 21 22 23 */ \
+  "fps","ps" }            /* 24 25       */
+
+/* These names are the ones which gcc emits, and 
+   I find them less confusing.  Toggle between them
+   using the `othernames' command. */
+
+#define ADDITIONAL_REGISTER_NAMES \
+{ "r0", "r1", "r2", "r3", /*  0  1  2  3 */ \
+  "r4", "r5", "r6", "r7", /*  4  5  6  7 */ \
+  "r8", "r9", "sl", "fp", /*  8  9 10 11 */ \
+  "ip", "sp", "lr", "pc", /* 12 13 14 15 */ \
+  "f0", "f1", "f2", "f3", /* 16 17 18 19 */ \
+  "f4", "f5", "f6", "f7", /* 20 21 22 23 */ \
+  "fps","ps" }            /* 24 25       */
+
+#define REGISTER_NAMES ADDITIONAL_REGISTER_NAMES
+#ifndef REGISTER_NAMES
+#define REGISTER_NAMES ORIGINAL_REGISTER_NAMES
+#endif
 
 /* Register numbers of various important registers.
    Note that some of these values are "real" register numbers,
@@ -110,15 +174,50 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    to be actual register numbers as far as the user is concerned
    but do serve to get the desired values when passed to read_register.  */
 
+#define A1_REGNUM 0		/* first integer-like argument */
+#define A4_REGNUM 3		/* last integer-like argument */
 #define AP_REGNUM 11
 #define FP_REGNUM 11		/* Contains address of executing stack frame */
 #define SP_REGNUM 13		/* Contains address of top of stack */
 #define LR_REGNUM 14		/* address to return to from a function call */
 #define PC_REGNUM 15		/* Contains program counter */
 #define F0_REGNUM 16		/* first floating point register */
+#define F3_REGNUM 19		/* last floating point argument register */
+#define F7_REGNUM 23		/* last floating point register */
 #define FPS_REGNUM 24		/* floating point status register */
 #define PS_REGNUM 25		/* Contains processor status */
 
+#define THUMB_FP_REGNUM 7	/* R7 is frame register on Thumb */
+
+#define ARM_NUM_ARG_REGS 	4
+#define ARM_LAST_ARG_REGNUM 	A4_REGNUM
+#define ARM_NUM_FP_ARG_REGS 	4
+#define ARM_LAST_FP_ARG_REGNUM	F3_REGNUM
+
+/* Instruction condition field values.  */
+#define INST_EQ		0x0
+#define INST_NE		0x1
+#define INST_CS		0x2
+#define INST_CC		0x3
+#define INST_MI		0x4
+#define INST_PL		0x5
+#define INST_VS		0x6
+#define INST_VC		0x7
+#define INST_HI		0x8
+#define INST_LS		0x9
+#define INST_GE		0xa
+#define INST_LT		0xb
+#define INST_GT		0xc
+#define INST_LE		0xd
+#define INST_AL		0xe
+#define INST_NV		0xf
+
+#define FLAG_N		0x80000000
+#define FLAG_Z		0x40000000
+#define FLAG_C		0x20000000
+#define FLAG_V		0x10000000
+
+
 
 /* Total amount of space needed to store our copies of the machine's
    register state, the array `registers'.  */
@@ -143,7 +242,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Largest value REGISTER_RAW_SIZE can have.  */
 
-#define MAX_REGISTER_RAW_SIZE 12
+#define MAX_REGISTER_RAW_SIZE 12 
 
 /* Largest value REGISTER_VIRTUAL_SIZE can have.  */
 
@@ -151,27 +250,26 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Nonzero if register N requires conversion
    from raw format to virtual format.  */
-
 #define REGISTER_CONVERTIBLE(N) ((unsigned)(N) - F0_REGNUM < 8)
 
-/* Convert data from raw format for register REGNUM
-   to virtual format for register REGNUM.  */
+/* Convert data from raw format for register REGNUM in buffer FROM
+   to virtual format with type TYPE in buffer TO.  */
 
-#define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,FROM,TO)	\
-  if (REGISTER_CONVERTIBLE(REGNUM))					\
-      convert_from_extended((FROM), (TO));				\
-  else									\
-      memcpy ((TO), (FROM), 4);
-
-/* Convert data from virtual format for register REGNUM
-   to raw format for register REGNUM.  */
+#define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,TYPE,FROM,TO) \
+{ \
+  double val; \
+  convert_from_extended ((FROM), & val); \
+  store_floating ((TO), TYPE_LENGTH (TYPE), val); \
+}
 
-#define REGISTER_CONVERT_TO_RAW(REGNUM,FROM,TO)	\
-  if (REGISTER_CONVERTIBLE(REGNUM)) 			\
-    convert_to_extended((FROM), (TO)); 		\
-  else							\
-    memcpy ((TO), (FROM), 4);
+/* Convert data from virtual format with type TYPE in buffer FROM
+   to raw format for register REGNUM in buffer TO.  */
 
+#define REGISTER_CONVERT_TO_RAW(TYPE,REGNUM,FROM,TO)	\
+{ \
+  double val = extract_floating ((FROM), TYPE_LENGTH (TYPE)); \
+  convert_to_extended (&val, (TO)); \
+}
 /* Return the GDB type object for the "standard" data type
    of data in register N.  */
 
@@ -179,8 +277,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  (((unsigned)(N) - F0_REGNUM) < 8 ? builtin_type_double : builtin_type_int)
 
 /* The system C compiler uses a similar structure return convention to gcc */
-
-#define USE_STRUCT_CONVENTION(gcc_p, type) (TYPE_LENGTH (type) > 4)
+extern use_struct_convention_fn arm_use_struct_convention;
+#define USE_STRUCT_CONVENTION(gcc_p, type) arm_use_struct_convention (gcc_p, type)
 
 /* Store the address of the place in which to copy the structure the
    subroutine will return.  This is called from call_function. */
@@ -194,7 +292,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
   if (TYPE_CODE (TYPE) == TYPE_CODE_FLT)				\
-    convert_from_extended(REGBUF + REGISTER_BYTE (F0_REGNUM), VALBUF);	\
+    convert_from_extended (REGBUF + REGISTER_BYTE (F0_REGNUM), VALBUF);	\
   else									\
     memcpy (VALBUF, REGBUF, TYPE_LENGTH (TYPE))
 
@@ -204,7 +302,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define STORE_RETURN_VALUE(TYPE,VALBUF) \
   if (TYPE_CODE (TYPE) == TYPE_CODE_FLT) {				\
     char _buf[MAX_REGISTER_RAW_SIZE];					\
-    convert_to_extended(VALBUF, _buf);					\
+    convert_to_extended (VALBUF, _buf); 					\
     write_register_bytes (REGISTER_BYTE (F0_REGNUM), _buf, MAX_REGISTER_RAW_SIZE); \
   } else								\
     write_register_bytes (0, VALBUF, TYPE_LENGTH (TYPE))
@@ -221,6 +319,25 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define VARIABLES_INSIDE_BLOCK(desc, gcc_p) (!(gcc_p))
 
 
+/* Define other aspects of the stack frame. 
+   We keep the offsets of 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) */
+
+#define EXTRA_FRAME_INFO  	\
+  struct frame_saved_regs fsr;	\
+  int framesize;		\
+  int frameoffset;		\
+  int framereg;
+
+extern void arm_init_extra_frame_info PARAMS ((struct frame_info *fi));
+#define INIT_EXTRA_FRAME_INFO(fromleaf, fi) arm_init_extra_frame_info (fi)
+
+/* Return the frame address.  On ARM, it is R11; on Thumb it is R7.  */
+CORE_ADDR arm_target_read_fp PARAMS ((void));
+#define TARGET_READ_FP() arm_target_read_fp ()
+
 /* Describe the pointer in each stack frame to the previous stack frame
    (its caller).  */
 
@@ -230,16 +347,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    However, if FRAME_CHAIN_VALID returns zero,
    it means the given frame is the outermost one and has no caller.  */
 
-/* In the case of the ARM, the frame's nominal address is the FP value,
-   and 12 bytes before comes the saved previous FP value as a 4-byte word.  */
+#define FRAME_CHAIN(thisframe) (CORE_ADDR) arm_frame_chain (thisframe)
+extern CORE_ADDR arm_frame_chain PARAMS ((struct frame_info *));
 
-#define FRAME_CHAIN(thisframe)  \
-  ((thisframe)->pc >= first_object_file_end ? \
-   read_memory_integer ((thisframe)->frame - 12, 4) :\
-   0)
+#define LOWEST_PC 0x20  /* the first 0x20 bytes are the trap vectors. */
 
 #define FRAME_CHAIN_VALID(chain, thisframe) \
-  (chain != 0 && (FRAME_SAVED_PC (thisframe) >= first_object_file_end))
+  (chain != 0 && (FRAME_SAVED_PC (thisframe) >= LOWEST_PC))
 
 /* Define other aspects of the stack frame.  */
 
@@ -258,8 +372,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Saved Pc.  */
 
-#define FRAME_SAVED_PC(FRAME) \
-  (read_memory_integer ((FRAME)->frame - 4, 4) & 0x03fffffc)
+#define FRAME_SAVED_PC(FRAME)	arm_frame_saved_pc (FRAME)
+extern CORE_ADDR arm_frame_saved_pc PARAMS ((struct frame_info *));
 
 #define FRAME_ARGS_ADDRESS(fi) (fi->frame)
 
@@ -280,121 +394,102 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    ways in the stack frame.  sp is even more special:
    the address we return for it IS the sp for the next frame.  */
 
+struct frame_saved_regs;
+struct frame_info;
+void frame_find_saved_regs PARAMS((struct frame_info *fi,
+				   struct frame_saved_regs *fsr));
+
 #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs) \
-{							      			\
-    register int regnum;							\
-    register int frame;								\
-    register int next_addr;							\
-    register int return_data_save;						\
-    register int saved_register_mask;						\
-    bzero (&frame_saved_regs, sizeof frame_saved_regs);				\
-    frame = (frame_info)->frame;						\
-    return_data_save = read_memory_integer(frame, 4) & 0x03fffffc - 12;		\
-    saved_register_mask =							\
-	read_memory_integer(return_data_save, 4);				\
-    next_addr = frame - 12;							\
-    for (regnum = 4; regnum < 10; regnum++)					\
-	if (saved_register_mask & (1<<regnum)) {				\
-	    next_addr -= 4;							\
-	    (frame_saved_regs).regs[regnum] = next_addr;			\
-	}									\
-    if (read_memory_integer(return_data_save + 4, 4) == 0xed6d7103) {		\
-	next_addr -= 12;							\
-	(frame_saved_regs).regs[F0_REGNUM + 7] = next_addr;			\
-    }										\
-    if (read_memory_integer(return_data_save + 8, 4) == 0xed6d6103) {		\
-	next_addr -= 12;							\
-	(frame_saved_regs).regs[F0_REGNUM + 6] = next_addr;			\
-    }										\
-    if (read_memory_integer(return_data_save + 12, 4) == 0xed6d5103) {		\
-	next_addr -= 12;							\
-	(frame_saved_regs).regs[F0_REGNUM + 5] = next_addr;			\
-    }										\
-    if (read_memory_integer(return_data_save + 16, 4) == 0xed6d4103) {		\
-	next_addr -= 12;							\
-	(frame_saved_regs).regs[F0_REGNUM + 4] = next_addr;			\
-    }										\
-    (frame_saved_regs).regs[SP_REGNUM] = next_addr;				\
-    (frame_saved_regs).regs[PC_REGNUM] = frame - 4;				\
-    (frame_saved_regs).regs[PS_REGNUM] = frame - 4;				\
-    (frame_saved_regs).regs[FP_REGNUM] = frame - 12;				\
-}
+ arm_frame_find_saved_regs (frame_info, &(frame_saved_regs));
+
 
 /* Things needed for making the inferior call functions.  */
 
+#define PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr) \
+    sp = arm_push_arguments ((nargs), (args), (sp), (struct_return), (struct_addr))
+extern CORE_ADDR
+arm_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int, CORE_ADDR));
+
 /* Push an empty stack frame, to record the current PC, etc.  */
 
-#define PUSH_DUMMY_FRAME \
-{								\
-    register CORE_ADDR sp = read_register (SP_REGNUM);		\
-    register int regnum;					\
-    /* opcode for ldmdb fp,{v1-v6,fp,ip,lr,pc}^ */		\
-    sp = push_word(sp, 0xe92dbf0); /* dummy return_data_save ins */ \
-    /* push a pointer to the dummy instruction minus 12 */	\
-    sp = push_word(sp, read_register (SP_REGNUM) - 16);		\
-    sp = push_word(sp, read_register (PS_REGNUM));		\
-    sp = push_word(sp, read_register (SP_REGNUM));		\
-    sp = push_word(sp, read_register (FP_REGNUM));		\
-    for (regnum = 9; regnum >= 4; regnum --)			\
-	sp = push_word(sp, read_register (regnum));		\
-    write_register (FP_REGNUM, read_register (SP_REGNUM) - 8);	\
-    write_register (SP_REGNUM, sp); }
+void arm_push_dummy_frame PARAMS ((void));
+
+#define PUSH_DUMMY_FRAME arm_push_dummy_frame ()
 
 /* Discard from the stack the innermost frame, restoring all registers.  */
 
-#define POP_FRAME \
-{									\
-    register CORE_ADDR fp = read_register (FP_REGNUM);			\
-    register unsigned long return_data_save =				\
-	read_memory_integer ( (read_memory_integer (fp, 4) &		\
-			       0x03fffffc)  - 12, 4);			\
-    register int regnum;						\
-    write_register (PS_REGNUM, read_memory_integer (fp - 4, 4));	\
-    write_register (PC_REGNUM, read_register (PS_REGNUM) & 0x03fffffc);	\
-    write_register (SP_REGNUM, read_memory_integer (fp - 8, 4));	\
-    write_register (FP_REGNUM, read_memory_integer (fp - 12, 4));	\
-    fp -= 12;								\
-    for (regnum = 9; regnum >= 4; regnum--)				\
-	if (return_data_save & (1<<regnum)) {				\
-	    fp -= 4;							\
-	    write_register (regnum, read_memory_integer(fp, 4));	\
-	}								\
-    flush_cached_frames ();						\
-    set_current_frame (create_new_frame (read_register (FP_REGNUM),	\
-					 read_pc ()));			\
-}
+void arm_pop_frame PARAMS ((void));
+
+#define POP_FRAME arm_pop_frame ()
 
 /* This sequence of words is the instructions
 
-     ldmia	sp!,{a1-a4}
-     mov 	lk,pc
-     bl		*+8
+     mov 	lr,pc
+     mov	pc,r4
      swi	bkpt_swi
 
-   Note this is 16 bytes.  */
+   Note this is 12 bytes.  */
 
-#define CALL_DUMMY {0xe8bd000f, 0xe1a0e00f, 0xeb000000, 0xef180000}
+#define CALL_DUMMY {0xe1a0e00f, 0xe1a0f004, 0xef180000}
 
 #define CALL_DUMMY_START_OFFSET 0  /* Start execution at beginning of dummy */
 
+#define CALL_DUMMY_BREAKPOINT_OFFSET arm_call_dummy_breakpoint_offset()
+extern int arm_call_dummy_breakpoint_offset PARAMS ((void));
+
 /* Insert the specified number of args and function address
    into a call sequence of the above form stored at DUMMYNAME.  */
 
 #define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, args, type, gcc_p) \
-{										\
-    register enum type_code code = TYPE_CODE (type);				\
-    register nargs_in_registers, struct_return = 0;				\
-    /* fix the load-arguments mask to move the first 4 or less arguments	\
-       into a1-a4 but make sure the structure return address in a1 is		\
-       not disturbed if the function is returning a structure */		\
-    if ((code == TYPE_CODE_STRUCT ||						\
-	 code == TYPE_CODE_UNION ||						\
-	 code == TYPE_CODE_ARRAY) &&						\
-	TYPE_LENGTH (type) > 4) {						\
-	nargs_in_registers = min(nargs + 1, 4);					\
-	struct_return = 1;							\
-    } else									\
-	nargs_in_registers = min(nargs, 4);					\
-    *(char *) dummyname = (1 << nargs_in_registers) - 1 - struct_return;	\
-    *(int *)((char *) dummyname + 8) =						\
-	(((fun - (pc + 16)) / 4) & 0x00ffffff) | 0xeb000000; }
+   arm_fix_call_dummy (dummyname, pc, fun, nargs, args, type, gcc_p)
+
+void arm_fix_call_dummy PARAMS ((char *dummy, CORE_ADDR pc, CORE_ADDR fun,
+				 int nargs, struct value **args,
+				 struct type *type, int gcc_p));
+
+CORE_ADDR arm_get_next_pc PARAMS ((CORE_ADDR));
+
+/* Functions for dealing with Thumb call thunks.  */
+#define IN_SOLIB_CALL_TRAMPOLINE(pc, name)	arm_in_call_stub (pc, name)
+#define SKIP_TRAMPOLINE_CODE(pc)		arm_skip_stub (pc)
+extern int arm_in_call_stub PARAMS ((CORE_ADDR pc,  char *name));
+extern CORE_ADDR arm_skip_stub PARAMS ((CORE_ADDR pc));
+
+/* Function to determine whether MEMADDR is in a Thumb function.  */
+extern int arm_pc_is_thumb PARAMS ((bfd_vma memaddr));
+
+/* Function to determine whether MEMADDR is in a call dummy called from
+   a Thumb function.  */
+extern int arm_pc_is_thumb_dummy PARAMS ((bfd_vma memaddr));
+
+/* Macros for setting and testing a bit in a minimal symbol that
+   marks it as Thumb function.  The MSB of the minimal symbol's
+   "info" field is used for this purpose. This field is already
+   being used to store the symbol size, so the assumption is
+   that the symbol size cannot exceed 2^31.
+ 
+   COFF_MAKE_MSYMBOL_SPECIAL
+   ELF_MAKE_MSYMBOL_SPECIAL	tests whether the COFF or ELF symbol corresponds 
+                        to a thumb function, and sets a "special" bit in a
+                        minimal symbol to indicate that it does
+   MSYMBOL_SET_SPECIAL	actually sets the "special" bit
+   MSYMBOL_IS_SPECIAL   tests the "special" bit in a minimal symbol
+   MSYMBOL_SIZE         returns the size of the minimal symbol, i.e.
+                        the "info" field with the "special" bit masked out
+*/
+ 
+extern int coff_sym_is_thumb(int val);
+#define MSYMBOL_SET_SPECIAL(msym) \
+    MSYMBOL_INFO (msym) = (char *) (((long) MSYMBOL_INFO (msym)) | 0x80000000)
+#define MSYMBOL_IS_SPECIAL(msym) \
+  (((long) MSYMBOL_INFO (msym) & 0x80000000) != 0)
+#define MSYMBOL_SIZE(msym) \
+  ((long) MSYMBOL_INFO (msym) & 0x7fffffff)
+
+/* Thumb symbol are of type STT_LOPROC, (synonymous with STT_ARM_TFUNC) */
+#define ELF_MAKE_MSYMBOL_SPECIAL(sym,msym) \
+ { if(ELF_ST_TYPE(((elf_symbol_type *)(sym))->internal_elf_sym.st_info) == STT_LOPROC) \
+	MSYMBOL_SET_SPECIAL(msym); }
+  
+#define COFF_MAKE_MSYMBOL_SPECIAL(val,msym) \
+ { if(coff_sym_is_thumb(val)) MSYMBOL_SET_SPECIAL(msym); }