X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Ferc32%2Finterf.c;h=89f747fd6e44dc0cfa91fd8141d36eafd640669a;hb=50838d1be72ddd30e0b5f081933482424ae5a6b0;hp=4ea62cf21035b7c755d5eba7961b2c2b28e93946;hpb=7230ff0faa65304b835fc525e52ddb6e3ba70325;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c
index 4ea62cf210..89f747fd6e 100644
--- a/sim/erc32/interf.c
+++ b/sim/erc32/interf.c
@@ -1,42 +1,37 @@
-/*
- * This file is part of SIS.
- * 
- * SIS, SPARC instruction simulator V1.6 Copyright (C) 1995 Jiri Gaisler,
- * European Space Agency
- * 
- * 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.
- * 
- * 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.
- * 
- */
+/* This file is part of SIS (SPARC instruction simulator)
 
+   Copyright (C) 1995-2020 Free Software Foundation, Inc.
+   Contributed by Jiri Gaisler, European Space Agency
+
+   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
+   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, see <http://www.gnu.org/licenses/>.  */
+
+#include "config.h"
 #include <signal.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/fcntl.h>
 #include "sis.h"
+#include "libiberty.h"
 #include "bfd.h"
 #include <dis-asm.h>
+#include "sim-config.h"
 
-#include "remote-sim.h"
+#include "gdb/remote-sim.h"
+#include "gdb/signals.h"
 
-#ifndef fprintf
-extern          fprintf();
-#endif
-
-#define	VAL(x)	strtol(x,(char *)NULL,0)
-
-extern char   **buildargv(char *input);
+#define PSR_CWP 0x7
 
 extern struct disassemble_info dinfo;
 extern struct pstate sregs;
@@ -47,6 +42,7 @@ extern int      nfp;
 extern int      ift;
 extern int      rom8;
 extern int      wrp;
+extern int      uben;
 extern int      sis_verbose;
 extern char    *sis_version;
 extern struct estate ebase;
@@ -54,6 +50,8 @@ extern struct evcell evbuf[];
 extern struct irqcell irqarr[];
 extern int      irqpend, ext_irl;
 extern int      sparclite;
+extern int      dumbio;
+extern int      sparclite_board;
 extern int      termsave;
 extern char     uart_dev1[], uart_dev2[];
 
@@ -61,154 +59,148 @@ int             sis_gdb_break = 1;
 
 host_callback *sim_callback;
 
-run_sim(sregs, go, icount, dis)
+int
+run_sim(sregs, icount, dis)
     struct pstate  *sregs;
-    int             go;
-    unsigned int    icount;
+    uint64          icount;
     int             dis;
 {
-    int             mexc, ws;
+    int             mexc, irq;
 
     if (sis_verbose)
 	(*sim_callback->printf_filtered) (sim_callback, "resuming at %x\n",
 					  sregs->pc);
    init_stdio();
-   sregs->starttime = time(NULL);
-    while ((!sregs->err_mode & (go || (icount > 0))) &&
-	   ((sregs->bptnum == 0) || !(sregs->bphit = check_bpt(sregs)))) {
+   sregs->starttime = get_time();
+   irq = 0;
+   if ((sregs->pc != 0) && (ebase.simtime == 0))
+	boot_init();
+   while (!sregs->err_mode & (icount > 0)) {
 
 	sregs->fhold = 0;
 	sregs->hold = 0;
-	sregs->icnt = 0;
-
-	check_interrupts(sregs);
-	if (sregs->trap) {
-	    sregs->err_mode = execute_trap(sregs);
-	} else {
-	    if (sregs->psr & 0x080)
-		sregs->asi = 8;
-	    else
-		sregs->asi = 9;
-
-	    mexc = memory_read(sregs->asi, sregs->pc, &sregs->inst, &sregs->hold);
-	    if (sregs->annul) {
-		sregs->annul = 0;
-		sregs->icnt = 1;
-		sregs->pc = sregs->npc;
-		sregs->npc = sregs->npc + 4;
-	    } else {
+	sregs->icnt = 1;
+
+        if (sregs->psr & 0x080)
+            sregs->asi = 8;
+        else
+            sregs->asi = 9;
+
+#if 0	/* DELETE ME! for debugging purposes only */
+        if (sis_verbose > 1)
+            if (sregs->pc == 0 || sregs->npc == 0)
+                printf ("bogus pc or npc\n");
+#endif
+        mexc = memory_iread (sregs->pc, &sregs->inst, &sregs->hold);
+#if 0	/* DELETE ME! for debugging purposes only */
+        if (sis_verbose > 2)
+            printf("pc %x, np %x, sp %x, fp %x, wm %x, cw %x, i %08x\n",
+                   sregs->pc, sregs->npc,
+                   sregs->r[(((sregs->psr & 7) << 4) + 14) & 0x7f],
+                   sregs->r[(((sregs->psr & 7) << 4) + 30) & 0x7f],
+                   sregs->wim,
+                   sregs->psr & 7,
+                   sregs->inst);
+#endif
+        if (sregs->annul) {
+            sregs->annul = 0;
+            sregs->icnt = 1;
+            sregs->pc = sregs->npc;
+            sregs->npc = sregs->npc + 4;
+        } else {
+	    if (ext_irl) irq = check_interrupts(sregs);
+	    if (!irq) {
 		if (mexc) {
 		    sregs->trap = I_ACC_EXC;
 		} else {
-		    if (sregs->histlen) {
-			sregs->histbuf[sregs->histind].addr = sregs->pc;
-			sregs->histbuf[sregs->histind].time = ebase.simtime;
-			sregs->histind++;
-			if (sregs->histind >= sregs->histlen)
-			    sregs->histind = 0;
-		    }
-		    if (dis) {
-			printf(" %8d ", ebase.simtime);
-			dis_mem(sregs->pc, 1, &dinfo);
-		    }
 		    if ((sis_gdb_break) && (sregs->inst == 0x91d02001)) {
 			if (sis_verbose)
 			    (*sim_callback->printf_filtered) (sim_callback,
 							      "SW BP hit at %x\n", sregs->pc);
-			sim_halt();
+                        sim_halt();
 			restore_stdio();
 			clearerr(stdin);
-			return (BPT_HIT);
+			return BPT_HIT;
 		    } else
 			dispatch_instruction(sregs);
 		}
 		icount--;
 	    }
 	    if (sregs->trap) {
+                irq = 0;
 		sregs->err_mode = execute_trap(sregs);
 	    }
 	}
 	advance_time(sregs);
 	if (ctrl_c) {
-	    go = icount = 0;
+	    icount = 0;
 	}
     }
     sim_halt();
-    sregs->tottime += time(NULL) - sregs->starttime;
+    sregs->tottime += get_time() - sregs->starttime;
     restore_stdio();
     clearerr(stdin);
     if (sregs->err_mode)
 	error_mode(sregs->pc);
     if (sregs->err_mode)
-	return (ERROR);
+	return ERROR;
     if (sregs->bphit) {
 	if (sis_verbose)
 	    (*sim_callback->printf_filtered) (sim_callback,
 					      "HW BP hit at %x\n", sregs->pc);
-	return (BPT_HIT);
+	return BPT_HIT;
     }
     if (ctrl_c) {
 	ctrl_c = 0;
-	return (CTRL_C);
+	return CTRL_C;
     }
-    return (TIME_OUT);
-}
-
-void
-sim_set_callbacks (ptr)
-     host_callback *ptr;
-{
-  sim_callback = ptr;
-}
-
-void
-sim_size (memsize)
-     int memsize;
-{
+    return TIME_OUT;
 }
 
 SIM_DESC
 sim_open (kind, callback, abfd, argv)
      SIM_OPEN_KIND kind;
      struct host_callback_struct *callback;
-     struct _bfd *abfd;
-     char **argv;
+     struct bfd *abfd;
+     char * const *argv;
 {
 
     int             argc = 0;
-    int             cont = 1;
     int             stat = 1;
-    int             grdl = 0;
-    int             freq = 15;
+    int             freq = 0;
 
     sim_callback = callback;
 
-    (*sim_callback->printf_filtered) (sim_callback, "\n SIS - SPARC instruction simulator %s\n", sis_version);
-    (*sim_callback->printf_filtered) (sim_callback, " Bug-reports to Jiri Gaisler ESA/ESTEC (jgais@wd.estec.esa.nl)\n");
-    while (argv[argc])
-      argc++;
+    argc = countargv (argv);
     while (stat < argc) {
 	if (argv[stat][0] == '-') {
 	    if (strcmp(argv[stat], "-v") == 0) {
-		sis_verbose = 1;
+		sis_verbose++;
 	    } else
 	    if (strcmp(argv[stat], "-nfp") == 0) {
-		(*sim_callback->printf_filtered) (sim_callback, "no FPU\n");
 		nfp = 1;
 	    } else
             if (strcmp(argv[stat], "-ift") == 0) {
                 ift = 1;
 	    } else
 	    if (strcmp(argv[stat], "-sparclite") == 0) {
-		(*sim_callback->printf_filtered) (sim_callback, "simulating Sparclite\n");
 		sparclite = 1;
 	    } else
+	    if (strcmp(argv[stat], "-sparclite-board") == 0) {
+		sparclite_board = 1;
+            } else 
+            if (strcmp(argv[stat], "-dumbio") == 0) {
+		dumbio = 1;
+	    } else
             if (strcmp(argv[stat], "-wrp") == 0) {
                 wrp = 1;
 	    } else
             if (strcmp(argv[stat], "-rom8") == 0) {
                 rom8 = 1;
 	    } else 
+            if (strcmp(argv[stat], "-uben") == 0) {
+                uben = 1;
+	    } else 
 	    if (strcmp(argv[stat], "-uart1") == 0) {
 		if ((stat + 1) < argc)
 		    strcpy(uart_dev1, argv[++stat]);
@@ -218,23 +210,48 @@ sim_open (kind, callback, abfd, argv)
 		    strcpy(uart_dev2, argv[++stat]);
 	    } else
 	    if (strcmp(argv[stat], "-nogdb") == 0) {
-		(*sim_callback->printf_filtered) (sim_callback, "disabling GDB trap handling for breakpoints\n");
 		sis_gdb_break = 0;
 	    } else
-	    if (strcmp(argv[stat], "-freq") == 0)
+	    if (strcmp(argv[stat], "-freq") == 0) {
 		if ((stat + 1) < argc) {
-		    freq = VAL(argv[++stat]);
-		    (*sim_callback->printf_filtered) (sim_callback, " ERC32 freq %d Mhz\n", freq);
+		    freq = strtol(argv[++stat], (char **)NULL, 0);
 		}
+	    } else
+	    if (strncmp(argv[stat], "--sysroot=", sizeof("--sysroot=") - 1) == 0) {
+		/* Ignore until we start to support this.  */
+	    } else {
+		(*sim_callback->printf_filtered) (sim_callback,
+						  "unknown option %s\n",
+						  argv[stat]);
+	    }
 	} else
 	    bfd_load(argv[stat]);
 	stat++;
     }
-    sregs.freq = freq;
+
+    if (sis_verbose) {
+	(*sim_callback->printf_filtered) (sim_callback, "\n SIS - SPARC instruction simulator %s\n", sis_version);
+	(*sim_callback->printf_filtered) (sim_callback, " Bug-reports to Jiri Gaisler ESA/ESTEC (jgais@wd.estec.esa.nl)\n");
+	if (nfp)
+	  (*sim_callback->printf_filtered) (sim_callback, "no FPU\n");
+	if (sparclite)
+	  (*sim_callback->printf_filtered) (sim_callback, "simulating Sparclite\n");
+	if (dumbio)
+	  (*sim_callback->printf_filtered) (sim_callback, "dumb IO (no input, dumb output)\n");
+	if (sis_gdb_break == 0)
+	  (*sim_callback->printf_filtered) (sim_callback, "disabling GDB trap handling for breakpoints\n");
+	if (freq)
+	  (*sim_callback->printf_filtered) (sim_callback, " ERC32 freq %d Mhz\n", freq);
+    }
+
+    sregs.freq = freq ? freq : 15;
     termsave = fcntl(0, F_GETFL, 0);
     INIT_DISASSEMBLE_INFO(dinfo, stdout,(fprintf_ftype)fprintf);
+#ifdef HOST_LITTLE_ENDIAN
+    dinfo.endian = BFD_ENDIAN_LITTLE;
+#else
     dinfo.endian = BFD_ENDIAN_BIG;
-    init_signals();
+#endif
     reset_all();
     ebase.simtime = 0;
     init_sim();
@@ -256,26 +273,28 @@ sim_close(sd, quitting)
 
 };
 
-/* For communication from sim_load to sim_create_inferior.  */
-static bfd_vma start_address;
-
 SIM_RC
 sim_load(sd, prog, abfd, from_tty)
      SIM_DESC sd;
-     char *prog;
+     const char *prog;
      bfd *abfd;
      int from_tty;
 {
-    start_address = bfd_load (prog);
-    return (0);
+    bfd_load (prog);
+    return SIM_RC_OK;
 }
 
 SIM_RC
-sim_create_inferior(sd, argv, env)
+sim_create_inferior(sd, abfd, argv, env)
      SIM_DESC sd;
-     char **argv;
-     char **env;
+     struct bfd *abfd;
+     char * const *argv;
+     char * const *env;
 {
+    bfd_vma start_address = 0;
+    if (abfd != NULL)
+      start_address = bfd_get_start_address (abfd);
+
     ebase.simtime = 0;
     reset_all();
     reset_stat(&sregs);
@@ -284,45 +303,53 @@ sim_create_inferior(sd, argv, env)
     return SIM_RC_OK;
 }
 
-void
-sim_store_register(sd, regno, value)
-     SIM_DESC sd;
+int
+sim_store_register(sd, regno, value, length)
+    SIM_DESC sd;
     int             regno;
     unsigned char  *value;
+    int length;
 {
-    /* FIXME: Review the computation of regval.  */
-    int             regval = (value[0] << 24) | (value[1] << 16) | (value[2] << 8) | value[3];
+    int regval;
+
+    regval = (value[0] << 24) | (value[1] << 16)
+		 | (value[2] << 8) | value[3];
     set_regi(&sregs, regno, regval);
+    return length;
 }
 
 
-void
-sim_fetch_register(sd, regno, buf)
+int
+sim_fetch_register(sd, regno, buf, length)
      SIM_DESC sd;
     int             regno;
     unsigned char  *buf;
+     int length;
 {
     get_regi(&sregs, regno, buf);
+    return -1;
 }
 
 int
-sim_write(sd, mem, buf, length)
-     SIM_DESC sd;
-    SIM_ADDR             mem;
-    unsigned char  *buf;
-    int             length;
+sim_write (SIM_DESC sd, SIM_ADDR mem, const unsigned char *buf, int length)
 {
-    return (sis_memory_write(mem, buf, length));
+    int i, len;
+
+    for (i = 0; i < length; i++) {
+	sis_memory_write ((mem + i) ^ EBT, &buf[i], 1);
+    }
+    return length;
 }
 
 int
-sim_read(sd, mem, buf, length)
-     SIM_DESC sd;
-     SIM_ADDR mem;
-     unsigned char *buf;
-     int length;
+sim_read (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)
 {
-    return (sis_memory_read(mem, buf, length));
+    int i, len;
+
+    for (i = 0; i < length; i++) {
+	sis_memory_read ((mem + i) ^ EBT, &buf[i], 1);
+    }
+    return length;
 }
 
 void
@@ -345,16 +372,13 @@ sim_stop_reason(sd, reason, sigrc)
     switch (simstat) {
 	case CTRL_C:
 	*reason = sim_stopped;
-	*sigrc = SIGINT;
+	*sigrc = GDB_SIGNAL_INT;
 	break;
     case OK:
     case TIME_OUT:
     case BPT_HIT:
 	*reason = sim_stopped;
-#ifdef _WIN32
-#define SIGTRAP 5
-#endif
-	*sigrc = SIGTRAP;
+	*sigrc = GDB_SIGNAL_TRAP;
 	break;
     case ERROR:
 	*sigrc = 0;
@@ -375,8 +399,6 @@ sim_stop_reason(sd, reason, sigrc)
    handlers.
 */
 
-#define PSR_CWP 0x7
-
 static void
 flush_windows ()
 {
@@ -405,6 +427,12 @@ flush_windows ()
       int i;
 
       sp = sregs.r[(win * 16 + 14) & 0x7f];
+#if 1
+      if (sis_verbose > 2) {
+	uint32 fp = sregs.r[(win * 16 + 30) & 0x7f];
+	printf("flush_window: win %d, sp %x, fp %x\n", win, sp, fp);
+      }
+#endif
 
       for (i = 0; i < 16; i++)
 	memory_write (11, sp + 4 * i, &sregs.r[(win * 16 + 16 + i) & 0x7f], 2,
@@ -418,28 +446,25 @@ flush_windows ()
 void
 sim_resume(SIM_DESC sd, int step, int siggnal)
 {
-    simstat = run_sim(&sregs, 1, 0, 0);
+    simstat = run_sim(&sregs, UINT64_MAX, 0);
 
     if (sis_gdb_break) flush_windows ();
 }
 
-int
-sim_trace (sd)
-     SIM_DESC sd;
-{
-  /* FIXME: unfinished */
-  sim_resume (sd, 0, 0);
-  return 1;
-}
-
 void
 sim_do_command(sd, cmd)
      SIM_DESC sd;
-    char           *cmd;
+     const char *cmd;
 {
     exec_cmd(&sregs, cmd);
 }
 
+char **
+sim_complete_command (SIM_DESC sd, const char *text, const char *word)
+{
+  return NULL;
+}
+
 #if 0 /* FIXME: These shouldn't exist.  */
 
 int