From owner-svn-ports-head@FreeBSD.ORG Sat Aug 31 17:25:09 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0BB366E2; Sat, 31 Aug 2013 17:25:09 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DDB942C0E; Sat, 31 Aug 2013 17:25:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7VHP8aJ014619; Sat, 31 Aug 2013 17:25:08 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7VHP8PV014604; Sat, 31 Aug 2013 17:25:08 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201308311725.r7VHP8PV014604@svn.freebsd.org> From: John Marino Date: Sat, 31 Aug 2013 17:25:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325818 - head/games/iourbanterror/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Aug 2013 17:25:09 -0000 Author: marino Date: Sat Aug 31 17:25:08 2013 New Revision: 325818 URL: http://svnweb.freebsd.org/changeset/ports/325818 Log: games/iourbanterror: Fix new patches Something went with shar extraction. One new patch came out wrong and the other wasn't created. Let's put them right now. PR: ports/180576 Reported by: Domininic Fandrey (maintainer) Added: head/games/iourbanterror/files/patch-code-qcommon-vm_x86.c (contents, props changed) Modified: head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c Modified: head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c ============================================================================== --- head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c Sat Aug 31 17:21:40 2013 (r325817) +++ head/games/iourbanterror/files/patch-code-qcommon-vm_interpreted.c Sat Aug 31 17:25:08 2013 (r325818) @@ -1,7 +1,6 @@ -diff -r de1eebcbab05 code/qcommon/vm_interpreted.c ---- code/qcommon/vm_interpreted.c Mon Jul 15 20:43:44 2013 +0200 -+++ code/qcommon/vm_interpreted.c Tue Jul 23 10:41:47 2013 +0200 -@@ -436,21 +436,21 @@ +--- code/qcommon/vm_interpreted.c.orig 2013-07-15 18:54:41.000000000 +0000 ++++ code/qcommon/vm_interpreted.c +@@ -436,21 +436,21 @@ nextInstruction2: return 0; } #endif @@ -27,7 +26,7 @@ diff -r de1eebcbab05 code/qcommon/vm_int opStackOfs -= 2; goto nextInstruction; case OP_STORE1: -@@ -460,7 +460,7 @@ +@@ -460,7 +460,7 @@ nextInstruction2: case OP_ARG: // single byte offset from programStack @@ -36,47 +35,3 @@ diff -r de1eebcbab05 code/qcommon/vm_int opStackOfs--; programCounter += 1; goto nextInstruction; -a05650c847d3648d03593516ce310db4 -echo x - games/iourbanterror/files/patch-code-qcommon-vm_x86.c -sed 's/^X//' >games/iourbanterror/files/patch-code-qcommon-vm_x86.c << 'b99229479f1b9014d0f8028a3c1f2c41' -diff -r de1eebcbab05 code/qcommon/vm_x86.c ---- code/qcommon/vm_x86.c Mon Jul 15 20:43:44 2013 +0200 -+++ code/qcommon/vm_x86.c Tue Jul 23 10:41:43 2013 +0200 -@@ -783,7 +783,7 @@ - return qtrue; - - case OP_STORE4: -- EmitMovEAXStack(vm, (vm->dataMask & ~3)); -+ EmitMovEAXStack(vm, vm->dataMask); - #if idx64 - EmitRexString(0x41, "C7 04 01"); // mov dword ptr [r9 + eax], 0x12345678 - Emit4(Constant4()); -@@ -798,7 +798,7 @@ - return qtrue; - - case OP_STORE2: -- EmitMovEAXStack(vm, (vm->dataMask & ~1)); -+ EmitMovEAXStack(vm, vm->dataMask); - #if idx64 - Emit1(0x66); // mov word ptr [r9 + eax], 0x1234 - EmitRexString(0x41, "C7 04 01"); -@@ -1369,7 +1369,7 @@ - case OP_STORE4: - EmitMovEAXStack(vm, 0); - EmitString("8B 54 9F FC"); // mov edx, dword ptr -4[edi + ebx * 4] -- MASK_REG("E2", vm->dataMask & ~3); // and edx, 0x12345678 -+ MASK_REG("E2", vm->dataMask); // and edx, 0x12345678 - #if idx64 - EmitRexString(0x41, "89 04 11"); // mov dword ptr [r9 + edx], eax - #else -@@ -1381,7 +1381,7 @@ - case OP_STORE2: - EmitMovEAXStack(vm, 0); - EmitString("8B 54 9F FC"); // mov edx, dword ptr -4[edi + ebx * 4] -- MASK_REG("E2", vm->dataMask & ~1); // and edx, 0x12345678 -+ MASK_REG("E2", vm->dataMask); // and edx, 0x12345678 - #if idx64 - Emit1(0x66); // mov word ptr [r9 + edx], eax - EmitRexString(0x41, "89 04 11"); -b99229479f1b9014d0f8028a3c1f2c41 -exit Added: head/games/iourbanterror/files/patch-code-qcommon-vm_x86.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/iourbanterror/files/patch-code-qcommon-vm_x86.c Sat Aug 31 17:25:08 2013 (r325818) @@ -0,0 +1,38 @@ +--- code/qcommon/vm_x86.c.orig 2013-07-15 18:54:41.000000000 +0000 ++++ code/qcommon/vm_x86.c +@@ -783,7 +783,7 @@ qboolean ConstOptimize(vm_t *vm, int cal + return qtrue; + + case OP_STORE4: +- EmitMovEAXStack(vm, (vm->dataMask & ~3)); ++ EmitMovEAXStack(vm, vm->dataMask); + #if idx64 + EmitRexString(0x41, "C7 04 01"); // mov dword ptr [r9 + eax], 0x12345678 + Emit4(Constant4()); +@@ -798,7 +798,7 @@ qboolean ConstOptimize(vm_t *vm, int cal + return qtrue; + + case OP_STORE2: +- EmitMovEAXStack(vm, (vm->dataMask & ~1)); ++ EmitMovEAXStack(vm, vm->dataMask); + #if idx64 + Emit1(0x66); // mov word ptr [r9 + eax], 0x1234 + EmitRexString(0x41, "C7 04 01"); +@@ -1369,7 +1369,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *he + case OP_STORE4: + EmitMovEAXStack(vm, 0); + EmitString("8B 54 9F FC"); // mov edx, dword ptr -4[edi + ebx * 4] +- MASK_REG("E2", vm->dataMask & ~3); // and edx, 0x12345678 ++ MASK_REG("E2", vm->dataMask); // and edx, 0x12345678 + #if idx64 + EmitRexString(0x41, "89 04 11"); // mov dword ptr [r9 + edx], eax + #else +@@ -1381,7 +1381,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *he + case OP_STORE2: + EmitMovEAXStack(vm, 0); + EmitString("8B 54 9F FC"); // mov edx, dword ptr -4[edi + ebx * 4] +- MASK_REG("E2", vm->dataMask & ~1); // and edx, 0x12345678 ++ MASK_REG("E2", vm->dataMask); // and edx, 0x12345678 + #if idx64 + Emit1(0x66); // mov word ptr [r9 + edx], eax + EmitRexString(0x41, "89 04 11");