From patchwork Sun Mar 1 21:10:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Gaisler X-Patchwork-Id: 5365 Received: (qmail 66340 invoked by alias); 1 Mar 2015 21:10:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 66261 invoked by uid 89); 1 Mar 2015 21:10:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 X-HELO: bin-vsp-out-02.atm.binero.net Received: from vsp-unauthed01.binero.net (HELO bin-vsp-out-02.atm.binero.net) (195.74.38.225) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sun, 01 Mar 2015 21:10:53 +0000 X-Halon-ID: 6efcb33d-c057-11e4-891e-005056917f90 Authorized-sender: jiri@gaisler.se Received: from decibel.local (unknown [78.68.173.120]) by bin-vsp-out-02.atm.binero.net (Halon Mail Gateway) with ESMTPSA; Sun, 1 Mar 2015 22:10:48 +0100 (CET) From: Jiri Gaisler To: gdb-patches@sourceware.org Cc: Jiri Gaisler Subject: [PATCH v3 01/14] sim/erc32: Added -v command line switch for verbose output Date: Sun, 1 Mar 2015 22:10:31 +0100 Message-Id: <1425244244-27709-2-git-send-email-jiri@gaisler.se> In-Reply-To: <1425244244-27709-1-git-send-email-jiri@gaisler.se> References: <1425244244-27709-1-git-send-email-jiri@gaisler.se> X-IsSubscribed: yes * help.c (usage) : update usage help print-out * sis.c (run_sim) : increase debug level with -v. Also print simulation time in long long format. --- sim/erc32/func.c | 5 +++-- sim/erc32/help.c | 2 +- sim/erc32/sis.c | 9 ++++++--- sim/erc32/sis.h | 8 +++----- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/sim/erc32/func.c b/sim/erc32/func.c index 5123863..e324b57 100644 --- a/sim/erc32/func.c +++ b/sim/erc32/func.c @@ -29,6 +29,7 @@ #include "end.h" #include #include "sim-config.h" +#include #define VAL(x) strtoul(x,(char **)NULL,0) @@ -643,8 +644,8 @@ show_stat(sregs) sregs->nbranch; #endif - printf("\n Cycles : %9d\n\r", ebase.simtime - sregs->simstart); - printf(" Instructions : %9d\n", sregs->ninst); + printf("\n Cycles : %9" PRIu64 "\n\r", ebase.simtime - sregs->simstart); + printf(" Instructions : %9" PRIu64 "\n", sregs->ninst); #ifdef STAT printf(" integer : %9.2f %%\n", 100.0 * (float) iinst / (float) sregs->ninst); diff --git a/sim/erc32/help.c b/sim/erc32/help.c index 21c2a77..9813bda 100644 --- a/sim/erc32/help.c +++ b/sim/erc32/help.c @@ -7,8 +7,8 @@ usage() { printf("usage: sis [-uart1 uart_device1] [-uart2 uart_device2]\n"); + printf("[-sparclite] [-dumbio] [-v] \n"); printf("[-nfp] [-freq frequency] [-c batch_file] [files]\n"); - printf("[-sparclite] [-dumbio]\n"); } void diff --git a/sim/erc32/sis.c b/sim/erc32/sis.c index ce9b3d0..931e3f3 100644 --- a/sim/erc32/sis.c +++ b/sim/erc32/sis.c @@ -30,6 +30,7 @@ #include "sis.h" #include #include "sim-config.h" +#include #define VAL(x) strtol(x,(char **)NULL,0) @@ -113,7 +114,7 @@ run_sim(sregs, icount, dis) sregs->histind = 0; } if (dis) { - printf(" %8u ", ebase.simtime); + printf(" %8" PRIu64 " ", ebase.simtime); dis_mem(sregs->pc, 1, &dinfo); } } @@ -205,6 +206,8 @@ 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(); @@ -271,7 +274,7 @@ main(argc, argv) case CTRL_C: printf("\b\bInterrupt!\n"); case TIME_OUT: - printf(" Stopped at time %d (%.3f ms)\n", ebase.simtime, + printf(" Stopped at time %" PRIu64 " (%.3f ms)\n", ebase.simtime, ((double) ebase.simtime / (double) sregs.freq) / 1000.0); break; case BPT_HIT: @@ -281,7 +284,7 @@ main(argc, argv) case ERROR: printf("IU in error mode (%d)\n", sregs.trap); stat = 0; - printf(" %8d ", ebase.simtime); + printf(" %8" PRIu64 " ", ebase.simtime); dis_mem(sregs.pc, 1, &dinfo); break; default: diff --git a/sim/erc32/sis.h b/sim/erc32/sis.h index dc02c65..c4d50da 100644 --- a/sim/erc32/sis.h +++ b/sim/erc32/sis.h @@ -23,6 +23,7 @@ #include "ansidecl.h" #include "gdb/callback.h" #include "gdb/remote-sim.h" +#include #include "end.h" @@ -51,11 +52,8 @@ typedef unsigned int uint32; /* 32-bit unsigned int */ typedef float float32; /* 32-bit float */ typedef double float64; /* 64-bit float */ -/* FIXME: what about host compilers that don't support 64-bit ints? */ -typedef unsigned long long uint64; /* 64-bit unsigned int */ -typedef long long int64; /* 64-bit signed int */ - -#define UINT64_MAX 18446744073709551615ULL +typedef uint64_t uint64; /* 64-bit unsigned int */ +typedef int64_t int64; /* 64-bit signed int */ struct pstate {