From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 72090 invoked by alias); 23 Nov 2016 22:14:51 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 70204 invoked by uid 89); 23 Nov 2016 22:14:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=1369, 1,18, 0xc, usi X-HELO: mail-pg0-f68.google.com Received: from mail-pg0-f68.google.com (HELO mail-pg0-f68.google.com) (74.125.83.68) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 Nov 2016 22:14:41 +0000 Received: by mail-pg0-f68.google.com with SMTP id p66so1931671pga.2 for ; Wed, 23 Nov 2016 14:14:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hU4wUELF46NNpCoW7PlPuky4MN+0p0WyjfDaUDYNe+8=; b=jYTcg6HKCW/GBoemF/CkooSMVN5wmE2/tKS5DPsECkoOCVRap0AaYi2x9Cb5t2eqx+ bd9DRHGxdfoc4O22Ftxpna/Yc3fiSGD+1PsEmaZhRdqKMBAeFXIdaXw2guZL/yTMghhn tIEZ6J2h0lm0wKnxHsFMEKmDYwm0k8i7vCQFHI5GYglz9IRm2nGiky97QkSxsh3vywyC VZEjylJ6ZSAFSOg/H59TC8zidaNYx/DpM8N0hq0ZEN2pA6LK2qT6bRupPTo/RV2l3/Sf uwDLIY+md65SS1DR77nLZYSsv7Ac4HB1SNe1DzkCrB7HFGgU5YHA81w4fONZvipTU1At 23Lg== X-Gm-Message-State: AKaTC01VnbJPYZy5kFuhqiHFEYlkLPcstETjesVONmr1F2yPCO4Omqj9TdHMF1U6ODDhNQ== X-Received: by 10.84.173.4 with SMTP id o4mr11436722plb.123.1479939280120; Wed, 23 Nov 2016 14:14:40 -0800 (PST) Received: from lianli.shorne-pla.net (z14.124-44-185.ppp.wakwak.ne.jp. [124.44.185.14]) by smtp.gmail.com with ESMTPSA id x26sm34435132pge.24.2016.11.23.14.14.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Nov 2016 14:14:39 -0800 (PST) Received: from lianli.shorne-pla.net (localhost [127.0.0.1]) by lianli.shorne-pla.net (8.15.2/8.15.2) with ESMTPS id uANMEa7k001936 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 24 Nov 2016 07:14:36 +0900 Received: (from shorne@localhost) by lianli.shorne-pla.net (8.15.2/8.15.2/Submit) id uANMEaG4001935; Thu, 24 Nov 2016 07:14:36 +0900 From: Stafford Horne To: gdb-patches@sourceware.org Cc: openrisc@lists.librecores.org, Peter Gavin Subject: [PATCH 05/18] sim: or1k: add NOP_EXIT_SILENT; make simulator print exit code for NOP_EXIT; Date: Wed, 23 Nov 2016 22:14:00 -0000 Message-Id: <1479939272-1754-6-git-send-email-shorne@gmail.com> In-Reply-To: <1479939272-1754-1-git-send-email-shorne@gmail.com> References: <1479939272-1754-1-git-send-email-shorne@gmail.com> X-IsSubscribed: yes X-SW-Source: 2016-11/txt/msg00710.txt.bz2 From: Peter Gavin make newlib's exit use NOP_EXIT_SILENT --- sim/or1k/ChangeLog | 8 ++++++++ sim/or1k/or1k.c | 3 +++ sim/or1k/or1k.h | 23 ++++++++++++----------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog index 3dc053a..cd2617c 100644 --- a/sim/or1k/ChangeLog +++ b/sim/or1k/ChangeLog @@ -1,3 +1,11 @@ +2012-05-21 Peter Gavin + + * or1k.c (or1k32bf_nop) make NOP_EXIT report exit code on + simulator output; add NOP_EXIT_SILENT which silently exits. This + is needed to maintain compatibility with existing testsuites, but + we need to be able to silently exit for the gcc testsuite. + Newlib's exit will use NOP_EXIT_SILENT. + 2012-05-17 Peter Gavin * or1k.c (or1k32bf_nop) handle NOP_NOP, NOP_REPORT; warn if diff --git a/sim/or1k/or1k.c b/sim/or1k/or1k.c index 9f6e207..aca7333 100644 --- a/sim/or1k/or1k.c +++ b/sim/or1k/or1k.c @@ -136,6 +136,9 @@ void or1k32bf_nop (sim_cpu *current_cpu, USI uimm16) break; case NOP_EXIT: + sim_io_printf (CPU_STATE(current_cpu), "exit(%d)\n", GET_H_GPR(3)); + /* fall through */ + case NOP_EXIT_SILENT: sim_engine_halt (sd, current_cpu, NULL, CPU_PC_GET (current_cpu), sim_exited, GET_H_GPR (3)); break; diff --git a/sim/or1k/or1k.h b/sim/or1k/or1k.h index 513c946..f1c9b73 100644 --- a/sim/or1k/or1k.h +++ b/sim/or1k/or1k.h @@ -1,17 +1,18 @@ #ifndef OR1K_H #define OR1K_H -#define NOP_NOP 0x0 -#define NOP_EXIT 0x1 -#define NOP_REPORT 0x2 -#define NOP_PUTC 0x4 -#define NOP_CNT_RESET 0x5 -#define NOP_GET_TICKS 0x6 -#define NOP_GET_PS 0x7 -#define NOP_TRACE_ON 0x8 -#define NOP_TRACE_OFF 0x9 -#define NOP_RANDOM 0xa -#define NOP_OR1KSIM 0xb +#define NOP_NOP 0x0 +#define NOP_EXIT 0x1 +#define NOP_REPORT 0x2 +#define NOP_PUTC 0x4 +#define NOP_CNT_RESET 0x5 +#define NOP_GET_TICKS 0x6 +#define NOP_GET_PS 0x7 +#define NOP_TRACE_ON 0x8 +#define NOP_TRACE_OFF 0x9 +#define NOP_RANDOM 0xa +#define NOP_OR1KSIM 0xb +#define NOP_EXIT_SILENT 0xc #define NUM_SPR 0x20000 #define SPR_GROUP_SHIFT 11 -- 2.7.4