<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/850103dcf8ae42b82856cf6d0b834fa2081315ad">https://github.com/macports/macports-ports/commit/850103dcf8ae42b82856cf6d0b834fa2081315ad</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 850103d Dynamips all architectures version bump to 0.2.20 STABLE
</span>850103d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 850103dcf8ae42b82856cf6d0b834fa2081315ad
</span>Author: lastic <lasticppc@gmail.com>
AuthorDate: Mon Apr 1 20:39:06 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> Dynamips all architectures version bump to 0.2.20 STABLE
</span>---
net/dynamips/Portfile | 109 +++-----
net/dynamips/files/Makefile.diff | 81 ------
net/dynamips/files/idle_pcs.diff | 531 ---------------------------------------
3 files changed, 32 insertions(+), 689 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dynamips/Portfile b/net/dynamips/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a07533..a2aa53d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dynamips/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dynamips/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,77 +1,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name dynamips
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers vexate.net:jstrine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Cisco router emulator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.ipflow.utc.fr/index.php/Cisco_7200_Simulator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Dynamips emulates a variety of Cisco routers on a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- traditional PC. It supports the emulation of select 7200, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3600, 3700, and 2600 series routers. It uses real Cisco \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IOS images (which are not part of this package). Of \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- course, this emulator cannot replace a real router. It is \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- simply a complementary tool to real labs for administrators \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- of Cisco networks or people wanting to pass their \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCNA/CCNP/CCIE exams.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.ipflow.utc.fr/dynamips
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname dynamips-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 0fe1875bb4e7e3624ca420dd75c85279 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 6f65a2e92f5d27aca9d8608369cb20c9539a8121
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libelf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpcap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles Makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch.pre_args set to allow use of unmodified idle_pcs patch from developer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args-append PREFIX=${prefix} CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CFLAGS=${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CFLAGS="${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args-append PREFIX=${prefix} CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CFLAGS=${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CFLAGS="${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dynamips_arch amd64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dynamips_arch x86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dynamips_arch nojit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args-append DYNAMIPS_ARCH=${dynamips_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args-append DYNAMIPS_ARCH=${dynamips_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +idle_pcs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_pcap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Without support to send/receive external traffic} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:libpcap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.pre_args-append HAS_PCAP=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.pre_args-append HAS_PCAP=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant idle_pcs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {With support for multiple idle-pcs. Uses patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- written by Yannick Le Teigner available at \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://dynagui.sourceforge.net.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append idle_pcs.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup GNS3 dynamips 0.2.20 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:lasticppc @lastic} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://github.com/GNS3/dynamips
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Cisco router emulator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Dynamips emulates a variety of Cisco routers on a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ traditional PC. It supports the emulation of select 7200, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3600, 3700, and 2600 series routers. It uses real Cisco \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IOS images (which are not part of this package). Of \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ course, this emulator cannot replace a real router. It is \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ simply a complementary tool to real labs for administrators \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ of Cisco networks or people wanting to pass their \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CCNA/CCNP/CCIE exams.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 23c02f144b13a466a1b6a96d43cd6c1d4770e1d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9688563ffca379e96a29f5777f68958501282fd02f1f9748526e4b8770f2e80d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 834033
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libelf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpcap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDYNAMIPS_CODE=stable
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dynamips/files/Makefile.diff b/net/dynamips/files/Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 796c5aa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dynamips/files/Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,81 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur ../dynamips-0.2.7.orig/Makefile ./Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../dynamips-0.2.7.orig/Makefile 2007-09-01 12:42:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Makefile 2007-09-01 13:28:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VERSION_DEV=$(VERSION_TRAIN)-$(shell date +%Y%m%d-%H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Executable binary extension
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DESTDIR?=/usr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIN_EXT?=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC?=gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,45 +39,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DHAS_RFC2553=$(HAS_RFC2553)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PCAP_LIB=/usr/local/lib/libpcap.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PCAP_LIB=-lpcap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #PCAP_LIB=-lpcap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(shell uname), FreeBSD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PTHREAD_LIBS?=-pthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(shell uname), Linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PTHREAD_LIBS?=-lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# PCAP_LIB=-lpcap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS=-L/usr/lib -L. /usr/lib/libelf.a $(PTHREAD_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTDIR=/usr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(shell uname -s), Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS+=-I/usr/local/include -mdynamic-no-pic -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS=-L/usr/local/lib -L. -lelf -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(shell uname -s), SunOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS+=-I/usr/local/include -DINADDR_NONE=0xFFFFFFFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -I /opt/csw/include -DSUNOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS=-L/usr/local/lib -L. -lelf -lpthread -L/opt/csw/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -lsocket -lnsl -lresolv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PCAP_LIB=/opt/csw/lib/libpcap.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(shell uname -o), Cygwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf -DCYGWIN \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS=-L/usr/local/lib -L. -lelf -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PCAP_LIB=-lpacket -lwpcap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFLAGS+=-I$(PREFIX)/include/libelf -I$(PREFIX)/include -mdynamic-no-pic -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS=-L$(PREFIX)/lib -L. -lelf -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS=-L. /usr/lib/libelf.a -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFLAGS+=-I$(PREFIX)/include/libelf -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS=-L. $(PREFIX)/lib/libelf.a -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROG=dynamips$(BIN_EXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -231,12 +200,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: $(PROG) nvram_export
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "Installing"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -d $(DESTDIR)/bin $(DESTDIR)/man/man1 $(DESTDIR)/man/man7 $(DESTDIR)/etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install dynamips nvram_export $(DESTDIR)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -m644 dynamips.1 $(DESTDIR)/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -m644 nvram_export.1 $(DESTDIR)/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -m644 hypervisor_mode.7 $(DESTDIR)/man/man7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# install -m644 example $(DESTDIR)/etc/dynamips
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/man/man1 $(DESTDIR)$(PREFIX)/share/man/man7 $(DESTDIR)$(PREFIX)/etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install dynamips nvram_export $(DESTDIR)$(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -m644 dynamips.1 $(DESTDIR)$(PREFIX)/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -m644 nvram_export.1 $(DESTDIR)$(PREFIX)/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -m644 hypervisor_mode.7 $(DESTDIR)$(PREFIX)/share/man/man7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# install -m644 example $(DESTDIR)$(PREFIX)/etc/dynamips
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: clean
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dynamips/files/idle_pcs.diff b/net/dynamips/files/idle_pcs.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 511b9eb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dynamips/files/idle_pcs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,531 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/cpu.h dynamips-0.2.7-YLT/cpu.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/cpu.h 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/cpu.h 2007-05-16 14:17:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void (*mmu_raw_dump)(cpu_gen_t *cpu);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void (*add_breakpoint)(cpu_gen_t *cpu,m_uint64_t addr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void (*remove_breakpoint)(cpu_gen_t *cpu,m_uint64_t addr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void (*set_idle_pc)(cpu_gen_t *cpu,m_uint64_t addr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void (*set_idle_pc)(cpu_gen_t *cpu,char* addr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void (*get_idling_pc)(cpu_gen_t *cpu);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void (*mts_rebuild)(cpu_gen_t *cpu);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void (*mts_show_stats)(cpu_gen_t *cpu);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/dev_c2600.c dynamips-0.2.7-YLT/dev_c2600.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/dev_c2600.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/dev_c2600.c 2007-05-16 13:45:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1360,6 +1360,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Copy some parameters from VM to CPU (idle PC, ...) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->idle_pc = vm->idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->num_idle_pc = vm->num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->timer_irq_check_itv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->timer_irq_check_itv = vm->timer_irq_check_itv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1503,8 +1504,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->name,cpu->ia,vm->jit_use ? "en":"dis");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_log(vm,"C2600_BOOT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "starting instance (CPU0 PC=0x%8.8x,idle_pc=0x%8.8x,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu->ia,cpu->idle_pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "starting instance (CPU0 PC=0x%8.8x,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->ia,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Start main CPU */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->ghost_status != VM_GHOST_RAM_GENERATE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/dev_c2691.c dynamips-0.2.7-YLT/dev_c2691.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/dev_c2691.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/dev_c2691.c 2007-05-16 13:46:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1153,6 +1153,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Copy some parameters from VM to CPU (idle PC, ...) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->idle_pc = vm->idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->num_idle_pc = vm->num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->timer_irq_check_itv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->timer_irq_check_itv = vm->timer_irq_check_itv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1263,8 +1264,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->name,cpu->pc,vm->jit_use ? "en":"dis");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_log(vm,"C2691_BOOT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "starting instance (CPU0 PC=0x%llx,idle_pc=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu->pc,cpu->idle_pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "starting instance (CPU0 PC=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Start main CPU */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->ghost_status != VM_GHOST_RAM_GENERATE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/dev_c3600.c dynamips-0.2.7-YLT/dev_c3600.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/dev_c3600.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/dev_c3600.c 2007-05-16 13:44:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1323,6 +1323,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Copy some parameters from VM to CPU (idle PC, ...) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->idle_pc = vm->idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->num_idle_pc = vm->num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->timer_irq_check_itv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->timer_irq_check_itv = vm->timer_irq_check_itv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1440,8 +1441,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->name,cpu->pc,vm->jit_use ? "en":"dis");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_log(vm,"C3600_BOOT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "starting instance (CPU0 PC=0x%llx,idle_pc=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu->pc,cpu->idle_pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "starting instance (CPU0 PC=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Start main CPU */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->ghost_status != VM_GHOST_RAM_GENERATE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/dev_c3725.c dynamips-0.2.7-YLT/dev_c3725.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/dev_c3725.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/dev_c3725.c 2007-05-16 13:46:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1167,6 +1167,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Copy some parameters from VM to CPU (idle PC, ...) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->idle_pc = vm->idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->num_idle_pc = vm->num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->timer_irq_check_itv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->timer_irq_check_itv = vm->timer_irq_check_itv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1277,8 +1278,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->name,cpu->pc,vm->jit_use ? "en":"dis");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_log(vm,"C3725_BOOT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "starting instance (CPU0 PC=0x%llx,idle_pc=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu->pc,cpu->idle_pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "starting instance (CPU0 PC=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Start main CPU */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->ghost_status != VM_GHOST_RAM_GENERATE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/dev_c3745.c dynamips-0.2.7-YLT/dev_c3745.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/dev_c3745.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/dev_c3745.c 2007-05-16 13:47:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1207,6 +1207,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Copy some parameters from VM to CPU (idle PC, ...) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->idle_pc = vm->idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->num_idle_pc = vm->num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->timer_irq_check_itv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->timer_irq_check_itv = vm->timer_irq_check_itv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1317,8 +1318,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->name,cpu->pc,vm->jit_use ? "en":"dis");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_log(vm,"C3745_BOOT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "starting instance (CPU0 PC=0x%llx,idle_pc=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu->pc,cpu->idle_pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "starting instance (CPU0 PC=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Start main CPU */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->ghost_status != VM_GHOST_RAM_GENERATE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/dev_c7200.c dynamips-0.2.7-YLT/dev_c7200.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/dev_c7200.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/dev_c7200.c 2007-05-16 13:44:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2072,6 +2072,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Copy some parameters from VM to CPU0 (idle PC, ...) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu0->idle_pc = vm->idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu0->num_idle_pc = vm->num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->timer_irq_check_itv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu0->timer_irq_check_itv = vm->timer_irq_check_itv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2193,6 +2194,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Copy some parameters from VM to CPU0 (idle PC, ...) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu0->idle_pc = vm->idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu0->num_idle_pc = vm->num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->timer_irq_check_itv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu0->timer_irq_check_itv = vm->timer_irq_check_itv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2314,8 +2316,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->name,cpu->pc,vm->jit_use ? "en":"dis");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_log(vm,"C7200_BOOT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "starting instance (CPU0 PC=0x%llx,idle_pc=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu->pc,cpu->idle_pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "starting instance (CPU0 PC=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Start main CPU */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->ghost_status != VM_GHOST_RAM_GENERATE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2364,8 +2366,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->name,cpu->ia,vm->jit_use ? "en":"dis");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_log(vm,"C7200P_BOOT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "starting instance (CPU0 IA=0x%8.8x,idle_pc=0x%8.8x,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu->ia,cpu->idle_pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "starting instance (CPU0 IA=0x%8.8x,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->ia,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Start main CPU */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->ghost_status != VM_GHOST_RAM_GENERATE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/dev_msfc1.c dynamips-0.2.7-YLT/dev_msfc1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/dev_msfc1.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/dev_msfc1.c 2007-05-16 14:18:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1220,6 +1220,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Copy some parameters from VM to CPU0 (idle PC, ...) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu0->idle_pc = vm->idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu0->num_idle_pc = vm->num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->timer_irq_check_itv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu0->timer_irq_check_itv = vm->timer_irq_check_itv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1326,8 +1327,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->name,cpu->pc,vm->jit_use ? "en":"dis");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_log(vm,"MSFC1_BOOT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "starting instance (CPU0 PC=0x%llx,idle_pc=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu->pc,cpu->idle_pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "starting instance (CPU0 PC=0x%llx,JIT %s)\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->pc,vm->jit_use ? "on":"off");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Start main CPU */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vm->ghost_status != VM_GHOST_RAM_GENERATE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/dynamips.c dynamips-0.2.7-YLT/dynamips.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/dynamips.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/dynamips.c 2007-05-16 14:20:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -818,6 +818,44 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* slices the val values into idle_pc values, and set them to the vm */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void set_idle_pc(vm_instance_t *vm, char *val) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *tmp_val;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int len = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* find out how many the string length */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (val[len] != '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int num_val = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* find out how many idle_pc values we have in the string */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (i < len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (val[i] == ',')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ num_val += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vm->num_idle_pc = num_val;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vm->idle_pc = (m_uint64_t*)malloc(num_val*sizeof(unsigned long long int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int current_val_idx = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* slice the string, and assign each individual idle_pc values */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (i < len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val = (char *) malloc((len+1)*sizeof(char));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int j = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while ((i < len)&&(val[i] != ',')) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val[j] = val[i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ j += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val[j] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vm->idle_pc[current_val_idx] = strtoull(tmp_val, NULL, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ current_val_idx += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(tmp_val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Parse the command line */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int parse_std_cmd_line(int argc,char *argv[],int *platform)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -941,8 +979,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Idle PC */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case OPT_IDLE_PC:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vm->idle_pc = strtoull(optarg,NULL,0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printf("Idle PC set to 0x%llx.\n",vm->idle_pc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_idle_pc(vm, optarg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Timer IRQ check interval */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/hv_vm.c dynamips-0.2.7-YLT/hv_vm.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/hv_vm.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/hv_vm.c 2007-05-16 14:14:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,7 +219,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vm->idle_pc = strtoull(argv[1],NULL,0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *tmp_val;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int len = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* find out how many the string length */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (argv[1][len] != '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int num_val = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* find out how many idle_pc values we have in the string */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (i < len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (argv[1][i] == ',')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ num_val += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vm->num_idle_pc = num_val;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vm->idle_pc = (m_uint64_t*)malloc(num_val*sizeof(unsigned long long int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int current_val_idx = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (i < len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val = (char *) malloc((len+1)*sizeof(char));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int j = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while ((i < len)&&(argv[1][i] != ',')) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val[j] = argv[1][i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ j += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val[j] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vm->idle_pc[current_val_idx] = strtoull(tmp_val, NULL, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ current_val_idx += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(tmp_val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_release(vm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,13 +271,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(cpu = find_cpu(conn,vm,atoi(argv[1]))))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu->set_idle_pc(cpu,strtoull(argv[2],NULL,0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu->set_idle_pc(cpu,argv[2]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm_release(vm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Get the idle PC proposals */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int cmd_get_idle_pc_prop(hypervisor_conn_t *conn,int argc,char *argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/mips64.c dynamips-0.2.7-YLT/mips64.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/mips64.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/mips64.c 2007-05-16 14:21:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,9 +138,41 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set idle PC value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void mips64_set_idle_pc(cpu_gen_t *cpu,m_uint64_t addr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void mips64_set_idle_pc(cpu_gen_t *cpu,char* addr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPU_MIPS64(cpu)->idle_pc = addr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *tmp_val;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int len = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* find out how many the string length */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (addr[len] != '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int num_val = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* find out how many idle_pc values we have in the string */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (i < len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (addr[i] == ',')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ num_val += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPU_MIPS64(cpu)->num_idle_pc = num_val;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPU_MIPS64(cpu)->idle_pc = (m_uint64_t*)malloc(num_val*sizeof(unsigned long long int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int current_val_idx = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* slice the string, and assign each individual idle_pc values */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (i < len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val = (char *) malloc((len+1)*sizeof(char));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int j = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while ((i < len)&&(addr[i] != ',')) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val[j] = addr[i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ j += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val[j] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPU_MIPS64(cpu)->idle_pc[current_val_idx] = (m_uint32_t) strtoull(tmp_val, NULL, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ current_val_idx += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(tmp_val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Timer IRQ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/mips64.h dynamips-0.2.7-YLT/mips64.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/mips64.h 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/mips64.h 2007-05-16 14:06:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -389,8 +389,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- insn_exec_page_t *exec_page_free_list;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- insn_exec_page_t *exec_page_array;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Idle PC value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- volatile m_uint64_t idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Idle PC value array */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ volatile m_uint64_t* idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Number of Idle PC value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ volatile int num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Timer IRQs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- volatile u_int timer_irq_pending;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -479,7 +482,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void mips64_set_prid(cpu_mips_t *cpu,m_uint32_t prid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set idle PC value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void mips64_set_idle_pc(cpu_gen_t *cpu,m_uint64_t addr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void mips64_set_idle_pc(cpu_gen_t *cpu,char* addr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Timer IRQ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *mips64_timer_irq_run(cpu_mips_t *cpu);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/mips64_jit.c dynamips-0.2.7-YLT/mips64_jit.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/mips64_jit.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/mips64_jit.c 2007-05-16 14:15:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -748,11 +748,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->perf_counter++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Handle virtual idle loop */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (unlikely(cpu->pc == cpu->idle_pc)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (++gen->idle_count == gen->idle_max) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu_idle_loop(gen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gen->idle_count = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (i = 0; i < cpu->num_idle_pc; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (unlikely(cpu->pc == cpu->idle_pc[i])) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (++gen->idle_count == gen->idle_max) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu_idle_loop(gen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gen->idle_count = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Handle the virtual CPU clock */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/ppc32.c dynamips-0.2.7-YLT/ppc32.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/ppc32.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/ppc32.c 2007-05-16 14:22:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,9 +92,41 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set idle PC value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void ppc32_set_idle_pc(cpu_gen_t *cpu,m_uint64_t addr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void ppc32_set_idle_pc(cpu_gen_t *cpu, char* addr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPU_PPC32(cpu)->idle_pc = (m_uint32_t)addr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *tmp_val;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int len = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* find out how many the string length */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (addr[len] != '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int num_val = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* find out how many idle_pc values we have in the string */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (i < len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (addr[i] == ',')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ num_val += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPU_PPC32(cpu)->num_idle_pc = num_val;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPU_PPC32(cpu)->idle_pc = (m_uint64_t*)malloc(num_val*sizeof(unsigned long long int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int current_val_idx = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* slice the string, and assign each individual idle_pc values */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (i < len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val = (char *) malloc((len+1)*sizeof(char));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int j = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while ((i < len)&&(addr[i] != ',')) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val[j] = addr[i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ j += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_val[j] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPU_PPC32(cpu)->idle_pc[current_val_idx] = (m_uint32_t) strtoull(tmp_val, NULL, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ current_val_idx += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(tmp_val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Timer IRQ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/ppc32.h dynamips-0.2.7-YLT/ppc32.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/ppc32.h 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/ppc32.h 2007-05-16 14:02:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,8 +336,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- insn_exec_page_t *exec_page_free_list;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- insn_exec_page_t *exec_page_array;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Idle PC value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- volatile m_uint32_t idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Array Idle PC value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ volatile m_uint32_t* idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Number of idle_pc values */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ volatile int num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Timer IRQs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- volatile u_int timer_irq_pending,timer_irq_armed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -489,7 +492,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void ppc32_set_pvr(cpu_ppc_t *cpu,m_uint32_t pvr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set idle PC value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void ppc32_set_idle_pc(cpu_gen_t *cpu,m_uint64_t addr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void ppc32_set_idle_pc(cpu_gen_t *cpu, char* addr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Timer IRQ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *ppc32_timer_irq_run(cpu_ppc_t *cpu);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/ppc32_jit.c dynamips-0.2.7-YLT/ppc32_jit.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/ppc32_jit.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/ppc32_jit.c 2007-05-16 14:16:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1239,11 +1239,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cpu->perf_counter++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Handle virtual idle loop */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (unlikely(cpu->ia == cpu->idle_pc)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (++gen->idle_count == gen->idle_max) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpu_idle_loop(gen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gen->idle_count = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (i = 0; i < cpu->num_idle_pc; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (unlikely(cpu->ia == cpu->idle_pc[i])) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (++gen->idle_count == gen->idle_max) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cpu_idle_loop(gen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gen->idle_count = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Handle the virtual CPU clock */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/vm.c dynamips-0.2.7-YLT/vm.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/vm.c 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/vm.c 2007-05-16 13:55:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -396,6 +396,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->vtty_aux_type = VTTY_TYPE_NONE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->timer_irq_check_itv = VM_TIMER_IRQ_CHECK_ITV;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vm->log_file_enabled = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vm->num_idle_pc = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(vm->name = strdup(name))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr,"VM %s: unable to store instance name!\n",name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur dynamips-0.2.7/vm.h dynamips-0.2.7-YLT/vm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dynamips-0.2.7/vm.h 2007-04-27 09:30:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dynamips-0.2.7-YLT/vm.h 2007-05-16 13:55:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,8 +148,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Timer IRQ interval check */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- u_int timer_irq_check_itv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* "idling" pointer counter */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_uint64_t idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* "idling" pointer counter array*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_uint64_t* idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* number of idle_pc values */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int num_idle_pc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* JIT block direct jumps */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int exec_blk_direct_jump;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,6 +183,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* VM objects */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct vm_obj *vm_object_list;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define VM_C7200(vm) ((c7200_t *)vm->hw_data)
</span></pre><pre style='margin:0'>
</pre>