Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On 12/17/2010 08:14 PM, Blue Swirl wrote:
On Wed, Dec 15, 2010 at 5:47 PM, Fabien Chouteauchout...@adacore.com wrote:
On 12/13/2010 07:18 PM, Blue Swirl wrote:
On Mon, Dec 13, 2010 at 3:51 PM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/11/2010 10:56 AM, Blue Swirl wrote:
On Tue, Dec 7, 2010 at 11:40 AM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien Chouteauchout...@adacore.com
wrote:
+#if !defined(CONFIG_USER_ONLY)
+/* Leon3 shutdown */
+if (intno == 0x80env-version == 0xf300) {
+leon3_shutdown();
+}
This looks like a hack. Should a trap instruction initiate a shutdown?
Yes, on Leon3 ta 0x0 initiates a shutdown.
Then this should be handled during translation. A Leon3 specific CPU
feature should be added and used much like CHECK_IU_FEATURE (in
translate.c). Then execution speed would not be affected for non-Leon3
CPUs.
OK, but I don't see how to request a shutdown during translation.
Just create a helper which calls shutdown, translator should insert a
call to that.
I think I understand what you mean, but I don't see why this would be faster
than my solution.
Shutdown is not performance critical, but interrupt handling is.
I understand that, but why is it faster to do it during translation?
I don't see how one if statement in do_interrupt will even slightly
impact
the performances, and why it will be slower than the same if' statement
in the translation.
BTW, I didn't use the unlikely function, but this will even more
reduce the impact...
--
Fabien Chouteau
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On 12/20/2010 07:46 AM, Edgar E. Iglesias wrote:
On Fri, Dec 17, 2010 at 07:14:20PM +, Blue Swirl wrote:
On Wed, Dec 15, 2010 at 5:47 PM, Fabien Chouteauchout...@adacore.com wrote:
On 12/13/2010 07:18 PM, Blue Swirl wrote:
On Mon, Dec 13, 2010 at 3:51 PM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/11/2010 10:56 AM, Blue Swirl wrote:
On Tue, Dec 7, 2010 at 11:40 AM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien Chouteauchout...@adacore.com
wrote:
Signed-off-by: Fabien Chouteauchout...@adacore.com
---
...
#ifdef DEBUG_PCALL
if (qemu_loglevel_mask(CPU_LOG_INT)) {
static int count;
@@ -4135,6 +4153,14 @@ void do_interrupt(CPUState *env)
env-pc = env-tbr;
env-npc = env-pc + 4;
env-exception_index = -1;
+
+#if !defined(CONFIG_USER_ONLY)
+/* IRQ acknowledgment for Leon3 */
+if (env-version == 0xf300(intno~15) ==
TT_EXTINT)
{
+grlib_irqmp_ack (env, intno);
+leon3_cache_control_int();
+}
Like this. I don't think a CPU should immediately ack any incoming
interrupts.
Leon3 does...
Strange. Then this should be handled at board level (leon3.c).
Well, it's a CPU feature not a board feature.
Maybe, but we don't want to clutter interrupt handling with this.
I don't see what you expect here... How can I get the acknowledgment
information without changing the do_interrupt function?
Board can acknowledge the interrupt just before calling cpu_interrupt().
Hi,
I don't think that will work properly. IIUC, the leon acks the irq when it
is actually taken by the CPU. Due to CPU internal masking, that may be at
a later point than when the irq is signalled to the CPU.
Exactly I've forget to mention that. Raising the interrupt do not mean
that the
CPU will handle it directly, for example if traps are disabled or if the CPU
handles an higher priority interrupt at the moment.
IMO, what is needed is something along the lines of what Fabien coded but
with some level of indirection so that the CPU doesn't call directly into
the irqmp model. Maybe through ack function pointers or through a
qemu_irq ack line or some other way. The board should then setup the
connection between the ack mechanism and the irqmp model.
The function pointer is a good idea, something like:
if (env-qemu_irq_ack != NULL) {
env-qemu_irq_ack(intno);
}
And actually this will help me to implement others machines (erc32 and
leon2).
Are you OK with that?
--
Fabien Chouteau
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On Mon, Dec 20, 2010 at 9:25 AM, Fabien Chouteau chout...@adacore.com wrote:
On 12/17/2010 08:14 PM, Blue Swirl wrote:
On Wed, Dec 15, 2010 at 5:47 PM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/13/2010 07:18 PM, Blue Swirl wrote:
On Mon, Dec 13, 2010 at 3:51 PM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/11/2010 10:56 AM, Blue Swirl wrote:
On Tue, Dec 7, 2010 at 11:40 AM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien
Chouteauchout...@adacore.com
wrote:
+#if !defined(CONFIG_USER_ONLY)
+ /* Leon3 shutdown */
+ if (intno == 0x80 env-version == 0xf300) {
+ leon3_shutdown();
+ }
This looks like a hack. Should a trap instruction initiate a
shutdown?
Yes, on Leon3 ta 0x0 initiates a shutdown.
Then this should be handled during translation. A Leon3 specific CPU
feature should be added and used much like CHECK_IU_FEATURE (in
translate.c). Then execution speed would not be affected for non-Leon3
CPUs.
OK, but I don't see how to request a shutdown during translation.
Just create a helper which calls shutdown, translator should insert a
call to that.
I think I understand what you mean, but I don't see why this would be
faster
than my solution.
Shutdown is not performance critical, but interrupt handling is.
I understand that, but why is it faster to do it during translation?
I don't see how one if statement in do_interrupt will even slightly
impact
the performances, and why it will be slower than the same if' statement in
the translation.
Because the whole point of translation is that the translated block
will be executed many times but the translation only once. Therefore
computing should be performed during translation instead of TB
execution time, if possible.
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On Mon, Dec 20, 2010 at 9:40 AM, Fabien Chouteau chout...@adacore.com wrote:
On 12/20/2010 07:46 AM, Edgar E. Iglesias wrote:
On Fri, Dec 17, 2010 at 07:14:20PM +, Blue Swirl wrote:
On Wed, Dec 15, 2010 at 5:47 PM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/13/2010 07:18 PM, Blue Swirl wrote:
On Mon, Dec 13, 2010 at 3:51 PM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/11/2010 10:56 AM, Blue Swirl wrote:
On Tue, Dec 7, 2010 at 11:40 AM, Fabien
Chouteauchout...@adacore.com
wrote:
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien
Chouteauchout...@adacore.com
wrote:
Signed-off-by: Fabien Chouteauchout...@adacore.com
---
...
#ifdef DEBUG_PCALL
if (qemu_loglevel_mask(CPU_LOG_INT)) {
static int count;
@@ -4135,6 +4153,14 @@ void do_interrupt(CPUState *env)
env-pc = env-tbr;
env-npc = env-pc + 4;
env-exception_index = -1;
+
+#if !defined(CONFIG_USER_ONLY)
+ /* IRQ acknowledgment for Leon3 */
+ if (env-version == 0xf300 (intno ~15)
==
TT_EXTINT)
{
+ grlib_irqmp_ack (env, intno);
+ leon3_cache_control_int();
+ }
Like this. I don't think a CPU should immediately ack any incoming
interrupts.
Leon3 does...
Strange. Then this should be handled at board level (leon3.c).
Well, it's a CPU feature not a board feature.
Maybe, but we don't want to clutter interrupt handling with this.
I don't see what you expect here... How can I get the acknowledgment
information without changing the do_interrupt function?
Board can acknowledge the interrupt just before calling cpu_interrupt().
Hi,
I don't think that will work properly. IIUC, the leon acks the irq when it
is actually taken by the CPU. Due to CPU internal masking, that may be at
a later point than when the irq is signalled to the CPU.
Exactly I've forget to mention that. Raising the interrupt do not mean that
the
CPU will handle it directly, for example if traps are disabled or if the CPU
handles an higher priority interrupt at the moment.
I think there is no way to avoid the performance penalty then.
IMO, what is needed is something along the lines of what Fabien coded but
with some level of indirection so that the CPU doesn't call directly into
the irqmp model. Maybe through ack function pointers or through a
qemu_irq ack line or some other way. The board should then setup the
connection between the ack mechanism and the irqmp model.
The function pointer is a good idea, something like:
if (env-qemu_irq_ack != NULL) {
env-qemu_irq_ack(intno);
}
And actually this will help me to implement others machines (erc32 and
leon2).
OK. Alternatively there could be a stub function which is used in
place of NULL, so that the if () can be avoided, but maybe this is
better.
If direct interrupt acks would be interesting also for x86 LAPIC, then
a more generic solution could be to introduce a new
env-interrupt_request flag, CPU_INTERRUPT_ACK, which could be tested
in common code of cpu-exec.c.
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On Fri, Dec 17, 2010 at 07:14:20PM +, Blue Swirl wrote:
On Wed, Dec 15, 2010 at 5:47 PM, Fabien Chouteau chout...@adacore.com wrote:
On 12/13/2010 07:18 PM, Blue Swirl wrote:
On Mon, Dec 13, 2010 at 3:51 PM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/11/2010 10:56 AM, Blue Swirl wrote:
On Tue, Dec 7, 2010 at 11:40 AM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien Chouteauchout...@adacore.com
wrote:
Signed-off-by: Fabien Chouteauchout...@adacore.com
---
...
#ifdef DEBUG_PCALL
if (qemu_loglevel_mask(CPU_LOG_INT)) {
static int count;
@@ -4135,6 +4153,14 @@ void do_interrupt(CPUState *env)
env-pc = env-tbr;
env-npc = env-pc + 4;
env-exception_index = -1;
+
+#if !defined(CONFIG_USER_ONLY)
+ /* IRQ acknowledgment for Leon3 */
+ if (env-version == 0xf300 (intno ~15) ==
TT_EXTINT)
{
+ grlib_irqmp_ack (env, intno);
+ leon3_cache_control_int();
+ }
Like this. I don't think a CPU should immediately ack any incoming
interrupts.
Leon3 does...
Strange. Then this should be handled at board level (leon3.c).
Well, it's a CPU feature not a board feature.
Maybe, but we don't want to clutter interrupt handling with this.
I don't see what you expect here... How can I get the acknowledgment
information without changing the do_interrupt function?
Board can acknowledge the interrupt just before calling cpu_interrupt().
Hi,
I don't think that will work properly. IIUC, the leon acks the irq when it
is actually taken by the CPU. Due to CPU internal masking, that may be at
a later point than when the irq is signalled to the CPU.
IMO, what is needed is something along the lines of what Fabien coded but
with some level of indirection so that the CPU doesn't call directly into
the irqmp model. Maybe through ack function pointers or through a
qemu_irq ack line or some other way. The board should then setup the
connection between the ack mechanism and the irqmp model.
Cheers
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On Wed, Dec 15, 2010 at 5:47 PM, Fabien Chouteau chout...@adacore.com wrote:
On 12/13/2010 07:18 PM, Blue Swirl wrote:
On Mon, Dec 13, 2010 at 3:51 PM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/11/2010 10:56 AM, Blue Swirl wrote:
On Tue, Dec 7, 2010 at 11:40 AM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien Chouteauchout...@adacore.com
wrote:
Signed-off-by: Fabien Chouteauchout...@adacore.com
---
Makefile.target | 5 +-
hw/leon3.c | 310
++
target-sparc/cpu.h | 10 ++
target-sparc/helper.c | 2 +-
target-sparc/op_helper.c | 30 -
5 files changed, 353 insertions(+), 4 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2800f47..f40e04f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -290,7 +290,10 @@ obj-sparc-y += cirrus_vga.o
else
obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
-obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
+obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
+
+# GRLIB
+obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
endif
obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
diff --git a/hw/leon3.c b/hw/leon3.c
new file mode 100644
index 000..ba61081
--- /dev/null
+++ b/hw/leon3.c
@@ -0,0 +1,310 @@
+/*
+ * QEMU Leon3 System Emulator
+ *
+ * Copyright (c) 2010 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person
obtaining
a copy
+ * of this software and associated documentation files (the
Software),
to deal
+ * in the Software without restriction, including without limitation
the
rights
+ * to use, copy, modify, merge, publish, distribute, sublicense,
and/or
sell
+ * copies of the Software, and to permit persons to whom the
Software
is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR
OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include hw.h
+#include qemu-timer.h
+#include qemu-char.h
+#include sysemu.h
+#include boards.h
+#include loader.h
+#include elf.h
+
+#include grlib.h
+
+/* #define DEBUG_LEON3 */
+
+#ifdef DEBUG_LEON3
+#define DPRINTF(fmt, ...) \
+ do { printf(Leon3: fmt , ## __VA_ARGS__); } while (0)
+#else
+#define DPRINTF(fmt, ...)
+#endif
+
+/* Default system clock. */
+#define CPU_CLK (40 * 1000 * 1000)
+
+#define PROM_FILENAME u-boot.bin
+
+#define MAX_PILS 16
+
+typedef struct Leon3State
+{
+ uint32_t cache_control;
+ uint32_t inst_cache_conf;
+ uint32_t data_cache_conf;
+
+ uint64_t entry; /* save kernel entry in case of
reset
*/
+} Leon3State;
+
+Leon3State leon3_state;
Again global state, please refactor. Perhaps most of the cache
handling code belong to target-sparc/op_helper.c and this structure to
CPUSPARCState.
I will try to find a solution for that.
Is it OK to add some Leon3 specific stuff in the CPUSPARCState?
Yes, no problem. You can also drop the intermediate Leon3State
structure if there is no benefit.
+
+/* Cache control: emulate the behavior of cache control registers
but
without
+ any effect on the emulated CPU */
+
+#define CACHE_DISABLED 0x0
+#define CACHE_FROZEN 0x1
+#define CACHE_ENABLED 0x3
+
+/* Cache Control register fields */
+
+#define CACHE_CTRL_IF (1 4) /* Instruction Cache Freeze on
Interrupt */
+#define CACHE_CTRL_DF (1 5) /* Data Cache Freeze on
Interrupt
*/
+#define CACHE_CTRL_DP (1 14) /* Data cache flush pending */
+#define CACHE_CTRL_IP (1 15) /* Instruction cache flush
pending
*/
+#define CACHE_CTRL_IB (1 16) /* Instruction burst fetch */
+#define CACHE_CTRL_FI (1 21) /* Flush Instruction cache
(Write
only)
*/
+#define CACHE_CTRL_FD (1 22) /* Flush Data cache (Write
only) */
+#define CACHE_CTRL_DS (1 23) /* Data cache snoop enable */
+
+void leon3_cache_control_int(void)
+{
+ uint32_t state = 0;
+
+ if (leon3_state.cache_control CACHE_CTRL_IF) {
+ /* Instruction cache state */
+ state = leon3_state.cache_control 0x3;
Please add a new define CACHE_CTRL_xxx to replace
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On 12/13/2010 07:18 PM, Blue Swirl wrote:
On Mon, Dec 13, 2010 at 3:51 PM, Fabien Chouteauchout...@adacore.com wrote:
On 12/11/2010 10:56 AM, Blue Swirl wrote:
On Tue, Dec 7, 2010 at 11:40 AM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien Chouteauchout...@adacore.com
wrote:
Signed-off-by: Fabien Chouteauchout...@adacore.com
---
Makefile.target |5 +-
hw/leon3.c | 310
++
target-sparc/cpu.h | 10 ++
target-sparc/helper.c|2 +-
target-sparc/op_helper.c | 30 -
5 files changed, 353 insertions(+), 4 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2800f47..f40e04f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -290,7 +290,10 @@ obj-sparc-y += cirrus_vga.o
else
obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
-obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
+obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
+
+# GRLIB
+obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
endif
obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
diff --git a/hw/leon3.c b/hw/leon3.c
new file mode 100644
index 000..ba61081
--- /dev/null
+++ b/hw/leon3.c
@@ -0,0 +1,310 @@
+/*
+ * QEMU Leon3 System Emulator
+ *
+ * Copyright (c) 2010 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person
obtaining
a copy
+ * of this software and associated documentation files (the
Software),
to deal
+ * in the Software without restriction, including without limitation
the
rights
+ * to use, copy, modify, merge, publish, distribute, sublicense,
and/or
sell
+ * copies of the Software, and to permit persons to whom the Software
is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR
OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include hw.h
+#include qemu-timer.h
+#include qemu-char.h
+#include sysemu.h
+#include boards.h
+#include loader.h
+#include elf.h
+
+#include grlib.h
+
+/* #define DEBUG_LEON3 */
+
+#ifdef DEBUG_LEON3
+#define DPRINTF(fmt, ...) \
+do { printf(Leon3: fmt , ## __VA_ARGS__); } while (0)
+#else
+#define DPRINTF(fmt, ...)
+#endif
+
+/* Default system clock. */
+#define CPU_CLK (40 * 1000 * 1000)
+
+#define PROM_FILENAMEu-boot.bin
+
+#define MAX_PILS 16
+
+typedef struct Leon3State
+{
+uint32_t cache_control;
+uint32_t inst_cache_conf;
+uint32_t data_cache_conf;
+
+uint64_t entry; /* save kernel entry in case of reset
*/
+} Leon3State;
+
+Leon3State leon3_state;
Again global state, please refactor. Perhaps most of the cache
handling code belong to target-sparc/op_helper.c and this structure to
CPUSPARCState.
I will try to find a solution for that.
Is it OK to add some Leon3 specific stuff in the CPUSPARCState?
Yes, no problem. You can also drop the intermediate Leon3State
structure if there is no benefit.
+
+/* Cache control: emulate the behavior of cache control registers but
without
+ any effect on the emulated CPU */
+
+#define CACHE_DISABLED 0x0
+#define CACHE_FROZEN 0x1
+#define CACHE_ENABLED 0x3
+
+/* Cache Control register fields */
+
+#define CACHE_CTRL_IF (14) /* Instruction Cache Freeze on
Interrupt */
+#define CACHE_CTRL_DF (15) /* Data Cache Freeze on Interrupt
*/
+#define CACHE_CTRL_DP (1 14) /* Data cache flush pending */
+#define CACHE_CTRL_IP (1 15) /* Instruction cache flush pending
*/
+#define CACHE_CTRL_IB (1 16) /* Instruction burst fetch */
+#define CACHE_CTRL_FI (1 21) /* Flush Instruction cache (Write
only)
*/
+#define CACHE_CTRL_FD (1 22) /* Flush Data cache (Write only) */
+#define CACHE_CTRL_DS (1 23) /* Data cache snoop enable */
+
+void leon3_cache_control_int(void)
+{
+uint32_t state = 0;
+
+if (leon3_state.cache_control CACHE_CTRL_IF) {
+/* Instruction cache state */
+state = leon3_state.cache_control 0x3;
Please add a new define CACHE_CTRL_xxx to replace 0x3.
Done.
+if (state == CACHE_ENABLED) {
+state = CACHE_FROZEN;
+DPRINTF(Instruction cache: freeze\n);
+}
+
+leon3_state.cache_control= ~0x3;
+
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On 12/11/2010 10:56 AM, Blue Swirl wrote:
On Tue, Dec 7, 2010 at 11:40 AM, Fabien Chouteauchout...@adacore.com wrote:
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien Chouteauchout...@adacore.com
wrote:
Signed-off-by: Fabien Chouteauchout...@adacore.com
---
Makefile.target |5 +-
hw/leon3.c | 310
++
target-sparc/cpu.h | 10 ++
target-sparc/helper.c|2 +-
target-sparc/op_helper.c | 30 -
5 files changed, 353 insertions(+), 4 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2800f47..f40e04f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -290,7 +290,10 @@ obj-sparc-y += cirrus_vga.o
else
obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
-obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
+obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
+
+# GRLIB
+obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
endif
obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
diff --git a/hw/leon3.c b/hw/leon3.c
new file mode 100644
index 000..ba61081
--- /dev/null
+++ b/hw/leon3.c
@@ -0,0 +1,310 @@
+/*
+ * QEMU Leon3 System Emulator
+ *
+ * Copyright (c) 2010 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
a copy
+ * of this software and associated documentation files (the Software),
to deal
+ * in the Software without restriction, including without limitation the
rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include hw.h
+#include qemu-timer.h
+#include qemu-char.h
+#include sysemu.h
+#include boards.h
+#include loader.h
+#include elf.h
+
+#include grlib.h
+
+/* #define DEBUG_LEON3 */
+
+#ifdef DEBUG_LEON3
+#define DPRINTF(fmt, ...) \
+do { printf(Leon3: fmt , ## __VA_ARGS__); } while (0)
+#else
+#define DPRINTF(fmt, ...)
+#endif
+
+/* Default system clock. */
+#define CPU_CLK (40 * 1000 * 1000)
+
+#define PROM_FILENAMEu-boot.bin
+
+#define MAX_PILS 16
+
+typedef struct Leon3State
+{
+uint32_t cache_control;
+uint32_t inst_cache_conf;
+uint32_t data_cache_conf;
+
+uint64_t entry; /* save kernel entry in case of reset */
+} Leon3State;
+
+Leon3State leon3_state;
Again global state, please refactor. Perhaps most of the cache
handling code belong to target-sparc/op_helper.c and this structure to
CPUSPARCState.
I will try to find a solution for that.
Is it OK to add some Leon3 specific stuff in the CPUSPARCState?
Yes, no problem. You can also drop the intermediate Leon3State
structure if there is no benefit.
+
+/* Cache control: emulate the behavior of cache control registers but
without
+ any effect on the emulated CPU */
+
+#define CACHE_DISABLED 0x0
+#define CACHE_FROZEN 0x1
+#define CACHE_ENABLED 0x3
+
+/* Cache Control register fields */
+
+#define CACHE_CTRL_IF (1 4) /* Instruction Cache Freeze on
Interrupt */
+#define CACHE_CTRL_DF (1 5) /* Data Cache Freeze on Interrupt */
+#define CACHE_CTRL_DP (114) /* Data cache flush pending */
+#define CACHE_CTRL_IP (115) /* Instruction cache flush pending */
+#define CACHE_CTRL_IB (116) /* Instruction burst fetch */
+#define CACHE_CTRL_FI (121) /* Flush Instruction cache (Write only)
*/
+#define CACHE_CTRL_FD (122) /* Flush Data cache (Write only) */
+#define CACHE_CTRL_DS (123) /* Data cache snoop enable */
+
+void leon3_cache_control_int(void)
+{
+uint32_t state = 0;
+
+if (leon3_state.cache_controlCACHE_CTRL_IF) {
+/* Instruction cache state */
+state = leon3_state.cache_control0x3;
Please add a new define CACHE_CTRL_xxx to replace 0x3.
Done.
+if (state == CACHE_ENABLED) {
+state = CACHE_FROZEN;
+DPRINTF(Instruction cache: freeze\n);
+}
+
+leon3_state.cache_control= ~0x3;
+leon3_state.cache_control |= state;
+}
+
+if (leon3_state.cache_controlCACHE_CTRL_DF) {
+/* Data cache state */
+state =
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On 12/12/2010 03:41 PM, Andreas Färber wrote: Am 06.12.2010 um 10:26 schrieb Fabien Chouteau: diff --git a/Makefile.target b/Makefile.target index 2800f47..f40e04f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -290,7 +290,10 @@ obj-sparc-y += cirrus_vga.o else obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o -obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o +obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o + +# GRLIB +obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o Aren't these three candidates for Makefile.hw if, as I understood it, they are from some non-sparc-specific component library? They are sparc specific, but non-leon3-specific. -- Fabien Chouteau
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On Mon, Dec 13, 2010 at 3:51 PM, Fabien Chouteau chout...@adacore.com wrote:
On 12/11/2010 10:56 AM, Blue Swirl wrote:
On Tue, Dec 7, 2010 at 11:40 AM, Fabien Chouteauchout...@adacore.com
wrote:
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien Chouteauchout...@adacore.com
wrote:
Signed-off-by: Fabien Chouteauchout...@adacore.com
---
Makefile.target | 5 +-
hw/leon3.c | 310
++
target-sparc/cpu.h | 10 ++
target-sparc/helper.c | 2 +-
target-sparc/op_helper.c | 30 -
5 files changed, 353 insertions(+), 4 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2800f47..f40e04f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -290,7 +290,10 @@ obj-sparc-y += cirrus_vga.o
else
obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
-obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
+obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
+
+# GRLIB
+obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
endif
obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
diff --git a/hw/leon3.c b/hw/leon3.c
new file mode 100644
index 000..ba61081
--- /dev/null
+++ b/hw/leon3.c
@@ -0,0 +1,310 @@
+/*
+ * QEMU Leon3 System Emulator
+ *
+ * Copyright (c) 2010 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person
obtaining
a copy
+ * of this software and associated documentation files (the
Software),
to deal
+ * in the Software without restriction, including without limitation
the
rights
+ * to use, copy, modify, merge, publish, distribute, sublicense,
and/or
sell
+ * copies of the Software, and to permit persons to whom the Software
is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR
OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include hw.h
+#include qemu-timer.h
+#include qemu-char.h
+#include sysemu.h
+#include boards.h
+#include loader.h
+#include elf.h
+
+#include grlib.h
+
+/* #define DEBUG_LEON3 */
+
+#ifdef DEBUG_LEON3
+#define DPRINTF(fmt, ...) \
+ do { printf(Leon3: fmt , ## __VA_ARGS__); } while (0)
+#else
+#define DPRINTF(fmt, ...)
+#endif
+
+/* Default system clock. */
+#define CPU_CLK (40 * 1000 * 1000)
+
+#define PROM_FILENAME u-boot.bin
+
+#define MAX_PILS 16
+
+typedef struct Leon3State
+{
+ uint32_t cache_control;
+ uint32_t inst_cache_conf;
+ uint32_t data_cache_conf;
+
+ uint64_t entry; /* save kernel entry in case of reset
*/
+} Leon3State;
+
+Leon3State leon3_state;
Again global state, please refactor. Perhaps most of the cache
handling code belong to target-sparc/op_helper.c and this structure to
CPUSPARCState.
I will try to find a solution for that.
Is it OK to add some Leon3 specific stuff in the CPUSPARCState?
Yes, no problem. You can also drop the intermediate Leon3State
structure if there is no benefit.
+
+/* Cache control: emulate the behavior of cache control registers but
without
+ any effect on the emulated CPU */
+
+#define CACHE_DISABLED 0x0
+#define CACHE_FROZEN 0x1
+#define CACHE_ENABLED 0x3
+
+/* Cache Control register fields */
+
+#define CACHE_CTRL_IF (1 4) /* Instruction Cache Freeze on
Interrupt */
+#define CACHE_CTRL_DF (1 5) /* Data Cache Freeze on Interrupt
*/
+#define CACHE_CTRL_DP (1 14) /* Data cache flush pending */
+#define CACHE_CTRL_IP (1 15) /* Instruction cache flush pending
*/
+#define CACHE_CTRL_IB (1 16) /* Instruction burst fetch */
+#define CACHE_CTRL_FI (1 21) /* Flush Instruction cache (Write
only)
*/
+#define CACHE_CTRL_FD (1 22) /* Flush Data cache (Write only) */
+#define CACHE_CTRL_DS (1 23) /* Data cache snoop enable */
+
+void leon3_cache_control_int(void)
+{
+ uint32_t state = 0;
+
+ if (leon3_state.cache_control CACHE_CTRL_IF) {
+ /* Instruction cache state */
+ state = leon3_state.cache_control 0x3;
Please add a new define CACHE_CTRL_xxx to replace 0x3.
Done.
+ if (state == CACHE_ENABLED) {
+ state = CACHE_FROZEN;
+ DPRINTF(Instruction cache: freeze\n);
+
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
Am 06.12.2010 um 10:26 schrieb Fabien Chouteau: diff --git a/Makefile.target b/Makefile.target index 2800f47..f40e04f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -290,7 +290,10 @@ obj-sparc-y += cirrus_vga.o else obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o -obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o +obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o + +# GRLIB +obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o Aren't these three candidates for Makefile.hw if, as I understood it, they are from some non-sparc-specific component library? Andreas
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On Tue, Dec 7, 2010 at 11:40 AM, Fabien Chouteau chout...@adacore.com wrote:
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien Chouteauchout...@adacore.com
wrote:
Signed-off-by: Fabien Chouteauchout...@adacore.com
---
Makefile.target | 5 +-
hw/leon3.c | 310
++
target-sparc/cpu.h | 10 ++
target-sparc/helper.c | 2 +-
target-sparc/op_helper.c | 30 -
5 files changed, 353 insertions(+), 4 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2800f47..f40e04f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -290,7 +290,10 @@ obj-sparc-y += cirrus_vga.o
else
obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
-obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
+obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
+
+# GRLIB
+obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
endif
obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
diff --git a/hw/leon3.c b/hw/leon3.c
new file mode 100644
index 000..ba61081
--- /dev/null
+++ b/hw/leon3.c
@@ -0,0 +1,310 @@
+/*
+ * QEMU Leon3 System Emulator
+ *
+ * Copyright (c) 2010 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
a copy
+ * of this software and associated documentation files (the Software),
to deal
+ * in the Software without restriction, including without limitation the
rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include hw.h
+#include qemu-timer.h
+#include qemu-char.h
+#include sysemu.h
+#include boards.h
+#include loader.h
+#include elf.h
+
+#include grlib.h
+
+/* #define DEBUG_LEON3 */
+
+#ifdef DEBUG_LEON3
+#define DPRINTF(fmt, ...) \
+ do { printf(Leon3: fmt , ## __VA_ARGS__); } while (0)
+#else
+#define DPRINTF(fmt, ...)
+#endif
+
+/* Default system clock. */
+#define CPU_CLK (40 * 1000 * 1000)
+
+#define PROM_FILENAME u-boot.bin
+
+#define MAX_PILS 16
+
+typedef struct Leon3State
+{
+ uint32_t cache_control;
+ uint32_t inst_cache_conf;
+ uint32_t data_cache_conf;
+
+ uint64_t entry; /* save kernel entry in case of reset */
+} Leon3State;
+
+Leon3State leon3_state;
Again global state, please refactor. Perhaps most of the cache
handling code belong to target-sparc/op_helper.c and this structure to
CPUSPARCState.
I will try to find a solution for that.
Is it OK to add some Leon3 specific stuff in the CPUSPARCState?
Yes, no problem. You can also drop the intermediate Leon3State
structure if there is no benefit.
+
+/* Cache control: emulate the behavior of cache control registers but
without
+ any effect on the emulated CPU */
+
+#define CACHE_DISABLED 0x0
+#define CACHE_FROZEN 0x1
+#define CACHE_ENABLED 0x3
+
+/* Cache Control register fields */
+
+#define CACHE_CTRL_IF (1 4) /* Instruction Cache Freeze on
Interrupt */
+#define CACHE_CTRL_DF (1 5) /* Data Cache Freeze on Interrupt */
+#define CACHE_CTRL_DP (1 14) /* Data cache flush pending */
+#define CACHE_CTRL_IP (1 15) /* Instruction cache flush pending */
+#define CACHE_CTRL_IB (1 16) /* Instruction burst fetch */
+#define CACHE_CTRL_FI (1 21) /* Flush Instruction cache (Write only)
*/
+#define CACHE_CTRL_FD (1 22) /* Flush Data cache (Write only) */
+#define CACHE_CTRL_DS (1 23) /* Data cache snoop enable */
+
+void leon3_cache_control_int(void)
+{
+ uint32_t state = 0;
+
+ if (leon3_state.cache_control CACHE_CTRL_IF) {
+ /* Instruction cache state */
+ state = leon3_state.cache_control 0x3;
Please add a new define CACHE_CTRL_xxx to replace 0x3.
Done.
+ if (state == CACHE_ENABLED) {
+ state = CACHE_FROZEN;
+ DPRINTF(Instruction cache: freeze\n);
+ }
+
+ leon3_state.cache_control= ~0x3;
+ leon3_state.cache_control |= state;
+ }
+
+ if (leon3_state.cache_control
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On 12/06/2010 06:53 PM, Blue Swirl wrote:
On Mon, Dec 6, 2010 at 9:26 AM, Fabien Chouteauchout...@adacore.com wrote:
Signed-off-by: Fabien Chouteauchout...@adacore.com
---
Makefile.target |5 +-
hw/leon3.c | 310 ++
target-sparc/cpu.h | 10 ++
target-sparc/helper.c|2 +-
target-sparc/op_helper.c | 30 -
5 files changed, 353 insertions(+), 4 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2800f47..f40e04f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -290,7 +290,10 @@ obj-sparc-y += cirrus_vga.o
else
obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
-obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
+obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
+
+# GRLIB
+obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
endif
obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
diff --git a/hw/leon3.c b/hw/leon3.c
new file mode 100644
index 000..ba61081
--- /dev/null
+++ b/hw/leon3.c
@@ -0,0 +1,310 @@
+/*
+ * QEMU Leon3 System Emulator
+ *
+ * Copyright (c) 2010 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the Software), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include hw.h
+#include qemu-timer.h
+#include qemu-char.h
+#include sysemu.h
+#include boards.h
+#include loader.h
+#include elf.h
+
+#include grlib.h
+
+/* #define DEBUG_LEON3 */
+
+#ifdef DEBUG_LEON3
+#define DPRINTF(fmt, ...) \
+do { printf(Leon3: fmt , ## __VA_ARGS__); } while (0)
+#else
+#define DPRINTF(fmt, ...)
+#endif
+
+/* Default system clock. */
+#define CPU_CLK (40 * 1000 * 1000)
+
+#define PROM_FILENAMEu-boot.bin
+
+#define MAX_PILS 16
+
+typedef struct Leon3State
+{
+uint32_t cache_control;
+uint32_t inst_cache_conf;
+uint32_t data_cache_conf;
+
+uint64_t entry; /* save kernel entry in case of reset */
+} Leon3State;
+
+Leon3State leon3_state;
Again global state, please refactor. Perhaps most of the cache
handling code belong to target-sparc/op_helper.c and this structure to
CPUSPARCState.
I will try to find a solution for that.
Is it OK to add some Leon3 specific stuff in the CPUSPARCState?
+
+/* Cache control: emulate the behavior of cache control registers but without
+ any effect on the emulated CPU */
+
+#define CACHE_DISABLED 0x0
+#define CACHE_FROZEN 0x1
+#define CACHE_ENABLED 0x3
+
+/* Cache Control register fields */
+
+#define CACHE_CTRL_IF (14) /* Instruction Cache Freeze on Interrupt */
+#define CACHE_CTRL_DF (15) /* Data Cache Freeze on Interrupt */
+#define CACHE_CTRL_DP (1 14) /* Data cache flush pending */
+#define CACHE_CTRL_IP (1 15) /* Instruction cache flush pending */
+#define CACHE_CTRL_IB (1 16) /* Instruction burst fetch */
+#define CACHE_CTRL_FI (1 21) /* Flush Instruction cache (Write only) */
+#define CACHE_CTRL_FD (1 22) /* Flush Data cache (Write only) */
+#define CACHE_CTRL_DS (1 23) /* Data cache snoop enable */
+
+void leon3_cache_control_int(void)
+{
+uint32_t state = 0;
+
+if (leon3_state.cache_control CACHE_CTRL_IF) {
+/* Instruction cache state */
+state = leon3_state.cache_control 0x3;
Please add a new define CACHE_CTRL_xxx to replace 0x3.
Done.
+if (state == CACHE_ENABLED) {
+state = CACHE_FROZEN;
+DPRINTF(Instruction cache: freeze\n);
+}
+
+leon3_state.cache_control= ~0x3;
+leon3_state.cache_control |= state;
+}
+
+if (leon3_state.cache_control CACHE_CTRL_DF) {
+/* Data cache state */
+state = (leon3_state.cache_control 2) 0x3;
+if (state == CACHE_ENABLED) {
+state = CACHE_FROZEN;
+DPRINTF(Data cache: freeze\n);
+}
+
+leon3_state.cache_control= ~(0x3 2);
+leon3_state.cache_control
[Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
Signed-off-by: Fabien Chouteau chout...@adacore.com
---
Makefile.target |5 +-
hw/leon3.c | 310 ++
target-sparc/cpu.h | 10 ++
target-sparc/helper.c|2 +-
target-sparc/op_helper.c | 30 -
5 files changed, 353 insertions(+), 4 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2800f47..f40e04f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -290,7 +290,10 @@ obj-sparc-y += cirrus_vga.o
else
obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
-obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
+obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
+
+# GRLIB
+obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
endif
obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
diff --git a/hw/leon3.c b/hw/leon3.c
new file mode 100644
index 000..ba61081
--- /dev/null
+++ b/hw/leon3.c
@@ -0,0 +1,310 @@
+/*
+ * QEMU Leon3 System Emulator
+ *
+ * Copyright (c) 2010 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the Software), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include hw.h
+#include qemu-timer.h
+#include qemu-char.h
+#include sysemu.h
+#include boards.h
+#include loader.h
+#include elf.h
+
+#include grlib.h
+
+/* #define DEBUG_LEON3 */
+
+#ifdef DEBUG_LEON3
+#define DPRINTF(fmt, ...) \
+do { printf(Leon3: fmt , ## __VA_ARGS__); } while (0)
+#else
+#define DPRINTF(fmt, ...)
+#endif
+
+/* Default system clock. */
+#define CPU_CLK (40 * 1000 * 1000)
+
+#define PROM_FILENAMEu-boot.bin
+
+#define MAX_PILS 16
+
+typedef struct Leon3State
+{
+uint32_t cache_control;
+uint32_t inst_cache_conf;
+uint32_t data_cache_conf;
+
+uint64_t entry; /* save kernel entry in case of reset */
+} Leon3State;
+
+Leon3State leon3_state;
+
+/* Cache control: emulate the behavior of cache control registers but without
+ any effect on the emulated CPU */
+
+#define CACHE_DISABLED 0x0
+#define CACHE_FROZEN 0x1
+#define CACHE_ENABLED 0x3
+
+/* Cache Control register fields */
+
+#define CACHE_CTRL_IF (1 4) /* Instruction Cache Freeze on Interrupt */
+#define CACHE_CTRL_DF (1 5) /* Data Cache Freeze on Interrupt */
+#define CACHE_CTRL_DP (1 14) /* Data cache flush pending */
+#define CACHE_CTRL_IP (1 15) /* Instruction cache flush pending */
+#define CACHE_CTRL_IB (1 16) /* Instruction burst fetch */
+#define CACHE_CTRL_FI (1 21) /* Flush Instruction cache (Write only) */
+#define CACHE_CTRL_FD (1 22) /* Flush Data cache (Write only) */
+#define CACHE_CTRL_DS (1 23) /* Data cache snoop enable */
+
+void leon3_cache_control_int(void)
+{
+uint32_t state = 0;
+
+if (leon3_state.cache_control CACHE_CTRL_IF) {
+/* Instruction cache state */
+state = leon3_state.cache_control 0x3;
+if (state == CACHE_ENABLED) {
+state = CACHE_FROZEN;
+DPRINTF(Instruction cache: freeze\n);
+}
+
+leon3_state.cache_control = ~0x3;
+leon3_state.cache_control |= state;
+}
+
+if (leon3_state.cache_control CACHE_CTRL_DF) {
+/* Data cache state */
+state = (leon3_state.cache_control 2) 0x3;
+if (state == CACHE_ENABLED) {
+state = CACHE_FROZEN;
+DPRINTF(Data cache: freeze\n);
+}
+
+leon3_state.cache_control = ~(0x3 2);
+leon3_state.cache_control |= (state 2);
+}
+}
+
+void leon3_cache_control_st(target_ulong addr, uint64_t val, int size)
+{
+DPRINTF(cc st addr:%lu, val:0x%x, size:%d\n, (long unsigned int)addr,
+(unsigned int)val, size);
+
+if (size != 4) {
+DPRINTF( CC 32bits only\n);
+return;
+}
+
+switch (addr) {
+case 0x00: /* Cache control */
+
+/* These values must always be read as zeros */
+val
Re: [Qemu-devel] [PATCH 5/6] [RFC] Emulation of Leon3.
On Mon, Dec 6, 2010 at 9:26 AM, Fabien Chouteau chout...@adacore.com wrote:
Signed-off-by: Fabien Chouteau chout...@adacore.com
---
Makefile.target | 5 +-
hw/leon3.c | 310
++
target-sparc/cpu.h | 10 ++
target-sparc/helper.c | 2 +-
target-sparc/op_helper.c | 30 -
5 files changed, 353 insertions(+), 4 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2800f47..f40e04f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -290,7 +290,10 @@ obj-sparc-y += cirrus_vga.o
else
obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
-obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
+obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
+
+# GRLIB
+obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
endif
obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
diff --git a/hw/leon3.c b/hw/leon3.c
new file mode 100644
index 000..ba61081
--- /dev/null
+++ b/hw/leon3.c
@@ -0,0 +1,310 @@
+/*
+ * QEMU Leon3 System Emulator
+ *
+ * Copyright (c) 2010 AdaCore
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
copy
+ * of this software and associated documentation files (the Software), to
deal
+ * in the Software without restriction, including without limitation the
rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include hw.h
+#include qemu-timer.h
+#include qemu-char.h
+#include sysemu.h
+#include boards.h
+#include loader.h
+#include elf.h
+
+#include grlib.h
+
+/* #define DEBUG_LEON3 */
+
+#ifdef DEBUG_LEON3
+#define DPRINTF(fmt, ...) \
+ do { printf(Leon3: fmt , ## __VA_ARGS__); } while (0)
+#else
+#define DPRINTF(fmt, ...)
+#endif
+
+/* Default system clock. */
+#define CPU_CLK (40 * 1000 * 1000)
+
+#define PROM_FILENAME u-boot.bin
+
+#define MAX_PILS 16
+
+typedef struct Leon3State
+{
+ uint32_t cache_control;
+ uint32_t inst_cache_conf;
+ uint32_t data_cache_conf;
+
+ uint64_t entry; /* save kernel entry in case of reset */
+} Leon3State;
+
+Leon3State leon3_state;
Again global state, please refactor. Perhaps most of the cache
handling code belong to target-sparc/op_helper.c and this structure to
CPUSPARCState.
+
+/* Cache control: emulate the behavior of cache control registers but without
+ any effect on the emulated CPU */
+
+#define CACHE_DISABLED 0x0
+#define CACHE_FROZEN 0x1
+#define CACHE_ENABLED 0x3
+
+/* Cache Control register fields */
+
+#define CACHE_CTRL_IF (1 4) /* Instruction Cache Freeze on Interrupt */
+#define CACHE_CTRL_DF (1 5) /* Data Cache Freeze on Interrupt */
+#define CACHE_CTRL_DP (1 14) /* Data cache flush pending */
+#define CACHE_CTRL_IP (1 15) /* Instruction cache flush pending */
+#define CACHE_CTRL_IB (1 16) /* Instruction burst fetch */
+#define CACHE_CTRL_FI (1 21) /* Flush Instruction cache (Write only) */
+#define CACHE_CTRL_FD (1 22) /* Flush Data cache (Write only) */
+#define CACHE_CTRL_DS (1 23) /* Data cache snoop enable */
+
+void leon3_cache_control_int(void)
+{
+ uint32_t state = 0;
+
+ if (leon3_state.cache_control CACHE_CTRL_IF) {
+ /* Instruction cache state */
+ state = leon3_state.cache_control 0x3;
Please add a new define CACHE_CTRL_xxx to replace 0x3.
+ if (state == CACHE_ENABLED) {
+ state = CACHE_FROZEN;
+ DPRINTF(Instruction cache: freeze\n);
+ }
+
+ leon3_state.cache_control = ~0x3;
+ leon3_state.cache_control |= state;
+ }
+
+ if (leon3_state.cache_control CACHE_CTRL_DF) {
+ /* Data cache state */
+ state = (leon3_state.cache_control 2) 0x3;
+ if (state == CACHE_ENABLED) {
+ state = CACHE_FROZEN;
+ DPRINTF(Data cache: freeze\n);
+ }
+
+ leon3_state.cache_control = ~(0x3 2);
+ leon3_state.cache_control |= (state 2);
+ }
+}
+
