| 1 |
lavajoe 08/06/26 23:50:49 |
| 2 |
|
| 3 |
Added: xtrs-4.9c-r2-gentoo.patch |
| 4 |
Log: |
| 5 |
Add upstream fix for kbwait; disable SIGIO; change default model back to 1 |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-emulation/xtrs/files/xtrs-4.9c-r2-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xtrs/files/xtrs-4.9c-r2-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xtrs/files/xtrs-4.9c-r2-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xtrs-4.9c-r2-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nurp xtrs-4.9c-orig/ChangeLog xtrs-4.9c/ChangeLog |
| 17 |
--- xtrs-4.9c-orig/ChangeLog 2006-05-14 18:55:28.000000000 -0600 |
| 18 |
+++ xtrs-4.9c/ChangeLog 2008-06-26 16:57:23.000000000 -0600 |
| 19 |
@@ -1,3 +1,13 @@ |
| 20 |
+4.9c-Gentoo -- Thu Jun 26 16:57:16 MDT 2008 -- Joe Peterson <joe@×××××××.com> |
| 21 |
+ |
| 22 |
+* Patched for Gentoo ebuild |
| 23 |
+ - Added assignment to volatile variable in the z80 delay loop |
| 24 |
+ (allows near-actual speed emulation with optimization) |
| 25 |
+ - Fixed keyboard wait issue that caused CPU spinning (i.e. max |
| 26 |
+ CPU usage) after using F10 (reset), F7, F8, or F9. |
| 27 |
+ - Disable SIGIO |
| 28 |
+ - Added NEWDOS/80 system date/time auto-initialization |
| 29 |
+ |
| 30 |
4.9c -- Sun May 14 17:54:25 PDT 2006 -- Tim Mann |
| 31 |
|
| 32 |
* Fixed the new -e flag on import/cmd and export/cmd to actually |
| 33 |
diff -Nurp xtrs-4.9c-orig/Makefile xtrs-4.9c/Makefile |
| 34 |
--- xtrs-4.9c-orig/Makefile 2006-05-13 15:10:25.000000000 -0600 |
| 35 |
+++ xtrs-4.9c/Makefile 2008-06-26 16:48:15.000000000 -0600 |
| 36 |
@@ -143,7 +143,7 @@ z80code: $(Z80CODE) |
| 37 |
include Makefile.local |
| 38 |
|
| 39 |
CFLAGS = $(DEBUG) $(ENDIAN) $(DEFAULT_ROM) $(READLINE) $(DISKDIR) $(IFLAGS) \ |
| 40 |
- $(APPDEFAULTS) -DKBWAIT -DHAVE_SIGIO |
| 41 |
+ $(APPDEFAULTS) -DKBWAIT |
| 42 |
LIBS = $(XLIB) $(READLINELIBS) $(EXTRALIBS) |
| 43 |
|
| 44 |
ZMACFLAGS = -h |
| 45 |
diff -Nurp xtrs-4.9c-orig/trs_keyboard.c xtrs-4.9c/trs_keyboard.c |
| 46 |
--- xtrs-4.9c-orig/trs_keyboard.c 2006-05-13 14:50:17.000000000 -0600 |
| 47 |
+++ xtrs-4.9c/trs_keyboard.c 2008-06-26 16:46:03.000000000 -0600 |
| 48 |
@@ -998,12 +998,12 @@ int trs_next_key(int wait) |
| 49 |
if ((z80_state.nmi && !z80_state.nmi_seen) || |
| 50 |
(z80_state.irq && z80_state.iff1) || |
| 51 |
trs_event_scheduled() || key_immediate) { |
| 52 |
+ key_immediate = 0; |
| 53 |
rval = -1; |
| 54 |
break; |
| 55 |
} |
| 56 |
trs_paused = 1; |
| 57 |
- pause(); /* Wait for SIGALRM or SIGIO */ |
| 58 |
- key_immediate = 0; |
| 59 |
+ pause(); /* Wait for SIGALRM */ |
| 60 |
trs_get_event(0); |
| 61 |
} |
| 62 |
return rval; |
| 63 |
diff -Nurp xtrs-4.9c-orig/z80.c xtrs-4.9c/z80.c |
| 64 |
--- xtrs-4.9c-orig/z80.c 2005-05-22 00:57:01.000000000 -0600 |
| 65 |
+++ xtrs-4.9c/z80.c 2008-06-26 16:44:32.000000000 -0600 |
| 66 |
@@ -3027,7 +3027,8 @@ int z80_run(int continuous) |
| 67 |
#endif |
| 68 |
/* Speed control */ |
| 69 |
if ((i = z80_state.delay)) { |
| 70 |
- while (--i) /*nothing*/; |
| 71 |
+ volatile int dummy; |
| 72 |
+ while (--i) dummy = i; |
| 73 |
} |
| 74 |
|
| 75 |
instruction = mem_read(REG_PC++); |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
-- |
| 80 |
gentoo-commits@l.g.o mailing list |
Archives