Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[aandrejevic] 60466: [SOFT386] Fix previous fix.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Sep 30 02:28:17 2013 New Revision: 60466 URL: http://svn.reactos.org/svn/reactos?rev=60466&view=rev Log: [SOFT386] Fix previous fix. Modified: branches/ntvdm/lib/soft386/common.inl Modified: branches/ntvdm/lib/soft386/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.inl?re… ============================================================================== --- branches/ntvdm/lib/soft386/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.inl [iso-8859-1] Mon Sep 30 02:28:17 2013 @@ -649,7 +649,7 @@ } /* Clear the top 16 bits */ - ModRegRm->MemoryAddress &= 0xFFFF0000; + ModRegRm->MemoryAddress &= 0x0000FFFF; } return TRUE;

11 years, 2 months

[aandrejevic] 60465: [SOFT386] Remove whitespace from empty line. Fix addressing bug.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Sep 30 02:06:55 2013 New Revision: 60465 URL: http://svn.reactos.org/svn/reactos?rev=60465&view=rev Log: [SOFT386] Remove whitespace from empty line. Fix addressing bug. Modified: branches/ntvdm/lib/soft386/common.inl branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.inl?re… ============================================================================== --- branches/ntvdm/lib/soft386/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.inl [iso-8859-1] Mon Sep 30 02:06:55 2013 @@ -647,6 +647,9 @@ /* Add the signed offset to the address */ ModRegRm->MemoryAddress += (LONG)Offset; } + + /* Clear the top 16 bits */ + ModRegRm->MemoryAddress &= 0xFFFF0000; } return TRUE; Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Mon Sep 30 02:06:55 2013 @@ -705,7 +705,7 @@ { SOFT386_MOD_REG_RM ModRegRm; BOOLEAN OperandSize, AddressSize; - + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE)

11 years, 2 months

[aandrejevic] 60464: [SOFT386] Fix prefix handling.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Sep 30 00:27:56 2013 New Revision: 60464 URL: http://svn.reactos.org/svn/reactos?rev=60464&view=rev Log: [SOFT386] Fix prefix handling. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Mon Sep 30 00:27:56 2013 @@ -3757,16 +3757,17 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x68); - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; - } - else - { - /* Invalid prefix */ - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; } if (Size)

11 years, 2 months

[aandrejevic] 60463: [SOFT386] Fix the LOOP instruction. LOOP should loop while ECX is not zero, not otherwise.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Sep 30 00:02:53 2013 New Revision: 60463 URL: http://svn.reactos.org/svn/reactos?rev=60463&view=rev Log: [SOFT386] Fix the LOOP instruction. LOOP should loop while ECX is not zero, not otherwise. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Mon Sep 30 00:02:53 2013 @@ -5186,8 +5186,8 @@ Size = !Size; } - if (Size) Condition = ((--State->GeneralRegs[SOFT386_REG_ECX].Long) == 0); - else Condition = ((--State->GeneralRegs[SOFT386_REG_ECX].LowWord) == 0); + if (Size) Condition = ((--State->GeneralRegs[SOFT386_REG_ECX].Long) != 0); + else Condition = ((--State->GeneralRegs[SOFT386_REG_ECX].LowWord) != 0); if (Opcode == 0xE0) {

11 years, 2 months

[aandrejevic] 60462: [SOFT386] Fetching the immediate operand once is sufficient.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Sep 29 23:45:06 2013 New Revision: 60462 URL: http://svn.reactos.org/svn/reactos?rev=60462&view=rev Log: [SOFT386] Fetching the immediate operand once is sufficient. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sun Sep 29 23:45:06 2013 @@ -464,13 +464,6 @@ USHORT Immediate = (USHORT)((SHORT)ImmByte); // Sign extend USHORT Value, Dummy; - /* Fetch the immediate operand */ - if (!Soft386FetchWord(State, &Immediate)) - { - /* Exception occurred */ - return FALSE; - } - /* Read the operands */ if (!Soft386ReadModrmWordOperands(State, &ModRegRm, &Dummy, &Value)) {

11 years, 2 months

[aandrejevic] 60461: [SOFT386] Move the code for ADD/OR/ADC/SBB/AND/SUB/XOR/CMP to Soft386ArithmeticOperation, and use that function to implement groups 0x80, 0x81, 0x82 and 0x83.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Sep 29 23:38:31 2013 New Revision: 60461 URL: http://svn.reactos.org/svn/reactos?rev=60461&view=rev Log: [SOFT386] Move the code for ADD/OR/ADC/SBB/AND/SUB/XOR/CMP to Soft386ArithmeticOperation, and use that function to implement groups 0x80, 0x81, 0x82 and 0x83. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sun Sep 29 23:38:31 2013 @@ -20,6 +20,126 @@ #include "common.h" /* PRIVATE FUNCTIONS **********************************************************/ + +inline +static +ULONG +Soft386ArithmeticOperation(PSOFT386_STATE State, + INT Operation, + ULONG FirstValue, + ULONG SecondValue, + UCHAR Bits) +{ + ULONG Result; + ULONG SignFlag = 1 << (Bits - 1); + ULONG MaxValue = (1 << Bits) - 1; + + /* Make sure the values don't exceed the maximum for their size */ + FirstValue &= MaxValue; + SecondValue &= MaxValue; + + /* Check which operation is this */ + switch (Operation) + { + /* ADD */ + case 0: + { + Result = (FirstValue + SecondValue) & MaxValue; + + /* Update CF, OF and AF */ + State->Flags.Cf = (Result < FirstValue) && (Result < SecondValue); + State->Flags.Of = ((FirstValue & SignFlag) == (SecondValue & SignFlag)) + && ((FirstValue & SignFlag) != (Result & SignFlag)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + + break; + } + + /* OR */ + case 1: + { + Result = FirstValue | SecondValue; + break; + } + + /* ADC */ + case 2: + { + INT Carry = State->Flags.Cf ? 1 : 0; + + Result = (FirstValue + SecondValue + Carry) & MaxValue; + + /* Update CF, OF and AF */ + State->Flags.Cf = ((SecondValue == MaxValue) && (Carry == 1)) + || ((Result < FirstValue) && (Result < (SecondValue + Carry))); + State->Flags.Of = ((FirstValue & SignFlag) == (SecondValue & SignFlag)) + && ((FirstValue & SignFlag) != (Result & SignFlag)); + State->Flags.Af = (((FirstValue & 0x0F) + ((SecondValue + Carry) & 0x0F)) & 0x10) + ? TRUE : FALSE; + + break; + } + + /* SBB */ + case 3: + { + INT Carry = State->Flags.Cf ? 1 : 0; + + Result = (FirstValue - SecondValue - Carry) & MaxValue; + + /* Update CF, OF and AF */ + State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Of = ((FirstValue & SignFlag) != (SecondValue & SignFlag)) + && ((FirstValue & SignFlag) != (Result & SignFlag)); + State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + Carry) & 0x0F); + + break; + } + + /* AND */ + case 4: + { + Result = FirstValue & SecondValue; + break; + } + + /* SUB or CMP */ + case 5: + case 7: + { + Result = (FirstValue - SecondValue) & MaxValue; + + /* Update CF, OF and AF */ + State->Flags.Cf = FirstValue < SecondValue; + State->Flags.Of = ((FirstValue & SignFlag) != (SecondValue & SignFlag)) + && ((FirstValue & SignFlag) != (Result & SignFlag)); + State->Flags.Af = (FirstValue & 0x0F) < (SecondValue & 0x0F); + + break; + } + + /* XOR */ + case 6: + { + Result = FirstValue ^ SecondValue; + break; + } + + default: + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + } + + /* Update ZF, SF and PF */ + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SignFlag) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(LOBYTE(Result)); + + /* Return the result */ + return Result; +} static inline @@ -160,7 +280,7 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup8082) { - UCHAR Immediate, Result, Dummy, Value; + UCHAR Immediate, Dummy, Value; SOFT386_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -190,109 +310,13 @@ return FALSE; } - /* Check which operation is this */ - switch (ModRegRm.Register) - { - /* ADD */ - case 0: - { - Result = Value + Immediate; - - /* Update CF, OF and AF */ - State->Flags.Cf = (Result < Value) && (Result < Immediate); - State->Flags.Of = ((Value & SIGN_FLAG_BYTE) == (Immediate & SIGN_FLAG_BYTE)) - && ((Value & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); - State->Flags.Af = (((Value & 0x0F) + (Immediate & 0x0F)) & 0x10) ? TRUE : FALSE; - - break; - } - - /* OR */ - case 1: - { - Result = Value | Immediate; - break; - } - - /* ADC */ - case 2: - { - INT Carry = State->Flags.Cf ? 1 : 0; - - Result = Value + Immediate + Carry; - - /* Update CF, OF and AF */ - State->Flags.Cf = ((Immediate == 0xFF) && (Carry == 1)) - || ((Result < Value) && (Result < (Immediate + Carry))); - State->Flags.Of = ((Value & SIGN_FLAG_BYTE) == (Immediate & SIGN_FLAG_BYTE)) - && ((Value & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); - State->Flags.Af = (((Value & 0x0F) + ((Immediate + Carry) & 0x0F)) & 0x10) - ? TRUE : FALSE; - - break; - } - - /* SBB */ - case 3: - { - INT Carry = State->Flags.Cf ? 1 : 0; - - Result = Value - Immediate - Carry; - - /* Update CF, OF and AF */ - State->Flags.Cf = Value < (Immediate + Carry); - State->Flags.Of = ((Value & SIGN_FLAG_BYTE) != (Immediate & SIGN_FLAG_BYTE)) - && ((Value & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); - State->Flags.Af = (Value & 0x0F) < ((Immediate + Carry) & 0x0F); - - break; - } - - /* AND */ - case 4: - { - Result = Value & Immediate; - break; - } - - /* SUB or CMP */ - case 5: - case 7: - { - Result = Value - Immediate; - - /* Update CF, OF and AF */ - State->Flags.Cf = Value < Immediate; - State->Flags.Of = ((Value & SIGN_FLAG_BYTE) != (Immediate & SIGN_FLAG_BYTE)) - && ((Value & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); - State->Flags.Af = (Value & 0x0F) < (Immediate & 0x0F); - - break; - } - - /* XOR */ - case 6: - { - Value ^= Immediate; - break; - } - - default: - { - /* Shouldn't happen */ - ASSERT(FALSE); - } - } - - /* Update ZF, SF and PF */ - State->Flags.Zf = (Result == 0) ? TRUE : FALSE; - State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; - State->Flags.Pf = Soft386CalculateParity(Result); + /* Calculate the result */ + Value = Soft386ArithmeticOperation(State, ModRegRm.Register, Value, Immediate, 8); /* Unless this is CMP, write back the result */ if (ModRegRm.Register != 7) { - return Soft386WriteModrmByteOperands(State, &ModRegRm, FALSE, Result); + return Soft386WriteModrmByteOperands(State, &ModRegRm, FALSE, Value); } return TRUE; @@ -300,14 +324,171 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup81) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (OperandSize) + { + ULONG Immediate, Value, Dummy; + + /* Fetch the immediate operand */ + if (!Soft386FetchDword(State, &Immediate)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Soft386ReadModrmDwordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = Soft386ArithmeticOperation(State, ModRegRm.Register, Value, Immediate, 32); + + /* Unless this is CMP, write back the result */ + if (ModRegRm.Register != 7) + { + return Soft386WriteModrmDwordOperands(State, &ModRegRm, FALSE, Value); + } + } + else + { + USHORT Immediate, Value, Dummy; + + /* Fetch the immediate operand */ + if (!Soft386FetchWord(State, &Immediate)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Soft386ReadModrmWordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = Soft386ArithmeticOperation(State, ModRegRm.Register, Value, Immediate, 16); + + /* Unless this is CMP, write back the result */ + if (ModRegRm.Register != 7) + { + return Soft386WriteModrmWordOperands(State, &ModRegRm, FALSE, Value); + } + } + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup83) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + CHAR ImmByte; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Fetch the immediate operand */ + if (!Soft386FetchByte(State, (PUCHAR)&ImmByte)) + { + /* Exception occurred */ + return FALSE; + } + + if (OperandSize) + { + ULONG Immediate = (ULONG)((LONG)ImmByte); // Sign extend + ULONG Value, Dummy; + + /* Read the operands */ + if (!Soft386ReadModrmDwordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = Soft386ArithmeticOperation(State, ModRegRm.Register, Value, Immediate, 32); + + /* Unless this is CMP, write back the result */ + if (ModRegRm.Register != 7) + { + return Soft386WriteModrmDwordOperands(State, &ModRegRm, FALSE, Value); + } + } + else + { + USHORT Immediate = (USHORT)((SHORT)ImmByte); // Sign extend + USHORT Value, Dummy; + + /* Fetch the immediate operand */ + if (!Soft386FetchWord(State, &Immediate)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Soft386ReadModrmWordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = Soft386ArithmeticOperation(State, ModRegRm.Register, Value, Immediate, 16); + + /* Unless this is CMP, write back the result */ + if (ModRegRm.Register != 7) + { + return Soft386WriteModrmWordOperands(State, &ModRegRm, FALSE, Value); + } + } + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup8F)

11 years, 2 months

[aandrejevic] 60460: [SOFT386] The immediate operand should be fetched before attempting to read the MOD-REG-R/M byte operands.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Sep 29 22:24:46 2013 New Revision: 60460 URL: http://svn.reactos.org/svn/reactos?rev=60460&view=rev Log: [SOFT386] The immediate operand should be fetched before attempting to read the MOD-REG-R/M byte operands. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sun Sep 29 22:24:46 2013 @@ -384,15 +384,15 @@ return FALSE; } + /* Fetch the count */ + if (!Soft386FetchByte(State, &Count)) + { + /* Exception occurred */ + return FALSE; + } + /* Read the operands */ if (!Soft386ReadModrmByteOperands(State, &ModRegRm, &Dummy, &Value)) - { - /* Exception occurred */ - return FALSE; - } - - /* Fetch the count */ - if (!Soft386FetchByte(State, &Count)) { /* Exception occurred */ return FALSE;

11 years, 2 months

[aandrejevic] 60459: [SOFT386] Implement opcode groups 0xC0 and 0xC1, also using Soft386RotateOperation. Remove two unnecessary blank lines.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Sep 29 22:23:01 2013 New Revision: 60459 URL: http://svn.reactos.org/svn/reactos?rev=60459&view=rev Log: [SOFT386] Implement opcode groups 0xC0 and 0xC1, also using Soft386RotateOperation. Remove two unnecessary blank lines. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sun Sep 29 22:23:01 2013 @@ -368,14 +368,125 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC0) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + UCHAR Dummy, Value, Count; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Soft386ReadModrmByteOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Fetch the count */ + if (!Soft386FetchByte(State, &Count)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = LOBYTE(Soft386RotateOperation(State, + ModRegRm.Register, + Value, + 8, + Count)); + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + FALSE, + Value); } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC1) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + UCHAR Count; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Fetch the count */ + if (!Soft386FetchByte(State, &Count)) + { + /* Exception occurred */ + return FALSE; + } + + if (OperandSize) + { + ULONG Dummy, Value; + + /* Read the operands */ + if (!Soft386ReadModrmDwordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = Soft386RotateOperation(State, + ModRegRm.Register, + Value, + 32, + Count); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, &ModRegRm, FALSE, Value); + } + else + { + USHORT Dummy, Value; + + /* Read the operands */ + if (!Soft386ReadModrmWordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = LOWORD(Soft386RotateOperation(State, + ModRegRm.Register, + Value, + 16, + Count)); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, &ModRegRm, FALSE, Value); + } } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC6) @@ -632,7 +743,6 @@ OperandSize = !OperandSize; } - if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) { /* The ADSIZE prefix toggles the size */ @@ -687,7 +797,6 @@ /* Write back the result */ return Soft386WriteModrmWordOperands(State, &ModRegRm, FALSE, Value); } - } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupF6)

11 years, 2 months

[aandrejevic] 60458: [SOFT386] Move the ROL/ROR/RCL/RCR/SHL/SHR/SAL/SAR handling code to Soft386RotateOperation, then use that to implement opcode groups 0xD0, 0xD1, 0xD2 and 0xD3.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Sep 29 22:15:32 2013 New Revision: 60458 URL: http://svn.reactos.org/svn/reactos?rev=60458&view=rev Log: [SOFT386] Move the ROL/ROR/RCL/RCR/SHL/SHR/SAL/SAR handling code to Soft386RotateOperation, then use that to implement opcode groups 0xD0, 0xD1, 0xD2 and 0xD3. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sun Sep 29 22:15:32 2013 @@ -19,6 +19,143 @@ #include "opcodes.h" #include "common.h" +/* PRIVATE FUNCTIONS **********************************************************/ + +static +inline +ULONG +Soft386RotateOperation(PSOFT386_STATE State, + INT Operation, + ULONG Value, + UCHAR Bits, + UCHAR Count) +{ + ULONG HighestBit = 1 << (Bits - 1); + ULONG Result; + + if ((Operation != 2) && (Operation != 3)) + { + /* Mask the count */ + Count &= Bits - 1; + } + else + { + /* For RCL and RCR, the CF is included in the value */ + Count %= Bits + 1; + } + + /* Check which operation is this */ + switch (Operation) + { + /* ROL */ + case 0: + { + Result = (Value << Count) | (Value >> (Bits - Count)); + + /* Update CF and OF */ + State->Flags.Cf = Result & 1; + if (Count == 1) State->Flags.Of = ((Result & HighestBit) ? TRUE : FALSE) + ^ State->Flags.Cf; + + break; + } + + /* ROR */ + case 1: + { + Result = (Value >> Count) | (Value << (Bits - Count)); + + /* Update CF and OF */ + State->Flags.Cf = (Result & HighestBit) ? TRUE : FALSE; + if (Count == 1) State->Flags.Of = State->Flags.Cf + ^ ((Result & (HighestBit >> 1)) + ? TRUE : FALSE); + + break; + } + + /* RCL */ + case 2: + { + Result = (Value << Count) + | (State->Flags.Cf << (Count - 1)) + | (Value >> (Bits - Count + 1)); + + /* Update CF and OF */ + State->Flags.Cf = (Value & (1 << (Bits - Count))) ? TRUE : FALSE; + if (Count == 1) State->Flags.Of = ((Result & HighestBit) ? TRUE : FALSE) + ^ State->Flags.Cf; + + break; + } + + /* RCR */ + case 3: + { + Result = (Value >> Count) + | (State->Flags.Cf << (Bits - Count)) + | (Value << (Bits - Count + 1)); + + /* Update CF and OF */ + State->Flags.Cf = (Value & (1 << (Bits - Count))) ? TRUE : FALSE; + if (Count == 1) State->Flags.Of = State->Flags.Cf + ^ ((Result & (HighestBit >> 1)) + ? TRUE : FALSE); + + break; + } + + /* SHL/SAL */ + case 4: + case 6: + { + Result = Value << Count; + + /* Update CF and OF */ + State->Flags.Cf = (Value & (1 << (Bits - Count))) ? TRUE : FALSE; + if (Count == 1) State->Flags.Of = ((Result & HighestBit) ? TRUE : FALSE) + ^ (State->Flags.Cf ? TRUE : FALSE); + + break; + } + + /* SHR */ + case 5: + { + Result = Value >> Count; + + /* Update CF and OF */ + State->Flags.Cf = (Value & (1 << (Count - 1))) ? TRUE : FALSE; + if (Count == 1) State->Flags.Of = (Value & HighestBit) ? TRUE : FALSE; + + break; + } + + /* SAR */ + case 7: + { + Result = Value >> Count; + + /* Fill the top Count bits with the sign bit */ + if (Value & HighestBit) Result |= ((1 << Count) - 1) << (Bits - Count); + + /* Update CF and OF */ + State->Flags.Cf = Value & 1; + if (Count == 1) State->Flags.Of = FALSE; + + break; + } + } + + /* Update ZF, SF and PF */ + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & HighestBit) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Return the result */ + return Result; +} + /* PUBLIC FUNCTIONS ***********************************************************/ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup8082) @@ -347,7 +484,7 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD0) { - UCHAR Result, Dummy, Value; + UCHAR Dummy, Value; SOFT386_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -370,104 +507,8 @@ return FALSE; } - /* Check which operation is this */ - switch (ModRegRm.Register) - { - /* ROL */ - case 0: - { - Result = (Value << 1) | (Value >> 7); - - /* Update CF and OF */ - State->Flags.Cf = Value >> 7; - State->Flags.Of = ((Result & SIGN_FLAG_BYTE) ? TRUE : FALSE) - ^ (State->Flags.Cf ? TRUE : FALSE); - - break; - } - - /* ROR */ - case 1: - { - Result = (Value >> 1) | (Value << 7); - - /* Update CF and OF */ - State->Flags.Cf = Value & 1; - State->Flags.Of = ((Result & SIGN_FLAG_BYTE) ? TRUE : FALSE) - ^ ((Result & (SIGN_FLAG_BYTE >> 1)) ? TRUE : FALSE); - - break; - } - - /* RCL */ - case 2: - { - Result = (Value << 1) | (State->Flags.Cf ? 1 : 0); - - /* Update CF and OF */ - State->Flags.Cf = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE; - State->Flags.Of = ((Result & SIGN_FLAG_BYTE) ? TRUE : FALSE) - ^ (State->Flags.Cf ? TRUE : FALSE); - - break; - } - - /* RCR */ - case 3: - { - Result = (Value >> 1) | (State->Flags.Cf ? SIGN_FLAG_BYTE : 0); - - /* Update CF and OF */ - State->Flags.Cf = Value & 1; - State->Flags.Of = ((Result & SIGN_FLAG_BYTE) ? TRUE : FALSE) - ^ ((Result & (SIGN_FLAG_BYTE >> 1)) ? TRUE : FALSE); - - break; - } - - /* SHL/SAL */ - case 4: - case 6: - { - Result = Value << 1; - - /* Update CF and OF */ - State->Flags.Cf = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE; - State->Flags.Of = ((Result & SIGN_FLAG_BYTE) ? TRUE : FALSE) - ^ (State->Flags.Cf ? TRUE : FALSE); - - break; - } - - /* SHR */ - case 5: - { - Result = Value >> 1; - - /* Update CF and OF */ - State->Flags.Cf = Value & 1; - State->Flags.Of = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE; - - break; - } - - /* SAR */ - case 7: - { - Result = (Value >> 1) | (Value & SIGN_FLAG_BYTE); - - /* Update CF and OF */ - State->Flags.Cf = Value & 1; - State->Flags.Of = FALSE; - - break; - } - } - - /* Update ZF, SF and PF */ - State->Flags.Zf = (Result == 0) ? TRUE : FALSE; - State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; - State->Flags.Pf = Soft386CalculateParity(Result); + /* Calculate the result */ + Value = LOBYTE(Soft386RotateOperation(State, ModRegRm.Register, Value, 8, 1)); /* Write back the result */ return Soft386WriteModrmByteOperands(State, @@ -479,20 +520,174 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD1) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (OperandSize) + { + ULONG Dummy, Value; + + /* Read the operands */ + if (!Soft386ReadModrmDwordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = Soft386RotateOperation(State, ModRegRm.Register, Value, 32, 1); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, &ModRegRm, FALSE, Value); + } + else + { + USHORT Dummy, Value; + + /* Read the operands */ + if (!Soft386ReadModrmWordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = LOWORD(Soft386RotateOperation(State, ModRegRm.Register, Value, 16, 1)); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, &ModRegRm, FALSE, Value); + } } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD2) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + UCHAR Dummy, Value; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Soft386ReadModrmByteOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = LOBYTE(Soft386RotateOperation(State, + ModRegRm.Register, + Value, + 8, + State->GeneralRegs[SOFT386_REG_ECX].LowByte)); + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + FALSE, + Value); } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD3) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (OperandSize) + { + ULONG Dummy, Value; + + /* Read the operands */ + if (!Soft386ReadModrmDwordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = Soft386RotateOperation(State, + ModRegRm.Register, + Value, + 32, + State->GeneralRegs[SOFT386_REG_ECX].LowByte); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, &ModRegRm, FALSE, Value); + } + else + { + USHORT Dummy, Value; + + /* Read the operands */ + if (!Soft386ReadModrmWordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Value = LOWORD(Soft386RotateOperation(State, + ModRegRm.Register, + Value, + 16, + State->GeneralRegs[SOFT386_REG_ECX].LowByte)); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, &ModRegRm, FALSE, Value); + } + } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupF6)

11 years, 2 months

[tfaber] 60457: [NTOS:CC] - A BCB's cache segment list is sorted -- so actually make use of that property during list traversal - Fix inverted wait condition in CcZeroData - Correct offset check in...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Sep 29 21:08:15 2013 New Revision: 60457 URL: http://svn.reactos.org/svn/reactos?rev=60457&view=rev Log: [NTOS:CC] - A BCB's cache segment list is sorted -- so actually make use of that property during list traversal - Fix inverted wait condition in CcZeroData - Correct offset check in CcSetFileSizes CORE-7491 Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=604… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sun Sep 29 21:08:15 2013 @@ -371,6 +371,8 @@ IoStatus->Information = 0; return FALSE; } + if (current->FileOffset >= ReadOffset + Length) + break; current_entry = current_entry->Flink; } KeReleaseSpinLock(&Bcb->BcbLock, oldirql); @@ -484,6 +486,8 @@ /* datas not available */ return FALSE; } + if (CacheSeg->FileOffset >= WriteOffset + Length) + break; current_entry = current_entry->Flink; } KeReleaseSpinLock(&Bcb->BcbLock, oldirql); @@ -683,7 +687,7 @@ ULONG TempLength; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - if (Wait) + if (!Wait) { /* testing, if the requested datas are available */ KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); @@ -702,6 +706,8 @@ /* datas not available */ return FALSE; } + if (CacheSeg->FileOffset >= WriteOffset.u.LowPart + Length) + break; current_entry = current_entry->Flink; } KeReleaseSpinLock(&Bcb->BcbLock, oldirql); Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=60457… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sun Sep 29 21:08:15 2013 @@ -163,8 +163,7 @@ CACHE_SEGMENT, BcbSegmentListEntry); current_entry = current_entry->Flink; - if (current->FileOffset > FileSizes->AllocationSize.QuadPart || - (current->FileOffset == 0 && FileSizes->AllocationSize.QuadPart == 0)) + if (current->FileOffset >= FileSizes->AllocationSize.QuadPart) { if ((current->ReferenceCount == 0) || ((current->ReferenceCount == 1) && current->Dirty)) { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=604… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Sep 29 21:08:15 2013 @@ -487,6 +487,8 @@ NULL); return current; } + if (current->FileOffset > FileOffset) + break; current_entry = current_entry->Flink; } @@ -686,18 +688,12 @@ } if (current->FileOffset < FileOffset) { - if (previous == NULL) - { - previous = current; - } - else - { - if (previous->FileOffset < current->FileOffset) - { - previous = current; - } - } - } + ASSERT(previous == NULL || + previous->FileOffset < current->FileOffset); + previous = current; + } + if (current->FileOffset > FileOffset) + break; current_entry = current_entry->Flink; } /* There was no existing segment. */

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013