summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-04-27 17:17:35 +0000
committerUlrich Müller <ulm@gentoo.org>2007-04-27 17:17:35 +0000
commit96b2e4b579878c5868655122c1fce78e15cf57c1 (patch)
treecbe1091d2462e6b90e7d6eb360872ddb8161cc65 /app-emulation/xtrs/files
parentminor fix to changelog (diff)
downloadgentoo-2-96b2e4b579878c5868655122c1fce78e15cf57c1.tar.gz
gentoo-2-96b2e4b579878c5868655122c1fce78e15cf57c1.tar.bz2
gentoo-2-96b2e4b579878c5868655122c1fce78e15cf57c1.zip
Fixed -delay handling for values more similar to previous ones.
(Portage version: 2.1.2.4)
Diffstat (limited to 'app-emulation/xtrs/files')
-rw-r--r--app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch19
1 files changed, 10 insertions, 9 deletions
diff --git a/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch b/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch
index 113e26afcfed..c9f5029b6afc 100644
--- a/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch
+++ b/app-emulation/xtrs/files/xtrs-4.9c-gentoo.patch
@@ -5,7 +5,7 @@ diff -Nur xtrs-4.9c-orig/ChangeLog xtrs-4.9c/ChangeLog
+4.9c-Gentoo -- Sat Apr 21 14:37:00 MDT 2007 Joe Peterson <joe@skyrush.com>
+
+* Patched for Gentoo ebuild
-+ - Change "int i" in the z80 delay loop to "volatile int"
++ - Added assignment to volatile variable in the z80 delay loop
+ (allows near-actual speed emulation with optimization)
+ - Fixed keyboard wait issue that caused CPU spinning (i.e. max
+ CPU usage) after using F10 (reset), F7, F8, or F9.
@@ -74,12 +74,13 @@ diff -Nur xtrs-4.9c-orig/trs_xinterface.c xtrs-4.9c/trs_xinterface.c
diff -Nur xtrs-4.9c-orig/z80.c xtrs-4.9c/z80.c
--- xtrs-4.9c-orig/z80.c 2005-05-22 08:57:01.000000000 +0200
+++ xtrs-4.9c/z80.c 2007-04-25 22:12:20.000000000 +0200
-@@ -2999,7 +2999,7 @@
- Uchar instruction;
- Ushort address; /* generic temps */
- int ret = 0;
-- int i;
-+ volatile int i;
- trs_continuous = continuous;
+@@ -3027,7 +3027,8 @@
+ #endif
+ /* Speed control */
+ if ((i = z80_state.delay)) {
+- while (--i) /*nothing*/;
++ volatile int dummy;
++ while (--i) dummy = i;
+ }
- /* loop to do a z80 instruction */
+ instruction = mem_read(REG_PC++);