From 2c047409b2b534a90dae8dba91236767fdff21d0 Mon Sep 17 00:00:00 2001 From: Liviu Ionescu Date: Fri, 16 Jun 2017 01:31:01 +0300 Subject: [PATCH] rebrand as GNU MCU Eclipse --- .github/ISSUE_TEMPLATE | 10 +- Makefile.objs | 8 +- README.md | 10 +- arch_init.c | 4 +- configure | 24 ++-- cpu-exec.c | 4 +- default-configs/gnuarmeclipse-softmmu.mak | 4 +- gdbstub.c | 10 +- hw/9pfs/Makefile.objs | 4 +- hw/Makefile.objs | 22 +-- hw/arm/Makefile.objs | 8 +- hw/core/loader.c | 10 +- hw/core/machine.c | 12 +- hw/core/null-machine.c | 4 +- hw/core/qdev-properties.c | 8 +- hw/core/sysbus.c | 8 +- hw/cortexm/Makefile.objs | 38 +++--- hw/cortexm/kinetis/Makefile.objs | 4 +- hw/cortexm/lpc/Makefile.objs | 4 +- hw/cortexm/sam/Makefile.objs | 4 +- hw/cortexm/stm32/Makefile.objs | 4 +- hw/cortexm/tiva/Makefile.objs | 4 +- hw/cortexm/xmc/Makefile.objs | 4 +- hw/intc/Makefile.objs | 2 +- hw/intc/arm_gic.c | 12 +- hw/intc/arm_gicv2m.c | 2 +- hw/intc/arm_gicv3_its_common.c | 2 +- hw/pci-bridge/Makefile.objs | 4 +- hw/scsi/Makefile.objs | 4 +- include/exec/gdbstub.h | 4 +- include/hw/boards.h | 4 +- include/hw/intc/arm_gic_common.h | 4 +- include/hw/loader.h | 4 +- include/qemu-common.h | 4 +- include/qemu/log.h | 8 +- include/sysemu/sysemu.h | 16 +-- memory.c | 8 +- monitor.c | 6 +- qemu-char.c | 8 +- qom/cpu.c | 4 +- qom/object.c | 4 +- qom/qom-qobject.c | 6 +- target-arm/arm-semi.c | 10 +- target-arm/cpu.c | 32 ++--- target-arm/cpu.h | 2 +- target-arm/gdbstub.c | 12 +- target-arm/helper.c | 36 ++--- util/log.c | 4 +- util/oslib-win32.c | 4 +- util/qemu-thread-posix.c | 4 +- util/readline.c | 4 +- vl.c | 156 +++++++++++----------- 52 files changed, 291 insertions(+), 291 deletions(-) diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE index 7a308c1236c..0dcbffb557d 100644 --- a/.github/ISSUE_TEMPLATE +++ b/.github/ISSUE_TEMPLATE @@ -1,22 +1,22 @@ ### Prerequisites -In case you encounter problems while using the GNU ARM Eclipse **QEMU**, please consider the following: +In case you encounter problems while using the **GNU MCU Eclipse QEMU**, please consider the following: * [ ] read the documentation pages carefully * [ ] check the [Known issues](http://gnuarmeclipse.github.io/support/known-issues/) * [ ] check the [FAQ](http://gnuarmeclipse.github.io/support/faq/) -* [ ] check the [GNU ARM Eclipse forum](http://gnuarmeclipse.github.io/support/forum/) for similar problems -* [ ] check the GitHub Issues [tracker](https://github.com/gnuarmeclipse/qemu/issues/) +* [ ] check the [GNU MCU Eclipse forum](http://gnuarmeclipse.github.io/support/forum/) for similar problems +* [ ] check the GitHub Issues [tracker](https://github.com/gnu-mcu-eclipse/qemu/issues/) If you still could not find a solution, if you have interesting use cases, if you have custom configurations, and generally if you have any experience that you want to share with others, -use the [GNU ARM Eclipse forum](http://gnuarmeclipse.github.io/support/forum/). +use the [GNU MCU Eclipse forum](http://gnuarmeclipse.github.io/support/forum/). Just [register](http://www.element14.com/community/create-account.jspa) to element14 community and use the [Start a discussion](http://www.element14.com/community/discussion/create.jspa?containerID=2436&containerType=700) link, with the QEMU category. If you are convinced that you identified a bug (if you have doubts, use the forum), or you have a -pertinent suggestion how to enhance GNU ARM Eclipse QEMU, continue and register +pertinent suggestion how to enhance GNU MCU Eclipse QEMU, continue and register an issue, but please keep in mind that QEMU is a separate project, and functional changes should normally be addressed to the original project developers. ### Description diff --git a/Makefile.objs b/Makefile.objs index ac70be0f0b8..1a7c2ef3c78 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -57,8 +57,8 @@ common-obj-y += page_cache.o common-obj-$(CONFIG_SPICE) += spice-qemu-char.o -# [GNU ARM Eclipse] -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +# [GNU MCU Eclipse] +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) common-obj-y += audio/ endif common-obj-y += hw/ @@ -68,8 +68,8 @@ common-obj-y += replay/ common-obj-y += ui/ -# [GNU ARM Eclipse] -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +# [GNU MCU Eclipse] +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) common-obj-y += bt-host.o bt-vhci.o endif diff --git a/README.md b/README.md index 65d751637e6..9038b268a06 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -[![GitHub release](https://img.shields.io/github/release/gnuarmeclipse/qemu.svg)](https://github.com/gnuarmeclipse/qemu/releases/latest) [![Github Releases](https://img.shields.io/github/downloads/gnuarmeclipse/qemu/latest/total.svg)](https://github.com/gnuarmeclipse/qemu/releases/latest) [![Github All Releases](https://img.shields.io/github/downloads/gnuarmeclipse/qemu/total.svg)](https://github.com/gnuarmeclipse/qemu/releases/latest) +[![GitHub release](https://img.shields.io/github/release/gnuarmeclipse/qemu.svg)](https://github.com/gnu-mcu-eclipse/qemu/releases/latest) [![Github Releases](https://img.shields.io/github/downloads/gnuarmeclipse/qemu/latest/total.svg)](https://github.com/gnu-mcu-eclipse/qemu/releases/latest) [![Github All Releases](https://img.shields.io/github/downloads/gnuarmeclipse/qemu/total.svg)](https://github.com/gnu-mcu-eclipse/qemu/releases/latest) -# GNU ARM Eclipse QEMU +# GNU MCU Eclipse QEMU -The [GNU ARM Eclipse QEMU](http://gnuarmeclipse.github.io/qemu) subproject is a fork of [QEMU](http://wiki.qemu.org/Main_Page) (an open source machine emulator), intended to provide support for Cortex-M emulation in GNU ARM Eclipse. The source code is part of the **GNU ARM Eclipse** project, and is available from [GitHub](https://github.com/gnuarmeclipse/qemu). Binary packages are available from [GitHub Releases](https://github.com/gnuarmeclipse/qemu/releases). +The [GNU MCU Eclipse QEMU](http://gnuarmeclipse.github.io/qemu) subproject is a fork of [QEMU](http://wiki.qemu.org/Main_Page) (an open source machine emulator), intended to provide support for Cortex-M emulation in GNU MCU Eclipse. The source code is part of the **GNU MCU Eclipse** project, and is available from [GitHub](https://github.com/gnu-mcu-eclipse/qemu). Binary packages are available from [GitHub Releases](https://github.com/gnu-mcu-eclipse/qemu/releases). ## How to use * [Overview](http://gnuarmeclipse.github.io/qemu/) (read me first!) * [QEMU Install](http://gnuarmeclipse.github.io/qemu/install) * Eclipse plug-in -* [Support](https://github.com/gnuarmeclipse/qemu/issues/1) (using the GitHub Issues) +* [Support](https://github.com/gnu-mcu-eclipse/qemu/issues/1) (using the GitHub Issues) ## How to build @@ -19,4 +19,4 @@ The [GNU ARM Eclipse QEMU](http://gnuarmeclipse.github.io/qemu) subproject is a ## Releases & binaries See the [releases](http://gnuarmeclipse.github.io/qemu/releases) page. -Binaries for most platforms can be downloaded from [GitHub Releases](https://github.com/gnuarmeclipse/qemu/releases). +Binaries for most platforms can be downloaded from [GitHub Releases](https://github.com/gnu-mcu-eclipse/qemu/releases). diff --git a/arch_init.c b/arch_init.c index 8150a9a78ae..8c2c5d04781 100644 --- a/arch_init.c +++ b/arch_init.c @@ -104,7 +104,7 @@ int qemu_read_default_config_files(bool userconfig) } ret = qemu_read_config_file(f->filename); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) if (ret < 0 && ret != -ENOENT && ret != -EACCES) { return ret; } @@ -112,7 +112,7 @@ int qemu_read_default_config_files(bool userconfig) if (ret < 0 && ret != -ENOENT) { return ret; } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ } diff --git a/configure b/configure index d9bdf609b2b..bc6c94cd30e 100755 --- a/configure +++ b/configure @@ -323,12 +323,12 @@ tcmalloc="no" jemalloc="no" replication="yes" -# --- [GNU ARM Eclipse] --- +# --- [GNU MCU Eclipse] --- gnuarmeclipse="no" branding_message="" semihosting_native="no" verbose="no" -# --- [GNU ARM Eclipse] --- +# --- [GNU MCU Eclipse] --- # parse CC options first for opt do @@ -744,13 +744,13 @@ case $opt in esac done -# --- [GNU ARM Eclipse] --- +# --- [GNU MCU Eclipse] --- case $target_list in gnuarmeclipse-softmmu) gnuarmeclipse="yes" semihosting_native="yes" verbose="yes" - branding_message="GNU ARM Eclipse" + branding_message="GNU MCU Eclipse" # convenience defs debug_tcg="yes" debug="yes" @@ -778,7 +778,7 @@ case $target_list in # fdt="no" # it fails ;; esac -# --- [GNU ARM Eclipse] --- +# --- [GNU MCU Eclipse] --- for opt do optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'` @@ -2664,21 +2664,21 @@ if test "$sdl" = "yes" ; then #endif int main(void) { return 0; } EOF - # --- [GNU ARM Eclipse] --- + # --- [GNU MCU Eclipse] --- echo "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs" - # --- [GNU ARM Eclipse] --- + # --- [GNU MCU Eclipse] --- if compile_prog "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs" ; then sdl_cflags="$sdl_cflags $x11_cflags" sdl_libs="$sdl_libs $x11_libs" fi - # --- [GNU ARM Eclipse] --- + # --- [GNU MCU Eclipse] --- if test $sdlabi = "2.0"; then sdl_libs="$sdl_libs -lSDL2_image" elif test $sdlabi = "1.2"; then sdl_libs="$sdl_libs -lSDL_image" fi echo "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs" - # --- [GNU ARM Eclipse] --- + # --- [GNU MCU Eclipse] --- libs_softmmu="$sdl_libs $libs_softmmu" fi @@ -6253,9 +6253,9 @@ if test "$ccache_cpp2" = "yes"; then echo "export CCACHE_CPP2=y" >> $config_host_mak fi -# --- [GNU ARM Eclipse] --- +# --- [GNU MCU Eclipse] --- if test "$gnuarmeclipse" = "yes"; then -echo "CONFIG_GNU_ARM_ECLIPSE=y" >> $config_host_mak +echo "CONFIG_GNU_MCU_ECLIPSE=y" >> $config_host_mak fi if test "$verbose" = "yes"; then @@ -6269,7 +6269,7 @@ fi if test ! -z "$branding_message"; then echo "CONFIG_BRANDING_MESSAGE=\"$branding_message\"" >> $config_host_mak fi -# --- [GNU ARM Eclipse] --- +# --- [GNU MCU Eclipse] --- # build tree in object directory in case the source is not in the current directory DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests" diff --git a/cpu-exec.c b/cpu-exec.c index d42477dbfce..b1a83636f1a 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -34,14 +34,14 @@ #endif #include "sysemu/replay.h" -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #if defined(_WIN64) #ifdef sigsetjmp #undef sigsetjmp #endif #define sigsetjmp(env, savesigs) _setjmp(env, NULL) #endif -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ /* -icount align implementation. */ diff --git a/default-configs/gnuarmeclipse-softmmu.mak b/default-configs/gnuarmeclipse-softmmu.mak index c6e4a9223bd..bdc49d22cde 100644 --- a/default-configs/gnuarmeclipse-softmmu.mak +++ b/default-configs/gnuarmeclipse-softmmu.mak @@ -13,11 +13,11 @@ CONFIG_STELLARIS_ENET=y CONFIG_PTIMER=y CONFIG_PCI=n -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] CONFIG_STM32=y CONFIG_KINETIS=n CONFIG_LPC=n CONFIG_TIVA=n CONFIG_XMC=n CONFIG_SAM=n -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] diff --git a/gdbstub.c b/gdbstub.c index ea9ff6a8d05..55a017a6295 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1255,11 +1255,11 @@ static void gdb_vm_state_change(void *opaque, int running, RunState state) const char *type; int ret; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #if defined(DEBUG_GDB) printf("vm_state %d, %d\n", running, state); #endif -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ if (running || s->state == RS_INACTIVE) { return; @@ -1513,7 +1513,7 @@ void gdb_exit(CPUArchState *env, int code) qemu_chr_delete(chr); #endif -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) gdbserver_state = NULL; #endif } @@ -1815,9 +1815,9 @@ int gdbserver_start(const char *device) } #endif -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) int gdbserver_is_started(void) { return (gdbserver_state != NULL); } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index a24e7bd8464..1cec22a096c 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -1,7 +1,7 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] # Disable all. -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) common-obj-y = 9p.o common-obj-y += 9p-local.o 9p-xattr.o common-obj-y += 9p-xattr-user.o 9p-posix-acl.o diff --git a/hw/Makefile.objs b/hw/Makefile.objs index a64d8b4eee7..4b94aded496 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,7 +1,7 @@ devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call land,$(CONFIG_VIRTFS),$(CONFIG_PCI))) += 9pfs/ devices-dirs-$(CONFIG_ACPI) += acpi/ -# [GNU ARM Eclipse] -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +# [GNU MCU Eclipse] +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) devices-dirs-$(CONFIG_SOFTMMU) += adc/ devices-dirs-$(CONFIG_SOFTMMU) += audio/ devices-dirs-$(CONFIG_SOFTMMU) += block/ @@ -13,8 +13,8 @@ devices-dirs-$(CONFIG_SOFTMMU) += display/ devices-dirs-$(CONFIG_SOFTMMU) += dma/ devices-dirs-$(CONFIG_SOFTMMU) += gpio/ devices-dirs-$(CONFIG_SOFTMMU) += i2c/ -# [GNU ARM Eclipse] -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +# [GNU MCU Eclipse] +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) devices-dirs-$(CONFIG_SOFTMMU) += ide/ endif devices-dirs-$(CONFIG_SOFTMMU) += input/ @@ -26,8 +26,8 @@ devices-dirs-$(CONFIG_SOFTMMU) += misc/ devices-dirs-$(CONFIG_SOFTMMU) += net/ devices-dirs-$(CONFIG_SOFTMMU) += nvram/ devices-dirs-$(CONFIG_SOFTMMU) += pci/ -# [GNU ARM Eclipse] -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +# [GNU MCU Eclipse] +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ devices-dirs-$(CONFIG_SOFTMMU) += pcmcia/ devices-dirs-$(CONFIG_SOFTMMU) += scsi/ @@ -40,17 +40,17 @@ devices-dirs-$(CONFIG_SOFTMMU) += usb/ devices-dirs-$(CONFIG_SOFTMMU) += vfio/ devices-dirs-$(CONFIG_VIRTIO) += virtio/ devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ -# [GNU ARM Eclipse] -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +# [GNU MCU Eclipse] +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) devices-dirs-$(CONFIG_SOFTMMU) += xen/ endif devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/ devices-dirs-$(CONFIG_SMBIOS) += smbios/ devices-dirs-y += core/ -# [GNU ARM Eclipse] -devices-dirs-$(CONFIG_GNU_ARM_ECLIPSE) += cortexm/ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] +devices-dirs-$(CONFIG_GNU_MCU_ECLIPSE) += cortexm/ +# [GNU MCU Eclipse] common-obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y) diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index dbe6f819abf..dbd1cec680c 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,15 +1,15 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] # Disable most. -# [GNU ARM Eclipse] boot.o required for TYPE_ARM_LINUX_BOOT_IF, +# [GNU MCU Eclipse] boot.o required for TYPE_ARM_LINUX_BOOT_IF, # refered as interface by TYPE_ARM_GIC_COMMON, parent of TYPE_CORTEXM_NVIC obj-y += boot.o -# [GNU ARM Eclipse] armv7m.o still needed for +# [GNU MCU Eclipse] armv7m.o still needed for # the definition of "ARM,bitband-memory" obj-y += armv7m.o -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) obj-y += collie.o exynos4_boards.o gumstix.o highbank.o obj-$(CONFIG_DIGIC) += digic_boards.o obj-y += integratorcp.o mainstone.o musicpal.o nseries.o diff --git a/hw/core/loader.c b/hw/core/loader.c index 52ad97c0a90..1561d5d44c3 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -59,7 +59,7 @@ #if defined(CONFIG_VERBOSE) #include "verbosity.h" #endif -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #include "qemu/log.h" #endif @@ -1058,15 +1058,15 @@ int rom_add_option(const char *file, int32_t bootindex) return rom_add_file(file, "genroms", 0, bootindex, true, NULL, NULL); } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) void rom_reset(void *unused) #else static void rom_reset(void *unused) -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ { -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) qemu_log_function_name(); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ Rom *rom; diff --git a/hw/core/machine.c b/hw/core/machine.c index ecc3a14438e..ce96281bb8e 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -115,7 +115,7 @@ static void machine_set_kernel(Object *obj, const char *value, Error **errp) ms->kernel_filename = g_strdup(value); } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) static char *machine_get_image(Object *obj, Error **errp) { @@ -132,7 +132,7 @@ static void machine_set_image(Object *obj, const char *value, Error **errp) ms->image_filename = g_strdup(value); } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ static char *machine_get_initrd(Object *obj, Error **errp) { @@ -504,13 +504,13 @@ static void machine_initfn(Object *obj) ms->mem_merge = true; ms->enable_graphics = true; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) object_property_add_str(obj, "image", machine_get_image, machine_set_image, NULL); object_property_set_description(obj, "image", "Bare-bone image file", NULL); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ /* Register notifier when init is done for sysbus sanity checks */ ms->sysbus_notifier.notify = machine_init_notify; @@ -526,9 +526,9 @@ static void machine_finalize(Object *obj) g_free(ms->initrd_filename); g_free(ms->kernel_cmdline); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) g_free((void*)ms->image_filename); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ g_free(ms->dtb); g_free(ms->dumpdtb); diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 4ff78f833b1..82c8563b979 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -16,7 +16,7 @@ #include "hw/hw.h" #include "hw/boards.h" -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) static void machine_none_init(MachineState *machine) { } @@ -29,4 +29,4 @@ static void machine_none_machine_init(MachineClass *mc) } DEFINE_MACHINE("none", machine_none_machine_init) -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 511f170cab3..cca126a70e5 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -11,9 +11,9 @@ #include "qapi/visitor.h" #include "sysemu/char.h" -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #include "qemu/log.h" -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ void qdev_prop_set_after_realize(DeviceState *dev, const char *name, Error **errp) @@ -1037,10 +1037,10 @@ void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value) Property *prop; void **ptr; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) qemu_log_mask(LOG_FUNC, "%s('%s', '%s')\n", __FUNCTION__, object_get_typename(OBJECT(dev)), name); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ prop = qdev_prop_find(dev, name); assert(prop && prop->info == &qdev_prop_ptr); diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index 392a019b8d8..dc3a2f9ff63 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -22,9 +22,9 @@ #include "monitor/monitor.h" #include "exec/address-spaces.h" -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #include "qemu/log.h" -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent); static char *sysbus_get_fw_dev_path(DeviceState *dev); @@ -134,9 +134,9 @@ static void sysbus_mmio_map_common(SysBusDevice *dev, int n, hwaddr addr, { assert(n >= 0 && n < dev->num_mmio); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) qemu_log_mask(LOG_FUNC, "%s(0x%08"PRIX64")\n", __FUNCTION__, addr); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ if (dev->mmio[n].addr == addr) { /* ??? region already mapped here. */ diff --git a/hw/cortexm/Makefile.objs b/hw/cortexm/Makefile.objs index 259506bc808..80583502731 100644 --- a/hw/cortexm/Makefile.objs +++ b/hw/cortexm/Makefile.objs @@ -1,25 +1,25 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] -obj-$(CONFIG_GNU_ARM_ECLIPSE) += mcu.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += helper.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += parson.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += json-parser.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += svd.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += mcu.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += helper.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += parson.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += json-parser.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += svd.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += register-bitfield.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += peripheral-register.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += peripheral.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += register-bitfield.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += peripheral-register.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += peripheral.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += nvic.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += itm.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += bitband.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += nvic.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += itm.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += bitband.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += board.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += graphic.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += gpio-led.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += button.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += button-gpio.o -obj-$(CONFIG_GNU_ARM_ECLIPSE) += button-reset.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += board.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += graphic.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += gpio-led.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += button.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += button-gpio.o +obj-$(CONFIG_GNU_MCU_ECLIPSE) += button-reset.o obj-$(CONFIG_STM32) += stm32/ obj-$(CONFIG_KINETIS) += kinetis/ @@ -28,4 +28,4 @@ obj-$(CONFIG_TIVA) += tiva/ obj-$(CONFIG_XMC) += xmc/ obj-$(CONFIG_SAM) += sam/ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] diff --git a/hw/cortexm/kinetis/Makefile.objs b/hw/cortexm/kinetis/Makefile.objs index 4a31dcb7d0f..0b438b82b3e 100644 --- a/hw/cortexm/kinetis/Makefile.objs +++ b/hw/cortexm/kinetis/Makefile.objs @@ -1,5 +1,5 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] obj-$(CONFIG_KINETIS) += mcus.o boards.o -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] diff --git a/hw/cortexm/lpc/Makefile.objs b/hw/cortexm/lpc/Makefile.objs index 85c428dbbe1..fbb5cd9b9a9 100644 --- a/hw/cortexm/lpc/Makefile.objs +++ b/hw/cortexm/lpc/Makefile.objs @@ -1,5 +1,5 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] obj-$(CONFIG_LPC) += mcus.o boards.o -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] diff --git a/hw/cortexm/sam/Makefile.objs b/hw/cortexm/sam/Makefile.objs index 1d54e5c09f5..d30acde5974 100644 --- a/hw/cortexm/sam/Makefile.objs +++ b/hw/cortexm/sam/Makefile.objs @@ -1,5 +1,5 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] obj-$(CONFIG_SAM) += mcus.o boards.o -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] diff --git a/hw/cortexm/stm32/Makefile.objs b/hw/cortexm/stm32/Makefile.objs index a12116c16dc..f4b312d958e 100644 --- a/hw/cortexm/stm32/Makefile.objs +++ b/hw/cortexm/stm32/Makefile.objs @@ -1,4 +1,4 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] obj-$(CONFIG_STM32) += boards-discovery.o boards-olimex.o boards-duino.o boards-nucleo.o obj-$(CONFIG_STM32) += mcu.o mcus.o @@ -13,4 +13,4 @@ obj-$(CONFIG_STM32) += exti.o obj-$(CONFIG_STM32) += syscfg.o obj-$(CONFIG_STM32) += afio.o -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] diff --git a/hw/cortexm/tiva/Makefile.objs b/hw/cortexm/tiva/Makefile.objs index 4c3e1773009..66b90a7adf2 100644 --- a/hw/cortexm/tiva/Makefile.objs +++ b/hw/cortexm/tiva/Makefile.objs @@ -1,5 +1,5 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] obj-$(CONFIG_TIVA) += mcus.o boards.o -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] diff --git a/hw/cortexm/xmc/Makefile.objs b/hw/cortexm/xmc/Makefile.objs index fe0ebcd303a..6e73d3526d9 100644 --- a/hw/cortexm/xmc/Makefile.objs +++ b/hw/cortexm/xmc/Makefile.objs @@ -1,5 +1,5 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] obj-$(CONFIG_XMC) += mcus.o boards.o -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 71ded9ba613..e0bcde62b08 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -24,7 +24,7 @@ obj-$(CONFIG_APIC) += apic.o apic_common.o obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) += arm_gicv3_kvm.o obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) += arm_gicv3_its_kvm.o -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) obj-$(CONFIG_STELLARIS) += armv7m_nvic.o endif obj-$(CONFIG_EXYNOS4) += exynos4210_gic.o exynos4210_combiner.o diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 3be07b44a05..a74d32889f4 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -30,13 +30,13 @@ #ifdef DEBUG_GIC -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #define DPRINTF(fmt, ...) \ do { fprintf(stdout, "arm_gic: " fmt , ## __VA_ARGS__); } while (0) #else #define DPRINTF(fmt, ...) \ do { fprintf(stderr, "arm_gic: " fmt , ## __VA_ARGS__); } while (0) -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #else #define DPRINTF(fmt, ...) do {} while(0) @@ -96,7 +96,7 @@ void gic_update(GICState *s) if (GIC_TEST_ENABLED(irq, cm) && gic_test_pending(s, irq, cm) && (irq < GIC_INTERNAL || GIC_TARGET(irq) & cm)) { -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) int prio = GIC_GET_PRIORITY(irq, cpu); uint32_t basepri = *(s->basepri_ptr); if ((basepri == 0) || (prio < basepri)) { @@ -110,7 +110,7 @@ void gic_update(GICState *s) best_prio = GIC_GET_PRIORITY(irq, cpu); best_irq = irq; } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ } } @@ -986,10 +986,10 @@ static void gic_dist_writeb(void *opaque, hwaddr offset, GIC_SET_PENDING(irq + i, GIC_TARGET(irq + i)); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) DPRINTF("GIC_SET_PENDING s->irq_state[%d].pending is %d\n", irq + i, s->irq_state[irq + i].pending); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ } } } else if (offset < 0x300) { diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c index 5f9f6672ab9..1f25772ee8d 100644 --- a/hw/intc/arm_gicv2m.c +++ b/hw/intc/arm_gicv2m.c @@ -151,7 +151,7 @@ static void gicv2m_realize(DeviceState *dev, Error **errp) sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->spi[i]); } -// [GNU ARM Eclipse] +// [GNU MCU Eclipse] #if defined(CONFIG_PCI) msi_nonbroken = true; #endif diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c index 51d4b71f0bf..ab9fdf355e4 100644 --- a/hw/intc/arm_gicv3_its_common.c +++ b/hw/intc/arm_gicv3_its_common.c @@ -107,7 +107,7 @@ void gicv3_its_init_mmio(GICv3ITSState *s, const MemoryRegionOps *ops) &s->iomem_its_translation); sysbus_init_mmio(sbd, &s->iomem_main); -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) msi_nonbroken = true; #endif } diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs index 20789d7a88e..8b13ea6ab37 100644 --- a/hw/pci-bridge/Makefile.objs +++ b/hw/pci-bridge/Makefile.objs @@ -1,7 +1,7 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] # Disable some. -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) common-obj-y += pci_bridge_dev.o common-obj-y += pci_expander_bridge.o endif diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index 507749bda7b..e9d40d35e5f 100644 --- a/hw/scsi/Makefile.objs +++ b/hw/scsi/Makefile.objs @@ -1,7 +1,7 @@ -# [GNU ARM Eclipse] +# [GNU MCU Eclipse] # Disable some. -ifeq ($(CONFIG_GNU_ARM_ECLIPSE),n) +ifeq ($(CONFIG_GNU_MCU_ECLIPSE),n) common-obj-y += scsi-disk.o common-obj-y += scsi-generic.o scsi-bus.o endif diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index fc9db4dbd54..2fe2ef3afea 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -112,9 +112,9 @@ int gdbserver_start(int); int gdbserver_start(const char *port); #endif -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) int gdbserver_is_started(void); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ /** * gdb_has_xml: diff --git a/include/hw/boards.h b/include/hw/boards.h index c9696bd1683..94e34055c1e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -177,10 +177,10 @@ struct MachineState { char *kernel_cmdline; char *initrd_filename; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) const char *image_filename; const char *mcu_device; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ const char *cpu_model; AccelState *accelerator; diff --git a/include/hw/intc/arm_gic_common.h b/include/hw/intc/arm_gic_common.h index 25af6410073..bc359784616 100644 --- a/include/hw/intc/arm_gic_common.h +++ b/include/hw/intc/arm_gic_common.h @@ -80,9 +80,9 @@ typedef struct GICState { uint16_t running_priority[GIC_NCPU]; uint16_t current_pending[GIC_NCPU]; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) uint32_t* basepri_ptr; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ /* If we present the GICv2 without security extensions to a guest, * the guest can configure the GICC_CTLR to configure group 1 binary point diff --git a/include/hw/loader.h b/include/hw/loader.h index 69e5f684035..8c45514fe17 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -213,8 +213,8 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict); int rom_add_vga(const char *file); int rom_add_option(const char *file, int32_t bootindex); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) void rom_reset(void *unused); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #endif diff --git a/include/qemu-common.h b/include/qemu-common.h index f1dc51c5803..8cd27471835 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -125,10 +125,10 @@ const char *qemu_get_vm_name(void); #define QEMU_FILE_TYPE_BIOS 0 #define QEMU_FILE_TYPE_KEYMAP 1 -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #define QEMU_FILE_TYPE_GRAPHICS 22 #define QEMU_FILE_TYPE_DEVICES 23 -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ char *qemu_find_file(int type, const char *name); diff --git a/include/qemu/log.h b/include/qemu/log.h index 74c7fd66efb..7b98fddb5c8 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -44,11 +44,11 @@ static inline bool qemu_log_separate(void) #define LOG_TRACE (1 << 15) #define CPU_LOG_TB_OP_IND (1 << 16) -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) // Leave some space to avoid overlapping. #define LOG_FUNC (1 << 20) #define LOG_MR (1 << 21) -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ /* Returns true if a bit is set in the current loglevel mask */ @@ -144,9 +144,9 @@ void qemu_log_flush(void); /* Close the log file */ void qemu_log_close(void); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #define qemu_log_function_name() \ qemu_log_mask(LOG_FUNC, "%s()\n", __FUNCTION__) -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #endif diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 18833ec2f17..3f874b4de5c 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -4,9 +4,9 @@ #include "config-host.h" -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #include "qemu/typedefs.h" -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #include "qemu/option.h" #include "qemu/queue.h" @@ -72,10 +72,10 @@ void qemu_system_killed(int signal, pid_t pid); void qemu_devices_reset(void); void qemu_system_reset(bool report); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) void qemu_reset_halt_request(void); void qemu_resume_request(void); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ void qemu_system_guest_panicked(void); size_t qemu_target_page_bits(void); @@ -143,9 +143,9 @@ int qemu_loadvm_state(QEMUFile *f); extern int autostart; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) extern int with_gdb; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ typedef enum { VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL, @@ -211,11 +211,11 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict); /* serial ports */ -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #define MAX_SERIAL_PORTS 10 #else #define MAX_SERIAL_PORTS 4 -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ extern CharDriverState *serial_hds[MAX_SERIAL_PORTS]; diff --git a/memory.c b/memory.c index 1792957cda5..bd6ecbfc584 100644 --- a/memory.c +++ b/memory.c @@ -31,9 +31,9 @@ #include "sysemu/kvm.h" #include "sysemu/sysemu.h" -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #include "qemu/log.h" -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ //#define DEBUG_UNASSIGNED @@ -989,11 +989,11 @@ void memory_region_init(MemoryRegion *mr, uint64_t size) { -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) if (name != NULL) { qemu_log_mask(LOG_FUNC, "%s(\"%s\", 0x%"PRIX64")\n", __FUNCTION__, name, size); } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ object_initialize(mr, sizeof(*mr), TYPE_MEMORY_REGION); mr->size = int128_make64(size); diff --git a/monitor.c b/monitor.c index 8a57995459f..3b9b22b87fa 100644 --- a/monitor.c +++ b/monitor.c @@ -1612,7 +1612,7 @@ static void hmp_stopcapture(Monitor *mon, const QDict *qdict) static void hmp_wavcapture(Monitor *mon, const QDict *qdict) { -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) const char *path = qdict_get_str(qdict, "path"); int has_freq = qdict_haskey(qdict, "freq"); int freq = qdict_get_try_int(qdict, "freq", -1); @@ -2942,7 +2942,7 @@ static void handle_hmp_command(Monitor *mon, const char *cmdline) QDict *qdict; const mon_cmd_t *cmd; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #if defined(CONFIG_VERBOSE) if (verbosity_level >= VERBOSITY_COMMON) { if (mon->flags == 0) { @@ -2950,7 +2950,7 @@ static void handle_hmp_command(Monitor *mon, const char *cmdline) } } #endif -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ cmd = monitor_parse_command(mon, &cmdline, mon->cmd_table); if (!cmd) { diff --git a/qemu-char.c b/qemu-char.c index f73b6f80b87..cd9fbdc96fb 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3405,11 +3405,11 @@ static gboolean tcp_chr_accept(GIOChannel *channel, GIOCondition cond, void *opa CharDriverState *chr = opaque; TCPCharDriver *s = chr->opaque; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) struct sockaddr_in6 saddr; #else struct sockaddr_in saddr; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #ifndef _WIN32 struct sockaddr_un uaddr; @@ -3480,7 +3480,7 @@ static gboolean tcp_chr_accept(QIOChannel *channel, sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(channel), NULL); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #if defined(CONFIG_VERBOSE) @@ -3504,7 +3504,7 @@ static gboolean tcp_chr_accept(QIOChannel *channel, #endif /* defined(CONFIG_VERBOSE) */ -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ if (!sioc) { return TRUE; diff --git a/qom/cpu.c b/qom/cpu.c index ee58280a608..ed6aec6e5da 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -241,9 +241,9 @@ void cpu_dump_statistics(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, void cpu_reset(CPUState *cpu) { -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) qemu_log_function_name(); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ CPUClass *klass = CPU_GET_CLASS(cpu); diff --git a/qom/object.c b/qom/object.c index a2e796a1c93..bc5d6aca8e4 100644 --- a/qom/object.c +++ b/qom/object.c @@ -310,9 +310,9 @@ static void type_initialize(TypeImpl *ti) continue; } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) g_assert(t); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ type_initialize_interface(ti, t, t); } diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c index 78d0b993247..a6413f94f21 100644 --- a/qom/qom-qobject.c +++ b/qom/qom-qobject.c @@ -18,12 +18,12 @@ #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #include "qapi/qmp/types.h" #include "qemu/log.h" -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ -#if defined(CONFIG_GNU_ARM_ECLIPSE__) +#if defined(CONFIG_GNU_MCU_ECLIPSE__) static char *dump_value(QObject *value, char *buf, size_t siz) { if (value->type->code == QTYPE_QINT) { diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c index 9a61189fd51..cb2119c4743 100644 --- a/target-arm/arm-semi.c +++ b/target-arm/arm-semi.c @@ -34,13 +34,13 @@ #include "hw/arm/arm.h" #include "qemu/cutils.h" -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #include "qemu/option.h" #include "qemu/config-file.h" #include "sysemu/sysemu.h" #include #include -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #endif @@ -296,12 +296,12 @@ target_ulong do_arm_semihosting(CPUARMState *env) } if (strcmp(s, ":tt") == 0) { -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) /* Mode is 0="r" for stdin, 4="w" for stdout, 8="a" for stderr */ int result_fileno = arg1 < 4 ? STDIN_FILENO : (arg1 < 8 ? STDOUT_FILENO : STDERR_FILENO); #else int result_fileno = arg1 < 4 ? STDIN_FILENO : STDOUT_FILENO; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ unlock_user(s, arg0, 0); return result_fileno; @@ -669,7 +669,7 @@ target_ulong do_arm_semihosting(CPUARMState *env) } #endif -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) CortexMBoardState *board = cortexm_board_get(); if (board != NULL) { diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 0189cd1fd8f..1590b23ff5c 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -210,10 +210,10 @@ static void arm_cpu_reset(CPUState *s) env->regs[15] = initial_pc & ~1; env->thumb = initial_pc & 1; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) qemu_log_mask(LOG_FUNC, "MSP=0x%08X, PC=0x%08X\n", env->regs[13], env->regs[15]); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ } /* AArch32 has a hard highvec setting of 0xFFFF0000. If we are currently @@ -334,13 +334,13 @@ static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) return ret; } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) static bool arm_v6m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { /* TODO: check v6m differences. */ return arm_v7m_cpu_exec_interrupt(cs, interrupt_request); } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #endif @@ -796,7 +796,7 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) /* CPU models. These are not needed for the AArch64 linux-user build. */ #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) static void arm926_initfn(Object *obj) { @@ -986,9 +986,9 @@ static void arm11mpcore_initfn(Object *obj) cpu->reset_auxcr = 1; } -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) static void arm_v6m_class_init(ObjectClass *oc, void *data) { @@ -1038,7 +1038,7 @@ static void cortex_m7_initfn(Object *obj) cpu->midr = 0x410FC270; /* M7, r0p0, TODO: check, when manual available */ } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ static void cortex_m3_initfn(Object *obj) { @@ -1531,7 +1531,7 @@ typedef struct ARMCPUInfo { static const ARMCPUInfo arm_cpus[] = { #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) { .name = "arm926", .initfn = arm926_initfn }, { .name = "arm946", .initfn = arm946_initfn }, { .name = "arm1026", .initfn = arm1026_initfn }, @@ -1543,9 +1543,9 @@ static const ARMCPUInfo arm_cpus[] = { { .name = "arm1136", .initfn = arm1136_initfn }, { .name = "arm1176", .initfn = arm1176_initfn }, { .name = "arm11mpcore", .initfn = arm11mpcore_initfn }, -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) /* Cortex-M cores - experimental support. */ { .name = "cortex-m0", .initfn = cortex_m0_initfn, .class_init = arm_v6m_class_init }, @@ -1555,14 +1555,14 @@ static const ARMCPUInfo arm_cpus[] = { .class_init = arm_v6m_class_init }, { .name = "cortex-m7", .initfn = cortex_m7_initfn, .class_init = arm_v7m_class_init }, -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ { .name = "cortex-m3", .initfn = cortex_m3_initfn, .class_init = arm_v7m_class_init }, { .name = "cortex-m4", .initfn = cortex_m4_initfn, .class_init = arm_v7m_class_init }, -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) { .name = "cortex-r5", .initfn = cortex_r5_initfn }, { .name = "cortex-a7", .initfn = cortex_a7_initfn }, { .name = "cortex-a8", .initfn = cortex_a8_initfn }, @@ -1587,7 +1587,7 @@ static const ARMCPUInfo arm_cpus[] = { #ifdef CONFIG_USER_ONLY { .name = "any", .initfn = arm_any_initfn }, #endif -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #endif { .name = NULL } }; @@ -1662,13 +1662,13 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) cc->write_elf32_note = arm_cpu_write_elf32_note; #endif -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) cc->gdb_num_core_regs = 32; cc->gdb_core_xml_file = "arm-cortexm.xml"; #else cc->gdb_num_core_regs = 26; cc->gdb_core_xml_file = "arm-core.xml"; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ cc->gdb_arch_name = arm_gdb_arch_name; cc->gdb_stop_before_watchpoint = true; diff --git a/target-arm/cpu.h b/target-arm/cpu.h index a0130754aff..22fb8c113a4 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -676,7 +676,7 @@ extern const struct VMStateDescription vmstate_arm_cpu; void arm_cpu_do_interrupt(CPUState *cpu); void arm_v7m_cpu_do_interrupt(CPUState *cpu); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) void arm_v6m_cpu_do_interrupt(CPUState *cpu); #endif bool arm_cpu_exec_interrupt(CPUState *cpu, int int_req); diff --git a/target-arm/gdbstub.c b/target-arm/gdbstub.c index 7f00d57cf49..08b491ee0dc 100644 --- a/target-arm/gdbstub.c +++ b/target-arm/gdbstub.c @@ -22,10 +22,10 @@ #include "cpu.h" #include "exec/gdbstub.h" -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) uint32_t helper_v7m_mrs(CPUARMState *env, uint32_t reg); void helper_v7m_msr(CPUARMState *env, uint32_t reg, uint32_t val); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ /* Old gdb always expect FPA registers. Newer (xml-aware) gdb only expect whatever the target description contains. Due to a historical mishap @@ -61,7 +61,7 @@ int arm_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) /* CPSR */ return gdb_get_reg32(mem_buf, cpsr_read(env)); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) case 26: /* MSP */ return gdb_get_reg32(mem_buf, helper_v7m_mrs(env, 8)); @@ -80,7 +80,7 @@ int arm_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) case 31: /* CONTROL */ return gdb_get_reg32(mem_buf, helper_v7m_mrs(env, 20)); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ } /* Unknown register. */ @@ -125,7 +125,7 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) cpsr_write(env, tmp, 0xffffffff, CPSRWriteByGDBStub); return 4; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) case 26: /* MSP */ helper_v7m_msr(env, 8, tmp); @@ -150,7 +150,7 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) /* CONTROL */ helper_v7m_msr(env, 20, tmp); return 4; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ } /* Unknown register. */ diff --git a/target-arm/helper.c b/target-arm/helper.c index c94c016b09a..710616ddad8 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -18,10 +18,10 @@ #include "exec/semihost.h" #include "sysemu/kvm.h" -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #include "hw/intc/gic_internal.h" #include -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #define ARM_CPU_FREQ 1000000000 /* FIXME: 1 GHz, should be configurable */ @@ -5962,7 +5962,7 @@ static void do_v7m_exception_exit(CPUARMState *env) type = env->regs[15]; if (env->v7m.exception != 0) -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) cortexm_nvic_complete_irq(env->nvic, env->v7m.exception); #else armv7m_nvic_complete_irq(env->nvic, env->v7m.exception); @@ -6015,13 +6015,13 @@ static void arm_log_exception(int idx) } } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) void arm_v6m_cpu_do_interrupt(CPUState *cs) { /* TODO: Rewrite for v6m */ return arm_v7m_cpu_do_interrupt(cs); } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ void arm_v7m_cpu_do_interrupt(CPUState *cs) { @@ -6045,7 +6045,7 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) one we're raising. */ switch (cs->exception_index) { case EXCP_UDEF: -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) cortexm_nvic_set_pending_exception(env->nvic, ARMV7M_EXCP_USAGE); #else armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_USAGE); @@ -6053,7 +6053,7 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) return; case EXCP_SWI: /* The PC already points to the next instruction. */ -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) cortexm_nvic_set_pending_exception(env->nvic, ARMV7M_EXCP_SVC); #else armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_SVC); @@ -6064,7 +6064,7 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) /* TODO: if we implemented the MPU registers, this is where we * should set the MMFAR, etc from exception.fsr and exception.vaddress. */ -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) cortexm_nvic_set_pending_exception(env->nvic, ARMV7M_EXCP_MEM); #else armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_MEM); @@ -6072,7 +6072,7 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) return; case EXCP_BKPT: -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) /* * The Breakpoint (BKPT) instruction provides for software * breakpoints. It can generate a DebugMonitor exception or @@ -6106,7 +6106,7 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) * priority is lower than or equal to the execution priority. * The exception escalates to a HardFault. */ -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ if (semihosting_enabled()) { int nr; @@ -6121,23 +6121,23 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) } } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) CortexMNVICState* nvic = CORTEXM_NVIC_STATE(env->nvic); // Check DHCSR.C_DEBUGEN if (nvic->dcb.dhcsr & 1) { cpu_interrupt(cs, CPU_INTERRUPT_DEBUG); return; } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) cortexm_nvic_set_pending_exception(env->nvic, ARMV7M_EXCP_DEBUG); #else armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_DEBUG); #endif return; case EXCP_IRQ: -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) env->v7m.exception = cortexm_nvic_acknowledge_irq(env->nvic); #else env->v7m.exception = armv7m_nvic_acknowledge_irq(env->nvic); @@ -8391,20 +8391,20 @@ void HELPER(v7m_msr)(CPUARMState *env, uint32_t reg, uint32_t val) case 17: /* BASEPRI */ env->v7m.basepri = val & 0xff; - #if defined(CONFIG_GNU_ARM_ECLIPSE) + #if defined(CONFIG_GNU_MCU_ECLIPSE) void* nvic = env->nvic; GICState* gic = ARM_GIC_COMMON(nvic); gic_update(gic); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ break; case 18: /* BASEPRI_MAX */ val &= 0xff; - #if defined(CONFIG_GNU_ARM_ECLIPSE) + #if defined(CONFIG_GNU_MCU_ECLIPSE) if (val != 0 && (val < env->v7m.basepri || env->v7m.basepri == 0)) { env->v7m.basepri = val; @@ -8419,7 +8419,7 @@ void HELPER(v7m_msr)(CPUARMState *env, uint32_t reg, uint32_t val) if (val != 0 && (val < env->v7m.basepri || env->v7m.basepri == 0)) env->v7m.basepri = val; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ break; diff --git a/util/log.c b/util/log.c index d1c201f9102..2a588b74704 100644 --- a/util/log.c +++ b/util/log.c @@ -275,12 +275,12 @@ const QEMULogItem qemu_log_items[] = { "do not chain compiled TBs so that \"exec\" and \"cpu\" show\n" "complete traces" }, -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) { LOG_FUNC, "func", "log functions entry" }, { LOG_MR, "mr", "log trace messages for memory regions read/writes" }, -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ { 0, NULL, NULL }, }; diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 6f222877545..8abd336489d 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -317,13 +317,13 @@ void qemu_init_exec_dir(const char *argv0) p--; } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) /* Eat-up \bin too */ --p; while (p != buf && *p != '\\') { p--; } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ *p = 0; if (access(buf, R_OK) == 0) { diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index 5724b2723d9..4930306170d 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -43,7 +43,7 @@ void qemu_mutex_init(QemuMutex *mutex) { int err; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) pthread_mutexattr_t mxattr; pthread_mutexattr_init(&mxattr); pthread_mutexattr_settype(&mxattr, PTHREAD_MUTEX_ERRORCHECK); @@ -51,7 +51,7 @@ void qemu_mutex_init(QemuMutex *mutex) err = pthread_mutex_init(&mutex->lock, &mxattr); #else err = pthread_mutex_init(&mutex->lock, NULL); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ if (err) error_exit(err, __func__); } diff --git a/util/readline.c b/util/readline.c index 52ab8605c64..d3445250710 100644 --- a/util/readline.c +++ b/util/readline.c @@ -44,7 +44,7 @@ void readline_show_prompt(ReadLineState *rs) /* update the displayed command line */ static void readline_update(ReadLineState *rs) { -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) // Do not update, since this sends funny chars to Eclipse console. #else int i, delta, len; @@ -82,7 +82,7 @@ static void readline_update(ReadLineState *rs) rs->last_cmd_buf_index = rs->cmd_buf_index; } rs->flush_func(rs->opaque); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ } static void readline_insert_char(ReadLineState *rs, int ch) diff --git a/vl.c b/vl.c index 03622f9e9ea..434ccaa74c0 100644 --- a/vl.c +++ b/vl.c @@ -35,7 +35,7 @@ #include #endif -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #include "qemu/thread.h" #include "qemu/log.h" @@ -124,7 +124,7 @@ int main(int argc, char **argv) #endif #endif /* CONFIG_SDL */ -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #ifdef CONFIG_COCOA #undef main @@ -200,10 +200,10 @@ int main(int argc, char **argv) #include "qapi/qmp/qerror.h" #include "sysemu/iothread.h" -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #include #include -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #if defined(CONFIG_VERBOSE) #include "verbosity.h" @@ -228,10 +228,10 @@ int nb_nics; NICInfo nd_table[MAX_NICS]; int autostart; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) int with_gdb; const char *mcu_device = NULL; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ #if defined(CONFIG_VERBOSE) /** @@ -250,7 +250,7 @@ int vga_interface_type = VGA_NONE; static int full_screen = 0; static int no_frame = 0; int no_quit = 0; -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) static bool grab_on_hover; #endif CharDriverState *serial_hds[MAX_SERIAL_PORTS]; @@ -1042,7 +1042,7 @@ static void configure_rtc(QemuOpts *opts) } } -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) /***********************************************************/ /* Bluetooth support */ static int nb_hcis; @@ -1119,7 +1119,7 @@ static struct bt_device_s *bt_device_add(const char *opt) error_report("warning: adding a slave device to an empty scatternet %i", vlan_id); -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) if (!strcmp(devname, "keyboard")) return bt_keyboard_init(vlan); #endif @@ -1514,7 +1514,7 @@ static void igd_gfx_passthru(void) has_igd_gfx_passthru = current_machine->igd_gfx_passthru; } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) static char *semihosting_concatenate_cmdline(int argc, const char **argv) { @@ -1560,7 +1560,7 @@ static char *semihosting_concatenate_cmdline(int argc, const char **argv) return cmdline; } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ /***********************************************************/ /* USB devices */ @@ -1724,7 +1724,7 @@ MachineInfoList *qmp_query_machines(Error **errp) return mach_list; } -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) static int machine_help_func(QemuOpts *opts, MachineState *machine) { @@ -1753,7 +1753,7 @@ static int machine_help_func(QemuOpts *opts, MachineState *machine) return 1; } -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ /***********************************************************/ @@ -2069,7 +2069,7 @@ void qemu_system_debug_request(void) qemu_notify_event(); } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) // These functions are used in the graphical reset button implementation. @@ -2110,7 +2110,7 @@ static int qemu_resume_requested(void) return r; } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ static bool main_loop_should_exit(void) { @@ -2154,7 +2154,7 @@ static bool main_loop_should_exit(void) vm_stop(r); } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) if (qemu_reset_halt_requested()) { pause_all_vcpus(); @@ -2169,7 +2169,7 @@ static bool main_loop_should_exit(void) } } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ return false; } @@ -2193,7 +2193,7 @@ static void main_loop(void) } while (!main_loop_should_exit()); } -#if defined(CONFIG_GNU_ARM_ECLIPSE) || defined(CONFIG_VERBOSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) || defined(CONFIG_VERBOSE) #if INTPTR_MAX == INT32_MAX #define QEMU_WORDSIZE "32-bits " @@ -2203,11 +2203,11 @@ static void main_loop(void) #define QEMU_WORDSIZE "" #endif -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) || defined(CONFIG_VERBOSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) || defined(CONFIG_VERBOSE) */ static void version(void) { -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) printf( #if defined(CONFIG_BRANDING_MESSAGE) CONFIG_BRANDING_MESSAGE " " @@ -2217,12 +2217,12 @@ static void version(void) QEMU_VERSION QEMU_PKGVERSION "\n" QEMU_COPYRIGHT "\n"); -#else /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#else /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION "\n" QEMU_COPYRIGHT "\n"); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ } static void help(int exitcode) @@ -2363,7 +2363,7 @@ static void select_vgahw(const char *p) } } -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) typedef enum DisplayType { DT_DEFAULT, @@ -2500,7 +2500,7 @@ static DisplayType select_display(const char *p) return display; } -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ static int balloon_parse(const char *arg) { @@ -2549,7 +2549,7 @@ char *qemu_find_file(int type, const char *name) subdir = "keymaps/"; break; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) case QEMU_FILE_TYPE_GRAPHICS: #if defined(CONFIG_WIN32) @@ -2567,7 +2567,7 @@ char *qemu_find_file(int type, const char *name) #endif break; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ default: abort(); @@ -2575,7 +2575,7 @@ char *qemu_find_file(int type, const char *name) for (i = 0; i < data_dir_idx; i++) { -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) #if defined(CONFIG_WIN32) buf = g_strdup_printf("%s\\%s%s", data_dir[i], subdir, name); #else @@ -2583,7 +2583,7 @@ char *qemu_find_file(int type, const char *name) #endif #else buf = g_strdup_printf("%s/%s%s", data_dir[i], subdir, name); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ if (access(buf, R_OK) == 0) { trace_load_file(name, buf); @@ -2924,7 +2924,7 @@ static int debugcon_parse(const char *devname) return 0; } -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) static gint machine_class_cmp(gconstpointer a, gconstpointer b) { @@ -2992,7 +2992,7 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) exit(!name || !is_help_option(name)); } -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ void qemu_add_exit_notifier(Notifier *notify) { @@ -3074,7 +3074,7 @@ static MachineClass *select_machine(void) { MachineClass *machine_class = find_default_machine(); -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) const char *optarg; #endif @@ -3086,7 +3086,7 @@ static MachineClass *select_machine(void) opts = qemu_get_machine_opts(); qemu_opts_loc_restore(opts); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) const char *board_name; board_name = qemu_opt_get(opts, "type"); @@ -3130,7 +3130,7 @@ static MachineClass *select_machine(void) exit(1); } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ loc_pop(&loc); return machine_class; @@ -3332,7 +3332,7 @@ int main(int argc, char **argv, char **envp) const char *kernel_filename, *kernel_cmdline; const char *boot_order = NULL; const char *boot_once = NULL; -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) DisplayState *ds; #endif int cyls, heads, secs, translation; @@ -3352,11 +3352,11 @@ int main(int argc, char **argv, char **envp) bool userconfig = true; bool nographic = false; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) // DisplayType display_type = DT_NONE; #else DisplayType display_type = DT_DEFAULT; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ int display_remote = 0; const char *log_mask = NULL; @@ -3369,7 +3369,7 @@ int main(int argc, char **argv, char **envp) Error *err = NULL; bool list_data_dirs = false; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) const char *image_filename = NULL; int actual_argc = argc; with_gdb = false; @@ -3377,7 +3377,7 @@ int main(int argc, char **argv, char **envp) /* Most emulated applications need semihosting, so start with it enabled. */ semihosting.enabled = true; semihosting.target = SEMIHOSTING_TARGET_NATIVE; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ module_call_init(MODULE_INIT_TRACE); @@ -3483,7 +3483,7 @@ int main(int argc, char **argv, char **envp) break; } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) if (popt->index == QEMU_OPTION_semihosting_cmdline) { /* no HAS_ARGS, optind set to next option */ semihosting.argc = argc - optind; @@ -3495,7 +3495,7 @@ int main(int argc, char **argv, char **envp) break; }; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ } } @@ -3512,24 +3512,24 @@ int main(int argc, char **argv, char **envp) optind = 1; for(;;) { -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) if (optind >= actual_argc) break; #else if (optind >= argc) break; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ if (argv[optind][0] != '-') { hda_opts = drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS); } else { const QEMUOption *popt; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) popt = lookup_opt(actual_argc, argv, &optarg, &optind); #else popt = lookup_opt(argc, argv, &optarg, &optind); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ if (!(popt->arch_mask & arch_type)) { error_report("Option not supported for this target"); @@ -3546,11 +3546,11 @@ int main(int argc, char **argv, char **envp) cpu_model = optarg; break; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) case QEMU_OPTION_mcu: mcu_device = optarg; break; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ case QEMU_OPTION_hda: { @@ -3669,7 +3669,7 @@ int main(int argc, char **argv, char **envp) } break; case QEMU_OPTION_display: -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) display_type = select_display(optarg); #endif break; @@ -3677,7 +3677,7 @@ int main(int argc, char **argv, char **envp) olist = qemu_find_opts("machine"); qemu_opts_parse_noisily(olist, "graphics=off", false); nographic = true; -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) display_type = DT_NONE; #endif break; @@ -3701,12 +3701,12 @@ int main(int argc, char **argv, char **envp) } break; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) case QEMU_OPTION_image: qemu_opts_set(qemu_find_opts("machine"), 0, "image", optarg, &error_abort); break; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ case QEMU_OPTION_kernel: qemu_opts_set(qemu_find_opts("machine"), 0, "kernel", optarg, @@ -3784,7 +3784,7 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_bt: add_device_config(DEV_BT, optarg); break; -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) case QEMU_OPTION_audio_help: AUD_help (); exit (0); @@ -3832,17 +3832,17 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_s: add_device_config(DEV_GDB, "tcp::" DEFAULT_GDBSTUB_PORT); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) with_gdb = true; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ break; case QEMU_OPTION_gdb: add_device_config(DEV_GDB, optarg); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) with_gdb = true; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ break; case QEMU_OPTION_L: @@ -4097,7 +4097,7 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_sdl: #ifdef CONFIG_SDL -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) display_type = DT_SDL; #endif break; @@ -4150,7 +4150,7 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_M: case QEMU_OPTION_machine: -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) case QEMU_OPTION_board: #endif olist = qemu_find_opts("machine"); @@ -4477,7 +4477,7 @@ int main(int argc, char **argv, char **envp) } } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) // Initialise tracing as soon as possible. @@ -4504,7 +4504,7 @@ int main(int argc, char **argv, char **envp) qemu_set_log(0); } -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ /* * Clear error location left behind by the loop. @@ -4552,22 +4552,22 @@ int main(int argc, char **argv, char **envp) } #endif -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) if (machine_class == NULL) { error_report("No machine specified, and there is no default.\n" "Use -machine help to list supported machines!\n"); exit(1); } -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ current_machine = MACHINE(object_new(object_class_get_name( OBJECT_CLASS(machine_class)))); -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) if (machine_help_func(qemu_get_machine_opts(), current_machine)) { exit(0); } -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ object_property_add_child(object_get_root(), "machine", OBJECT(current_machine), &error_abort); @@ -4592,7 +4592,7 @@ int main(int argc, char **argv, char **envp) exit(0); } -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) // Moved up, right after the args loop. @@ -4619,7 +4619,7 @@ int main(int argc, char **argv, char **envp) qemu_set_log(0); } -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ /* If no data_dir is specified then try to find it relative to the executable path. */ @@ -4754,7 +4754,7 @@ int main(int argc, char **argv, char **envp) } } -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) #if defined(CONFIG_VNC) if (!QTAILQ_EMPTY(&(qemu_find_opts("vnc")->head))) { @@ -4805,7 +4805,7 @@ int main(int argc, char **argv, char **envp) cortexm_graphic_start(nographic); -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ page_size_init(); socket_init(); @@ -4852,9 +4852,9 @@ int main(int argc, char **argv, char **envp) kernel_cmdline = qemu_opt_get(machine_opts, "append"); bios_name = qemu_opt_get(machine_opts, "firmware"); -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) image_filename = qemu_opt_get(machine_opts, "image"); -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); if (opts) { @@ -4939,7 +4939,7 @@ int main(int argc, char **argv, char **envp) } #endif -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) /* init the bluetooth world */ if (foreach_device_config(DEV_BT, bt_parse)) exit(1); @@ -5034,15 +5034,15 @@ int main(int argc, char **argv, char **envp) current_machine->boot_order = boot_order; current_machine->cpu_model = cpu_model; -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) current_machine->mcu_device = mcu_device; -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ machine_class->init(current_machine); realtime_init(); -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) audio_init(); #endif @@ -5093,7 +5093,7 @@ int main(int argc, char **argv, char **envp) qemu_register_reset(restore_boot_order, g_strdup(boot_order)); } -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) ds = init_displaystate(); @@ -5115,7 +5115,7 @@ int main(int argc, char **argv, char **envp) break; } -#endif /* !defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* !defined(CONFIG_GNU_MCU_ECLIPSE) */ /* must be after terminal init, SDL library changes signal handlers */ os_setup_signal_handling(); @@ -5175,12 +5175,12 @@ int main(int argc, char **argv, char **envp) exit(1); } -#if defined(CONFIG_GNU_ARM_ECLIPSE) +#if defined(CONFIG_GNU_MCU_ECLIPSE) } else if (autostart && (kernel_filename || image_filename)) { /* If an image is defined and no -S is requested, start it. */ #else } else if (autostart) { -#endif /* defined(CONFIG_GNU_ARM_ECLIPSE) */ +#endif /* defined(CONFIG_GNU_MCU_ECLIPSE) */ vm_start(); } @@ -5197,7 +5197,7 @@ int main(int argc, char **argv, char **envp) /* vhost-user must be cleaned up before chardevs. */ net_cleanup(); -#if !defined(CONFIG_GNU_ARM_ECLIPSE) +#if !defined(CONFIG_GNU_MCU_ECLIPSE) audio_cleanup(); #endif monitor_cleanup();