Removed support for compiled vm mode. Use bytecode by default.

code/client/cl_cgame.c

@@ -733,7 +733,7 @@ void CL_InitCGame( void ) {
 	// load the dll or bytecode
 	if ( cl_connectedToPureServer != 0 ) {
 		// if sv_pure is set we only allow qvms to be loaded
-		interpret = VMI_COMPILED;
+		interpret = VMI_BYTECODE;
 	}
 	else {
 		interpret = Cvar_VariableValue( "vm_cgame" );

code/client/cl_ui.c

@@ -1150,7 +1150,7 @@ void CL_InitUI( void ) {
 	// load the dll or bytecode
 	if ( cl_connectedToPureServer != 0 ) {
 		// if sv_pure is set we only allow qvms to be loaded
-		interpret = VMI_COMPILED;
+		interpret = VMI_BYTECODE;
 	}
 	else {
 		interpret = Cvar_VariableValue( "vm_ui" );

code/qcommon/qcommon.h

@@ -287,8 +287,7 @@ typedef struct vm_s vm_t;
 
 typedef enum {
 	VMI_NATIVE,
-	VMI_BYTECODE,
+	VMI_BYTECODE
-	VMI_COMPILED
 } vmInterpret_t;
 
 typedef enum {

code/qcommon/vm.c

@@ -57,9 +57,9 @@ VM_Init
 ==============
 */
 void VM_Init( void ) {
-	Cvar_Get( "vm_cgame", "2", CVAR_ARCHIVE );	// !@# SHIP WITH SET TO 2
+	Cvar_Get( "vm_cgame", "1", CVAR_ARCHIVE );
-	Cvar_Get( "vm_game", "2", CVAR_ARCHIVE );	// !@# SHIP WITH SET TO 2
+	Cvar_Get( "vm_game", "1", CVAR_ARCHIVE );
-	Cvar_Get( "vm_ui", "2", CVAR_ARCHIVE );		// !@# SHIP WITH SET TO 2
+	Cvar_Get( "vm_ui", "1", CVAR_ARCHIVE );
 
 	Cmd_AddCommand ("vmprofile", VM_VmProfile_f );
 	Cmd_AddCommand ("vminfo", VM_VmInfo_f );
@@ -394,7 +394,7 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
 	// never allow dll loading with a demo
 	if ( interpret == VMI_NATIVE ) {
 		if ( Cvar_VariableValue( "fs_restrict" ) ) {
-			interpret = VMI_COMPILED;
+			interpret = VMI_BYTECODE;
 		}
 	}
 
@@ -407,7 +407,6 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
 		}
 
 		Com_Printf( "Failed to load dll, looking for qvm.\n" );
-		interpret = VMI_COMPILED;
 	}
 
 	// load the image
@@ -461,18 +460,7 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
 	// copy or compile the instructions
 	vm->codeLength = header->codeLength;
 
-#ifdef _WIN64
-	vm->compiled = qfalse;
 	VM_PrepareInterpreter( vm, header );
-#else
-	if ( interpret >= VMI_COMPILED ) {
-		vm->compiled = qtrue;
-		VM_Compile( vm, header );
-	} else {
-		vm->compiled = qfalse;
-		VM_PrepareInterpreter( vm, header );
-	}
-#endif
 
 	// free the original file
 	FS_FreeFile( header );
@@ -624,12 +612,6 @@ intptr_t	QDECL VM_Call( vm_t *vm, int callnum, ... ) {
                             args[8],  args[9], args[10], args[11],
                             args[12], args[13], args[14], args[15]);
 	}
-#ifndef _WIN64
-	else if ( vm->compiled )
-	{
-		r = VM_CallCompiled( vm, &callnum );
-	}
-#endif
 	else
 	{
 		struct {
@@ -736,11 +718,7 @@ void VM_VmInfo_f( void ) {
 			Com_Printf( "native\n" );
 			continue;
 		}
-		if ( vm->compiled ) {
+        Com_Printf( "interpreted\n" );
-			Com_Printf( "compiled on load\n" );
-		} else {
-			Com_Printf( "interpreted\n" );
-		}
 		Com_Printf( "    code length : %7i\n", vm->codeLength );
 		Com_Printf( "    table length: %7i\n", vm->instructionPointersLength );
 		Com_Printf( "    data length : %7i\n", vm->dataMask + 1 );
@@ -765,13 +743,3 @@ void VM_LogSyscalls( int *args ) {
 	fprintf(f, "%i: %i (%i) = %i %i %i %i\n", callnum, (int)(intptr_t)( args - (int *)currentVM->dataBase ),
 		args[0], args[1], args[2], args[3], args[4] );
 }
-
-
-
-#ifdef oDLL_ONLY // bk010215 - for DLL_ONLY dedicated servers/builds w/o VM
-int	VM_CallCompiled( vm_t *vm, int *args ) {
-  return(0); 
-}
-
-void VM_Compile( vm_t *vm, vmHeader_t *header ) {}
-#endif // DLL_ONLY

code/qcommon/vm_local.h

@@ -144,7 +144,6 @@ struct vm_s {
 	// for interpreted modules
 	qboolean	currentlyInterpreting;
 
-	qboolean	compiled;
 	byte		*codeBase;
 	int			codeLength;
 
@@ -171,9 +170,6 @@ struct vm_s {
 extern	vm_t	*currentVM;
 extern	int		vm_debugLevel;
 
-void VM_Compile( vm_t *vm, vmHeader_t *header );
-int	VM_CallCompiled( vm_t *vm, int *args );
-
 void VM_PrepareInterpreter( vm_t *vm, vmHeader_t *header );
 int	VM_CallInterpreted( vm_t *vm, int *args );
 

code/win32/vs/quake3.vcxproj

@@ -743,16 +743,6 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\qcommon\vm_x86.c">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\game\bg_public.h" />

code/win32/vs/quake3.vcxproj.filters

@@ -174,9 +174,6 @@
     <ClCompile Include="..\..\qcommon\vm_interpreted.c">
       <Filter>Source Files\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\qcommon\vm_x86.c">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\game\bg_public.h">