From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: "Igor Mammedov" <imammedo@redhat.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Yongbok Kim" <yongbok.kim@imgtec.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org, "Eduardo Habkost" <ehabkost@redhat.com>,
"James Hogan" <james.hogan@imgtec.com>,
"Thomas Huth" <thuth@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>
Subject: [Qemu-devel] [PATCH 3/8] mips: split cpu_mips_realize_env() out of cpu_mips_init()
Date: Thu, 17 Aug 2017 01:30:57 -0300 [thread overview]
Message-ID: <20170817043102.6322-4-f4bug@amsat.org> (raw)
In-Reply-To: <20170817043102.6322-1-f4bug@amsat.org>
so it can be used in mips_cpu_realizefn() in the next commit
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/mips/internal.h | 1 +
target/mips/translate.c | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/target/mips/internal.h b/target/mips/internal.h
index 91c2df4537..cf4c9db427 100644
--- a/target/mips/internal.h
+++ b/target/mips/internal.h
@@ -132,6 +132,7 @@ void mips_tcg_init(void);
/* TODO QOM'ify CPU reset and remove */
void cpu_state_reset(CPUMIPSState *s);
+void cpu_mips_realize_env(CPUMIPSState *env);
/* cp0_timer.c */
uint32_t cpu_mips_get_random(CPUMIPSState *env);
diff --git a/target/mips/translate.c b/target/mips/translate.c
index f0febaf1b2..5fc7979ac5 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -20512,6 +20512,17 @@ void mips_tcg_init(void)
#include "translate_init.c"
+void cpu_mips_realize_env(CPUMIPSState *env)
+{
+ env->exception_base = (int32_t)0xBFC00000;
+
+#ifndef CONFIG_USER_ONLY
+ mmu_init(env, env->cpu_model);
+#endif
+ fpu_init(env, env->cpu_model);
+ mvp_init(env, env->cpu_model);
+}
+
MIPSCPU *cpu_mips_init(const char *cpu_model)
{
MIPSCPU *cpu;
@@ -20524,13 +20535,7 @@ MIPSCPU *cpu_mips_init(const char *cpu_model)
cpu = MIPS_CPU(object_new(TYPE_MIPS_CPU));
env = &cpu->env;
env->cpu_model = def;
- env->exception_base = (int32_t)0xBFC00000;
-
-#ifndef CONFIG_USER_ONLY
- mmu_init(env, def);
-#endif
- fpu_init(env, def);
- mvp_init(env, def);
+ cpu_mips_realize_env(env);
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
--
2.14.1
next prev parent reply other threads:[~2017-08-17 4:31 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 4:30 [Qemu-devel] [PATCH 0/8] QOMify MIPS cpu Philippe Mathieu-Daudé
2017-08-17 4:30 ` [Qemu-devel] [PATCH 1/8] mips: move hw/mips/cputimer.c to target/mips/ Philippe Mathieu-Daudé
2017-08-17 4:30 ` [Qemu-devel] [PATCH 2/8] mips: introduce internal.h and cleanup cpu.h Philippe Mathieu-Daudé
2017-08-17 14:38 ` Igor Mammedov
2017-08-17 15:06 ` Philippe Mathieu-Daudé
2017-08-18 20:03 ` Philippe Mathieu-Daudé
2017-08-21 8:57 ` Igor Mammedov
2017-08-17 4:30 ` Philippe Mathieu-Daudé [this message]
2017-08-17 4:30 ` [Qemu-devel] [PATCH 4/8] mips: call cpu_mips_realize_env() from mips_cpu_realizefn() Philippe Mathieu-Daudé
2017-08-17 4:30 ` [Qemu-devel] [PATCH 5/8] mips: MIPSCPU model subclasses Philippe Mathieu-Daudé
2017-08-17 4:31 ` [Qemu-devel] [RFC PATCH 6/8] !fixup mips: now than MIPSCPU is QOMified, mark it abstract Philippe Mathieu-Daudé
2017-08-17 15:17 ` Igor Mammedov
2017-08-17 4:31 ` [Qemu-devel] [PATCH 7/8] mips: replace cpu_mips_init() with cpu_generic_init() Philippe Mathieu-Daudé
2017-08-17 4:31 ` [Qemu-devel] [PATCH 8/8] mips: update mips_cpu_list() to use object_class_get_list() Philippe Mathieu-Daudé
2017-08-17 4:54 ` [Qemu-devel] [PATCH 0/8] QOMify MIPS cpu no-reply
2017-08-17 16:34 ` Philippe Mathieu-Daudé
2017-08-17 15:22 ` Igor Mammedov
2017-08-18 20:08 ` Philippe Mathieu-Daudé
2017-08-21 9:02 ` Igor Mammedov
2017-08-30 13:50 ` Igor Mammedov
2017-08-30 14:41 ` Philippe Mathieu-Daudé
2017-08-30 18:19 ` James Hogan
2017-08-30 19:52 ` Philippe Mathieu-Daudé
2017-08-30 20:53 ` James Hogan
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=20170817043102.6322-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=aurelien@aurel32.net \
--cc=ehabkost@redhat.com \
--cc=hpoussin@reactos.org \
--cc=imammedo@redhat.com \
--cc=james.hogan@imgtec.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=yongbok.kim@imgtec.com \
/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).