Index: vm_x86.c =================================================================== --- vm_x86.c (revision 1978) +++ vm_x86.c (working copy) @@ -59,6 +59,7 @@ static int compiledOfs = 0; static byte *code = NULL; static int pc = 0; +static int jusedSize = 0; static int *instructionPointers = NULL; @@ -96,6 +97,7 @@ static int instruction, pass; static int lastConst = 0; static int oc0, oc1, pop0, pop1; +static int jlabel; typedef enum { @@ -107,6 +109,14 @@ static ELastCommand LastCommand; +static void ErrJump( void ) +{ + Com_Error( ERR_DROP, "program tried to execute code outside VM\n" ); + exit(1); +} + +static void (*const errJumpPtr)(void) = ErrJump; + /* ================= AsmCall @@ -124,13 +134,21 @@ sub edi, 4 test eax,eax jl systemCall + cmp eax, [callMask] + jae badAddr // calling another vm function shl eax,2 add eax, dword ptr [instructionPointers] call dword ptr [eax] mov eax, dword ptr [edi] - and eax, [callMask] ret +badAddr: + call ErrJump + // leave something on the opstack + //add edi, 4 + //mov dword ptr [edi], 0 + //ret + systemCall: // convert negative num to system call number @@ -212,12 +230,18 @@ "subl $4, %edi\n\t" "testl %eax, %eax\n\t" "jl 0f\n\t" + "cmpl " CMANGVAR(callMask) ", %eax\n\t" + "jae 1f\n\t" "shll $2, %eax\n\t" "addl " CMANGVAR(instructionPointers) ", %eax\n\t" "call *(%eax)\n\t" "movl (%edi), %eax\n\t" - "andl " CMANGVAR(callMask) ", %eax\n\t" "ret\n" + "1:\n\t" // bad address, leave something on the opstack + "call " CMANGFUNC(ErrJump) "\n\t" + //"addl $4, %edi\n\t" + //"movl $0, (%edi)\n\t" + //"ret\n\t" "0:\n\t" // system call "notl %eax\n\t" "pushl %ebp\n\t" @@ -249,6 +273,11 @@ return v; } +static int NextConstant4( void ) { + return (code[pc] | (code[pc+1]<<8) | (code[pc+2]<<16) | (code[pc+3]<<24)); +} + + static int Constant1( void ) { int v; @@ -336,15 +365,19 @@ LastCommand = command; } -static void EmitAddEDI4(vm_t *vm) { - if (LastCommand == LAST_COMMAND_SUB_DI_4 && jused[instruction-1] == 0) - { // sub di,4 +static void EmitAddEDI4( vm_t *vm ) { + if ( jlabel ) { + EmitString( "83 C7 04" ); // add edi,4 + return; + } + if ( LastCommand == LAST_COMMAND_SUB_DI_4 ) + { // sub edi, 4 compiledOfs -= 3; vm->instructionPointers[ instruction-1 ] = compiledOfs; return; } - if (LastCommand == LAST_COMMAND_SUB_DI_8 && jused[instruction-1] == 0) - { // sub di,8 + if ( LastCommand == LAST_COMMAND_SUB_DI_8 ) + { // sub edi, 8 compiledOfs -= 3; vm->instructionPointers[ instruction-1 ] = compiledOfs; EmitString( "83 EF 04" ); // sub edi,4 @@ -354,6 +387,10 @@ } static void EmitMovEAXEDI(vm_t *vm) { + if ( jlabel ) { + EmitString( "8B 07" ); // mov eax, dword ptr [edi] + return; + } if (LastCommand == LAST_COMMAND_MOV_EDI_EAX) { // mov [edi], eax compiledOfs -= 2; @@ -373,25 +410,51 @@ Emit4( lastConst ); return; } - EmitString( "8B 07" ); // mov eax, dword ptr [edi] + EmitString( "8B 07" ); // mov eax, dword ptr [edi] } +void EmitMovECXEDI( vm_t *vm ) { + if ( jlabel ) { + EmitString( "8B 0F" ); // mov ecx, dword ptr [edi] + return; + } + if ( LastCommand == LAST_COMMAND_MOV_EDI_EAX ) // mov [edi], eax + { + compiledOfs -= 2; + vm->instructionPointers[ instruction-1 ] = compiledOfs; + EmitString( "89 C1" ); // mov ecx, eax + return; + } + if (pop1 == OP_DIVI || pop1 == OP_DIVU || pop1 == OP_MULI || pop1 == OP_MULU || + pop1 == OP_STORE4 || pop1 == OP_STORE2 || pop1 == OP_STORE1 ) + { + EmitString( "89 C1" ); // mov ecx, eax + return; + } + EmitString( "8B 0F" ); // mov ecx, dword ptr [edi] +} + + qboolean EmitMovEBXEDI(vm_t *vm, int andit) { - if (LastCommand == LAST_COMMAND_MOV_EDI_EAX) - { // mov [edi], eax + if ( jlabel ) { + EmitString( "8B 1F" ); // mov ebx, dword ptr [edi] + return qfalse; + } + if ( LastCommand == LAST_COMMAND_MOV_EDI_EAX ) + { // mov dword ptr [edi], eax compiledOfs -= 2; vm->instructionPointers[ instruction-1 ] = compiledOfs; EmitString( "8B D8"); // mov bx, eax return qfalse; } - if (pop1 == OP_DIVI || pop1 == OP_DIVU || pop1 == OP_MULI || pop1 == OP_MULU || + if ( pop1 == OP_DIVI || pop1 == OP_DIVU || pop1 == OP_MULI || pop1 == OP_MULU || pop1 == OP_STORE4 || pop1 == OP_STORE2 || pop1 == OP_STORE1 ) { EmitString( "8B D8"); // mov bx, eax return qfalse; } - if (pop1 == OP_CONST && buf[compiledOfs-6] == 0xC7 && buf[compiledOfs-5] == 0x07 ) - { // mov edi, 0x123456 + if ( pop1 == OP_CONST && buf[compiledOfs-6] == 0xC7 && buf[compiledOfs-5] == 0x07 ) + { // mov dword ptr [edi], 0x12345678 compiledOfs -= 6; vm->instructionPointers[ instruction-1 ] = compiledOfs; EmitString( "BB" ); // mov ebx, 0x12345678 @@ -403,7 +466,7 @@ return qtrue; } - EmitString( "8B 1F" ); // mov ebx, dword ptr [edi] + EmitString( "8B 1F" ); // mov ebx, dword ptr [edi] return qfalse; } @@ -417,8 +480,343 @@ jused[x] = 1; \ } while(0) + /* ================= +ConstOptimize +================= +*/ +qboolean ConstOptimize( vm_t *vm ) { + int v, opt; + int op1; + + // we can safely perform optimizations only in case if + // we are 100% sure that next instruction is not a jump label + if ( !jused[instruction] && vm->jumpTableTargets ) + op1 = code[pc+4]; + else + return qfalse; + + switch ( op1 ) { + + case OP_LOAD4: + EmitAddEDI4(vm); + EmitString( "BB" ); // mov ebx, 0x12345678 + Emit4( (Constant4()&vm->dataMask) + (int)vm->dataBase); + EmitString( "8B 03" ); // mov eax, dword ptr [ebx] + EmitCommand(LAST_COMMAND_MOV_EDI_EAX); // mov dword ptr [edi], eax + pc++; // OP_LOAD4 + instruction += 1; + return qtrue; + + case OP_LOAD2: + EmitAddEDI4(vm); + EmitString( "BB" ); // mov ebx, 0x12345678 + Emit4( (Constant4()&vm->dataMask) + (int)vm->dataBase); + EmitString( "0F B7 03" ); // movzx eax, word ptr [ebx] + EmitCommand(LAST_COMMAND_MOV_EDI_EAX); // mov dword ptr [edi], eax + pc++; // OP_LOAD2 + instruction += 1; + return qtrue; + + case OP_LOAD1: + EmitAddEDI4(vm); + EmitString( "BB" ); // mov ebx, 0x12345678 + Emit4( (Constant4()&vm->dataMask) + (int)vm->dataBase); + EmitString( "0F B6 03" ); // movzx eax, byte ptr [ebx] + EmitCommand(LAST_COMMAND_MOV_EDI_EAX); // mov dword ptr [edi], eax + pc++; // OP_LOAD1 + instruction += 1; + return qtrue; + + case OP_STORE4: + opt = EmitMovEBXEDI(vm, (vm->dataMask & ~3)); + EmitString( "B8" ); // mov eax, 0x12345678 + Emit4( Constant4() ); +// if (!opt) { +// EmitString( "81 E3" ); // and ebx, 0x12345678 +// Emit4( vm->dataMask & ~3 ); +// } + EmitString( "89 83" ); // mov dword ptr [ebx+0x12345678], eax + Emit4( (int)vm->dataBase ); + EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 + pc++; // OP_STORE4 + instruction += 1; + return qtrue; + + case OP_STORE2: + opt = EmitMovEBXEDI(vm, (vm->dataMask & ~1)); + EmitString( "B8" ); // mov eax, 0x12345678 + Emit4( Constant4() ); +// if (!opt) { +// EmitString( "81 E3" ); // and ebx, 0x12345678 +// Emit4( vm->dataMask & ~1 ); +// } + EmitString( "66 89 83" ); // mov word ptr [ebx+0x12345678], eax + Emit4( (int)vm->dataBase ); + EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 + pc++; // OP_STORE2 + instruction += 1; + return qtrue; + + case OP_STORE1: + opt = EmitMovEBXEDI(vm, vm->dataMask); + EmitString( "B8" ); // mov eax, 0x12345678 + Emit4( Constant4() ); +// if (!opt) { +// EmitString( "81 E3" ); // and ebx, 0x12345678 +// Emit4( vm->dataMask ); +// } + EmitString( "88 83" ); // mov byte ptr [ebx+0x12345678], eax + Emit4( (int)vm->dataBase ); + EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 + pc++; // OP_STORE4 + instruction += 1; + return qtrue; + + case OP_ADD: + v = Constant4(); + EmitMovEAXEDI( vm ); + if ( v >= 0 && v <= 127 ) { + EmitString( "83 C0" ); // add eax, 0x7F + Emit1( v ); + } else { + EmitString( "05" ); // add eax, 0x12345678 + Emit4( v ); + } + EmitCommand( LAST_COMMAND_MOV_EDI_EAX ); + pc++; // OP_ADD + instruction += 1; + return qtrue; + + case OP_SUB: + v = Constant4(); + EmitMovEAXEDI( vm ); + if ( v >= 0 && v <= 127 ) { + EmitString( "83 E8" ); // sub eax, 0x7F + Emit1( v ); + } else { + EmitString( "2D" ); // sub eax, 0x12345678 + Emit4( v ); + } + EmitCommand( LAST_COMMAND_MOV_EDI_EAX ); + pc++; // OP_SUB + instruction += 1; + return qtrue; + + case OP_MULI: + v = Constant4(); + EmitMovEAXEDI( vm ); + if ( v >= 0 && v <= 127 ) { + EmitString( "6B C0" ); // imul eax, 0x7F + Emit1( v ); + } else { + EmitString( "69 C0" ); // imul eax, 0x12345678 + Emit4( v ); + } + EmitCommand( LAST_COMMAND_MOV_EDI_EAX ); + pc++; // OP_MULI + instruction += 1; + return qtrue; + + case OP_LSH: + v = NextConstant4(); + if ( v < 0 || v > 31 ) + break; + EmitMovEAXEDI( vm ); + EmitString( "C1 E0" ); // shl dword ptr [edi], 0x12 + Emit1( v ); + EmitCommand( LAST_COMMAND_MOV_EDI_EAX ); + pc += 5; // CONST + OP_LSH + instruction += 1; + return qtrue; + + case OP_RSHI: + v = NextConstant4(); + if ( v < 0 || v > 31 ) + break; + EmitMovEAXEDI( vm ); + EmitString( "C1 F8" ); // sar eax, 0x12 + Emit1( v ); + EmitCommand( LAST_COMMAND_MOV_EDI_EAX ); + pc += 5; // CONST + OP_RSHI + instruction += 1; + return qtrue; + + case OP_RSHU: + v = NextConstant4(); + if ( v < 0 || v > 31 ) + break; + EmitMovEAXEDI( vm ); + EmitString( "C1 E8" ); // shr eax, 0x12 + Emit1( v ); + EmitCommand( LAST_COMMAND_MOV_EDI_EAX ); + pc += 5; // CONST + OP_RSHU + instruction += 1; + return qtrue; + + case OP_BAND: + v = Constant4(); + EmitMovEAXEDI( vm ); + if ( v >= 0 && v <= 127 ) { + EmitString( "83 E0" ); // and eax, 0x7F + Emit1( v ); + } else { + EmitString( "25" ); // and eax, 0x12345678 + Emit4( v ); + } + EmitCommand( LAST_COMMAND_MOV_EDI_EAX ); + pc += 1; // OP_BAND + instruction += 1; + return qtrue; + + case OP_BOR: + v = Constant4(); + EmitMovEAXEDI( vm ); + if ( v >= 0 && v <= 127 ) { + EmitString( "83 C8" ); // or eax, 0x7F + Emit1( v ); + } else { + EmitString( "0D" ); // or eax, 0x12345678 + Emit4( v ); + } + EmitCommand( LAST_COMMAND_MOV_EDI_EAX ); + pc += 1; // OP_BOR + instruction += 1; + return qtrue; + + case OP_BXOR: + v = Constant4(); + EmitMovEAXEDI( vm ); + if ( v >= 0 && v <= 127 ) { + EmitString( "83 F0" ); // xor eax, 0x7F + Emit1( v ); + } else { + EmitString( "35" ); // xor eax, 0x12345678 + Emit4( v ); + } + EmitCommand( LAST_COMMAND_MOV_EDI_EAX ); + pc += 1; // OP_BXOR + instruction += 1; + return qtrue; + + case OP_EQF: + case OP_NEF: + if ( NextConstant4() != 0 ) + break; + pc += 5; // CONST + OP_EQF|OP_NEF + EmitMovEAXEDI( vm ); + EmitCommand(LAST_COMMAND_SUB_DI_4); + // floating point hack :) + EmitString( "25" ); // and eax, 0x7FFFFFFF + Emit4( 0x7FFFFFFF ); + if ( op1 == OP_EQF ) + EmitString( "75 06" ); // jnz +6 + else + EmitString( "74 06" ); // jz +6 + EmitString( "FF 25" ); // jmp [0x12345678] + v = Constant4(); + JUSED(v); + Emit4( (int)vm->instructionPointers + v*4 ); + instruction += 1; + return qtrue; + + case OP_EQ: + case OP_NE: + v = Constant4(); + EmitMovEAXEDI( vm ); + EmitCommand(LAST_COMMAND_SUB_DI_4); + if ( v == 0 ) { + EmitString( "85 C0" ); // test eax, eax + } else { + EmitString( "3D" ); // cmp eax, 0x12345678 + Emit4( v ); + } + pc += 1; // OP_EQ/OP_NE + if ( op1 == OP_EQ ) + EmitString( "75 06" ); // jne +6 + else + EmitString( "74 06" ); // je +6 + EmitString( "FF 25" ); // jmp [0x12345678] + v = Constant4(); + JUSED(v); + Emit4( (int)vm->instructionPointers + v*4 ); + instruction += 1; + return qtrue; + + case OP_GEI: + case OP_GTI: + v = Constant4(); + EmitMovEAXEDI( vm ); + EmitCommand( LAST_COMMAND_SUB_DI_4 ); + EmitString( "3D" ); // cmp eax, 0x12345678 + Emit4( v ); + pc += 1; // OP_GEI|OP_GTI + if ( op1 == OP_GEI ) + EmitString( "7C 06" ); // jl +6 + else + EmitString( "7E 06" ); // jle +6 + EmitString( "FF 25" ); // jmp [0x12345678] + v = Constant4(); + JUSED(v); + Emit4( (int)vm->instructionPointers + v*4 ); + instruction += 1; + return qtrue; + + case OP_LEI: + case OP_LTI: + v = Constant4(); + EmitMovEAXEDI( vm ); + EmitCommand( LAST_COMMAND_SUB_DI_4 ); + EmitString( "3D" ); // cmp eax, 0x12345678 + Emit4( v ); + pc += 1; // OP_GEI|OP_GTI + if ( op1 == OP_LEI ) + EmitString( "7F 06" ); // jg +6 + else + EmitString( "7D 06" ); // jge +6 + EmitString( "FF 25" ); // jmp [0x12345678] + v = Constant4(); + JUSED(v); + Emit4( (int)vm->instructionPointers + v*4 ); + instruction += 1; + return qtrue; + + case OP_JUMP: + v = Constant4(); + JUSED(v); + EmitString( "FF 25" ); // jmp dword ptr [instructionPointers + 0x12345678] + Emit4( (int)vm->instructionPointers + v*4 ); + pc += 1; // OP_JUMP + instruction += 1; + return qtrue; + + case OP_CALL: + if ( NextConstant4() < 0 ) + break; + v = Constant4(); + JUSED(v); + // FIXME: not needed? + //EmitString( "C7 86" ); // mov dword ptr [esi+database],0x12345678 + //Emit4( (int)vm->dataBase ); + //Emit4( pc ); + EmitString( "FF 15" ); // call dword ptr [instructionPointers + 0x12345678] + Emit4( (int)vm->instructionPointers + v*4 ); + EmitString( "8B 07" ); // mov eax, dword ptr [edi] + pc += 1; // OP_CALL + instruction += 1; + return qtrue; + + default: + break; + } + + return qfalse; +} + + +/* +================= VM_Compile ================= */ @@ -428,15 +826,23 @@ int v; int i; qboolean opt; - int jusedSize = header->instructionCount + 2; + jusedSize = header->instructionCount + 2; // allocate a very large temp buffer, we will shrink it later maxLength = header->codeLength * 8; buf = Z_Malloc(maxLength); jused = Z_Malloc(jusedSize); + code = Z_Malloc(header->codeLength+32); Com_Memset(jused, 0, jusedSize); + Com_Memset(buf, 0, maxLength); + // copy code in larger buffer and put some zeros at the end + // so we can safely look ahead for a few instructions in it + // without a chance to get false-positive because of some garbage bytes + Com_Memset(code, 0, header->codeLength+32); + Com_Memcpy(code, (byte *)header + header->codeOffset, header->codeLength ); + // ensure that the optimisation pass knows about all the jump // table targets for( i = 0; i < vm->numJumpTableTargets; i++ ) { @@ -452,7 +858,7 @@ // translate all instructions pc = 0; instruction = 0; - code = (byte *)header + header->codeOffset; + //code = (byte *)header + header->codeOffset; compiledOfs = 0; LastCommand = LAST_COMMAND_NONE; @@ -466,6 +872,12 @@ } vm->instructionPointers[ instruction ] = compiledOfs; + + if ( !vm->jumpTableTargets ) + jlabel = 1; + else + jlabel = jused[ instruction ]; + instruction++; if(pc > header->codeLength) @@ -487,95 +899,8 @@ Emit4( Constant4() ); break; case OP_CONST: - if (code[pc+4] == OP_LOAD4) { - EmitAddEDI4(vm); - EmitString( "BB" ); // mov ebx, 0x12345678 - Emit4( (Constant4()&vm->dataMask) + (int)vm->dataBase); - EmitString( "8B 03" ); // mov eax, dword ptr [ebx] - EmitCommand(LAST_COMMAND_MOV_EDI_EAX); // mov dword ptr [edi], eax - pc++; // OP_LOAD4 - instruction += 1; + if ( ConstOptimize( vm ) ) break; - } - if (code[pc+4] == OP_LOAD2) { - EmitAddEDI4(vm); - EmitString( "BB" ); // mov ebx, 0x12345678 - Emit4( (Constant4()&vm->dataMask) + (int)vm->dataBase); - EmitString( "0F B7 03" ); // movzx eax, word ptr [ebx] - EmitCommand(LAST_COMMAND_MOV_EDI_EAX); // mov dword ptr [edi], eax - pc++; // OP_LOAD4 - instruction += 1; - break; - } - if (code[pc+4] == OP_LOAD1) { - EmitAddEDI4(vm); - EmitString( "BB" ); // mov ebx, 0x12345678 - Emit4( (Constant4()&vm->dataMask) + (int)vm->dataBase); - EmitString( "0F B6 03" ); // movzx eax, byte ptr [ebx] - EmitCommand(LAST_COMMAND_MOV_EDI_EAX); // mov dword ptr [edi], eax - pc++; // OP_LOAD4 - instruction += 1; - break; - } - if (code[pc+4] == OP_STORE4) { - opt = EmitMovEBXEDI(vm, (vm->dataMask & ~3)); - EmitString( "B8" ); // mov eax, 0x12345678 - Emit4( Constant4() ); -// if (!opt) { -// EmitString( "81 E3" ); // and ebx, 0x12345678 -// Emit4( vm->dataMask & ~3 ); -// } - EmitString( "89 83" ); // mov dword ptr [ebx+0x12345678], eax - Emit4( (int)vm->dataBase ); - EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 - pc++; // OP_STORE4 - instruction += 1; - break; - } - if (code[pc+4] == OP_STORE2) { - opt = EmitMovEBXEDI(vm, (vm->dataMask & ~1)); - EmitString( "B8" ); // mov eax, 0x12345678 - Emit4( Constant4() ); -// if (!opt) { -// EmitString( "81 E3" ); // and ebx, 0x12345678 -// Emit4( vm->dataMask & ~1 ); -// } - EmitString( "66 89 83" ); // mov word ptr [ebx+0x12345678], eax - Emit4( (int)vm->dataBase ); - EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 - pc++; // OP_STORE4 - instruction += 1; - break; - } - if (code[pc+4] == OP_STORE1) { - opt = EmitMovEBXEDI(vm, vm->dataMask); - EmitString( "B8" ); // mov eax, 0x12345678 - Emit4( Constant4() ); -// if (!opt) { -// EmitString( "81 E3" ); // and ebx, 0x12345678 -// Emit4( vm->dataMask ); -// } - EmitString( "88 83" ); // mov byte ptr [ebx+0x12345678], eax - Emit4( (int)vm->dataBase ); - EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 - pc++; // OP_STORE4 - instruction += 1; - break; - } - if (code[pc+4] == OP_ADD) { - EmitString( "81 07" ); // add dword ptr [edi], 0x1234567 - Emit4( Constant4() ); - pc++; // OP_ADD - instruction += 1; - break; - } - if (code[pc+4] == OP_SUB) { - EmitString( "81 2F" ); // sub dword ptr [edi], 0x1234567 - Emit4( Constant4() ); - pc++; // OP_ADD - instruction += 1; - break; - } EmitAddEDI4(vm); EmitString( "C7 07" ); // mov dword ptr [edi], 0x12345678 lastConst = Constant4(); @@ -741,9 +1066,9 @@ break; case OP_EQ: - EmitCommand(LAST_COMMAND_SUB_DI_8); // sub edi, 8 - EmitString( "8B 47 04" ); // mov eax, dword ptr [edi+4] - EmitString( "3B 47 08" ); // cmp eax, dword ptr [edi+8] + EmitMovEAXEDI( vm ); + EmitCommand( LAST_COMMAND_SUB_DI_8 ); // sub edi, 8 + EmitString( "3B 47 04" ); // cmp eax, dword ptr [edi+4] EmitString( "75 06" ); // jne +6 EmitString( "FF 25" ); // jmp [0x12345678] v = Constant4(); @@ -751,9 +1076,9 @@ Emit4( (int)vm->instructionPointers + v*4 ); break; case OP_NE: - EmitCommand(LAST_COMMAND_SUB_DI_8); // sub edi, 8 - EmitString( "8B 47 04" ); // mov eax, dword ptr [edi+4] - EmitString( "3B 47 08" ); // cmp eax, dword ptr [edi+8] + EmitMovEAXEDI( vm ); + EmitCommand( LAST_COMMAND_SUB_DI_8 ); // sub edi, 8 + EmitString( "3B 47 04" ); // cmp eax, dword ptr [edi+4] EmitString( "74 06" ); // je +6 EmitString( "FF 25" ); // jmp [0x12345678] v = Constant4(); @@ -761,9 +1086,9 @@ Emit4( (int)vm->instructionPointers + v*4 ); break; case OP_LTI: + EmitMovEAXEDI( vm ); EmitCommand(LAST_COMMAND_SUB_DI_8); // sub edi, 8 - EmitString( "8B 47 04" ); // mov eax, dword ptr [edi+4] - EmitString( "3B 47 08" ); // cmp eax, dword ptr [edi+8] + EmitString( "39 47 04" ); // cmp dword ptr [edi+4], eax EmitString( "7D 06" ); // jnl +6 EmitString( "FF 25" ); // jmp [0x12345678] v = Constant4(); @@ -771,9 +1096,9 @@ Emit4( (int)vm->instructionPointers + v*4 ); break; case OP_LEI: + EmitMovEAXEDI( vm ); EmitCommand(LAST_COMMAND_SUB_DI_8); // sub edi, 8 - EmitString( "8B 47 04" ); // mov eax, dword ptr [edi+4] - EmitString( "3B 47 08" ); // cmp eax, dword ptr [edi+8] + EmitString( "39 47 04" ); // cmp dword ptr [edi+4], eax EmitString( "7F 06" ); // jnle +6 EmitString( "FF 25" ); // jmp [0x12345678] v = Constant4(); @@ -781,9 +1106,9 @@ Emit4( (int)vm->instructionPointers + v*4 ); break; case OP_GTI: + EmitMovEAXEDI( vm ); EmitCommand(LAST_COMMAND_SUB_DI_8); // sub edi, 8 - EmitString( "8B 47 04" ); // mov eax, dword ptr [edi+4] - EmitString( "3B 47 08" ); // cmp eax, dword ptr [edi+8] + EmitString( "39 47 04" ); // cmp eax, dword ptr [edi+4] EmitString( "7E 06" ); // jng +6 EmitString( "FF 25" ); // jmp [0x12345678] v = Constant4(); @@ -791,9 +1116,9 @@ Emit4( (int)vm->instructionPointers + v*4 ); break; case OP_GEI: + EmitMovEAXEDI( vm ); EmitCommand(LAST_COMMAND_SUB_DI_8); // sub edi, 8 - EmitString( "8B 47 04" ); // mov eax, dword ptr [edi+4] - EmitString( "3B 47 08" ); // cmp eax, dword ptr [edi+8] + EmitString( "39 47 04" ); // cmp eax, dword ptr [edi+4] EmitString( "7C 06" ); // jnge +6 EmitString( "FF 25" ); // jmp [0x12345678] v = Constant4(); @@ -801,9 +1126,9 @@ Emit4( (int)vm->instructionPointers + v*4 ); break; case OP_LTU: + EmitMovEAXEDI( vm ); EmitCommand(LAST_COMMAND_SUB_DI_8); // sub edi, 8 - EmitString( "8B 47 04" ); // mov eax, dword ptr [edi+4] - EmitString( "3B 47 08" ); // cmp eax, dword ptr [edi+8] + EmitString( "39 47 04" ); // cmp eax, dword ptr [edi+4] EmitString( "73 06" ); // jnb +6 EmitString( "FF 25" ); // jmp [0x12345678] v = Constant4(); @@ -811,9 +1136,9 @@ Emit4( (int)vm->instructionPointers + v*4 ); break; case OP_LEU: + EmitMovEAXEDI( vm ); EmitCommand(LAST_COMMAND_SUB_DI_8); // sub edi, 8 - EmitString( "8B 47 04" ); // mov eax, dword ptr [edi+4] - EmitString( "3B 47 08" ); // cmp eax, dword ptr [edi+8] + EmitString( "39 47 04" ); // cmp eax, dword ptr [edi+4] EmitString( "77 06" ); // jnbe +6 EmitString( "FF 25" ); // jmp [0x12345678] v = Constant4(); @@ -821,9 +1146,9 @@ Emit4( (int)vm->instructionPointers + v*4 ); break; case OP_GTU: + EmitMovEAXEDI( vm ); EmitCommand(LAST_COMMAND_SUB_DI_8); // sub edi, 8 - EmitString( "8B 47 04" ); // mov eax, dword ptr [edi+4] - EmitString( "3B 47 08" ); // cmp eax, dword ptr [edi+8] + EmitString( "39 47 04" ); // cmp eax, dword ptr [edi+4] EmitString( "76 06" ); // jna +6 EmitString( "FF 25" ); // jmp [0x12345678] v = Constant4(); @@ -831,9 +1156,9 @@ Emit4( (int)vm->instructionPointers + v*4 ); break; case OP_GEU: + EmitMovEAXEDI( vm ); EmitCommand(LAST_COMMAND_SUB_DI_8); // sub edi, 8 - EmitString( "8B 47 04" ); // mov eax, dword ptr [edi+4] - EmitString( "3B 47 08" ); // cmp eax, dword ptr [edi+8] + EmitString( "39 47 04" ); // cmp eax, dword ptr [edi+4] EmitString( "72 06" ); // jnae +6 EmitString( "FF 25" ); // jmp [0x12345678] v = Constant4(); @@ -913,7 +1238,9 @@ Emit4( (int)vm->instructionPointers + v*4 ); break; case OP_NEGI: - EmitString( "F7 1F" ); // neg dword ptr [edi] + EmitMovEAXEDI( vm ); + EmitString( "F7 D8" ); // neg eax + EmitCommand( LAST_COMMAND_MOV_EDI_EAX ); break; case OP_ADD: EmitMovEAXEDI(vm); // mov eax, dword ptr [edi] @@ -984,18 +1311,21 @@ EmitString( "F7 17" ); // not dword ptr [edi] break; case OP_LSH: - EmitString( "8B 0F" ); // mov ecx, dword ptr [edi] - EmitString( "D3 67 FC" ); // shl dword ptr [edi-4], cl + //EmitString( "8B 0F" ); // mov ecx, dword ptr [edi] + EmitMovECXEDI( vm ); + EmitString( "D3 67 FC" ); // shl dword ptr [edi-4], cl EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 break; case OP_RSHI: - EmitString( "8B 0F" ); // mov ecx, dword ptr [edi] - EmitString( "D3 7F FC" ); // sar dword ptr [edi-4], cl + //EmitString( "8B 0F" ); // mov ecx, dword ptr [edi] + EmitMovECXEDI( vm ); + EmitString( "D3 7F FC" ); // sar dword ptr [edi-4], cl EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 break; case OP_RSHU: - EmitString( "8B 0F" ); // mov ecx, dword ptr [edi] - EmitString( "D3 6F FC" ); // shr dword ptr [edi-4], cl + //EmitString( "8B 0F" ); // mov ecx, dword ptr [edi] + EmitMovECXEDI( vm ); + EmitString( "D3 6F FC" ); // shr dword ptr [edi-4], cl EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 break; case OP_NEGF: @@ -1076,11 +1406,15 @@ break; case OP_JUMP: - EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 - EmitString( "8B 47 04" ); // mov eax,dword ptr [edi+4] - // FIXME: range check - EmitString( "FF 24 85" ); // jmp dword ptr [instructionPointers + eax * 4] + EmitCommand(LAST_COMMAND_SUB_DI_4); // sub edi, 4 + EmitString( "8B 47 04" ); // mov eax,dword ptr [edi+4] + EmitString( "3B 05" ); // cmp eax,[callMask] + Emit4( (int)&callMask ); + EmitString( "73 07" ); // jae +7 + EmitString( "FF 24 85" ); // jmp dword ptr [instructionPointers + eax * 4] Emit4( (int)vm->instructionPointers ); + EmitString( "FF 15" ); // call errJumpPtr + Emit4( (int)&errJumpPtr ); break; default: VMFREE_BUFFERS(); @@ -1123,6 +1457,7 @@ } #endif + Z_Free( code ); Z_Free( buf ); Z_Free( jused ); Com_Printf( "VM file %s compiled to %i bytes of code\n", vm->name, compiledOfs ); @@ -1161,8 +1496,10 @@ byte *image; void *opStack; int *oldInstructionPointers; + int oldCallMask; oldInstructionPointers = instructionPointers; + oldCallMask = callMask; currentVM = vm; instructionPointers = vm->instructionPointers; @@ -1170,7 +1507,7 @@ // interpret the code vm->currentlyInterpreting = qtrue; - callMask = vm->dataMask; + callMask = vm->instructionCount; // we might be called recursively, so this might not be the very top programStack = vm->programStack; @@ -1241,6 +1578,7 @@ // in case we were recursively called by another vm instructionPointers = oldInstructionPointers; + callMask = oldCallMask; return *(int *)opStack; }