Index: Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/Makefile,v retrieving revision 1.143 diff -u -p -r1.143 Makefile --- Makefile 19 Jul 2012 20:15:43 -0000 1.143 +++ Makefile 3 Oct 2012 17:08:54 -0000 @@ -6,7 +6,7 @@ # PORTNAME= qemu -PORTVERSION= 1.1.1 +PORTVERSION= 1.2.0 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -18,7 +18,7 @@ MAINTAINER= nox@FreeBSD.org COMMENT= QEMU CPU Emulator - development version HAS_CONFIGURE= yes -EXTRACT_SUFX= .tar.bz2 +USE_BZIP2= yes USE_GMAKE= yes USE_PERL5_BUILD= yes USE_PYTHON_BUILD= yes @@ -43,7 +43,7 @@ CDROM_DMA_DESC= IDE CDROM DMA PCAP_DESC= pcap dependency (networking with bpf) SEABIOS_GIT_DESC= add seabios snapshot (-bios bios.bin-1.6.3.1) USBREDIR_DESC= usb device network redirection (experimental!) -GNS3_DESC= gns3 patches (udp, promiscuous multicast) +GNS3_DESC= gns3 patches (promiscuous multicast) ADD_AUDIO_DESC= Emulate more audio hardware (experimental!) CLANG_HACK_DESC= clang workaround (result slow and less stable!) X86_TARGETS_DESC= Don't build non-x86 system targets @@ -91,13 +91,7 @@ PLIST_SUB+= NONX86="" .endif .if ${PORT_OPTIONS:MGNS3} -EXTRA_PATCHES+= ${FILESDIR}/hw_e1000_c.patch \ - ${FILESDIR}/net_c.patch \ - ${FILESDIR}/net_h.patch \ - ${FILESDIR}/net_udp_c.patch \ - ${FILESDIR}/net_udp_h.patch \ - ${FILESDIR}/Makefile_objs.patch \ - ${FILESDIR}/gns3-qemu-options.hx.patch +EXTRA_PATCHES+= ${FILESDIR}/hw_e1000_c.patch .endif WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation Index: distinfo =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/distinfo,v retrieving revision 1.65 diff -u -p -r1.65 distinfo --- distinfo 19 Jul 2012 20:15:43 -0000 1.65 +++ distinfo 5 Sep 2012 22:02:48 -0000 @@ -1,2 +1,2 @@ -SHA256 (qemu/1.1.1/qemu-1.1.1.tar.bz2) = 004a3032b504e70174c504d6c156b1ec3445abd9913602af0d7a5ac0703ddf5c -SIZE (qemu/1.1.1/qemu-1.1.1.tar.bz2) = 11712524 +SHA256 (qemu/1.2.0/qemu-1.2.0.tar.bz2) = c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 +SIZE (qemu/1.2.0/qemu-1.2.0.tar.bz2) = 9865186 Index: files/Makefile_objs.patch =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/Makefile_objs.patch,v retrieving revision 1.1 diff -u -p -r1.1 Makefile_objs.patch --- files/Makefile_objs.patch 17 Feb 2012 22:31:17 -0000 1.1 +++ files/Makefile_objs.patch 3 Oct 2012 17:17:29 -0000 @@ -1,10 +0,0 @@ ---- qemu-0.14.1/Makefile.objs.orig Thu Jun 23 17:44:50 2011 -+++ qemu-0.14.1/Makefile.objs Thu Jun 23 17:45:01 2011 -@@ -34,6 +34,7 @@ - net-nested-y = queue.o checksum.o util.o - net-nested-y += socket.o - net-nested-y += dump.o -+net-nested-y += udp.o - net-nested-$(CONFIG_POSIX) += tap.o - net-nested-$(CONFIG_LINUX) += tap-linux.o - net-nested-$(CONFIG_WIN32) += tap-win32.o Index: files/gns3-qemu-options.hx.patch =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/gns3-qemu-options.hx.patch,v retrieving revision 1.1 diff -u -p -r1.1 gns3-qemu-options.hx.patch --- files/gns3-qemu-options.hx.patch 13 Jul 2011 20:01:41 -0000 1.1 +++ files/gns3-qemu-options.hx.patch 3 Oct 2012 17:17:29 -0000 @@ -1,11 +0,0 @@ ---- a/qemu-options.hx -+++ b/qemu-options.hx -@@ -1050,6 +1050,8 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, - " connect the user mode network stack to VLAN 'n', configure its\n" - " DHCP server and enabled optional services\n" - #endif -+ "-net udp[,vlan=n],sport=sport,dport=dport,daddr=host\n" -+ " connect the vlan 'n' to a udp host (for dynamips/pemu/GNS3)\n" - #ifdef _WIN32 - "-net tap[,vlan=n][,name=str],ifname=name\n" - " connect the host TAP network interface to VLAN 'n'\n" Index: files/net_c.patch =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/net_c.patch,v retrieving revision 1.1 diff -u -p -r1.1 net_c.patch --- files/net_c.patch 21 Aug 2011 15:49:39 -0000 1.1 +++ files/net_c.patch 3 Oct 2012 17:17:29 -0000 @@ -1,38 +0,0 @@ ---- qemu-0.15.0/net.c.orig -+++ qemu-0.15.0/net.c -@@ -30,6 +30,7 @@ - #include "net/dump.h" - #include "net/slirp.h" - #include "net/vde.h" -+#include "net/udp.h" - #include "net/util.h" - #include "monitor.h" - #include "qemu-common.h" -@@ -1029,6 +1030,27 @@ static const struct { - }, - }, - #endif -+ [NET_CLIENT_TYPE_UDP] = { -+ .type = "udp", -+ .init = net_init_udp, -+ .desc = { -+ NET_COMMON_PARAMS_DESC, -+ { -+ .name = "sport", -+ .type = QEMU_OPT_NUMBER, -+ .help = "source port number", -+ }, { -+ .name = "daddr", -+ .type = QEMU_OPT_STRING, -+ .help = "destination IP address", -+ }, { -+ .name = "dport", -+ .type = QEMU_OPT_NUMBER, -+ .help = "destination port number", -+ }, -+ { /* end of list */ } -+ }, -+ }, - [NET_CLIENT_TYPE_DUMP] = { - .type = "dump", - .init = net_init_dump, Index: files/net_h.patch =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/net_h.patch,v retrieving revision 1.1 diff -u -p -r1.1 net_h.patch --- files/net_h.patch 21 Aug 2011 15:49:39 -0000 1.1 +++ files/net_h.patch 3 Oct 2012 17:17:29 -0000 @@ -1,10 +0,0 @@ ---- qemu-0.15.0/net.h.orig -+++ qemu-0.15.0/net.h -@@ -35,6 +35,7 @@ typedef enum { - NET_CLIENT_TYPE_TAP, - NET_CLIENT_TYPE_SOCKET, - NET_CLIENT_TYPE_VDE, -+ NET_CLIENT_TYPE_UDP, - NET_CLIENT_TYPE_DUMP, - - NET_CLIENT_TYPE_MAX Index: files/net_udp_c.patch =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/net_udp_c.patch,v retrieving revision 1.1 diff -u -p -r1.1 net_udp_c.patch --- files/net_udp_c.patch 17 Feb 2012 22:31:17 -0000 1.1 +++ files/net_udp_c.patch 3 Oct 2012 17:17:29 -0000 @@ -1,141 +0,0 @@ ---- qemu-0.14.1/net/udp.c.orig Thu Jun 23 17:09:02 2011 -+++ qemu-0.14.1/net/udp.c Thu Jun 23 17:10:17 2011 -@@ -0,0 +1,138 @@ -+/* -+ * QEMU System Emulator -+ * -+ * Copyright (c) 2003-2008 Fabrice Bellard -+ * -+ * 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 "net/udp.h" -+ -+#include "config-host.h" -+ -+#ifndef _WIN32 -+#include -+#include -+#include -+#endif -+ -+#include "net.h" -+#include "qemu-char.h" -+#include "qemu-common.h" -+#include "qemu-option.h" -+#include "qemu_socket.h" -+#include "sysemu.h" -+ -+ -+typedef struct UDPState { -+ VLANClientState nc; -+ int rfd; -+ struct sockaddr_in sender; -+} UDPState; -+ -+static void udp_to_qemu(void *opaque) -+{ -+ UDPState *s = opaque; -+ uint8_t buf[4096]; -+ int size; -+ -+ size = recvfrom(s->rfd, (char *)buf, sizeof(buf), 0, NULL, NULL); -+ if (size > 0) { -+ qemu_send_packet(&s->nc, buf, size); -+ } -+} -+ -+static ssize_t udp_receive(VLANClientState *nc, const uint8_t *buf, size_t size) -+{ -+ UDPState *s = DO_UPCAST(UDPState, nc, nc); -+ int ret; -+ -+ do { -+ ret = sendto(s->rfd, (const char *)buf, size, 0, (struct sockaddr *)&s->sender, sizeof (s->sender)); -+ } while (ret < 0 && errno == EINTR); -+ -+ return ret; -+} -+ -+static void udp_cleanup(VLANClientState *nc) -+{ -+ UDPState *s = DO_UPCAST(UDPState, nc, nc); -+ qemu_set_fd_handler(s->rfd, NULL, NULL, NULL); -+ close(s->rfd); -+} -+ -+static NetClientInfo net_udp_info = { -+ .type = NET_CLIENT_TYPE_UDP, -+ .size = sizeof(UDPState), -+ .receive = udp_receive, -+ .cleanup = udp_cleanup, -+}; -+ -+static int net_udp_init(VLANState *vlan, const char *model, -+ const char *name, int sport, -+ const char *daddr, int dport) -+{ -+ VLANClientState *nc; -+ UDPState *s; -+ struct sockaddr_in receiver; -+ int ret; -+ -+ nc = qemu_new_net_client(&net_udp_info, vlan, NULL, model, name); -+ -+ snprintf(nc->info_str, sizeof(nc->info_str),"udp: %i->%s:%i", -+ sport, daddr, dport); -+ -+ s = DO_UPCAST(UDPState, nc, nc); -+ -+ s->rfd = socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP); -+ receiver.sin_family = AF_INET; -+ receiver.sin_addr.s_addr = INADDR_ANY; -+ receiver.sin_port = htons(sport); -+ ret = bind(s->rfd, (struct sockaddr *)&receiver, sizeof(receiver)); -+ -+ if (ret == -1) { -+ fprintf (stderr, "bind error:%s\n", strerror(errno)); -+ return ret; -+ } -+ -+ memset((char*)&s->sender, 0,sizeof(s->sender)); -+ s->sender.sin_family = AF_INET; -+ s->sender.sin_port = htons(dport); -+ inet_aton(daddr, &s->sender.sin_addr); -+ -+ qemu_set_fd_handler(s->rfd, udp_to_qemu, NULL, s); -+ -+ return 0; -+} -+ -+int net_init_udp(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan) -+{ -+ const char *daddr; -+ int sport, dport; -+ -+ daddr = qemu_opt_get(opts, "daddr"); -+ -+ sport = qemu_opt_get_number(opts, "sport", 0); -+ dport = qemu_opt_get_number(opts, "dport", 0); -+ -+ if (net_udp_init(vlan, "udp", name, sport, daddr, dport) == -1) { -+ return -1; -+ } -+ -+ return 0; -+} Index: files/net_udp_h.patch =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/net_udp_h.patch,v retrieving revision 1.1 diff -u -p -r1.1 net_udp_h.patch --- files/net_udp_h.patch 17 Feb 2012 22:31:17 -0000 1.1 +++ files/net_udp_h.patch 3 Oct 2012 17:17:29 -0000 @@ -1,35 +0,0 @@ ---- qemu-0.14.1/net/udp.h.orig Thu Jun 23 17:12:45 2011 -+++ qemu-0.14.1/net/udp.h Thu Jun 23 17:12:28 2011 -@@ -0,0 +1,32 @@ -+/* -+ * QEMU System Emulator -+ * -+ * Copyright (c) 2003-2008 Fabrice Bellard -+ * -+ * 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. -+ */ -+#ifndef QEMU_NET_UDP_H -+#define QEMU_NET_UDP_H -+ -+#include "qemu-common.h" -+#include "qemu-option.h" -+ -+int net_init_udp(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan); -+ -+#endif /* QEMU_NET_UDP_H */ Index: files/patch-90_security =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-90_security,v retrieving revision 1.9 diff -u -p -r1.9 patch-90_security --- files/patch-90_security 2 Dec 2011 19:28:07 -0000 1.9 +++ files/patch-90_security 5 Sep 2012 22:20:48 -0000 @@ -15,7 +15,7 @@ Index: qemu/hw/dma.c } Index: qemu/hw/fdc.c -@@ -1322,7 +1322,8 @@ +@@ -1445,7 +1445,8 @@ static uint32_t fdctrl_read_data(FDCtrl fd_sector(cur_drv)); return 0; } @@ -25,16 +25,16 @@ Index: qemu/hw/fdc.c FLOPPY_DPRINTF("error getting sector %d\n", fd_sector(cur_drv)); /* Sure, image size is too small... */ -@@ -1776,7 +1777,8 @@ +@@ -1905,7 +1906,8 @@ static void fdctrl_write_data(FDCtrl *fd if (pos == FD_SECTOR_LEN - 1 || fdctrl->data_pos == fdctrl->data_len) { cur_drv = get_cur_drv(fdctrl); - if (bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) { + if (cur_drv->bs == NULL || + bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) { - FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv)); + FLOPPY_DPRINTF("error writing sector %d\n", + fd_sector(cur_drv)); return; - } Index: qemu-0.8.2/hw/sb16.c =================================================================== --- qemu-0.8.2.orig/hw/sb16.c 2006-07-22 20:23:34.000000000 +0300 Index: files/patch-e1000-rx =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-e1000-rx,v retrieving revision 1.1 diff -u -p -r1.1 patch-e1000-rx --- files/patch-e1000-rx 1 Jun 2012 20:49:50 -0000 1.1 +++ files/patch-e1000-rx 5 Sep 2012 22:23:08 -0000 @@ -1,133 +0,0 @@ -Message-ID: <4FC741F1.4000905@redhat.com> -Date: Thu, 31 May 2012 12:03:29 +0200 -From: Paolo Bonzini -To: Jan Kiszka -References: <20120530202311.GA1768@onelab2.iet.unipi.it> - <20120530212333.GD2672@onelab2.iet.unipi.it> - <4FC69389.8050404@web.de> - - <4FC69B28.1000106@web.de> - - <4FC71FEB.9030100@redhat.com> <4FC72A95.4040808@web.de> -In-Reply-To: <4FC72A95.4040808@web.de> -Cc: Luigi Rizzo , rizzo@iet.unipi.it, - qemu-devel@nongnu.org, - Stefano Stabellini -Subject: Re: [Qemu-devel] Proposed patch: huge RX speedup for hw/e1000.c - -Il 31/05/2012 10:23, Jan Kiszka ha scritto: ->> > @@ -922,6 +923,7 @@ set_rdt(E1000State *s, int index, uint32_t val) ->> > { ->> > s->check_rxov = 0; ->> > s->mac_reg[index] = val & 0xffff; ->> > + qemu_notify_event(); -> This still looks like the wrong tool: Packets that can't be delivered -> are queued. - -Packets that are read from the tap but can't be delivered are queued; -packets that are left on the tap need qemu_notify_event to be flushed. - -> So we need to flush the queue and clear the blocked delivery -> there. qemu_flush_queued_packets appears more appropriate for this. - -Right, and qemu_flush_queued_packets needs to call qemu_notify_event -which makes the call in virtio-net unnecessary. - -Paolo - -diff --git a/hw/e1000.c b/hw/e1000.c -index 4573f13..43d933a 100644 ---- a/hw/e1000.c -+++ b/hw/e1000.c -@@ -295,6 +295,7 @@ set_rx_control(E1000State *s, int index, uint32_t val) - s->rxbuf_min_shift = ((val / E1000_RCTL_RDMTS_QUAT) & 3) + 1; - DBGOUT(RX, "RCTL: %d, mac_reg[RCTL] = 0x%x\n", s->mac_reg[RDT], - s->mac_reg[RCTL]); -+ qemu_flush_queued_packets(&s->nic->nc); - } - - static void -@@ -926,6 +927,9 @@ set_rdt(E1000State *s, int index, uint32_t val) - { - s->check_rxov = 0; - s->mac_reg[index] = val & 0xffff; -+ if (e1000_has_rxbufs(s, 1)) { -+ qemu_flush_queued_packets(&s->nic->nc); -+ } - } - - static void -diff --git a/hw/virtio-net.c b/hw/virtio-net.c -index 3f190d4..0974945 100644 ---- a/hw/virtio-net.c -+++ b/hw/virtio-net.c -@@ -447,10 +447,6 @@ static void virtio_net_handle_rx(VirtIODevice *vdev, VirtQueue *vq) - VirtIONet *n = to_virtio_net(vdev); - - qemu_flush_queued_packets(&n->nic->nc); -- -- /* We now have RX buffers, signal to the IO thread to break out of the -- * select to re-poll the tap file descriptor */ -- qemu_notify_event(); - } - - static int virtio_net_can_receive(VLANClientState *nc) -diff --git a/net.c b/net.c -index 1922d8a..fa846ae 100644 ---- a/net.c -+++ b/net.c -@@ -491,7 +491,12 @@ void qemu_flush_queued_packets(VLANClientState *vc) - queue = vc->send_queue; - } - -- qemu_net_queue_flush(queue); -+ if (qemu_net_queue_flush(queue)) { -+ /* We emptied the queue successfully, signal to the IO thread to repoll -+ * the file descriptor (for tap, for example). -+ */ -+ qemu_notify_event(); -+ } - } - - static ssize_t qemu_send_packet_async_with_flags(VLANClientState *sender, -diff --git a/net/queue.c b/net/queue.c -index 1ab5247..fd1c7e6 100644 ---- a/net/queue.c -+++ b/net/queue.c -@@ -232,7 +232,7 @@ void qemu_net_queue_purge(NetQueue *queue, VLANClientState *from) - } - } - --void qemu_net_queue_flush(NetQueue *queue) -+bool qemu_net_queue_flush(NetQueue *queue) - { - while (!QTAILQ_EMPTY(&queue->packets)) { - NetPacket *packet; -@@ -248,7 +248,7 @@ void qemu_net_queue_flush(NetQueue *queue) - packet->size); - if (ret == 0) { - QTAILQ_INSERT_HEAD(&queue->packets, packet, entry); -- break; -+ return 0; - } - - if (packet->sent_cb) { -@@ -257,4 +257,5 @@ void qemu_net_queue_flush(NetQueue *queue) - - g_free(packet); - } -+ return 1; - } -diff --git a/net/queue.h b/net/queue.h -index a31958e..4bf6d3c 100644 ---- a/net/queue.h -+++ b/net/queue.h -@@ -66,6 +66,6 @@ ssize_t qemu_net_queue_send_iov(NetQueue *queue, - NetPacketSent *sent_cb); - - void qemu_net_queue_purge(NetQueue *queue, VLANClientState *from); --void qemu_net_queue_flush(NetQueue *queue); -+bool qemu_net_queue_flush(NetQueue *queue); - - #endif /* QEMU_NET_QUEUE_H */ - Index: files/patch-z-arm-bsd-user-001 =================================================================== RCS file: /home/pcvs/ports/emulators/qemu-devel/files/patch-z-arm-bsd-user-001,v retrieving revision 1.1 diff -u -p -r1.1 patch-z-arm-bsd-user-001 --- files/patch-z-arm-bsd-user-001 19 Jul 2012 20:15:43 -0000 1.1 +++ files/patch-z-arm-bsd-user-001 9 Sep 2012 03:17:36 -0000 @@ -289,6 +289,18 @@ #endif --- a/bsd-user/syscall.c.orig +++ b/bsd-user/syscall.c +@@ -96,6 +96,11 @@ static abi_long do_obreak(abi_ulong new_ + return 0; + } + ++abi_long do_brk(abi_ulong new_brk) ++{ ++ return do_obreak(new_brk); ++} ++ + #if defined(TARGET_I386) + static abi_long do_freebsd_sysarch(CPUX86State *env, int op, abi_ulong parms) + { @@ -157,6 +161,12 @@ static abi_long do_freebsd_sysarch(void } #endif Index: files/patch-bsd-user-qemu.h @@ -0,0 +1,31 @@ +--- a/bsd-user/qemu.h ++++ b/bsd-user/qemu.h +@@ -50,6 +50,10 @@ struct image_info { + abi_ulong entry; + abi_ulong code_offset; + abi_ulong data_offset; ++#if 1 ++ abi_ulong arg_start; ++ abi_ulong arg_end; ++#endif + int personality; + }; + +@@ -72,6 +76,17 @@ struct emulated_sigtable { + typedef struct TaskState { + struct TaskState *next; + int used; /* non zero if used */ ++#if 1 ++#ifdef TARGET_ARM ++ int swi_errno; ++#endif ++#if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32) ++ /* Extra fields for semihosted binaries. */ ++ uint32_t heap_base; ++ uint32_t heap_limit; ++#endif ++ uint32_t stack_base; ++#endif + struct image_info *info; + + struct emulated_sigtable sigtab[TARGET_NSIG];