Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 60819: [FAST486] Implement the XADD instruction.
by aandrejevic＠svn.reactos.org 01 Nov '13

01 Nov '13

Author: aandrejevic Date: Fri Nov 1 02:48:28 2013 New Revision: 60819 URL: http://svn.reactos.org/svn/reactos?rev=60819&view=rev Log: [FAST486] Implement the XADD instruction. Modified: branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/extraops.h Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Fri Nov 1 02:48:28 2013 @@ -229,8 +229,8 @@ NULL, // TODO: OPCODE 0xBD NOT IMPLEMENTED NULL, // TODO: OPCODE 0xBE NOT IMPLEMENTED NULL, // TODO: OPCODE 0xBF NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xC0 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xC1 NOT IMPLEMENTED + Fast486ExtOpcodeXaddByte, + Fast486ExtOpcodeXadd, NULL, // Invalid NULL, // Invalid NULL, // Invalid @@ -1233,6 +1233,165 @@ return Fast486WriteModrmByteOperands(State, &ModRegRm, FALSE, Value); } +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeXaddByte) +{ + UCHAR Source, Destination, Result; + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xC0); + + TOGGLE_ADSIZE(AddressSize); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Fast486ReadModrmByteOperands(State, + &ModRegRm, + &Source, + &Destination)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = Source + Destination; + + /* Update the flags */ + State->Flags.Cf = (Result < Source) && (Result < Destination); + State->Flags.Of = ((Source & SIGN_FLAG_BYTE) == (Destination & SIGN_FLAG_BYTE)) + && ((Source & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (((Source & 0x0F) + (Destination & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Fast486CalculateParity(Result); + + /* Write the sum to the destination */ + if (!Fast486WriteModrmByteOperands(State, &ModRegRm, FALSE, Result)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write the old value of the destination to the source */ + if (!Fast486WriteModrmByteOperands(State, &ModRegRm, TRUE, Destination)) + { + /* Exception occurred */ + return FALSE; + } + + return TRUE; +} + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeXadd) +{ + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xC1); + + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + + TOGGLE_ADSIZE(AddressSize); + TOGGLE_OPSIZE(OperandSize); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG Source, Destination, Result; + + if (!Fast486ReadModrmDwordOperands(State, + &ModRegRm, + &Source, + &Destination)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = Source + Destination; + + /* Update the flags */ + State->Flags.Cf = (Result < Source) && (Result < Destination); + State->Flags.Of = ((Source & SIGN_FLAG_LONG) == (Destination & SIGN_FLAG_LONG)) + && ((Source & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (((Source & 0x0F) + (Destination & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Fast486CalculateParity(Result); + + /* Write the sum to the destination */ + if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, FALSE, Result)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write the old value of the destination to the source */ + if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, TRUE, Destination)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + USHORT Source, Destination, Result; + + if (!Fast486ReadModrmWordOperands(State, + &ModRegRm, + &Source, + &Destination)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = Source + Destination; + + /* Update the flags */ + State->Flags.Cf = (Result < Source) && (Result < Destination); + State->Flags.Of = ((Source & SIGN_FLAG_WORD) == (Destination & SIGN_FLAG_WORD)) + && ((Source & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (((Source & 0x0F) + (Destination & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Fast486CalculateParity(Result); + + /* Write the sum to the destination */ + if (!Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, Result)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write the old value of the destination to the source */ + if (!Fast486WriteModrmWordOperands(State, &ModRegRm, TRUE, Destination)) + { + /* Exception occurred */ + return FALSE; + } + } + + return TRUE; +} + FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBswap) { PUCHAR Pointer; Modified: branches/ntvdm/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] Fri Nov 1 02:48:28 2013 @@ -43,6 +43,8 @@ FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBtc); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeConditionalJmp); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeConditionalSet); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeXaddByte); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeXadd); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBswap); FAST486_OPCODE_HANDLER(Fast486OpcodeExtended);

1 0

[hbelusca] 60818: [FAST486] Fix the type of a variable. [NTVDM] Introduce a BOP handler table for the 256 possible BOP functions and use it.
by hbelusca＠svn.reactos.org 01 Nov '13

01 Nov '13

Author: hbelusca Date: Fri Nov 1 02:28:47 2013 New Revision: 60818 URL: http://svn.reactos.org/svn/reactos?rev=60818&view=rev Log: [FAST486] Fix the type of a variable. [NTVDM] Introduce a BOP handler table for the 256 possible BOP functions and use it. Modified: branches/ntvdm/lib/fast486/fast486.c branches/ntvdm/subsystems/ntvdm/bop.c branches/ntvdm/subsystems/ntvdm/bop.h branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Fri Nov 1 02:28:47 2013 @@ -219,7 +219,7 @@ NTAPI Fast486Reset(PFAST486_STATE State) { - USHORT i; + FAST486_SEG_REGS i; FAST486_MEM_READ_PROC MemReadCallback = State->MemReadCallback; FAST486_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback; Modified: branches/ntvdm/subsystems/ntvdm/bop.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bop.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bop.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bop.c [iso-8859-1] Fri Nov 1 02:28:47 2013 @@ -13,12 +13,12 @@ #include "emulator.h" #include "bios.h" +#include "bop.h" #include "dos.h" -#include "vga.h" -#include "pic.h" -#include "ps2.h" -#include "timer.h" - +//#include "vga.h" +//#include "pic.h" +//#include "ps2.h" +//#include "timer.h" LPCWSTR ExceptionName[] = { @@ -30,6 +30,266 @@ L"Bound Range Exceeded", L"Invalid Opcode", L"FPU Not Available" +}; + +EMULATOR_BOP_PROC BopProc[EMULATOR_MAX_BOP_NUM] = +{ + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + ControlBop }; VOID WINAPI Exception(BYTE ExceptionNumber, LPWORD Stack) Modified: branches/ntvdm/subsystems/ntvdm/bop.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bop.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bop.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bop.h [iso-8859-1] Fri Nov 1 02:28:47 2013 @@ -7,4 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ +typedef VOID (WINAPI *EMULATOR_BOP_PROC)(LPWORD Stack); + +extern EMULATOR_BOP_PROC BopProc[EMULATOR_MAX_BOP_NUM]; + +VOID WINAPI ControlBop(LPWORD Stack); + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Nov 1 02:28:47 2013 @@ -12,6 +12,7 @@ #include "emulator.h" #include "bios.h" +#include "bop.h" #include "dos.h" #include "vga.h" #include "pic.h" @@ -225,7 +226,6 @@ } } -VOID WINAPI ControlBop(LPWORD Stack); static VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode) { WORD StackSegment, StackPointer; @@ -238,16 +238,10 @@ /* Get the stack */ Stack = (LPWORD)SEG_OFF_TO_PTR(StackSegment, StackPointer); - switch (BopCode) - { - case EMULATOR_INT_BOP: - ControlBop(Stack); - break; - - default: - DPRINT1("Invalid BOP code %u\n", BopCode); - break; - } + if (BopProc[BopCode] != NULL) + BopProc[BopCode](Stack); + else + DPRINT1("Invalid BOP code %u\n", BopCode); } static UCHAR WINAPI EmulatorIntAcknowledge(PFAST486_STATE State) Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Fri Nov 1 02:28:47 2013 @@ -35,8 +35,9 @@ #define EMULATOR_FLAG_ID (1 << 21) /* Common definitions */ -#define EMULATOR_BOP 0xC4C4 -#define EMULATOR_INT_BOP 0xFF +#define EMULATOR_BOP 0xC4C4 +#define EMULATOR_INT_BOP 0xFF +#define EMULATOR_MAX_BOP_NUM 0xFF + 1 #define STACK_COUNTER 0 #define STACK_INT_NUM 1

1 0

[aandrejevic] 60817: [FAST486] Fix a bug in the IRET instruction.
by aandrejevic＠svn.reactos.org 01 Nov '13

01 Nov '13

Author: aandrejevic Date: Fri Nov 1 02:08:34 2013 New Revision: 60817 URL: http://svn.reactos.org/svn/reactos?rev=60817&view=rev Log: [FAST486] Fix a bug in the IRET instruction. Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Fri Nov 1 02:08:34 2013 @@ -4613,7 +4613,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeIret) { - USHORT i; + FAST486_SEG_REGS i; ULONG InstPtr, CodeSel, StackPtr, StackSel; FAST486_FLAGS_REG NewFlags; BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; @@ -4777,7 +4777,7 @@ Cpl = Fast486GetCurrentPrivLevel(State); /* Check segment security */ - for (i = 0; i <= FAST486_NUM_SEG_REGS; i++) + for (i = 0; i < FAST486_NUM_SEG_REGS; i++) { /* Don't check CS or SS */ if ((i == FAST486_REG_CS) || (i == FAST486_REG_SS)) continue;

1 0

[aandrejevic] 60816: [NTVDM] Revert a previous incorrect fix for the PIT. Modify the PitDecrementCount function to take a parameter instead of it being called multiple times (which is slower).
by aandrejevic＠svn.reactos.org 01 Nov '13

01 Nov '13

Author: aandrejevic Date: Fri Nov 1 01:57:40 2013 New Revision: 60816 URL: http://svn.reactos.org/svn/reactos?rev=60816&view=rev Log: [NTVDM] Revert a previous incorrect fix for the PIT. Modify the PitDecrementCount function to take a parameter instead of it being called multiple times (which is slower). Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/timer.c branches/ntvdm/subsystems/ntvdm/timer.h Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Fri Nov 1 01:57:40 2013 @@ -140,35 +140,20 @@ /* Main loop */ while (VdmRunning) { - /* Get the resolution of the system timer */ - DWORD TimerResolution = PitGetResolution(); - /* Get the current number of ticks */ CurrentTickCount = GetTickCount(); - if (TimerResolution > 1000) - { - /* Get the current performance counter value */ - QueryPerformanceCounter(&Counter); + /* Get the current performance counter value */ + QueryPerformanceCounter(&Counter); - /* Get the number of PIT ticks that have passed */ - TimerTicks = ((Counter.QuadPart - LastTimerTick.QuadPart) - * PIT_BASE_FREQUENCY) / Frequency.QuadPart; - } - else - { - /* Use the standard tick count */ - Counter.QuadPart = CurrentTickCount; + /* Get the number of PIT ticks that have passed */ + TimerTicks = ((Counter.QuadPart - LastTimerTick.QuadPart) + * PIT_BASE_FREQUENCY) / Frequency.QuadPart; - /* Get the number of PIT ticks that have passed */ - TimerTicks = ((Counter.QuadPart - LastTimerTick.QuadPart) - * PIT_BASE_FREQUENCY) / 1000; - } - /* Update the PIT */ if (TimerTicks > 0) { - for (i = 0; i < TimerTicks; i++) PitDecrementCount(); + PitDecrementCount(TimerTicks); LastTimerTick = Counter; } Modified: branches/ntvdm/subsystems/ntvdm/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] Fri Nov 1 01:57:40 2013 @@ -146,7 +146,7 @@ } } -VOID PitDecrementCount() +VOID PitDecrementCount(DWORD Count) { INT i; @@ -157,7 +157,12 @@ case PIT_MODE_INT_ON_TERMINAL_COUNT: { /* Decrement the value */ - PitChannels[i].CurrentValue--; + if (Count > PitChannels[i].CurrentValue) + { + /* The value does not reload in this case */ + PitChannels[i].CurrentValue = 0; + } + else PitChannels[i].CurrentValue -= Count; /* Did it fall to the terminal count? */ if (PitChannels[i].CurrentValue == 0 && !PitChannels[i].Pulsed) @@ -171,47 +176,100 @@ case PIT_MODE_RATE_GENERATOR: { - /* Decrement the value */ - PitChannels[i].CurrentValue--; - - /* Did it fall to zero? */ - if (PitChannels[i].CurrentValue != 0) break; - - /* Yes, raise the output line and reload */ - if (i == 0) PicInterruptRequest(0); - PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; + BOOLEAN Reloaded = FALSE; + + while (Count) + { + if ((Count > PitChannels[i].CurrentValue) + && (PitChannels[i].CurrentValue != 0)) + { + /* Decrease the count */ + Count -= PitChannels[i].CurrentValue; + + /* Reload the value */ + PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; + + /* Set the flag */ + Reloaded = TRUE; + } + else + { + /* Decrease the value */ + PitChannels[i].CurrentValue -= Count; + + /* Clear the count */ + Count = 0; + + /* Did it fall to zero? */ + if (PitChannels[i].CurrentValue == 0) + { + PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; + Reloaded = TRUE; + } + } + } + + /* If there was a reload on channel 0, raise IRQ 0 */ + if ((i == 0) && Reloaded) PicInterruptRequest(0); break; } case PIT_MODE_SQUARE_WAVE: { - /* Decrement the value by 2 */ - PitChannels[i].CurrentValue -= 2; - - /* Did it fall to zero? */ - if (PitChannels[i].CurrentValue != 0) break; - - /* Yes, toggle the flip-flop */ - PitChannels[i].OutputFlipFlop = !PitChannels[i].OutputFlipFlop; - - /* Did this create a rising edge in the signal? */ - if (PitChannels[i].OutputFlipFlop) - { - /* Yes, IRQ 0 if this is channel 0 */ - if (i == 0) PicInterruptRequest(0); - } - - /* Reload the value, but make sure it's even */ - if (PitChannels[i].ReloadValue % 2) - { - /* It's odd, reduce it by 1 */ - PitChannels[i].CurrentValue = PitChannels[i].ReloadValue - 1; - } - else - { - /* It was even */ - PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; + INT ReloadCount = 0; + WORD ReloadValue = PitChannels[i].ReloadValue; + + /* The reload value must be even */ + ReloadValue &= ~1; + + while (Count) + { + if (((Count * 2) > PitChannels[i].CurrentValue) + && (PitChannels[i].CurrentValue != 0)) + { + /* Decrease the count */ + Count -= PitChannels[i].CurrentValue / 2; + + /* Reload the value */ + PitChannels[i].CurrentValue = ReloadValue; + + /* Increment the reload count */ + ReloadCount++; + } + else + { + /* Clear the count */ + Count = 0; + + /* Decrease the value */ + PitChannels[i].CurrentValue -= Count * 2; + + /* Did it fall to zero? */ + if (PitChannels[i].CurrentValue == 0) + { + /* Reload the value */ + PitChannels[i].CurrentValue = ReloadValue; + + /* Increment the reload count */ + ReloadCount++; + } + } + } + + if (ReloadCount == 0) break; + + /* Toggle the flip-flop if the number of reloads was odd */ + if (ReloadCount & 1) + { + PitChannels[i].OutputFlipFlop = !PitChannels[i].OutputFlipFlop; + } + + /* Was there any rising edge on channel 0 ? */ + if ((PitChannels[i].OutputFlipFlop || ReloadCount) && (i == 0)) + { + /* Yes, IRQ 0 */ + PicInterruptRequest(0); } break; Modified: branches/ntvdm/subsystems/ntvdm/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] Fri Nov 1 01:57:40 2013 @@ -48,7 +48,7 @@ VOID PitWriteCommand(BYTE Value); BYTE PitReadData(BYTE Channel); VOID PitWriteData(BYTE Channel, BYTE Value); -VOID PitDecrementCount(); +VOID PitDecrementCount(DWORD Count); DWORD PitGetResolution(VOID); #endif // _TIMER_H_

1 0

[hbelusca] 60815: Fix a comment...
by hbelusca＠svn.reactos.org 01 Nov '13

01 Nov '13

Author: hbelusca Date: Fri Nov 1 01:51:15 2013 New Revision: 60815 URL: http://svn.reactos.org/svn/reactos?rev=60815&view=rev Log: Fix a comment... Modified: branches/ntvdm/lib/fast486/common.c Modified: branches/ntvdm/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.c [iso-8859-1] Fri Nov 1 01:51:15 2013 @@ -146,7 +146,7 @@ PageLength = PAGE_OFFSET(LinearAddress + Size); } - /* Read the entry */ + /* Read the memory */ State->MemReadCallback(State, (TableEntry.Address << 12) | PageOffset, Buffer, @@ -155,7 +155,7 @@ } else { - /* Read the entry */ + /* Read the memory */ State->MemReadCallback(State, LinearAddress, Buffer, Size); } @@ -260,7 +260,7 @@ PageLength = PAGE_OFFSET(LinearAddress + Size); } - /* Write the entry */ + /* Write the memory */ State->MemWriteCallback(State, (TableEntry.Address << 12) | PageOffset, Buffer, @@ -269,7 +269,7 @@ } else { - /* Write the entry */ + /* Write the memory */ State->MemWriteCallback(State, LinearAddress, Buffer, Size); }

1 0

[hbelusca] 60814: [FAST486][NTVDM] - Introduce a Fast486Initialize which is used to set up the CPU callbacks (and use default ones if some of the given callbacks are NULL), and to reset it the firs...
by hbelusca＠svn.reactos.org 01 Nov '13

01 Nov '13

Author: hbelusca Date: Fri Nov 1 01:46:58 2013 New Revision: 60814 URL: http://svn.reactos.org/svn/reactos?rev=60814&view=rev Log: [FAST486][NTVDM] - Introduce a Fast486Initialize which is used to set up the CPU callbacks (and use default ones if some of the given callbacks are NULL), and to reset it the first time. Now Fast486Reset is meant to be used for only resetting the CPU to a safe state. - Hence we are now sure that State->WhateverCallback is never NULL (and is theoretically valid), so don't do NULL-checks when calling them, but call them directly. The default cases for those checks become the default calls for the default callbacks. - Remove the now-unneeded EmulatorIdle function. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/common.c branches/ntvdm/lib/fast486/common.inl branches/ntvdm/lib/fast486/fast486.c branches/ntvdm/lib/fast486/opcodes.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Nov 1 01:46:58 2013 @@ -391,6 +391,21 @@ VOID NTAPI +Fast486Initialize(PFAST486_STATE State, + FAST486_MEM_READ_PROC MemReadCallback, + FAST486_MEM_WRITE_PROC MemWriteCallback, + FAST486_IO_READ_PROC IoReadCallback, + FAST486_IO_WRITE_PROC IoWriteCallback, + FAST486_IDLE_PROC IdleCallback, + FAST486_BOP_PROC BopCallback, + FAST486_INT_ACK_PROC IntAckCallback); + +VOID +NTAPI +Fast486Reset(PFAST486_STATE State); + +VOID +NTAPI Fast486Continue(PFAST486_STATE State); VOID @@ -408,10 +423,6 @@ VOID NTAPI Fast486DumpState(PFAST486_STATE State); - -VOID -NTAPI -Fast486Reset(PFAST486_STATE State); VOID NTAPI Modified: branches/ntvdm/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.c [iso-8859-1] Fri Nov 1 01:46:58 2013 @@ -65,7 +65,6 @@ { /* Read beyond limit */ Fast486Exception(State, FAST486_EXCEPTION_GP); - return FALSE; } @@ -91,7 +90,6 @@ if (!CachedDescriptor->Executable) { /* Data segment not executable */ - Fast486Exception(State, FAST486_EXCEPTION_GP); return FALSE; } @@ -101,7 +99,6 @@ if (CachedDescriptor->Executable && (!CachedDescriptor->ReadWrite)) { /* Code segment not readable */ - Fast486Exception(State, FAST486_EXCEPTION_GP); return FALSE; } @@ -149,37 +146,17 @@ PageLength = PAGE_OFFSET(LinearAddress + Size); } - /* Did the host provide a memory hook? */ - if (State->MemReadCallback) - { - /* Yes, call the host */ - State->MemReadCallback(State, - (TableEntry.Address << 12) | PageOffset, - Buffer, - PageLength); - } - else - { - /* Read the memory directly */ - RtlMoveMemory(Buffer, - (PVOID)((TableEntry.Address << 12) | PageOffset), - PageLength); - } + /* Read the entry */ + State->MemReadCallback(State, + (TableEntry.Address << 12) | PageOffset, + Buffer, + PageLength); } } else { - /* Did the host provide a memory hook? */ - if (State->MemReadCallback) - { - /* Yes, call the host */ - State->MemReadCallback(State, LinearAddress, Buffer, Size); - } - else - { - /* Read the memory directly */ - RtlMoveMemory(Buffer, (PVOID)LinearAddress, Size); - } + /* Read the entry */ + State->MemReadCallback(State, LinearAddress, Buffer, Size); } return TRUE; @@ -229,14 +206,12 @@ if (CachedDescriptor->Executable) { /* Code segment not writable */ - Fast486Exception(State, FAST486_EXCEPTION_GP); return FALSE; } else if (!CachedDescriptor->ReadWrite) { /* Data segment not writeable */ - Fast486Exception(State, FAST486_EXCEPTION_GP); return FALSE; } @@ -285,37 +260,17 @@ PageLength = PAGE_OFFSET(LinearAddress + Size); } - /* Did the host provide a memory hook? */ - if (State->MemWriteCallback) - { - /* Yes, call the host */ - State->MemWriteCallback(State, - (TableEntry.Address << 12) | PageOffset, - Buffer, - PageLength); - } - else - { - /* Read the memory directly */ - RtlMoveMemory((PVOID)((TableEntry.Address << 12) | PageOffset), - Buffer, - PageLength); - } + /* Write the entry */ + State->MemWriteCallback(State, + (TableEntry.Address << 12) | PageOffset, + Buffer, + PageLength); } } else { - /* Did the host provide a memory hook? */ - if (State->MemWriteCallback) - { - /* Yes, call the host */ - State->MemWriteCallback(State, LinearAddress, Buffer, Size); - } - else - { - /* Write the memory directly */ - RtlMoveMemory((PVOID)LinearAddress, Buffer, Size); - } + /* Write the entry */ + State->MemWriteCallback(State, LinearAddress, Buffer, Size); } return TRUE; @@ -339,17 +294,10 @@ { /* Read the TSS */ // FIXME: This code is only correct when paging is disabled!!! - if (State->MemReadCallback) - { - State->MemReadCallback(State, - State->Tss.Address, - &Tss, - sizeof(Tss)); - } - else - { - RtlMoveMemory(&Tss, (PVOID)State->Tss.Address, sizeof(Tss)); - } + State->MemReadCallback(State, + State->Tss.Address, + &Tss, + sizeof(Tss)); /* Check the new (higher) privilege level */ switch (GET_SEGMENT_RPL(SegmentSelector)) Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Fri Nov 1 01:46:58 2013 @@ -186,21 +186,11 @@ /* Read the GDT */ // FIXME: This code is only correct when paging is disabled!!! - if (State->MemReadCallback) - { - State->MemReadCallback(State, - State->Gdtr.Address - + GET_SEGMENT_INDEX(Selector), - &GdtEntry, - sizeof(GdtEntry)); - } - else - { - RtlMoveMemory(&GdtEntry, - (PVOID)(State->Gdtr.Address - + GET_SEGMENT_INDEX(Selector)), - sizeof(GdtEntry)); - } + State->MemReadCallback(State, + State->Gdtr.Address + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry)); if (Segment == FAST486_REG_SS) { @@ -399,42 +389,22 @@ { /* Read from the IDT */ // FIXME: This code is only correct when paging is disabled!!! - if (State->MemReadCallback) - { - State->MemReadCallback(State, - State->Idtr.Address - + Number * sizeof(*IdtEntry), - IdtEntry, - sizeof(*IdtEntry)); - } - else - { - RtlMoveMemory(IdtEntry, - (PVOID)(State->Idtr.Address - + Number * sizeof(*IdtEntry)), - sizeof(*IdtEntry)); - } + State->MemReadCallback(State, + State->Idtr.Address + + Number * sizeof(*IdtEntry), + IdtEntry, + sizeof(*IdtEntry)); } else { /* Read from the real-mode IVT */ /* Paging is always disabled in real mode */ - if (State->MemReadCallback) - { - State->MemReadCallback(State, - State->Idtr.Address - + Number * sizeof(FarPointer), - &FarPointer, - sizeof(FarPointer)); - } - else - { - RtlMoveMemory(&FarPointer, - (PVOID)(State->Idtr.Address - + Number * sizeof(FarPointer)), - sizeof(FarPointer)); - } + State->MemReadCallback(State, + State->Idtr.Address + + Number * sizeof(FarPointer), + &FarPointer, + sizeof(FarPointer)); /* Fill a fake IDT entry */ IdtEntry->Offset = LOWORD(FarPointer); @@ -458,6 +428,7 @@ BOOLEAN Fast486CalculateParity(UCHAR Number) { + // See http://graphics.stanford.edu/~seander/bithacks.html#ParityLookupTable too... return (0x9669 >> ((Number & 0x0F) ^ (Number >> 4))) & 1; } Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Fri Nov 1 01:46:58 2013 @@ -124,38 +124,146 @@ || (Fast486OpcodeHandlers[Opcode] == Fast486OpcodePrefix)); } +/* DEFAULT CALLBACKS **********************************************************/ + +static VOID +NTAPI +Fast486MemReadCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) +{ + UNREFERENCED_PARAMETER(State); + + RtlMoveMemory(Buffer, (PVOID)Address, Size); +} + +static VOID +NTAPI +Fast486MemWriteCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) +{ + UNREFERENCED_PARAMETER(State); + + RtlMoveMemory((PVOID)Address, Buffer, Size); +} + +static VOID +NTAPI +Fast486IoReadCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) +{ + UNREFERENCED_PARAMETER(State); + UNREFERENCED_PARAMETER(Port); + UNREFERENCED_PARAMETER(Buffer); + UNREFERENCED_PARAMETER(Size); +} + +static VOID +NTAPI +Fast486IoWriteCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) +{ + UNREFERENCED_PARAMETER(State); + UNREFERENCED_PARAMETER(Port); + UNREFERENCED_PARAMETER(Buffer); + UNREFERENCED_PARAMETER(Size); +} + +static VOID +NTAPI +Fast486IdleCallback(PFAST486_STATE State) +{ + UNREFERENCED_PARAMETER(State); +} + +static VOID +NTAPI +Fast486BopCallback(PFAST486_STATE State, UCHAR BopCode) +{ + UNREFERENCED_PARAMETER(State); + UNREFERENCED_PARAMETER(BopCode); +} + +static UCHAR +NTAPI +Fast486IntAckCallback(PFAST486_STATE State) +{ + UNREFERENCED_PARAMETER(State); + + /* Return something... */ + return 0; +} + /* PUBLIC FUNCTIONS ***********************************************************/ VOID NTAPI -Fast486Continue(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_CONTINUE); -} - -VOID -NTAPI -Fast486StepInto(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_STEP_INTO); -} - -VOID -NTAPI -Fast486StepOver(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_STEP_OVER); -} - -VOID -NTAPI -Fast486StepOut(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_STEP_OUT); +Fast486Initialize(PFAST486_STATE State, + FAST486_MEM_READ_PROC MemReadCallback, + FAST486_MEM_WRITE_PROC MemWriteCallback, + FAST486_IO_READ_PROC IoReadCallback, + FAST486_IO_WRITE_PROC IoWriteCallback, + FAST486_IDLE_PROC IdleCallback, + FAST486_BOP_PROC BopCallback, + FAST486_INT_ACK_PROC IntAckCallback) +{ + /* Set the callbacks (or use default ones if some are NULL) */ + State->MemReadCallback = (MemReadCallback ? MemReadCallback : Fast486MemReadCallback ); + State->MemWriteCallback = (MemWriteCallback ? MemWriteCallback : Fast486MemWriteCallback); + State->IoReadCallback = (IoReadCallback ? IoReadCallback : Fast486IoReadCallback ); + State->IoWriteCallback = (IoWriteCallback ? IoWriteCallback : Fast486IoWriteCallback ); + State->IdleCallback = (IdleCallback ? IdleCallback : Fast486IdleCallback ); + State->BopCallback = (BopCallback ? BopCallback : Fast486BopCallback ); + State->IntAckCallback = (IntAckCallback ? IntAckCallback : Fast486IntAckCallback ); + + /* Reset the CPU */ + Fast486Reset(State); +} + +VOID +NTAPI +Fast486Reset(PFAST486_STATE State) +{ + USHORT i; + + FAST486_MEM_READ_PROC MemReadCallback = State->MemReadCallback; + FAST486_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback; + FAST486_IO_READ_PROC IoReadCallback = State->IoReadCallback; + FAST486_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback; + FAST486_IDLE_PROC IdleCallback = State->IdleCallback; + FAST486_BOP_PROC BopCallback = State->BopCallback; + FAST486_INT_ACK_PROC IntAckCallback = State->IntAckCallback; + + /* Clear the entire structure */ + RtlZeroMemory(State, sizeof(*State)); + + /* Initialize the registers */ + State->Flags.AlwaysSet = 1; + State->InstPtr.LowWord = 0xFFF0; + + /* Initialize segments */ + for (i = 0; i < FAST486_NUM_SEG_REGS; i++) + { + /* Set the selector, base and limit, other values don't apply in real mode */ + State->SegmentRegs[i].Selector = 0; + State->SegmentRegs[i].Base = 0; + State->SegmentRegs[i].Limit = 0xFFFF; + } + + /* Initialize the code segment */ + State->SegmentRegs[FAST486_REG_CS].Selector = 0xF000; + State->SegmentRegs[FAST486_REG_CS].Base = 0xFFFF0000; + + /* Initialize the IDT */ + State->Idtr.Size = 0x3FF; + State->Idtr.Address = 0; + + /* Initialize CR0 */ + State->ControlRegisters[FAST486_REG_CR0] |= FAST486_CR0_ET; + + /* Restore the callbacks */ + State->MemReadCallback = MemReadCallback; + State->MemWriteCallback = MemWriteCallback; + State->IoReadCallback = IoReadCallback; + State->IoWriteCallback = IoWriteCallback; + State->IdleCallback = IdleCallback; + State->BopCallback = BopCallback; + State->IntAckCallback = IntAckCallback; } VOID @@ -244,52 +352,34 @@ VOID NTAPI -Fast486Reset(PFAST486_STATE State) -{ - INT i; - FAST486_MEM_READ_PROC MemReadCallback = State->MemReadCallback; - FAST486_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback; - FAST486_IO_READ_PROC IoReadCallback = State->IoReadCallback; - FAST486_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback; - FAST486_IDLE_PROC IdleCallback = State->IdleCallback; - FAST486_BOP_PROC BopCallback = State->BopCallback; - FAST486_INT_ACK_PROC IntAckCallback = State->IntAckCallback; - - /* Clear the entire structure */ - RtlZeroMemory(State, sizeof(*State)); - - /* Initialize the registers */ - State->Flags.AlwaysSet = 1; - State->InstPtr.LowWord = 0xFFF0; - - /* Initialize segments */ - for (i = 0; i < FAST486_NUM_SEG_REGS; i++) - { - /* Set the selector, base and limit, other values don't apply in real mode */ - State->SegmentRegs[i].Selector = 0; - State->SegmentRegs[i].Base = 0; - State->SegmentRegs[i].Limit = 0xFFFF; - } - - /* Initialize the code segment */ - State->SegmentRegs[FAST486_REG_CS].Selector = 0xF000; - State->SegmentRegs[FAST486_REG_CS].Base = 0xFFFF0000; - - /* Initialize the IDT */ - State->Idtr.Size = 0x3FF; - State->Idtr.Address = 0; - - /* Initialize CR0 */ - State->ControlRegisters[FAST486_REG_CR0] |= FAST486_CR0_ET; - - /* Restore the callbacks */ - State->MemReadCallback = MemReadCallback; - State->MemWriteCallback = MemWriteCallback; - State->IoReadCallback = IoReadCallback; - State->IoWriteCallback = IoWriteCallback; - State->IdleCallback = IdleCallback; - State->BopCallback = BopCallback; - State->IntAckCallback = IntAckCallback; +Fast486Continue(PFAST486_STATE State) +{ + /* Call the internal function */ + Fast486ExecutionControl(State, FAST486_CONTINUE); +} + +VOID +NTAPI +Fast486StepInto(PFAST486_STATE State) +{ + /* Call the internal function */ + Fast486ExecutionControl(State, FAST486_STEP_INTO); +} + +VOID +NTAPI +Fast486StepOver(PFAST486_STATE State) +{ + /* Call the internal function */ + Fast486ExecutionControl(State, FAST486_STEP_OVER); +} + +VOID +NTAPI +Fast486StepOut(PFAST486_STATE State) +{ + /* Call the internal function */ + Fast486ExecutionControl(State, FAST486_STEP_OUT); } VOID Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Fri Nov 1 01:46:58 2013 @@ -4613,7 +4613,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeIret) { - INT i; + USHORT i; ULONG InstPtr, CodeSel, StackPtr, StackSel; FAST486_FLAGS_REG NewFlags; BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Nov 1 01:46:58 2013 @@ -250,10 +250,6 @@ } } -static VOID WINAPI EmulatorIdle(PFAST486_STATE State) -{ -} - static UCHAR WINAPI EmulatorIntAcknowledge(PFAST486_STATE State) { UNREFERENCED_PARAMETER(State); @@ -264,23 +260,21 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -BOOLEAN EmulatorInitialize() +BOOLEAN EmulatorInitialize(VOID) { /* Allocate memory for the 16-bit address space */ BaseAddress = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_ADDRESS); if (BaseAddress == NULL) return FALSE; - /* Set the callbacks */ - EmulatorContext.MemReadCallback = EmulatorReadMemory; - EmulatorContext.MemWriteCallback = EmulatorWriteMemory; - EmulatorContext.IoReadCallback = EmulatorReadIo; // Must be != NULL - EmulatorContext.IoWriteCallback = EmulatorWriteIo; // Must be != NULL - EmulatorContext.IdleCallback = EmulatorIdle; // Must be != NULL - EmulatorContext.BopCallback = EmulatorBiosOperation; - EmulatorContext.IntAckCallback = EmulatorIntAcknowledge; - - /* Reset the CPU */ - Fast486Reset(&EmulatorContext); + /* Initialize the CPU */ + Fast486Initialize(&EmulatorContext, + EmulatorReadMemory, + EmulatorWriteMemory, + EmulatorReadIo, + EmulatorWriteIo, + NULL, + EmulatorBiosOperation, + EmulatorIntAcknowledge); /* Enable interrupts */ EmulatorSetFlag(EMULATOR_FLAG_IF); @@ -288,6 +282,12 @@ return TRUE; } +VOID EmulatorCleanup(VOID) +{ + /* Free the memory allocated for the 16-bit address space */ + if (BaseAddress != NULL) HeapFree(GetProcessHeap(), 0, BaseAddress); +} + VOID EmulatorSetStack(WORD Segment, DWORD Offset) { Fast486SetStack(&EmulatorContext, Segment, Offset); @@ -365,12 +365,6 @@ Fast486StepInto(&EmulatorContext); } -VOID EmulatorCleanup(VOID) -{ - /* Free the memory allocated for the 16-bit address space */ - if (BaseAddress != NULL) HeapFree(GetProcessHeap(), 0, BaseAddress); -} - VOID EmulatorSetA20(BOOLEAN Enabled) { A20Line = Enabled; Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Fri Nov 1 01:46:58 2013 @@ -85,7 +85,7 @@ /* FUNCTIONS ******************************************************************/ -BOOLEAN EmulatorInitialize(); +BOOLEAN EmulatorInitialize(VOID); VOID EmulatorSetStack(WORD Segment, DWORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset); VOID EmulatorInterrupt(BYTE Number); @@ -96,8 +96,8 @@ BOOLEAN EmulatorGetFlag(ULONG Flag); VOID EmulatorSetFlag(ULONG Flag); VOID EmulatorClearFlag(ULONG Flag); -VOID EmulatorStep(); -VOID EmulatorCleanup(); +VOID EmulatorStep(VOID); +VOID EmulatorCleanup(VOID); VOID EmulatorSetA20(BOOLEAN Enabled); #endif // _EMULATOR_H_

1 0

[aandrejevic] 60813: [FAST486] In real mode, the value in the IVT is a far pointer, not an IDT entry. Fix the case when MemReadCallback is NULL.
by aandrejevic＠svn.reactos.org 01 Nov '13

01 Nov '13

Author: aandrejevic Date: Fri Nov 1 00:30:26 2013 New Revision: 60813 URL: http://svn.reactos.org/svn/reactos?rev=60813&view=rev Log: [FAST486] In real mode, the value in the IVT is a far pointer, not an IDT entry. Fix the case when MemReadCallback is NULL. Modified: branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Fri Nov 1 00:30:26 2013 @@ -430,7 +430,7 @@ } else { - RtlMoveMemory(IdtEntry, + RtlMoveMemory(&FarPointer, (PVOID)(State->Idtr.Address + Number * sizeof(FarPointer)), sizeof(FarPointer));

1 0

[hbelusca] 60812: [FAST486][NTVDM] BOP numbers are 1 byte and map to a function (over 255). But one can pass additional "parameters" to those functions by adding extra bytes, however such functions...
by hbelusca＠svn.reactos.org 01 Nov '13

01 Nov '13

Author: hbelusca Date: Fri Nov 1 00:01:07 2013 New Revision: 60812 URL: http://svn.reactos.org/svn/reactos?rev=60812&view=rev Log: [FAST486][NTVDM] BOP numbers are 1 byte and map to a function (over 255). But one can pass additional "parameters" to those functions by adding extra bytes, however such functions must advance "by hand" the instruction pointer. [NTVDM] - Take into account our previous remark for the BIOS interrupt stubs, and comment them. - Rework EmulatorBiosOperation (move almost all of its existing code into subfunctions in bop.c) so that one can call many other BOP functions in the future (WIP). The BOP number (still called) EMULATOR_INT_BOP (of value 0xFF) is used for internal 16 --> 32 bit switching for our 32bit bios. - It appears that the IoRead/WriteCallback and IdleCallback must not be NULL for using fast486. I'm committing a temporary fix that I will definitely fix in a subsequent commit. Added: branches/ntvdm/subsystems/ntvdm/bop.c (with props) branches/ntvdm/subsystems/ntvdm/bop.h (with props) Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/opcodes.c branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Nov 1 00:01:07 2013 @@ -210,7 +210,7 @@ (NTAPI *FAST486_BOP_PROC) ( PFAST486_STATE State, - USHORT BopCode + UCHAR BopCode ); typedef Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Fri Nov 1 00:01:07 2013 @@ -4331,10 +4331,10 @@ && (ModRegRm.SecondRegister == FAST486_REG_ESP) && (State->BopCallback != NULL)) { - USHORT BopCode; + UCHAR BopCode; /* Fetch the BOP code */ - if (!Fast486FetchWord(State, &BopCode)) + if (!Fast486FetchByte(State, &BopCode)) { /* Exception occurred */ return FALSE; Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Fri Nov 1 00:01:07 2013 @@ -5,6 +5,7 @@ list(APPEND SOURCE bios.c + bop.c dos.c emulator.c pic.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Fri Nov 1 00:01:07 2013 @@ -453,7 +453,7 @@ BOOLEAN BiosInitialize(VOID) { - INT i; + USHORT i; WORD Offset = 0; LPWORD IntVecTable = (LPWORD)BaseAddress; LPBYTE BiosCode = (LPBYTE)SEG_OFF_TO_PTR(BIOS_SEGMENT, 0); @@ -465,7 +465,7 @@ Bda->KeybdBufferEnd = Bda->KeybdBufferStart + BIOS_KBD_BUFFER_SIZE * sizeof(WORD); /* Generate ISR stubs and fill the IVT */ - for (i = 0; i < 256; i++) + for (i = 0x00; i <= 0xFF; i++) { IntVecTable[i * 2] = Offset; IntVecTable[i * 2 + 1] = BIOS_SEGMENT; @@ -473,27 +473,28 @@ BiosCode[Offset++] = 0xFB; // sti BiosCode[Offset++] = 0x6A; // push i - BiosCode[Offset++] = (BYTE)i; + BiosCode[Offset++] = (UCHAR)i; BiosCode[Offset++] = 0x6A; // push 0 BiosCode[Offset++] = 0x00; +// BOP_SEQ: BiosCode[Offset++] = 0xF8; // clc BiosCode[Offset++] = LOBYTE(EMULATOR_BOP); // BOP sequence BiosCode[Offset++] = HIBYTE(EMULATOR_BOP); - BiosCode[Offset++] = LOBYTE(EMULATOR_INT_BOP); - BiosCode[Offset++] = HIBYTE(EMULATOR_INT_BOP); - - BiosCode[Offset++] = 0x73; // jnc +3 + BiosCode[Offset++] = EMULATOR_INT_BOP; + + BiosCode[Offset++] = 0x73; // jnc EXIT (offset +3) BiosCode[Offset++] = 0x03; // HACK: The following instruction should be HLT! BiosCode[Offset++] = 0x90; // nop - BiosCode[Offset++] = 0xEB; // jmp -10 - BiosCode[Offset++] = 0xF6; - + BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -9) + BiosCode[Offset++] = 0xF7; + +// EXIT: BiosCode[Offset++] = 0x83; // add sp, 4 BiosCode[Offset++] = 0xC4; BiosCode[Offset++] = 0x04; Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Fri Nov 1 00:01:07 2013 @@ -18,8 +18,10 @@ #define ROM_AREA_START 0xE0000 #define ROM_AREA_END 0xFFFFF #define BDA_SEGMENT 0x40 + #define BIOS_PIC_MASTER_INT 0x08 -#define BIOS_PIC_SLAVE_INT 0x70 +#define BIOS_PIC_SLAVE_INT 0x70 + #define BIOS_SEGMENT 0xF000 #define BIOS_VIDEO_INTERRUPT 0x10 Added: branches/ntvdm/subsystems/ntvdm/bop.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bop.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bop.c (added) +++ branches/ntvdm/subsystems/ntvdm/bop.c [iso-8859-1] Fri Nov 1 00:01:07 2013 @@ -0,0 +1,165 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: bop.c + * PURPOSE: BIOS Operation Handlers + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "emulator.h" +#include "bios.h" +#include "dos.h" +#include "vga.h" +#include "pic.h" +#include "ps2.h" +#include "timer.h" + + +LPCWSTR ExceptionName[] = +{ + L"Division By Zero", + L"Debug", + L"Unexpected Error", + L"Breakpoint", + L"Integer Overflow", + L"Bound Range Exceeded", + L"Invalid Opcode", + L"FPU Not Available" +}; + +VOID WINAPI Exception(BYTE ExceptionNumber, LPWORD Stack) +{ + WORD CodeSegment, InstructionPointer; + + ASSERT(ExceptionNumber < 8); + + /* Get the CS:IP */ + InstructionPointer = Stack[STACK_IP]; + CodeSegment = Stack[STACK_CS]; + + /* Display a message to the user */ + DisplayMessage(L"Exception: %s occured at %04X:%04X", + ExceptionName[ExceptionNumber], + CodeSegment, + InstructionPointer); + + /* Stop the VDM */ + VdmRunning = FALSE; + return; +} + +// VOID WINAPI IrqDispatch(BYTE IrqNumber, LPWORD Stack) +// { + // /* Check if this was an PIC IRQ */ + // if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) + // { + // /* It was an IRQ from the master PIC */ + // BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT, Stack); + // } + // else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8) + // { + // /* It was an IRQ from the slave PIC */ + // BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8, Stack); + // } + + // return; +// } + +// VOID WINAPI BiosInt(BYTE IntNumber, LPWORD Stack) +// { +// } + +VOID WINAPI IntDispatch(LPWORD Stack) +{ + BYTE IntNum; + + /* Get the interrupt number */ + IntNum = LOBYTE(Stack[STACK_INT_NUM]); + + /* Check if this was an exception */ + if (IntNum < 8) + { + Exception(IntNum, Stack); + return; + } + + /* Check if this was an PIC IRQ */ + if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) + { + /* It was an IRQ from the master PIC */ + BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT, Stack); + return; + } + else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8) + { + /* It was an IRQ from the slave PIC */ + BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8, Stack); + return; + } + + switch (IntNum) + { + case BIOS_VIDEO_INTERRUPT: + { + /* This is the video BIOS interrupt, call the BIOS */ + BiosVideoService(Stack); + break; + } + case BIOS_EQUIPMENT_INTERRUPT: + { + /* This is the BIOS "get equipment" command, call the BIOS */ + BiosEquipmentService(Stack); + break; + } + case BIOS_KBD_INTERRUPT: + { + /* This is the keyboard BIOS interrupt, call the BIOS */ + BiosKeyboardService(Stack); + break; + } + case BIOS_TIME_INTERRUPT: + { + /* This is the time BIOS interrupt, call the BIOS */ + BiosTimeService(Stack); + break; + } + case BIOS_SYS_TIMER_INTERRUPT: + { + /* BIOS timer update */ + BiosSystemTimerInterrupt(Stack); + break; + } + case 0x20: + { + DosInt20h(Stack); + break; + } + case 0x21: + { + DosInt21h(Stack); + break; + } + case 0x23: + { + DosBreakInterrupt(Stack); + break; + } + default: + { + DPRINT1("Unhandled interrupt: 0x%02X\n", IntNum); + break; + } + } +} + +VOID WINAPI ControlBop(LPWORD Stack) +{ + IntDispatch(Stack); +} + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/bop.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/bop.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bop.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bop.h (added) +++ branches/ntvdm/subsystems/ntvdm/bop.h [iso-8859-1] Fri Nov 1 00:01:07 2013 @@ -0,0 +1,10 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: bop.h + * PURPOSE: BIOS Operation Handlers + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/bop.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Nov 1 00:01:07 2013 @@ -225,10 +225,10 @@ } } -static VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, USHORT BopCode) -{ - WORD StackSegment, StackPointer, CodeSegment, InstructionPointer; - BYTE IntNum; +VOID WINAPI ControlBop(LPWORD Stack); +static VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode) +{ + WORD StackSegment, StackPointer; LPWORD Stack; /* Get the SS:SP */ @@ -238,97 +238,20 @@ /* Get the stack */ Stack = (LPWORD)SEG_OFF_TO_PTR(StackSegment, StackPointer); - if (BopCode == EMULATOR_INT_BOP) - { - /* Get the interrupt number */ - IntNum = LOBYTE(Stack[STACK_INT_NUM]); - - /* Get the CS:IP */ - InstructionPointer = Stack[STACK_IP]; - CodeSegment = Stack[STACK_CS]; - - /* Check if this was an exception */ - if (IntNum < 8) - { - /* Display a message to the user */ - DisplayMessage(L"Exception: %s occured at %04X:%04X", - ExceptionName[IntNum], - CodeSegment, - InstructionPointer); - - /* Stop the VDM */ - VdmRunning = FALSE; - return; - } - - /* Check if this was an PIC IRQ */ - if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) - { - /* It was an IRQ from the master PIC */ - BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT, Stack); - return; - } - else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8) - { - /* It was an IRQ from the slave PIC */ - BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8, Stack); - return; - } - - switch (IntNum) - { - case BIOS_VIDEO_INTERRUPT: - { - /* This is the video BIOS interrupt, call the BIOS */ - BiosVideoService(Stack); - break; - } - case BIOS_EQUIPMENT_INTERRUPT: - { - /* This is the BIOS "get equipment" command, call the BIOS */ - BiosEquipmentService(Stack); - break; - } - case BIOS_KBD_INTERRUPT: - { - /* This is the keyboard BIOS interrupt, call the BIOS */ - BiosKeyboardService(Stack); - break; - } - case BIOS_TIME_INTERRUPT: - { - /* This is the time BIOS interrupt, call the BIOS */ - BiosTimeService(Stack); - break; - } - case BIOS_SYS_TIMER_INTERRUPT: - { - /* BIOS timer update */ - BiosSystemTimerInterrupt(Stack); - break; - } - case 0x20: - { - DosInt20h(Stack); - break; - } - case 0x21: - { - DosInt21h(Stack); - break; - } - case 0x23: - { - DosBreakInterrupt(Stack); - break; - } - default: - { - DPRINT1("Unhandled interrupt: 0x%02X\n", IntNum); - break; - } - } - } + switch (BopCode) + { + case EMULATOR_INT_BOP: + ControlBop(Stack); + break; + + default: + DPRINT1("Invalid BOP code %u\n", BopCode); + break; + } +} + +static VOID WINAPI EmulatorIdle(PFAST486_STATE State) +{ } static UCHAR WINAPI EmulatorIntAcknowledge(PFAST486_STATE State) @@ -350,8 +273,9 @@ /* Set the callbacks */ EmulatorContext.MemReadCallback = EmulatorReadMemory; EmulatorContext.MemWriteCallback = EmulatorWriteMemory; - EmulatorContext.IoReadCallback = EmulatorReadIo; - EmulatorContext.IoWriteCallback = EmulatorWriteIo; + EmulatorContext.IoReadCallback = EmulatorReadIo; // Must be != NULL + EmulatorContext.IoWriteCallback = EmulatorWriteIo; // Must be != NULL + EmulatorContext.IdleCallback = EmulatorIdle; // Must be != NULL EmulatorContext.BopCallback = EmulatorBiosOperation; EmulatorContext.IntAckCallback = EmulatorIntAcknowledge; Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Fri Nov 1 00:01:07 2013 @@ -35,13 +35,14 @@ #define EMULATOR_FLAG_ID (1 << 21) /* Common definitions */ -#define EMULATOR_BOP 0xC4C4 -#define EMULATOR_INT_BOP 0xBEEF -#define STACK_COUNTER 0 -#define STACK_INT_NUM 1 -#define STACK_IP 2 -#define STACK_CS 3 -#define STACK_FLAGS 4 +#define EMULATOR_BOP 0xC4C4 +#define EMULATOR_INT_BOP 0xFF + +#define STACK_COUNTER 0 +#define STACK_INT_NUM 1 +#define STACK_IP 2 +#define STACK_CS 3 +#define STACK_FLAGS 4 enum { Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Fri Nov 1 00:01:07 2013 @@ -29,17 +29,6 @@ BOOLEAN VdmRunning = TRUE; LPVOID BaseAddress = NULL; -LPCWSTR ExceptionName[] = -{ - L"Division By Zero", - L"Debug", - L"Unexpected Error", - L"Breakpoint", - L"Integer Overflow", - L"Bound Range Exceeded", - L"Invalid Opcode", - L"FPU Not Available" -}; /* PUBLIC FUNCTIONS ***********************************************************/

1 0

[pschweitzer] 60811: [NTOSKRNL] - Finally fully implement FstubVerifyPartitionTableEFI(). It is capable of fixing a GPT disk. - Fix implementation of FstubReadHeaderEFI() (which returns a pointer t...
by pschweitzer＠svn.reactos.org 31 Oct '13

31 Oct '13

Author: pschweitzer Date: Thu Oct 31 18:03:48 2013 New Revision: 60811 URL: http://svn.reactos.org/svn/reactos?rev=60811&view=rev Log: [NTOSKRNL] - Finally fully implement FstubVerifyPartitionTableEFI(). It is capable of fixing a GPT disk. - Fix implementation of FstubReadHeaderEFI() (which returns a pointer to the header). Fixed all the other functions accordingly. Note that you have to be careful when using Disk->Buffer. You can easily read a buffer that doesn't contain your data anylonger. - Fix implementation of FstubReadPartitionTableEFI(). It was improperly dealing with the backup table. Now, it will look for it and replace/recreate it if not found where expected. - Fix implementation of FstubWriteEntryEFI(). The computation of memory placement was wrong, and thus it was missing partitions and causing corruption. Thank you checksums! In case you format a disk with GPT using Linux (with GParted, for instance), don't be surprised if once started with ReactOS your GPT is modified, and especially its backup table moved. They don't have the same sector counts. It was a nice way to tests whether ReactOS properly write GPT. Which it does now :-). Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Thu Oct 31 18:03:48 2013 @@ -134,6 +134,17 @@ NTSTATUS NTAPI +FstubWriteHeaderEFI(IN PDISK_INFORMATION Disk, + IN ULONG PartitionsSizeSector, + IN GUID DiskGUID, + IN ULONG NumberOfEntries, + IN ULONGLONG FirstUsableLBA, + IN ULONGLONG LastUsableLBA, + IN ULONG PartitionEntryCRC32, + IN BOOLEAN WriteBackupTable); + +NTSTATUS +NTAPI FstubWritePartitionTableEFI(IN PDISK_INFORMATION Disk, IN GUID DiskGUID, IN ULONG MaxPartitionCount, @@ -220,7 +231,7 @@ } else { - DiskInformation->DiskGeometry = *DiskGeometry; + RtlCopyMemory(&DiskInformation->DiskGeometry, DiskGeometry, sizeof(DISK_GEOMETRY_EX)); } /* Ensure read/received information are correct */ @@ -799,7 +810,7 @@ NTAPI FstubReadHeaderEFI(IN PDISK_INFORMATION Disk, IN BOOLEAN ReadBackupTable, - PEFI_PARTITION_HEADER HeaderBuffer) + PEFI_PARTITION_HEADER * HeaderBuffer) { NTSTATUS Status; PUCHAR Sector = NULL; @@ -931,7 +942,7 @@ if (PreviousCRC32 == EFIHeader->PartitionEntryCRC32) { /* In case of a success, return read header */ - *HeaderBuffer = *EFIHeader; + *HeaderBuffer = EFIHeader; return STATUS_SUCCESS; } else @@ -949,10 +960,11 @@ OUT struct _DRIVE_LAYOUT_INFORMATION_EX** DriveLayout) { NTSTATUS Status; - EFI_PARTITION_HEADER EfiHeader; - ULONGLONG SectorsForPartitions; + ULONG NumberOfEntries; + PEFI_PARTITION_HEADER EfiHeader; EFI_PARTITION_ENTRY PartitionEntry; BOOLEAN UpdatedPartitionTable = FALSE; + ULONGLONG SectorsForPartitions, PartitionEntryLBA; PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL; ULONG i, PartitionCount, PartitionIndex, PartitionsPerSector; PAGED_CODE(); @@ -971,27 +983,34 @@ return Status; } + /* Backup the number of entries, will be used later on */ + NumberOfEntries = EfiHeader->NumberOfEntries; + /* Allocate a DRIVE_LAYOUT_INFORMATION_EX struct big enough */ DriveLayoutEx = ExAllocatePoolWithTag(NonPagedPool, FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION_EX, PartitionEntry) + - EfiHeader.NumberOfEntries * sizeof(PARTITION_INFORMATION_EX), + EfiHeader->NumberOfEntries * sizeof(PARTITION_INFORMATION_EX), TAG_FSTUB); if (!DriveLayoutEx) { return STATUS_INSUFFICIENT_RESOURCES; } - if (ReadBackupTable) - { - /* If we read backup but if it doesn't match with current geometry */ - if ((Disk->SectorCount - 1ULL) != EfiHeader.AlternateLBA) + if (!ReadBackupTable) + { + /* If we weren't ask to read backup table, + * check the status of the backup table. + * In case it's not where we're expecting it, move it and ask + * for a partition table rewrite. + */ + if ((Disk->SectorCount - 1ULL) != EfiHeader->AlternateLBA) { /* We'll update it. First, count number of sectors needed to store partitions */ - SectorsForPartitions = ((ULONGLONG)EfiHeader.NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; + SectorsForPartitions = (EfiHeader->NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; /* Then set first usable LBA: Legacy MBR + GPT header + Partitions entries */ - EfiHeader.FirstUsableLBA = SectorsForPartitions + 2; + EfiHeader->FirstUsableLBA = SectorsForPartitions + 2; /* Then set last usable LBA: Last sector - GPT header - Partitions entries */ - EfiHeader.LastUsableLBA = Disk->SectorCount - SectorsForPartitions - 1; + EfiHeader->LastUsableLBA = Disk->SectorCount - SectorsForPartitions - 1; /* Inform that we'll rewrite partition table */ UpdatedPartitionTable = TRUE; } @@ -999,16 +1018,21 @@ DriveLayoutEx->PartitionStyle = PARTITION_STYLE_GPT; /* Translate LBA -> Offset */ - DriveLayoutEx->Gpt.StartingUsableOffset.QuadPart = EfiHeader.FirstUsableLBA * Disk->SectorSize; - DriveLayoutEx->Gpt.UsableLength.QuadPart = EfiHeader.LastUsableLBA - EfiHeader.FirstUsableLBA * Disk->SectorSize; - DriveLayoutEx->Gpt.MaxPartitionCount = EfiHeader.NumberOfEntries; - DriveLayoutEx->Gpt.DiskId = EfiHeader.DiskGUID; - + DriveLayoutEx->Gpt.StartingUsableOffset.QuadPart = EfiHeader->FirstUsableLBA * Disk->SectorSize; + DriveLayoutEx->Gpt.UsableLength.QuadPart = EfiHeader->LastUsableLBA - EfiHeader->FirstUsableLBA * Disk->SectorSize; + DriveLayoutEx->Gpt.MaxPartitionCount = EfiHeader->NumberOfEntries; + DriveLayoutEx->Gpt.DiskId = EfiHeader->DiskGUID; + + /* Backup partition entry position */ + PartitionEntryLBA = EfiHeader->PartitionEntryLBA; /* Count number of partitions per sector */ PartitionsPerSector = (Disk->SectorSize / PARTITION_ENTRY_SIZE); - /* Read all partitions and fill in structure */ + /* Read all partitions and fill in structure + * BEWARE! Past that point EfiHeader IS NOT VALID ANYMORE + * It will be erased by the reading of the partition entry + */ for (i = 0, PartitionCount = 0, PartitionIndex = PartitionsPerSector; - i < EfiHeader.NumberOfEntries; + i < NumberOfEntries; i++) { /* Only read following sector if we finished with previous sector */ @@ -1016,7 +1040,7 @@ { Status = FstubReadSector(Disk->DeviceObject, Disk->SectorSize, - EfiHeader.PartitionEntryLBA + (i / PartitionsPerSector), + PartitionEntryLBA + (i / PartitionsPerSector), Disk->Buffer); if (!NT_SUCCESS(Status)) { @@ -1245,9 +1269,9 @@ IN BOOLEAN FixErrors) { NTSTATUS Status; - PEFI_PARTITION_HEADER EFIHeader; - EFI_PARTITION_HEADER ReadEFIHeader; - BOOLEAN PrimaryValid = FALSE, BackupValid = FALSE; + PEFI_PARTITION_HEADER EFIHeader, ReadEFIHeader; + BOOLEAN PrimaryValid = FALSE, BackupValid = FALSE, WriteBackup; + ULONGLONG ReadPosition, WritePosition, SectorsForPartitions, PartitionIndex; PAGED_CODE(); EFIHeader = ExAllocatePoolWithTag(NonPagedPool, sizeof(EFI_PARTITION_HEADER), TAG_FSTUB); @@ -1260,43 +1284,112 @@ if (NT_SUCCESS(Status)) { PrimaryValid = TRUE; + ASSERT(ReadEFIHeader); + RtlCopyMemory(EFIHeader, ReadEFIHeader, sizeof(EFI_PARTITION_HEADER)); } Status = FstubReadHeaderEFI(Disk, TRUE, &ReadEFIHeader); if (NT_SUCCESS(Status)) { BackupValid = TRUE; - } - - if (!PrimaryValid) - { - if (!BackupValid || !FixErrors) - { - ExFreePoolWithTag(EFIHeader, TAG_FSTUB); - return STATUS_DISK_CORRUPT_ERROR; - } - - DPRINT1("EFI::Partition table fixing not yet supported!\n"); - ExFreePoolWithTag(EFIHeader, TAG_FSTUB); - return STATUS_NOT_IMPLEMENTED; - } - else if (!BackupValid) - { - if (!PrimaryValid || !FixErrors) - { - ExFreePoolWithTag(EFIHeader, TAG_FSTUB); - return STATUS_DISK_CORRUPT_ERROR; - } - - DPRINT1("EFI::Partition table fixing not yet supported!\n"); - ExFreePoolWithTag(EFIHeader, TAG_FSTUB); - return STATUS_NOT_IMPLEMENTED; - } - else + ASSERT(ReadEFIHeader); + RtlCopyMemory(EFIHeader, ReadEFIHeader, sizeof(EFI_PARTITION_HEADER)); + } + + /* If both are sane, just return */ + if (PrimaryValid && BackupValid) { ExFreePoolWithTag(EFIHeader, TAG_FSTUB); return STATUS_SUCCESS; } + + /* If both are damaged OR if we have not been ordered to fix + * Then, quit and warn about disk corruption + */ + if ((!PrimaryValid && !BackupValid) || !FixErrors) + { + ExFreePoolWithTag(EFIHeader, TAG_FSTUB); + return STATUS_DISK_CORRUPT_ERROR; + } + + /* Compute sectors taken by partitions */ + SectorsForPartitions = ((EFIHeader->NumberOfEntries * PARTITION_ENTRY_SIZE) + Disk->SectorSize - 1) / Disk->SectorSize; + if (PrimaryValid) + { + WriteBackup = TRUE; + /* Take position at backup table for writing */ + WritePosition = Disk->SectorCount - SectorsForPartitions; + /* And read from primary table */ + ReadPosition = 2ULL; + + DPRINT("EFI::Will repair backup table from primary\n"); + } + else + { + ASSERT(BackupValid); + WriteBackup = FALSE; + /* Take position at primary table for writing */ + WritePosition = 2ULL; + /* And read from backup table */ + ReadPosition = Disk->SectorCount - SectorsForPartitions; + + DPRINT("EFI::Will repair primary table from backup\n"); + } + + PartitionIndex = 0ULL; + + /* If no partitions are to be copied, just restore header */ + if (SectorsForPartitions <= 0) + { + Status = FstubWriteHeaderEFI(Disk, + SectorsForPartitions, + EFIHeader->DiskGUID, + EFIHeader->NumberOfEntries, + EFIHeader->FirstUsableLBA, + EFIHeader->LastUsableLBA, + EFIHeader->PartitionEntryCRC32, + WriteBackup); + + goto Cleanup; + } + + /* Copy all the partitions */ + for (; PartitionIndex < SectorsForPartitions; ++PartitionIndex) + { + /* First, read the partition from the first table */ + Status = FstubReadSector(Disk->DeviceObject, + Disk->SectorSize, + ReadPosition + PartitionIndex, + Disk->Buffer); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Then, write it in the other table */ + Status = FstubWriteSector(Disk->DeviceObject, + Disk->SectorSize, + WritePosition + PartitionIndex, + Disk->Buffer); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + } + + /* Now we're done, write the header */ + Status = FstubWriteHeaderEFI(Disk, + SectorsForPartitions, + EFIHeader->DiskGUID, + EFIHeader->NumberOfEntries, + EFIHeader->FirstUsableLBA, + EFIHeader->LastUsableLBA, + EFIHeader->PartitionEntryCRC32, + WriteBackup); + +Cleanup: + ExFreePoolWithTag(EFIHeader, TAG_FSTUB); + return Status; } NTSTATUS @@ -1384,7 +1477,7 @@ /* Copy the entry at the proper place into the buffer * That way, we don't erase previous entries */ - RtlCopyMemory(Disk->Buffer + (((PartitionEntryNumber * PARTITION_ENTRY_SIZE) % Disk->SectorSize) / sizeof(PUSHORT)), + RtlCopyMemory((PVOID)((ULONG_PTR)Disk->Buffer + ((PartitionEntryNumber * PARTITION_ENTRY_SIZE) % Disk->SectorSize)), PartitionEntry, sizeof(EFI_PARTITION_ENTRY)); /* Compute size of buffer */ @@ -1403,6 +1496,7 @@ { return Status; } + /* We clean buffer */ RtlZeroMemory(Disk->Buffer, Disk->SectorSize); } @@ -1484,13 +1578,18 @@ /* Debug the way we'll break disk, to let user pray */ DPRINT("FSTUB: About to write the following header for %s table\n", (WriteBackupTable ? "backup" : "primary")); - DPRINT(" Signature: %I64x\n Revision: %x\n HeaderSize: %x\n HeaderCRC32: %x\n", - EFIHeader->Signature, EFIHeader->Revision, EFIHeader->HeaderSize, EFIHeader->HeaderCRC32); - DPRINT(" MyLBA: %I64x\n AlternateLBA: %I64x\n FirstUsableLBA: %I64x\n LastUsableLBA: %I64x\n", - EFIHeader->MyLBA, EFIHeader->AlternateLBA, EFIHeader->FirstUsableLBA, EFIHeader->LastUsableLBA); - DPRINT(" PartitionEntryLBA: %I64x\n NumberOfEntries: %x\n SizeOfPartitionEntry: %x\n PartitionEntryCRC32: %x\n", - EFIHeader->PartitionEntryLBA, EFIHeader->NumberOfEntries, - EFIHeader->SizeOfPartitionEntry, EFIHeader->PartitionEntryCRC32); + DPRINT(" Signature: %I64x\n", EFIHeader->Signature); + DPRINT(" Revision: %x\n", EFIHeader->Revision); + DPRINT(" HeaderSize: %x\n", EFIHeader->HeaderSize); + DPRINT(" HeaderCRC32: %x\n", EFIHeader->HeaderCRC32); + DPRINT(" MyLBA: %I64x\n", EFIHeader->MyLBA); + DPRINT(" AlternateLBA: %I64x\n", EFIHeader->AlternateLBA); + DPRINT(" FirstUsableLBA: %I64x\n", EFIHeader->FirstUsableLBA); + DPRINT(" LastUsableLBA: %I64x\n", EFIHeader->LastUsableLBA); + DPRINT(" PartitionEntryLBA: %I64x\n", EFIHeader->PartitionEntryLBA); + DPRINT(" NumberOfEntries: %x\n", EFIHeader->NumberOfEntries); + DPRINT(" SizeOfPartitionEntry: %x\n", EFIHeader->SizeOfPartitionEntry); + DPRINT(" PartitionEntryCRC32: %x\n", EFIHeader->PartitionEntryCRC32); /* Write header to disk */ return FstubWriteSector(Disk->DeviceObject, @@ -2324,10 +2423,12 @@ IoWritePartitionTableEx(IN PDEVICE_OBJECT DeviceObject, IN struct _DRIVE_LAYOUT_INFORMATION_EX* DriveLayout) { + GUID DiskGuid; NTSTATUS Status; + ULONG NumberOfEntries; PDISK_INFORMATION Disk; - ULONGLONG SectorsForPartitions; - EFI_PARTITION_HEADER EfiHeader; + PEFI_PARTITION_HEADER EfiHeader; + ULONGLONG SectorsForPartitions, FirstUsableLBA, LastUsableLBA; PAGED_CODE(); ASSERT(DeviceObject); @@ -2367,20 +2468,23 @@ if (NT_SUCCESS(Status)) { /* Check if there are enough places for the partitions to be written */ - if (DriveLayout->PartitionCount <= EfiHeader.NumberOfEntries) + if (DriveLayout->PartitionCount <= EfiHeader->NumberOfEntries) { + /* Backup data */ + NumberOfEntries = EfiHeader->NumberOfEntries; + RtlCopyMemory(&DiskGuid, &EfiHeader->DiskGUID, sizeof(GUID)); /* Count number of sectors needed to store partitions */ - SectorsForPartitions = (EfiHeader.NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; + SectorsForPartitions = (NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; /* Set first usable LBA: Legacy MBR + GPT header + Partitions entries */ - EfiHeader.FirstUsableLBA = SectorsForPartitions + 2; + FirstUsableLBA = SectorsForPartitions + 2; /* Set last usable LBA: Last sector - GPT header - Partitions entries */ - EfiHeader.LastUsableLBA = Disk->SectorCount - SectorsForPartitions - 1; + LastUsableLBA = Disk->SectorCount - SectorsForPartitions - 1; /* Write primary table */ Status = FstubWritePartitionTableEFI(Disk, - EfiHeader.DiskGUID, - EfiHeader.NumberOfEntries, - EfiHeader.FirstUsableLBA, - EfiHeader.LastUsableLBA, + DiskGuid, + NumberOfEntries, + FirstUsableLBA, + LastUsableLBA, FALSE, DriveLayout->PartitionCount, DriveLayout->PartitionEntry); @@ -2388,10 +2492,10 @@ if (NT_SUCCESS(Status)) { Status = FstubWritePartitionTableEFI(Disk, - EfiHeader.DiskGUID, - EfiHeader.NumberOfEntries, - EfiHeader.FirstUsableLBA, - EfiHeader.LastUsableLBA, + DiskGuid, + NumberOfEntries, + FirstUsableLBA, + LastUsableLBA, TRUE, DriveLayout->PartitionCount, DriveLayout->PartitionEntry);

1 0

[akhaldi] 60810: [USER32] * Fix MSVC build.
by akhaldi＠svn.reactos.org 31 Oct '13

31 Oct '13

Author: akhaldi Date: Thu Oct 31 17:45:16 2013 New Revision: 60810 URL: http://svn.reactos.org/svn/reactos?rev=60810&view=rev Log: [USER32] * Fix MSVC build. Modified: trunk/reactos/win32ss/user/user32/windows/font.c Modified: trunk/reactos/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] Thu Oct 31 17:45:16 2013 @@ -218,9 +218,12 @@ { LONG ret; UINT cp = GdiGetCodePage( hDC ); // CP_ACP - DWORD len = MultiByteToWideChar(cp, 0, lpString, nCount, NULL, 0); + DWORD len; + LPWSTR strW; + + len = MultiByteToWideChar(cp, 0, lpString, nCount, NULL, 0); if (!len) return 0; - LPWSTR strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!strW) return 0; MultiByteToWideChar(cp, 0, lpString, nCount, strW, len); ret = GetTabbedTextExtentW(hDC, strW, len, nTabPositions, lpnTabStopPositions);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs