* Rename remote-es1800.c to remote-es.c

[deliverable/binutils-gdb.git] / gdb / rs6000-tdep.c

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index d07c94526e0a38b5ef5de15944757efa3196a4ff..e783c1e4e430766696e2fe0449c15e0d061eb948 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -106,8 +106,15 @@ branch_dest (opcode, instr, pc, safety)
          dest = read_register (LR_REGNUM) & ~3;
 
        else if (ext_op == 528)                 /* br cond to count reg */
-         dest = read_register (CTR_REGNUM) & ~3;
-
+         {
+           dest = read_register (CTR_REGNUM) & ~3;
+
+           /* If we are about to execute a system call, dest is something
+              like 0x22fc or 0x3b00.  Upon completion the system call
+              will return to the address in the link register.  */
+           if (dest < TEXT_SEGMENT_BASE)
+             dest = read_register (LR_REGNUM) & ~3;
+         }
        else return -1; 
        break;
        
@@ -135,7 +142,7 @@ single_step (signal)
   if (!one_stepped) {
     loc = read_pc ();
 
-    read_memory (loc, &insn, 4);
+    read_memory (loc, (char *) &insn, 4);
 
     breaks[0] = loc + INSNLEN(insn);
     opcode = insn >> 26;
@@ -322,7 +329,14 @@ extern int stop_stack_dummy;
 void
 push_dummy_frame ()
 {
-  int sp, pc;                          /* stack pointer and link register */
+  /* stack pointer.  */
+  CORE_ADDR sp;
+
+  /* link register.  */
+  CORE_ADDR pc;
+  /* Same thing, target byte order.  */
+  char pc_targ[4];
+  
   int ii;
 
   target_fetch_registers (-1);
@@ -338,7 +352,8 @@ push_dummy_frame ()
   }
   
   sp = read_register(SP_REGNUM);
-  pc = read_register(PC_REGNUM);  
+  pc = read_register(PC_REGNUM);
+  memcpy (pc_targ, (char *) &pc, 4);
 
   dummy_frame_addr [dummy_frame_count++] = sp;
 
@@ -357,7 +372,7 @@ push_dummy_frame ()
   set_current_frame (create_new_frame (sp-DUMMY_FRAME_SIZE, pc));
 
   /* save program counter in link register's space. */
-  write_memory (sp+8, &pc, 4);
+  write_memory (sp+8, pc_targ, 4);
 
   /* save all floating point and general purpose registers here. */
 
@@ -382,7 +397,7 @@ push_dummy_frame ()
   sp -= DUMMY_FRAME_SIZE;
 
   /* And finally, this is the back chain. */
-  write_memory (sp+8, &pc, 4);
+  write_memory (sp+8, pc_targ, 4);
 }
 
 
@@ -449,7 +464,7 @@ pop_dummy_frame ()
 void
 pop_frame ()
 {
-  int pc, lr, sp, prev_sp;             /* %pc, %lr, %sp */
+  CORE_ADDR pc, lr, sp, prev_sp;               /* %pc, %lr, %sp */
   struct aix_framedata fdata;
   FRAME fr = get_current_frame ();
   int addr, ii;
@@ -469,11 +484,11 @@ pop_frame ()
   addr = get_pc_function_start (fr->pc) + FUNCTION_START_OFFSET;
   function_frame_info (addr, &fdata);
 
-  read_memory (sp, &prev_sp, 4);
+  prev_sp = read_memory_integer (sp, 4);
   if (fdata.frameless)
     lr = read_register (LR_REGNUM);
   else
-    read_memory (prev_sp+8, &lr, 4);
+    lr = read_memory_integer (prev_sp+8, 4);
 
   /* reset %pc value. */
   write_register (PC_REGNUM, lr);
@@ -826,7 +841,7 @@ ran_out_of_registers_for_arguments:
         ++f_argno;
       }
 
-      write_memory (sp+24+(ii*4), VALUE_CONTENTS (arg), len);
+      write_memory (sp+24+(ii*4), (char *) VALUE_CONTENTS (arg), len);
       ii += ((len + 3) & -4) / 4;
     }
   }
@@ -884,23 +899,6 @@ extract_return_value (valtype, regbuf, valbuf)
 CORE_ADDR rs6000_struct_return_address;
 
 
-/* Throw away this debugging code. FIXMEmgo. */
-void
-print_frame(fram)
-int fram;
-{
-  int ii, val;
-  for (ii=0; ii<40; ++ii) {
-    if ((ii % 4) == 0)
-      printf ("\n");
-    val = read_memory_integer (fram + ii * 4, 4);
-    printf ("0x%08x\t", val);
-  }
-  printf ("\n");
-}
-
-
-
 /* Indirect function calls use a piece of trampoline code to do context
    switching, i.e. to set the new TOC table. Skip such code if we are on
    its first instruction (as when we have single-stepped to here). 
@@ -927,7 +925,7 @@ CORE_ADDR pc;
   for (ii=0; trampoline_code[ii]; ++ii) {
     op  = read_memory_integer (pc + (ii*4), 4);
     if (op != trampoline_code [ii])
-      return NULL;
+      return 0;
   }
   ii = read_register (11);             /* r11 holds destination addr   */
   pc = read_memory_integer (ii, 4);    /* (r11) value                  */
@@ -948,6 +946,10 @@ int pcsaved;
   CORE_ADDR func_start;
   struct aix_framedata fdata;
 
+  if (fi->next != NULL)
+    /* Don't even think about framelessness except on the innermost frame.  */
+    return 0;
+  
   func_start = get_pc_function_start (fi->pc) + FUNCTION_START_OFFSET;
 
   /* If we failed to find the start of the function, it is a mistake
@@ -1079,6 +1081,32 @@ frame_initial_stack_address (fi)
   return fi->initial_sp = read_register (fdata.alloca_reg);     
 }
 
+FRAME_ADDR
+rs6000_frame_chain (thisframe)
+     struct frame_info *thisframe;
+{
+  FRAME_ADDR fp;
+  if (inside_entry_file ((thisframe)->pc))
+    return 0;
+  if (thisframe->signal_handler_caller)
+    {
+      /* This was determined by experimentation on AIX 3.2.  Perhaps
+        it corresponds to some offset in /usr/include/sys/user.h or
+        something like that.  Using some system include file would
+        have the advantage of probably being more robust in the face
+        of OS upgrades, but the disadvantage of being wrong for
+        cross-debugging.  */
+
+#define SIG_FRAME_FP_OFFSET 284
+      fp = read_memory_integer (thisframe->frame + SIG_FRAME_FP_OFFSET, 4);
+    }
+  else
+    fp = read_memory_integer ((thisframe)->frame, 4);
+
+  return fp;
+}
+
+\f
 /* xcoff_relocate_symtab -     hook for symbol table relocation.
    also reads shared libraries.. */
 
@@ -1110,7 +1138,10 @@ unsigned int pid;
     vmap_ldinfo(ldi);
 
    do {
-     add_text_to_loadinfo (ldi->ldinfo_textorg, ldi->ldinfo_dataorg);
+     /* We are allowed to assume CORE_ADDR == pointer.  This code is
+       native only.  */
+     add_text_to_loadinfo ((CORE_ADDR) ldi->ldinfo_textorg,
+                          (CORE_ADDR) ldi->ldinfo_dataorg);
     } while (ldi->ldinfo_next
             && (ldi = (void *) (ldi->ldinfo_next + (char *) ldi)));