Make find_thread_ptid lookup thread map instead of iterate

[deliverable/binutils-gdb.git] / sim / erc32 / sis.c

diff --git a/sim/erc32/sis.c b/sim/erc32/sis.c
index c13b24651181104b14ed6ed7254f0b0bebf7f8cf..c52a90a34393c5b494ff895aa1e98a1112085d61 100644 (file)
--- a/sim/erc32/sis.c
+++ b/sim/erc32/sis.c
@@ -1,23 +1,20 @@
-/*
- * This file is part of SIS.
- * 
- * SIS, SPARC instruction simulator. 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 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/>.
- * 
- */
+/* 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>
@@ -75,7 +72,7 @@ run_sim(sregs, icount, dis)
     uint64          icount;
     int             dis;
 {
-    int             irq, mexc, deb, asi;
+    int             irq, mexc, deb;
 
     sregs->starttime = get_time();
     init_stdio();
@@ -84,11 +81,7 @@ run_sim(sregs, icount, dis)
     irq = 0;
     while (icount > 0) {
 
-       if (sregs->psr & 0x080)
-           asi = 9;
-       else
-           asi = 8;
-       mexc = memory_read(asi, sregs->pc, &sregs->inst, 2, &sregs->hold);
+       mexc = memory_iread (sregs->pc, &sregs->inst, &sregs->hold);
        sregs->icnt = 1;
        if (sregs->annul) {
            sregs->annul = 0;
@@ -173,7 +166,7 @@ main(argc, argv)
     while (stat < argc) {
        if (argv[stat][0] == '-') {
            if (strcmp(argv[stat], "-v") == 0) {
-               sis_verbose = 1;
+               sis_verbose += 1;
            } else if (strcmp(argv[stat], "-c") == 0) {
                if ((stat + 1) < argc) {
                    copt = 1;
@@ -206,8 +199,6 @@ main(argc, argv)
 #endif
             } else if (strcmp(argv[stat], "-dumbio") == 0) {
                dumbio = 1;
-            } else if (strcmp(argv[stat], "-v") == 0) {
-               sis_verbose += 1;
            } else {
                printf("unknown option %s\n", argv[stat]);
                usage();
@@ -227,7 +218,11 @@ main(argc, argv)
     sregs.freq = freq;
 
     INIT_DISASSEMBLE_INFO(dinfo, stdout, (fprintf_ftype) fprintf);
+#ifdef HOST_LITTLE_ENDIAN
+    dinfo.endian = BFD_ENDIAN_LITTLE;
+#else
     dinfo.endian = BFD_ENDIAN_BIG;
+#endif
 
     termsave = fcntl(0, F_GETFL, 0);
     using_history();