GDB 7.6.50

sim/arm/wrapper.c

 /* run front end support for arm
-   Copyright (C) 1995-1997, 2000-2002, 2007-2012 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995-2013 Free Software Foundation, Inc.
 
    This file is part of ARM SIM.
 
    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 3 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
@@ skipping 16 matching lines @@
 #include "gdb/callback.h"
 #include "gdb/remote-sim.h"
 #include "armdefs.h"
 #include "armemu.h"
 #include "dbg_rdi.h"
 #include "ansidecl.h"
 #include "sim-utils.h"
 #include "run-sim.h"
 #include "gdb/sim-arm.h"
 #include "gdb/signals.h"
+#include "libiberty.h"
 
 host_callback *sim_callback;
 
 static struct ARMul_State *state;
 
 /* Who is using the simulator.  */
 static SIM_OPEN_KIND sim_kind;
 
 /* argv[0] */
 static char *myname;
@@ skipping 186 matching lines @@
 sim_create_inferior (sd, abfd, argv, env)
      SIM_DESC sd ATTRIBUTE_UNUSED;
      struct bfd * abfd;
      char ** argv;
      char ** env;
 {
   int argvlen = 0;
   int mach;
   char **arg;
 
+  init ();
+
   if (abfd != NULL)
-    ARMul_SetPC (state, bfd_get_start_address (abfd));
+    {
+      ARMul_SetPC (state, bfd_get_start_address (abfd));
+      mach = bfd_get_mach (abfd);
+    }
   else
-    ARMul_SetPC (state, 0);     /* ??? */
-
-  mach = bfd_get_mach (abfd);
+    {
+      ARMul_SetPC (state, 0);   /* ??? */
+      mach = 0;
+    }
 
   switch (mach)
     {
     default:
       (*sim_callback->printf_filtered)
         (sim_callback,
          "Unknown machine type '%d'; please update sim_create_inferior.\n",
          mach);
       /* fall through */
 
@@ skipping 174 matching lines @@
       memory[1] = val >> 8;
       memory[0] = val >> 0;
     }
 }
 
 int
 sim_store_register (sd, rn, memory, length)
      SIM_DESC sd ATTRIBUTE_UNUSED;
      int rn;
      unsigned char *memory;
-     int length ATTRIBUTE_UNUSED;
+     int length;
 {
   init ();
 
   switch ((enum sim_arm_regs) rn)
     {
     case SIM_ARM_R0_REGNUM:
     case SIM_ARM_R1_REGNUM:
     case SIM_ARM_R2_REGNUM:
     case SIM_ARM_R3_REGNUM:
     case SIM_ARM_R4_REGNUM:
@@ skipping 80 matching lines @@
     case SIM_ARM_IWMMXT_COP1R12_REGNUM:
     case SIM_ARM_IWMMXT_COP1R13_REGNUM:
     case SIM_ARM_IWMMXT_COP1R14_REGNUM:
     case SIM_ARM_IWMMXT_COP1R15_REGNUM:
       return Store_Iwmmxt_Register (rn - SIM_ARM_IWMMXT_COP0R0_REGNUM, memory);
 
     default:
       return 0;
     }
 
-  return -1;
+  return length;
 }
 
 int
 sim_fetch_register (sd, rn, memory, length)
      SIM_DESC sd ATTRIBUTE_UNUSED;
      int rn;
      unsigned char *memory;
-     int length ATTRIBUTE_UNUSED;
+     int length;
 {
   ARMword regval;
+  int len = length;
 
   init ();
 
   switch ((enum sim_arm_regs) rn)
     {
     case SIM_ARM_R0_REGNUM:
     case SIM_ARM_R1_REGNUM:
     case SIM_ARM_R2_REGNUM:
     case SIM_ARM_R3_REGNUM:
     case SIM_ARM_R4_REGNUM:
@@ skipping 82 matching lines @@
     case SIM_ARM_IWMMXT_COP1R12_REGNUM:
     case SIM_ARM_IWMMXT_COP1R13_REGNUM:
     case SIM_ARM_IWMMXT_COP1R14_REGNUM:
     case SIM_ARM_IWMMXT_COP1R15_REGNUM:
       return Fetch_Iwmmxt_Register (rn - SIM_ARM_IWMMXT_COP0R0_REGNUM, memory);
 
     default:
       return 0;
     }
 
-  while (length)
+  while (len)
     {
       tomem (state, memory, regval);
 
-      length -= 4;
+      len -= 4;
       memory += 4;
       regval = 0;
     }  
 
-  return -1;
+  return length;
 }
 
 #ifdef SIM_TARGET_SWITCHES
 
 static void sim_target_parse_arg_array PARAMS ((char **));
 
 typedef struct
 {
   char *        swi_option;
   unsigned int  swi_mask;
@@ skipping 257 matching lines @@
 }
 
 void
 sim_set_callbacks (ptr)
      host_callback *ptr;
 {
   sim_callback = ptr;
 }
 
 char **
-sim_complete_command (SIM_DESC sd, char *text, char *word)
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
 {
   return NULL;
 }