qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: amir.gonnen@neuroblade.ai
Subject: [PATCH 3/7] target/nios2: Only build mmu.c for system mode
Date: Sun, 27 Feb 2022 08:21:21 -1000	[thread overview]
Message-ID: <20220227182125.21809-4-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220227182125.21809-1-richard.henderson@linaro.org>

We can thus remove an ifdef covering the entire file.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/nios2/mmu.c       | 3 ---
 target/nios2/meson.build | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c
index 306370f675..437fad09b7 100644
--- a/target/nios2/mmu.c
+++ b/target/nios2/mmu.c
@@ -25,7 +25,6 @@
 #include "mmu.h"
 #include "trace/trace-target_nios2.h"
 
-#if !defined(CONFIG_USER_ONLY)
 
 /* rw - 0 = read, 1 = write, 2 = fetch.  */
 unsigned int mmu_translate(CPUNios2State *env,
@@ -217,5 +216,3 @@ void dump_mmu(CPUNios2State *env)
                     (entry->data & CR_TLBACC_X) ? 'X' : '-');
     }
 }
-
-#endif /* !CONFIG_USER_ONLY */
diff --git a/target/nios2/meson.build b/target/nios2/meson.build
index e643917db1..62b384702d 100644
--- a/target/nios2/meson.build
+++ b/target/nios2/meson.build
@@ -2,14 +2,13 @@ nios2_ss = ss.source_set()
 nios2_ss.add(files(
   'cpu.c',
   'helper.c',
-  'mmu.c',
   'nios2-semi.c',
   'op_helper.c',
   'translate.c',
 ))
 
 nios2_softmmu_ss = ss.source_set()
-nios2_softmmu_ss.add(files('monitor.c'))
+nios2_softmmu_ss.add(files('monitor.c', 'mmu.c'))
 
 target_arch += {'nios2': nios2_ss}
 target_softmmu_arch += {'nios2': nios2_softmmu_ss}
-- 
2.25.1



  parent reply	other threads:[~2022-02-27 18:23 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-27 18:21 [PATCH 0/7] target/nios2: Rewrite interrupt handling Richard Henderson
2022-02-27 18:21 ` [PATCH 1/7] target/nios2: Remove mmu_read_debug Richard Henderson
2022-03-02 12:44   ` Peter Maydell
2022-02-27 18:21 ` [PATCH 2/7] target/nios2: Replace MMU_LOG with tracepoints Richard Henderson
2022-02-27 22:01   ` Philippe Mathieu-Daudé
2022-03-02 12:48   ` Peter Maydell
2022-02-27 18:21 ` Richard Henderson [this message]
2022-02-27 22:01   ` [PATCH 3/7] target/nios2: Only build mmu.c for system mode Philippe Mathieu-Daudé
2022-03-02 12:49   ` Peter Maydell
2022-02-27 18:21 ` [PATCH 4/7] target/nios2: Hoist R_ZERO check in rdctl Richard Henderson
2022-02-27 22:02   ` Philippe Mathieu-Daudé
2022-03-02 12:50   ` Peter Maydell
2022-02-27 18:21 ` [PATCH 5/7] target/nios2: Split mmu_write Richard Henderson
2022-03-02 12:57   ` Peter Maydell
2022-02-27 18:21 ` [PATCH 6/7] target/nios2: Special case ipending in rdctl and wrctl Richard Henderson
2022-02-27 22:06   ` Philippe Mathieu-Daudé
2022-03-02 13:00   ` Peter Maydell
2022-02-27 18:21 ` [PATCH 7/7] target/nios2: Rewrite interrupt handling Richard Henderson
2022-02-27 22:05   ` Philippe Mathieu-Daudé
2022-03-02 13:06   ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220227182125.21809-4-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=amir.gonnen@neuroblade.ai \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).