Attachment #103023 for bug #142886

View | Details | Raw Unified | Return to bug 142886
Collapse All | Expand All

Lines 7-13 Link Here

(-)ports/games/ioquake3/Makefile (-1 / +1 lines)
7		7
8	PORTNAME?= ioquake3	8	PORTNAME?= ioquake3
9	DISTVERSION?= 1.36	9	DISTVERSION?= 1.36
10	PORTREVISION?= 1	10	PORTREVISION?= 2
11	CATEGORIES= games	11	CATEGORIES= games
12	MASTER_SITES?= http://ioquake3.org/files/${DISTVERSION}/	12	MASTER_SITES?= http://ioquake3.org/files/${DISTVERSION}/
13		13




--- code/qcommon/vm_interpreted.c	2009/11/01 19:58:07	1717
+++ code/qcommon/vm_interpreted.c	2010/01/16 10:55:51	1772
@@ -516,18 +516,20 @@
 
 //VM_LogSyscalls( (int *)&image[ programStack + 4 ] );
 				{
-					intptr_t* argptr = (intptr_t *)&image[ programStack + 4 ];
-				#if __WORDSIZE == 64
-				// the vm has ints on the stack, we expect
-				// longs so we have to convert it
-					intptr_t argarr[16];
-					int i;
-					for (i = 0; i < 16; ++i) {
-						argarr[i] = *(int*)&image[ programStack + 4 + 4*i ];
+					// the vm has ints on the stack, we expect
+					// pointers so we might have to convert it
+					if (sizeof(intptr_t) != sizeof(int)) {
+						intptr_t argarr[16];
+						int *imagePtr = (int *)&image[programStack];
+						int i;
+						for (i = 0; i < 16; ++i) {
+							argarr[i] = *(++imagePtr);
+						}
+						r = vm->systemCall( argarr );
+					} else {
+						intptr_t* argptr = (intptr_t *)&image[ programStack + 4 ];
+						r = vm->systemCall( argptr );
 					}
-					argptr = argarr;
-				#endif
-					r = vm->systemCall( argptr );
 				}
 
 #ifdef DEBUG_VM




==============================================================================

Should the game freeze when entering a match, try to change the value of
com_zoneMegs (e.g. to 48).

The configuration files are saved to ~/.ioquake3 instead of ~/.q3a because
they have additional variables which would be removed if other engines
overwrite them. But you can safely copy the original directory to the new one
for the first time.

Should you encounter freezes when playing a demo or single player game,
rebuild without client libraries.

==============================================================================

Lines 17-23 Link Here

(-)ports/games/ioquake3-devel/Makefile (-1 / +1 lines)
17	PLIST= ${.CURDIR}/../ioquake3/pkg-plist	17	PLIST= ${.CURDIR}/../ioquake3/pkg-plist
18	PATCHDIR= ${WRKDIR}/freebsd-patchset/	18	PATCHDIR= ${WRKDIR}/freebsd-patchset/
19		19
20	SVNREVISION= 1771	20	SVNREVISION= 1772
21	BINSUFFIX= -devel	21	BINSUFFIX= -devel
22		22
23	.include "${.CURDIR}/../ioquake3/Makefile"	23	.include "${.CURDIR}/../ioquake3/Makefile"

Lines 1-3 Link Here

(-)ports/games/ioquake3-devel/distinfo (-3 / +3 lines)
1	MD5 (ioquake3-devel-1.36_SVN1771.zip) = 651a912a4cebb68f33a9f7fc63a3ec0e	1	MD5 (ioquake3-devel-1.36_SVN1772.zip) = 6d5e4b9899eeb5541da8585d978f438f
2	SHA256 (ioquake3-devel-1.36_SVN1771.zip) = 75aecab911f880e19d319c9e508fc4495b1d53e22207fae26d0a1b436817b4d9	2	SHA256 (ioquake3-devel-1.36_SVN1772.zip) = 756eb79863f415703b6e3407db22104dc514f904586b5a09d72788f5745c1daa
3	SIZE (ioquake3-devel-1.36_SVN1771.zip) = 4927089	3	SIZE (ioquake3-devel-1.36_SVN1772.zip) = 4927099

Lines 1-6 Link Here

(-)ports/games/ioquake3-devel/pkg-message (-2 / +2 lines)
1	==============================================================================	1	==============================================================================
2		2
3	Should you encounter freezes when playing a demo or single player game,	3	Should the game freeze when entering a match, try to change the value of
4	rebuild without client libraries.	4	com_zoneMegs (e.g. to 48).
5		5
6	==============================================================================	6	==============================================================================

Return to bug 142886

Line 0 Link Here

(-)ports/games/ioquake3/files/patch-code-qcommon-vm_interpreted.c (+34 lines)
	1	--- code/qcommon/vm_interpreted.c 2009/11/01 19:58:07 1717
	2	+++ code/qcommon/vm_interpreted.c 2010/01/16 10:55:51 1772
	3	@@ -516,18 +516,20 @@
	4
	5	//VM_LogSyscalls( (int *)&image[ programStack + 4 ] );
	6	{
	7	- intptr_t* argptr = (intptr_t *)&image[ programStack + 4 ];
	8	- #if __WORDSIZE == 64
	9	- // the vm has ints on the stack, we expect
	10	- // longs so we have to convert it
	11	- intptr_t argarr[16];
	12	- int i;
	13	- for (i = 0; i < 16; ++i) {
	14	- argarr[i] = (int)&image[ programStack + 4 + 4*i ];
	15	+ // the vm has ints on the stack, we expect
	16	+ // pointers so we might have to convert it
	17	+ if (sizeof(intptr_t) != sizeof(int)) {
	18	+ intptr_t argarr[16];
	19	+ int imagePtr = (int )&image[programStack];
	20	+ int i;
	21	+ for (i = 0; i < 16; ++i) {
	22	+ argarr[i] = *(++imagePtr);
	23	+ }
	24	+ r = vm->systemCall( argarr );
	25	+ } else {
	26	+ intptr_t* argptr = (intptr_t *)&image[ programStack + 4 ];
	27	+ r = vm->systemCall( argptr );
	28	}
	29	- argptr = argarr;
	30	- #endif
	31	- r = vm->systemCall( argptr );
	32	}
	33
	34	#ifdef DEBUG_VM

Lines 1-14 Link Here

(-)ports/games/ioquake3/pkg-message (-5 / +2 lines)
1	==============================================================================	1	==============================================================================
2		2
3	The input devices are now handled by SDL. Some mouse buttons will have	3	Should the game freeze when entering a match, try to change the value of
4	different aliases and the mouse speed needs to be readjusted.	4	com_zoneMegs (e.g. to 48).
5		5
6	The configuration files are saved to ~/.ioquake3 instead of ~/.q3a because	6	The configuration files are saved to ~/.ioquake3 instead of ~/.q3a because
7	they have additional variables which would be removed if other engines	7	they have additional variables which would be removed if other engines
8	overwrite them. But you can safely copy the original directory to the new one	8	overwrite them. But you can safely copy the original directory to the new one
9	for the first time.	9	for the first time.
10		10
11	Should you encounter freezes when playing a demo or single player game,
12	rebuild without client libraries.
13
14	==============================================================================	11	==============================================================================