Don't write to inferior_ptid in windows-nat.c, part II

[deliverable/binutils-gdb.git] / sim / rl78 / gdb-if.c

diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c
index 04d4f0e110760faf8d715652a184ef902bb7e57f..ba07038c009d581f1c54fe874cb65c04647be29d 100644 (file)
--- a/sim/rl78/gdb-if.c
+++ b/sim/rl78/gdb-if.c
@@ -1,6 +1,6 @@
 /* gdb-if.c -- sim interface to GDB.
 
 /* gdb-if.c -- sim interface to GDB.
 

-Copyright (C) 2011-2013 Free Software Foundation, Inc.
+Copyright (C) 2011-2020 Free Software Foundation, Inc.

 Contributed by Red Hat, Inc.
 
 This file is part of the GNU simulators.
 Contributed by Red Hat, Inc.
 
 This file is part of the GNU simulators.


@@ -55,8 +55,6 @@ static struct sim_state the_minisim = {
 
 static int open;
 
 
 static int open;
 

-static unsigned char hw_breakpoints[MEM_SIZE/8];
-

 static struct host_callback_struct *host_callbacks;
 
 /* Open an instance of the sim.  For this sim, only one instance
 static struct host_callback_struct *host_callbacks;
 
 /* Open an instance of the sim.  For this sim, only one instance


@@ -66,7 +64,7 @@ static struct host_callback_struct *host_callbacks;
 SIM_DESC
 sim_open (SIM_OPEN_KIND kind,
          struct host_callback_struct *callback,
 SIM_DESC
 sim_open (SIM_OPEN_KIND kind,
          struct host_callback_struct *callback,

-         struct bfd *abfd, char **argv)
+         struct bfd *abfd, char * const *argv)

 {
   if (open)
     fprintf (stderr, "rl78 minisim: re-opened sim\n");
 {
   if (open)
     fprintf (stderr, "rl78 minisim: re-opened sim\n");


@@ -88,6 +86,37 @@ sim_open (SIM_OPEN_KIND kind,
 
   sim_disasm_init (abfd);
   open = 1;
 
   sim_disasm_init (abfd);
   open = 1;

+
+  while (argv != NULL && *argv != NULL)
+    {
+      if (strcmp (*argv, "g10") == 0 || strcmp (*argv, "-Mg10") == 0)
+       {
+         fprintf (stderr, "rl78 g10 support enabled.\n");
+         rl78_g10_mode = 1;
+         g13_multiply = 0;
+         g14_multiply = 0;
+         mem_set_mirror (0, 0xf8000, 4096);
+         break;
+       }
+      if (strcmp (*argv, "g13") == 0 || strcmp (*argv, "-Mg13") == 0)
+       {
+         fprintf (stderr, "rl78 g13 support enabled.\n");
+         rl78_g10_mode = 0;
+         g13_multiply = 1;
+         g14_multiply = 0;
+         break;
+       }
+      if (strcmp (*argv, "g14") == 0 || strcmp (*argv, "-Mg14") == 0)
+       {
+         fprintf (stderr, "rl78 g14 support enabled.\n");
+         rl78_g10_mode = 0;
+         g13_multiply = 0;
+         g14_multiply = 1;
+         break;
+       }
+      argv++;
+    }
+

   return &the_minisim;
 }
 
   return &the_minisim;
 }
 


@@ -142,7 +171,7 @@ open_objfile (const char *filename)
 /* Load a program.  */
 
 SIM_RC
 /* Load a program.  */
 
 SIM_RC

-sim_load (SIM_DESC sd, char *prog, struct bfd *abfd, int from_tty)
+sim_load (SIM_DESC sd, const char *prog, struct bfd *abfd, int from_tty)

 {
   check_desc (sd);
 
 {
   check_desc (sd);
 


@@ -159,7 +188,8 @@ sim_load (SIM_DESC sd, char *prog, struct bfd *abfd, int from_tty)
 /* Create inferior.  */
 
 SIM_RC
 /* Create inferior.  */
 
 SIM_RC

-sim_create_inferior (SIM_DESC sd, struct bfd *abfd, char **argv, char **env)
+sim_create_inferior (SIM_DESC sd, struct bfd *abfd,
+                    char * const *argv, char * const *env)

 {
   check_desc (sd);
 
 {
   check_desc (sd);
 


@@ -341,7 +371,15 @@ sim_store_register (SIM_DESC sd, int regno, unsigned char *buf, int length)
   val = get_le (buf, length);
 
   if (regno == sim_rl78_pc_regnum)
   val = get_le (buf, length);
 
   if (regno == sim_rl78_pc_regnum)

-    pc = val;
+    {
+      pc = val;
+
+      /* The rl78 program counter is 20 bits wide.  Ensure that GDB
+         hasn't picked up any stray bits.  This has occurred when performing
+        a GDB "return" command in which the return address is obtained
+        from a 32-bit container on the stack.  */
+      assert ((pc & ~0x0fffff) == 0);
+    }

   else
     memory[reg_addr (regno)] = val;
   return size;
   else
     memory[reg_addr (regno)] = val;
   return size;


@@ -456,13 +494,6 @@ sim_resume (SIM_DESC sd, int step, int sig_to_deliver)
          break;
        }
 
          break;
        }
 

-      if (hw_breakpoints[pc >> 3]
-          && (hw_breakpoints[pc >> 3] & (1 << (pc & 0x7))))
-       {
-         reason = sim_stopped;
-         siggnal = GDB_SIGNAL_TRAP;
-         break;
-       }

       rc = setjmp (decode_jmp_buf);
       if (rc == 0)
        rc = decode_opcode ();
       rc = setjmp (decode_jmp_buf);
       if (rc == 0)
        rc = decode_opcode ();


@@ -500,9 +531,10 @@ sim_stop_reason (SIM_DESC sd, enum sim_stop *reason_p, int *sigrc_p)
    command.  */
 
 void
    command.  */
 
 void

-sim_do_command (SIM_DESC sd, char *cmd)
+sim_do_command (SIM_DESC sd, const char *cmd)

 {
 {

-  char *args;
+  const char *args;
+  char *p = strdup (cmd);

 
   check_desc (sd);
 
 
   check_desc (sd);
 


@@ -513,8 +545,6 @@ sim_do_command (SIM_DESC sd, char *cmd)
     }
   else
     {
     }
   else
     {

-      char *p = cmd;
-

       /* Skip leading whitespace.  */
       while (isspace (*p))
        p++;
       /* Skip leading whitespace.  */
       while (isspace (*p))
        p++;


@@ -562,6 +592,8 @@ sim_do_command (SIM_DESC sd, char *cmd)
   else
     printf ("The 'sim' command expects either 'trace' or 'verbose'"
            " as a subcommand.\n");
   else
     printf ("The 'sim' command expects either 'trace' or 'verbose'"
            " as a subcommand.\n");

+
+  free (p);

 }
 
 /* Stub for command completion.  */
 }
 
 /* Stub for command completion.  */