From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id A04E73858425 for ; Mon, 14 Aug 2023 11:58:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A04E73858425 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-687ca37628eso4075130b3a.1 for ; Mon, 14 Aug 2023 04:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692014305; x=1692619105; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=yfT7sKyvW14VBnB9rp0JKurB04xKwBNUqtI4I1ZCEt4=; b=BmP+1ig3Za4UyzJxla4/ZhDiKhQQuMFCdx7/XKXdKCDEKX7aSUhOaPznebUKqV2TQ0 d0vapQHx8IWV7YQ1XlknX0RmcZZPSlBLcyiy+T3d9W05EgMlusvNGFHk1aDuwH7DstvO j2yKei83egOxCbeaZN4X3gXNm/75xjYDp8CILw8A93Nb8tekID0SebxPHS9bBT3Qjp9U rleWS3H/mY9rajLrNKti5mTOoMJM20RZoOyUclgxSNF4lHl7mNow622eEILyk+rB7g2C 8epby3q7Et3tH1r/SJKSU6m6gb99cTxBg1WIyZ3kBIESG9sZfiBwRa1dDXa7JXSRlEy9 XHGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692014305; x=1692619105; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yfT7sKyvW14VBnB9rp0JKurB04xKwBNUqtI4I1ZCEt4=; b=BQ+BhcSDUkGj0vc93aCwyI5c+hKMepC2SEn+FqGjSAgpFiFM/j4ffZ21ocApybSaWx HtyblASpH2ZtYRcBiLE+pCtpM8BDXNAwiz9EwnuRE7ojJ5kA1YmebkE5ofTk6zv4qhzF 5o5Ci7ZxA0cyTu5s3A8hej5EqoYC++dRkZFAG5ODac+xAHYr1V/ZVE5PzwMNoUkECcWw vMaQY4JVg0+4YeAoC3XfnfkFi81kTacMNbGUhHP/9YQaHXRLw+RGYn+ipKSQAugK9sWO z6Z39pv7TZtgj+k/Lz9Rp3xBcrXQSxRSeOn3EiZc4Y9Qh7BOU621fYeW2PBx72Wzdy4o L84g== X-Gm-Message-State: AOJu0Yw/UjMjAjfmEzTmMpNyszHUMRMsi7094yFz6jUe7Vjaatw2XQIT RaX1R3D5kyxRbz0zxYIxlCXg+3dM5rM= X-Google-Smtp-Source: AGHT+IFihg+xDVz+QChXq7ZmnC0oApWxi00tFLpY0cCAQnYXjwcnBcBCQYpfkIdaxR3gDzBnyyoC1w== X-Received: by 2002:a05:6a00:1395:b0:67e:6269:6ea8 with SMTP id t21-20020a056a00139500b0067e62696ea8mr13040706pfg.22.1692014305459; Mon, 14 Aug 2023 04:58:25 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:5b3b:287:2751:579d]) by smtp.gmail.com with ESMTPSA id r30-20020a63441e000000b0056001f43726sm8309272pga.92.2023.08.14.04.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 04:58:25 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 18EDA1142419; Mon, 14 Aug 2023 21:28:22 +0930 (ACST) Date: Mon, 14 Aug 2023 21:28:22 +0930 From: Alan Modra To: gdb-patches@sourceware.org Cc: aburgess@redhat.com Subject: sim regen preparation Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3033.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Regerating sim loses commit 1be79b1ebfad from sim/lm32/cpu.h, a generated file, so this patch move those declarations to sim/lm32/sim-main.h. OK to apply? diff --git a/sim/lm32/cpu.h b/sim/lm32/cpu.h index d7ce731b423..805f1eb7d30 100644 --- a/sim/lm32/cpu.h +++ b/sim/lm32/cpu.h @@ -163,17 +163,6 @@ struct scache { struct argbuf argbuf; }; -/* From traps.c. */ -extern USI lm32bf_b_insn (SIM_CPU * current_cpu, USI r0, USI f_r0); -extern USI lm32bf_divu_insn (SIM_CPU * current_cpu, IADDR pc, USI r0, USI r1, USI r2); -extern USI lm32bf_modu_insn (SIM_CPU * current_cpu, IADDR pc, USI r0, USI r1, USI r2); -extern void lm32bf_wcsr_insn (SIM_CPU * current_cpu, USI f_csr, USI r1); -extern USI lm32bf_break_insn (SIM_CPU * current_cpu, IADDR pc); -extern USI lm32bf_scall_insn (SIM_CPU * current_cpu, IADDR pc); - -/* From user.c. */ -extern UINT lm32bf_user_insn (SIM_CPU * current_cpu, INT r0, INT r1, UINT imm); - /* Macros to simplify extraction, reading and semantic code. These define and assign the local vars that contain the insn's fields. */ diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h index 82e81988ce5..e0e967c4233 100644 --- a/sim/lm32/sim-main.h +++ b/sim/lm32/sim-main.h @@ -56,4 +56,15 @@ extern SIM_CORE_SIGNAL_FN lm32_core_signal; lm32_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), \ (TRANSFER), (ERROR)) +/* From traps.c. */ +extern USI lm32bf_b_insn (SIM_CPU * current_cpu, USI r0, USI f_r0); +extern USI lm32bf_divu_insn (SIM_CPU * current_cpu, IADDR pc, USI r0, USI r1, USI r2); +extern USI lm32bf_modu_insn (SIM_CPU * current_cpu, IADDR pc, USI r0, USI r1, USI r2); +extern void lm32bf_wcsr_insn (SIM_CPU * current_cpu, USI f_csr, USI r1); +extern USI lm32bf_break_insn (SIM_CPU * current_cpu, IADDR pc); +extern USI lm32bf_scall_insn (SIM_CPU * current_cpu, IADDR pc); + +/* From user.c. */ +extern UINT lm32bf_user_insn (SIM_CPU * current_cpu, INT r0, INT r1, UINT imm); + #endif /* SIM_MAIN_H */ -- Alan Modra Australia Development Lab, IBM