MIPSsim pseudo machine emulation.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3400 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-10-17 13:08:32 +00:00
parent 94ced07534
commit 6bf5b4e8a8
4 changed files with 26 additions and 5 deletions

View File

@ -478,11 +478,12 @@ VL_OBJS+= ppc4xx_devs.o ppc405_uc.o ppc405_boards.o
CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
endif endif
ifeq ($(TARGET_BASE_ARCH), mips) ifeq ($(TARGET_BASE_ARCH), mips)
VL_OBJS+= mips_r4k.o mips_malta.o mips_pica61.o VL_OBJS+= mips_r4k.o mips_malta.o mips_pica61.o mips_mipssim.o
VL_OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o VL_OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o
VL_OBJS+= jazz_led.o VL_OBJS+= jazz_led.o
VL_OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o VL_OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
VL_OBJS+= piix_pci.o smbus_eeprom.o parallel.o mixeng.o cirrus_vga.o $(SOUND_HW) $(AUDIODRV) VL_OBJS+= piix_pci.o smbus_eeprom.o parallel.o mixeng.o cirrus_vga.o $(SOUND_HW) $(AUDIODRV)
VL_OBJS+= mipsnet.o
CPPFLAGS += -DHAS_AUDIO CPPFLAGS += -DHAS_AUDIO
endif endif
ifeq ($(TARGET_BASE_ARCH), cris) ifeq ($(TARGET_BASE_ARCH), cris)

View File

@ -2036,6 +2036,8 @@ A generic ISA PC-like machine "mips"
The MIPS Malta prototype board "malta" The MIPS Malta prototype board "malta"
@item @item
An ACER Pica "pica61" An ACER Pica "pica61"
@item
MIPS MIPSsim emulator pseudo board "mipssim"
@end itemize @end itemize
The generic emulation is supported by Debian 'Etch' and is able to The generic emulation is supported by Debian 'Etch' and is able to
@ -2044,7 +2046,7 @@ emulated:
@itemize @minus @itemize @minus
@item @item
MIPS 24Kf CPU A range of MIPS CPUs, default is the 24Kf
@item @item
PC style serial port PC style serial port
@item @item
@ -2083,6 +2085,17 @@ PC Keyboard
IDE controller IDE controller
@end itemize @end itemize
The MIPSsim emulation supports:
@itemize @minus
@item
A range of MIPS CPUs, default is the 24Kf
@item
PC style serial port
@item
MIPSnet network emulation
@end itemize
@node ARM System emulator @node ARM System emulator
@section ARM System emulator @section ARM System emulator

1
vl.c
View File

@ -7365,6 +7365,7 @@ void register_machines(void)
qemu_register_machine(&mips_machine); qemu_register_machine(&mips_machine);
qemu_register_machine(&mips_malta_machine); qemu_register_machine(&mips_malta_machine);
qemu_register_machine(&mips_pica61_machine); qemu_register_machine(&mips_pica61_machine);
qemu_register_machine(&mips_mipssim_machine);
#elif defined(TARGET_SPARC) #elif defined(TARGET_SPARC)
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
qemu_register_machine(&sun4u_machine); qemu_register_machine(&sun4u_machine);

12
vl.h
View File

@ -1068,6 +1068,9 @@ void pci_pcnet_init(PCIBus *bus, NICInfo *nd, int devfn);
void lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque, void lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque,
qemu_irq irq, qemu_irq *reset); qemu_irq irq, qemu_irq *reset);
/* mipsnet.c */
void mipsnet_init(int base, qemu_irq irq, NICInfo *nd);
/* vmmouse.c */ /* vmmouse.c */
void *vmmouse_init(void *m); void *vmmouse_init(void *m);
@ -1190,12 +1193,15 @@ extern QEMUMachine mips_machine;
/* mips_malta.c */ /* mips_malta.c */
extern QEMUMachine mips_malta_machine; extern QEMUMachine mips_malta_machine;
/* mips_int.c */
extern void cpu_mips_irq_init_cpu(CPUState *env);
/* mips_pica61.c */ /* mips_pica61.c */
extern QEMUMachine mips_pica61_machine; extern QEMUMachine mips_pica61_machine;
/* mips_mipssim.c */
extern QEMUMachine mips_mipssim_machine;
/* mips_int.c */
extern void cpu_mips_irq_init_cpu(CPUState *env);
/* mips_timer.c */ /* mips_timer.c */
extern void cpu_mips_clock_init(CPUState *); extern void cpu_mips_clock_init(CPUState *);
extern void cpu_mips_irqctrl_init (void); extern void cpu_mips_irqctrl_init (void);