Skip to content

Commit bda19d7

Browse files
Yoshinori Satophilmd
authored andcommitted
hw/rx: Add RX GDB simulator
Add the RX machine internally simulated in GDB. Signed-off-by: Yoshinori Sato <[email protected]> Tested-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Richard Henderson <[email protected]> [PMD: Use TYPE_RX62N_CPU, use #define for RX62N_NR_TMR/CMT/SCI, renamed CPU -> MCU, device -> microcontroller] Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Message-Id: <[email protected]> [PMD: Split of MCU, rename gdbsim, Add gdbsim-r5f562n7/r5f562n8] Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
1 parent 1db2086 commit bda19d7

File tree

6 files changed

+215
-0
lines changed

6 files changed

+215
-0
lines changed

MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,13 @@ F: include/hw/riscv/opentitan.h
12561256
F: include/hw/char/ibex_uart.h
12571257
F: include/hw/intc/ibex_plic.h
12581258

1259+
RX Machines
1260+
-----------
1261+
rx-gdbsim
1262+
M: Yoshinori Sato <[email protected]>
1263+
S: Maintained
1264+
F: hw/rx/rx-gdbsim.c
1265+
12591266
SH4 Machines
12601267
------------
12611268
R2D

default-configs/rx-softmmu.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Default configuration for rx-softmmu
22

3+
CONFIG_RX_GDBSIM=y

hw/rx/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ config RX62N_MCU
44
select RENESAS_TMR
55
select RENESAS_CMT
66
select RENESAS_SCI
7+
8+
config RX_GDBSIM
9+
bool
10+
select RX62N_MCU

hw/rx/Makefile.objs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
obj-$(CONFIG_RX62N_MCU) += rx62n.o
2+
obj-$(CONFIG_RX_GDBSIM) += rx-gdbsim.o

hw/rx/rx-gdbsim.c

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
/*
2+
* RX QEMU GDB simulator
3+
*
4+
* Copyright (c) 2019 Yoshinori Sato
5+
*
6+
* This program is free software; you can redistribute it and/or modify it
7+
* under the terms and conditions of the GNU General Public License,
8+
* version 2 or later, as published by the Free Software Foundation.
9+
*
10+
* This program is distributed in the hope it will be useful, but WITHOUT
11+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13+
* more details.
14+
*
15+
* You should have received a copy of the GNU General Public License along with
16+
* this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
19+
#include "qemu/osdep.h"
20+
#include "qemu/cutils.h"
21+
#include "qemu/error-report.h"
22+
#include "qapi/error.h"
23+
#include "qemu-common.h"
24+
#include "cpu.h"
25+
#include "hw/hw.h"
26+
#include "hw/sysbus.h"
27+
#include "hw/loader.h"
28+
#include "hw/rx/rx62n.h"
29+
#include "sysemu/sysemu.h"
30+
#include "sysemu/qtest.h"
31+
#include "sysemu/device_tree.h"
32+
#include "hw/boards.h"
33+
34+
/* Same address of GDB integrated simulator */
35+
#define SDRAM_BASE EXT_CS_BASE
36+
37+
typedef struct RxGdbSimMachineClass {
38+
/*< private >*/
39+
MachineClass parent_class;
40+
/*< public >*/
41+
const char *mcu_name;
42+
uint32_t xtal_freq_hz;
43+
} RxGdbSimMachineClass;
44+
45+
typedef struct RxGdbSimMachineState {
46+
/*< private >*/
47+
MachineState parent_obj;
48+
/*< public >*/
49+
RX62NState mcu;
50+
} RxGdbSimMachineState;
51+
52+
#define TYPE_RX_GDBSIM_MACHINE MACHINE_TYPE_NAME("rx62n-common")
53+
54+
#define RX_GDBSIM_MACHINE(obj) \
55+
OBJECT_CHECK(RxGdbSimMachineState, (obj), TYPE_RX_GDBSIM_MACHINE)
56+
57+
#define RX_GDBSIM_MACHINE_CLASS(klass) \
58+
OBJECT_CLASS_CHECK(RxGdbSimMachineClass, (klass), TYPE_RX_GDBSIM_MACHINE)
59+
#define RX_GDBSIM_MACHINE_GET_CLASS(obj) \
60+
OBJECT_GET_CLASS(RxGdbSimMachineClass, (obj), TYPE_RX_GDBSIM_MACHINE)
61+
62+
static void rx_load_image(RXCPU *cpu, const char *filename,
63+
uint32_t start, uint32_t size)
64+
{
65+
static uint32_t extable[32];
66+
long kernel_size;
67+
int i;
68+
69+
kernel_size = load_image_targphys(filename, start, size);
70+
if (kernel_size < 0) {
71+
fprintf(stderr, "qemu: could not load kernel '%s'\n", filename);
72+
exit(1);
73+
}
74+
cpu->env.pc = start;
75+
76+
/* setup exception trap trampoline */
77+
/* linux kernel only works little-endian mode */
78+
for (i = 0; i < ARRAY_SIZE(extable); i++) {
79+
extable[i] = cpu_to_le32(0x10 + i * 4);
80+
}
81+
rom_add_blob_fixed("extable", extable, sizeof(extable), VECTOR_TABLE_BASE);
82+
}
83+
84+
static void rx_gdbsim_init(MachineState *machine)
85+
{
86+
MachineClass *mc = MACHINE_GET_CLASS(machine);
87+
RxGdbSimMachineState *s = RX_GDBSIM_MACHINE(machine);
88+
RxGdbSimMachineClass *rxc = RX_GDBSIM_MACHINE_GET_CLASS(machine);
89+
MemoryRegion *sysmem = get_system_memory();
90+
const char *kernel_filename = machine->kernel_filename;
91+
const char *dtb_filename = machine->dtb;
92+
93+
if (machine->ram_size < mc->default_ram_size) {
94+
char *sz = size_to_str(mc->default_ram_size);
95+
error_report("Invalid RAM size, should be more than %s", sz);
96+
g_free(sz);
97+
}
98+
99+
/* Allocate memory space */
100+
memory_region_add_subregion(sysmem, SDRAM_BASE, machine->ram);
101+
102+
/* Initialize MCU */
103+
object_initialize_child(OBJECT(machine), "mcu", &s->mcu, rxc->mcu_name);
104+
object_property_set_link(OBJECT(&s->mcu), OBJECT(sysmem),
105+
"main-bus", &error_abort);
106+
object_property_set_uint(OBJECT(&s->mcu), rxc->xtal_freq_hz,
107+
"xtal-frequency-hz", &error_abort);
108+
object_property_set_bool(OBJECT(&s->mcu), kernel_filename != NULL,
109+
"load-kernel", &error_abort);
110+
qdev_realize(DEVICE(&s->mcu), NULL, &error_abort);
111+
112+
/* Load kernel and dtb */
113+
if (kernel_filename) {
114+
ram_addr_t kernel_offset;
115+
116+
/*
117+
* The kernel image is loaded into
118+
* the latter half of the SDRAM space.
119+
*/
120+
kernel_offset = machine->ram_size / 2;
121+
rx_load_image(RXCPU(first_cpu), kernel_filename,
122+
SDRAM_BASE + kernel_offset, kernel_offset);
123+
if (dtb_filename) {
124+
ram_addr_t dtb_offset;
125+
int dtb_size;
126+
void *dtb;
127+
128+
dtb = load_device_tree(dtb_filename, &dtb_size);
129+
if (dtb == NULL) {
130+
error_report("Couldn't open dtb file %s", dtb_filename);
131+
exit(1);
132+
}
133+
if (machine->kernel_cmdline &&
134+
qemu_fdt_setprop_string(dtb, "/chosen", "bootargs",
135+
machine->kernel_cmdline) < 0) {
136+
error_report("Couldn't set /chosen/bootargs");
137+
exit(1);
138+
}
139+
/* DTB is located at the end of SDRAM space. */
140+
dtb_offset = machine->ram_size - dtb_size;
141+
rom_add_blob_fixed("dtb", dtb, dtb_size,
142+
SDRAM_BASE + dtb_offset);
143+
/* Set dtb address to R1 */
144+
RXCPU(first_cpu)->env.regs[1] = SDRAM_BASE + dtb_offset;
145+
}
146+
}
147+
}
148+
149+
static void rx_gdbsim_class_init(ObjectClass *oc, void *data)
150+
{
151+
MachineClass *mc = MACHINE_CLASS(oc);
152+
153+
mc->init = rx_gdbsim_init;
154+
mc->default_cpu_type = TYPE_RX62N_CPU;
155+
mc->default_ram_size = 16 * MiB;
156+
mc->default_ram_id = "ext-sdram";
157+
}
158+
159+
static void rx62n7_class_init(ObjectClass *oc, void *data)
160+
{
161+
RxGdbSimMachineClass *rxc = RX_GDBSIM_MACHINE_CLASS(oc);
162+
MachineClass *mc = MACHINE_CLASS(oc);
163+
164+
rxc->mcu_name = TYPE_R5F562N7_MCU;
165+
rxc->xtal_freq_hz = 12 * 1000 * 1000;
166+
mc->desc = "gdb simulator (R5F562N7 MCU and external RAM)";
167+
};
168+
169+
static void rx62n8_class_init(ObjectClass *oc, void *data)
170+
{
171+
RxGdbSimMachineClass *rxc = RX_GDBSIM_MACHINE_CLASS(oc);
172+
MachineClass *mc = MACHINE_CLASS(oc);
173+
174+
rxc->mcu_name = TYPE_R5F562N8_MCU;
175+
rxc->xtal_freq_hz = 12 * 1000 * 1000;
176+
mc->desc = "gdb simulator (R5F562N8 MCU and external RAM)";
177+
};
178+
179+
static const TypeInfo rx_gdbsim_types[] = {
180+
{
181+
.name = MACHINE_TYPE_NAME("gdbsim-r5f562n7"),
182+
.parent = TYPE_RX_GDBSIM_MACHINE,
183+
.class_init = rx62n7_class_init,
184+
}, {
185+
.name = MACHINE_TYPE_NAME("gdbsim-r5f562n8"),
186+
.parent = TYPE_RX_GDBSIM_MACHINE,
187+
.class_init = rx62n8_class_init,
188+
}, {
189+
.name = TYPE_RX_GDBSIM_MACHINE,
190+
.parent = TYPE_MACHINE,
191+
.instance_size = sizeof(RxGdbSimMachineState),
192+
.class_size = sizeof(RxGdbSimMachineClass),
193+
.class_init = rx_gdbsim_class_init,
194+
.abstract = true,
195+
}
196+
};
197+
198+
DEFINE_TYPES(rx_gdbsim_types)

include/hw/rx/rx62n.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
#define TYPE_R5F562N7_MCU "r5f562n7-mcu"
3838
#define TYPE_R5F562N8_MCU "r5f562n8-mcu"
3939

40+
#define EXT_CS_BASE 0x01000000
41+
#define VECTOR_TABLE_BASE 0xffffff80
42+
#define RX62N_CFLASH_BASE 0xfff80000
43+
4044
#define RX62N_NR_TMR 2
4145
#define RX62N_NR_CMT 2
4246
#define RX62N_NR_SCI 6

0 commit comments

Comments
 (0)