import gdb-1999-07-07 post reformat

1 files changed, 130 insertions, 125 deletions

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 436fd5e..3e50ca8 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -2,21 +2,22 @@
    Copyright (C) 1988, 1989, 1991, 1994, 1995, 1996, 1998
    Free Software Foundation, Inc.
 
-This file is part of GDB.
+   This file is part of GDB.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "gdb_string.h"
@@ -46,10 +47,11 @@ static int gdb_print_insn_i386 (bfd_vma, disassemble_info *);
 void _initialize_i386_tdep PARAMS ((void));
 
 /* This is the variable the is set with "set disassembly-flavor",
- and its legitimate values. */
+   and its legitimate values. */
 static char att_flavor[] = "att";
 static char intel_flavor[] = "intel";
-static char *valid_flavors[] = {
+static char *valid_flavors[] =
+{
   att_flavor,
   intel_flavor,
   NULL
@@ -60,7 +62,7 @@ static char *disassembly_flavor = att_flavor;
 static void set_disassembly_flavor_sfunc PARAMS ((char *, int, struct cmd_list_element *));
 static void set_disassembly_flavor ();
 
-void (*disassembly_flavor_hook) PARAMS((char *args, int from_tty));
+void (*disassembly_flavor_hook) PARAMS ((char *args, int from_tty));
 
 /* Stdio style buffering was used to minimize calls to ptrace, but this
    buffering did not take into account that the code section being accessed
@@ -92,31 +94,31 @@ static int codestream_cnt;
 #define codestream_get() (codestream_cnt-- == 0 ? \
 			 codestream_fill(0) : codestream_buf[codestream_off++])
 
-static unsigned char 
+static unsigned char
 codestream_fill (peek_flag)
-    int peek_flag;
+     int peek_flag;
 {
   codestream_addr = codestream_next_addr;
   codestream_next_addr += CODESTREAM_BUFSIZ;
   codestream_off = 0;
   codestream_cnt = CODESTREAM_BUFSIZ;
   read_memory (codestream_addr, (char *) codestream_buf, CODESTREAM_BUFSIZ);
-  
+
   if (peek_flag)
-    return (codestream_peek());
+    return (codestream_peek ());
   else
-    return (codestream_get());
+    return (codestream_get ());
 }
 
 static void
 codestream_seek (place)
-    CORE_ADDR place;
+     CORE_ADDR place;
 {
   codestream_next_addr = place / CODESTREAM_BUFSIZ;
   codestream_next_addr *= CODESTREAM_BUFSIZ;
   codestream_cnt = 0;
   codestream_fill (1);
-  while (codestream_tell() != place)
+  while (codestream_tell () != place)
     codestream_get ();
 }
 
@@ -162,7 +164,7 @@ i386_follow_jump ()
 	  delta = extract_signed_integer (buf, 2);
 
 	  /* include size of jmp inst (including the 0x66 prefix).  */
-	  pos += delta + 4; 
+	  pos += delta + 4;
 	}
       else
 	{
@@ -209,7 +211,7 @@ i386_get_frame_setup (pc)
       /*
        * this function must start with
        * 
-       *    popl %eax		  0x58
+       *    popl %eax             0x58
        *    xchgl %eax, (%esp)  0x87 0x04 0x24
        * or xchgl %eax, 0(%esp) 0x87 0x44 0x24 0x00
        *
@@ -222,8 +224,10 @@ i386_get_frame_setup (pc)
        */
       int pos;
       unsigned char buf[4];
-      static unsigned char proto1[3] = { 0x87,0x04,0x24 };
-      static unsigned char proto2[4] = { 0x87,0x44,0x24,0x00 };
+      static unsigned char proto1[3] =
+      {0x87, 0x04, 0x24};
+      static unsigned char proto2[4] =
+      {0x87, 0x44, 0x24, 0x00};
       pos = codestream_tell ();
       codestream_read (buf, 4);
       if (memcmp (buf, proto1, 3) == 0)
@@ -232,7 +236,7 @@ i386_get_frame_setup (pc)
 	pos += 4;
 
       codestream_seek (pos);
-      op = codestream_get (); /* update next opcode */
+      op = codestream_get ();	/* update next opcode */
     }
 
   if (op == 0x68 || op == 0x6a)
@@ -265,11 +269,11 @@ i386_get_frame_setup (pc)
       if (buf[0] == 0xe8 && buf[6] == 0xc4 && buf[7] == 0x4)
 	pos += sizeof (buf);
       codestream_seek (pos);
-      op = codestream_get (); /* update next opcode */
+      op = codestream_get ();	/* update next opcode */
     }
 
   if (op == 0x55)		/* pushl %ebp */
-    {			
+    {
       /* check for movl %esp, %ebp - can be written two ways */
       switch (codestream_get ())
 	{
@@ -285,7 +289,7 @@ i386_get_frame_setup (pc)
 	  return (-1);
 	}
       /* check for stack adjustment 
-       *
+
        *  subl $XXX, %esp
        *
        * note: you can't subtract a 16 bit immediate
@@ -306,13 +310,13 @@ i386_get_frame_setup (pc)
 	  /* subl with signed byte immediate 
 	   * (though it wouldn't make sense to be negative)
 	   */
-	  return (codestream_get());
+	  return (codestream_get ());
 	}
       else if (op == 0x81)
 	{
 	  char buf[4];
 	  /* Maybe it is subl with 32 bit immedediate.  */
-	  codestream_get();
+	  codestream_get ();
 	  if (codestream_get () != 0xec)
 	    /* Some instruction starting with 0x81 other than subl.  */
 	    {
@@ -320,7 +324,7 @@ i386_get_frame_setup (pc)
 	      return 0;
 	    }
 	  /* It is subl with 32 bit immediate.  */
-	  codestream_read ((unsigned char *)buf, 4);
+	  codestream_read ((unsigned char *) buf, 4);
 	  return extract_signed_integer (buf, 4);
 	}
       else
@@ -332,8 +336,8 @@ i386_get_frame_setup (pc)
     {
       char buf[2];
       /* enter instruction: arg is 16 bit unsigned immed */
-      codestream_read ((unsigned char *)buf, 2);
-      codestream_get (); /* flush final byte of enter instruction */
+      codestream_read ((unsigned char *) buf, 2);
+      codestream_get ();	/* flush final byte of enter instruction */
       return extract_unsigned_integer (buf, 2);
     }
   return (-1);
@@ -354,8 +358,8 @@ i386_frame_num_args (fi)
      this call and a previous one, and we would say there are more args
      than there really are.  */
 
-  int retpc;						
-  unsigned char op;					
+  int retpc;
+  unsigned char op;
   struct frame_info *pfi;
 
   /* on the 386, the instruction following the call could be:
@@ -372,38 +376,38 @@ i386_frame_num_args (fi)
        nameless arguments.  */
     return -1;
 
-  pfi = get_prev_frame (fi);			
+  pfi = get_prev_frame (fi);
   if (pfi == 0)
     {
       /* Note:  this can happen if we are looking at the frame for
-	 main, because FRAME_CHAIN_VALID won't let us go into
-	 start.  If we have debugging symbols, that's not really
-	 a big deal; it just means it will only show as many arguments
-	 to main as are declared.  */
+         main, because FRAME_CHAIN_VALID won't let us go into
+         start.  If we have debugging symbols, that's not really
+         a big deal; it just means it will only show as many arguments
+         to main as are declared.  */
       return -1;
     }
   else
     {
-      retpc = pfi->pc;					
-      op = read_memory_integer (retpc, 1);			
-      if (op == 0x59)					
-	/* pop %ecx */			       
-	return 1;				
+      retpc = pfi->pc;
+      op = read_memory_integer (retpc, 1);
+      if (op == 0x59)
+	/* pop %ecx */
+	return 1;
       else if (op == 0x83)
 	{
-	  op = read_memory_integer (retpc+1, 1);	
-	  if (op == 0xc4)				
-	    /* addl $<signed imm 8 bits>, %esp */	
-	    return (read_memory_integer (retpc+2,1)&0xff)/4;
+	  op = read_memory_integer (retpc + 1, 1);
+	  if (op == 0xc4)
+	    /* addl $<signed imm 8 bits>, %esp */
+	    return (read_memory_integer (retpc + 2, 1) & 0xff) / 4;
 	  else
 	    return 0;
 	}
       else if (op == 0x81)
-	{ /* add with 32 bit immediate */
-	  op = read_memory_integer (retpc+1, 1);	
-	  if (op == 0xc4)				
-	    /* addl $<imm 32>, %esp */		
-	    return read_memory_integer (retpc+2, 4) / 4;
+	{			/* add with 32 bit immediate */
+	  op = read_memory_integer (retpc + 1, 1);
+	  if (op == 0xc4)
+	    /* addl $<imm 32>, %esp */
+	    return read_memory_integer (retpc + 2, 4) / 4;
 	  else
 	    return 0;
 	}
@@ -455,49 +459,49 @@ i386_frame_find_saved_regs (fip, fsrp)
   CORE_ADDR adr;
   CORE_ADDR pc;
   int i;
-  
+
   memset (fsrp, 0, sizeof *fsrp);
-  
+
   /* if frame is the end of a dummy, compute where the
    * beginning would be
    */
   dummy_bottom = fip->frame - 4 - REGISTER_BYTES - CALL_DUMMY_LENGTH;
-  
+
   /* check if the PC is in the stack, in a dummy frame */
-  if (dummy_bottom <= fip->pc && fip->pc <= fip->frame) 
+  if (dummy_bottom <= fip->pc && fip->pc <= fip->frame)
     {
       /* all regs were saved by push_call_dummy () */
       adr = fip->frame;
-      for (i = 0; i < NUM_REGS; i++) 
+      for (i = 0; i < NUM_REGS; i++)
 	{
 	  adr -= REGISTER_RAW_SIZE (i);
 	  fsrp->regs[i] = adr;
 	}
       return;
     }
-  
+
   pc = get_pc_function_start (fip->pc);
   if (pc != 0)
     locals = i386_get_frame_setup (pc);
-  
-  if (locals >= 0) 
+
+  if (locals >= 0)
     {
       adr = fip->frame - 4 - locals;
-      for (i = 0; i < 8; i++) 
+      for (i = 0; i < 8; i++)
 	{
 	  op = codestream_get ();
 	  if (op < 0x50 || op > 0x57)
 	    break;
 #ifdef I386_REGNO_TO_SYMMETRY
 	  /* Dynix uses different internal numbering.  Ick.  */
-	  fsrp->regs[I386_REGNO_TO_SYMMETRY(op - 0x50)] = adr;
+	  fsrp->regs[I386_REGNO_TO_SYMMETRY (op - 0x50)] = adr;
 #else
 	  fsrp->regs[op - 0x50] = adr;
 #endif
 	  adr -= 4;
 	}
     }
-  
+
   fsrp->regs[PC_REGNUM] = fip->frame + 4;
   fsrp->regs[FP_REGNUM] = fip->frame;
 }
@@ -510,43 +514,44 @@ i386_skip_prologue (pc)
 {
   unsigned char op;
   int i;
-  static unsigned char pic_pat[6] = { 0xe8, 0, 0, 0, 0, /* call   0x0 */
-				      0x5b,             /* popl   %ebx */
-				    };
+  static unsigned char pic_pat[6] =
+  {0xe8, 0, 0, 0, 0,		/* call   0x0 */
+   0x5b,			/* popl   %ebx */
+  };
   CORE_ADDR pos;
-  
+
   if (i386_get_frame_setup (pc) < 0)
     return (pc);
-  
+
   /* found valid frame setup - codestream now points to 
    * start of push instructions for saving registers
    */
-  
+
   /* skip over register saves */
   for (i = 0; i < 8; i++)
     {
       op = codestream_peek ();
       /* break if not pushl inst */
-      if (op < 0x50 || op > 0x57) 
+      if (op < 0x50 || op > 0x57)
 	break;
       codestream_get ();
     }
 
   /* The native cc on SVR4 in -K PIC mode inserts the following code to get
      the address of the global offset table (GOT) into register %ebx.
-      call	0x0
-      popl	%ebx
-      movl	%ebx,x(%ebp)	(optional)
-      addl	y,%ebx
+     call       0x0
+     popl       %ebx
+     movl       %ebx,x(%ebp)    (optional)
+     addl       y,%ebx
      This code is with the rest of the prologue (at the end of the
      function), so we have to skip it to get to the first real
      instruction at the start of the function.  */
-     
+
   pos = codestream_tell ();
   for (i = 0; i < 6; i++)
     {
       op = codestream_get ();
-      if (pic_pat [i] != op)
+      if (pic_pat[i] != op)
 	break;
     }
   if (i == 6)
@@ -555,33 +560,33 @@ i386_skip_prologue (pc)
       long delta = 6;
 
       op = codestream_get ();
-      if (op == 0x89)			/* movl %ebx, x(%ebp) */
+      if (op == 0x89)		/* movl %ebx, x(%ebp) */
 	{
 	  op = codestream_get ();
-	  if (op == 0x5d)		/* one byte offset from %ebp */
+	  if (op == 0x5d)	/* one byte offset from %ebp */
 	    {
 	      delta += 3;
 	      codestream_read (buf, 1);
 	    }
-	  else if (op == 0x9d)		/* four byte offset from %ebp */
+	  else if (op == 0x9d)	/* four byte offset from %ebp */
 	    {
 	      delta += 6;
 	      codestream_read (buf, 4);
 	    }
-	  else				/* unexpected instruction */
-	      delta = -1;
-          op = codestream_get ();
+	  else			/* unexpected instruction */
+	    delta = -1;
+	  op = codestream_get ();
 	}
-					/* addl y,%ebx */
-      if (delta > 0 && op == 0x81 && codestream_get () == 0xc3) 
+      /* addl y,%ebx */
+      if (delta > 0 && op == 0x81 && codestream_get () == 0xc3)
 	{
-	    pos += delta + 6;
+	  pos += delta + 6;
 	}
     }
   codestream_seek (pos);
-  
+
   i386_follow_jump ();
-  
+
   return (codestream_tell ());
 }
 
@@ -591,7 +596,7 @@ i386_push_dummy_frame ()
   CORE_ADDR sp = read_register (SP_REGNUM);
   int regnum;
   char regbuf[MAX_REGISTER_RAW_SIZE];
-  
+
   sp = push_word (sp, read_register (PC_REGNUM));
   sp = push_word (sp, read_register (FP_REGNUM));
   write_register (FP_REGNUM, sp);
@@ -611,10 +616,10 @@ i386_pop_frame ()
   int regnum;
   struct frame_saved_regs fsr;
   char regbuf[MAX_REGISTER_RAW_SIZE];
-  
+
   fp = FRAME_FP (frame);
   get_frame_saved_regs (frame, &fsr);
-  for (regnum = 0; regnum < NUM_REGS; regnum++) 
+  for (regnum = 0; regnum < NUM_REGS; regnum++)
     {
       CORE_ADDR adr;
       adr = fsr.regs[regnum];
@@ -639,7 +644,7 @@ i386_pop_frame ()
    This routine returns true on success. */
 
 int
-get_longjmp_target(pc)
+get_longjmp_target (pc)
      CORE_ADDR *pc;
 {
   char buf[TARGET_PTR_BIT / TARGET_CHAR_BIT];
@@ -647,7 +652,7 @@ get_longjmp_target(pc)
 
   sp = read_register (SP_REGNUM);
 
-  if (target_read_memory (sp + SP_ARG0, /* Offset of first arg on stack */
+  if (target_read_memory (sp + SP_ARG0,		/* Offset of first arg on stack */
 			  buf,
 			  TARGET_PTR_BIT / TARGET_CHAR_BIT))
     return 0;
@@ -666,26 +671,26 @@ get_longjmp_target(pc)
 #endif /* GET_LONGJMP_TARGET */
 
 void
-i386_extract_return_value(type, regbuf, valbuf)
+i386_extract_return_value (type, regbuf, valbuf)
      struct type *type;
      char regbuf[REGISTER_BYTES];
      char *valbuf;
 {
 /* On AIX, floating point values are returned in floating point registers.  */
 #ifdef I386_AIX_TARGET
-  if (TYPE_CODE_FLT == TYPE_CODE(type))
+  if (TYPE_CODE_FLT == TYPE_CODE (type))
     {
       double d;
       /* 387 %st(0), gcc uses this */
       floatformat_to_double (&floatformat_i387_ext,
-			     &regbuf[REGISTER_BYTE(FP0_REGNUM)],
+			     &regbuf[REGISTER_BYTE (FP0_REGNUM)],
 			     &d);
       store_floating (valbuf, TYPE_LENGTH (type), d);
     }
   else
 #endif /* I386_AIX_TARGET */
-    { 
-      memcpy (valbuf, regbuf, TYPE_LENGTH (type)); 
+    {
+      memcpy (valbuf, regbuf, TYPE_LENGTH (type));
     }
 }
 
@@ -729,12 +734,12 @@ sunpro_static_transform_name (name)
   if (IS_STATIC_TRANSFORM_NAME (name))
     {
       /* For file-local statics there will be a period, a bunch
-	 of junk (the contents of which match a string given in the
-	 N_OPT), a period and the name.  For function-local statics
-	 there will be a bunch of junk (which seems to change the
-	 second character from 'A' to 'B'), a period, the name of the
-	 function, and the name.  So just skip everything before the
-	 last period.  */
+         of junk (the contents of which match a string given in the
+         N_OPT), a period and the name.  For function-local statics
+         there will be a bunch of junk (which seems to change the
+         second character from 'A' to 'B'), a period, the name of the
+         function, and the name.  So just skip everything before the
+         last period.  */
       p = strrchr (name, '.');
       if (p != NULL)
 	name = p + 1;
@@ -752,17 +757,17 @@ skip_trampoline_code (pc, name)
      CORE_ADDR pc;
      char *name;
 {
-  if (pc && read_memory_unsigned_integer (pc, 2) == 0x25ff) /* jmp *(dest) */
+  if (pc && read_memory_unsigned_integer (pc, 2) == 0x25ff)	/* jmp *(dest) */
     {
-      unsigned long indirect = read_memory_unsigned_integer (pc+2, 4);
+      unsigned long indirect = read_memory_unsigned_integer (pc + 2, 4);
       struct minimal_symbol *indsym =
-	indirect ? lookup_minimal_symbol_by_pc (indirect) : 0;
-      char *symname = indsym ? SYMBOL_NAME(indsym) : 0;
+      indirect ? lookup_minimal_symbol_by_pc (indirect) : 0;
+      char *symname = indsym ? SYMBOL_NAME (indsym) : 0;
 
-      if (symname) 
+      if (symname)
 	{
-	  if (strncmp (symname,"__imp_", 6) == 0
-	      || strncmp (symname,"_imp_", 5) == 0)
+	  if (strncmp (symname, "__imp_", 6) == 0
+	      || strncmp (symname, "_imp_", 5) == 0)
 	    return name ? 1 : read_memory_unsigned_integer (indirect, 4);
 	}
     }
@@ -772,7 +777,7 @@ skip_trampoline_code (pc, name)
 static int
 gdb_print_insn_i386 (memaddr, info)
      bfd_vma memaddr;
-     disassemble_info * info;
+     disassemble_info *info;
 {
   if (disassembly_flavor == att_flavor)
     return print_insn_i386_att (memaddr, info);
@@ -794,9 +799,9 @@ set_disassembly_flavor_sfunc (args, from_tty, c)
      struct cmd_list_element *c;
 {
   set_disassembly_flavor ();
-  
+
   if (disassembly_flavor_hook != NULL)
-    disassembly_flavor_hook(args, from_tty);
+    disassembly_flavor_hook (args, from_tty);
 }
 
 static void
@@ -812,24 +817,24 @@ void
 _initialize_i386_tdep ()
 {
   struct cmd_list_element *new_cmd;
-  
+
   tm_print_insn = gdb_print_insn_i386;
   tm_print_insn_info.mach = bfd_lookup_arch (bfd_arch_i386, 0)->mach;
 
   /* Add the variable that controls the disassembly flavor */
 
   new_cmd = add_set_enum_cmd ("disassembly-flavor", no_class,
-				  valid_flavors,
-				  (char *) &disassembly_flavor,
-				  "Set the disassembly flavor, the valid values are \"att\" and \"intel\", \
+			      valid_flavors,
+			      (char *) &disassembly_flavor,
+			      "Set the disassembly flavor, the valid values are \"att\" and \"intel\", \
 and the default value is \"att\".",
-				  &setlist);
+			      &setlist);
   new_cmd->function.sfunc = set_disassembly_flavor_sfunc;
-  add_show_from_set(new_cmd, &showlist);
-  
+  add_show_from_set (new_cmd, &showlist);
+
   /* Finally, initialize the disassembly flavor to the default given
      in the disassembly_flavor variable */
 
   set_disassembly_flavor ();
-  
+
 }