Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[aandrejevic] 60591: [SOFT386] Implement an API for external segment modification. [NTVDM] Implement EmulatorSetRegister for NEW_EMULATOR.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Oct 9 21:48:52 2013 New Revision: 60591 URL: http://svn.reactos.org/svn/reactos?rev=60591&view=rev Log: [SOFT386] Implement an API for external segment modification. [NTVDM] Implement EmulatorSetRegister for NEW_EMULATOR. Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/soft386.c branches/ntvdm/subsystems/ntvdm/emulator.c Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Wed Oct 9 21:48:52 2013 @@ -369,6 +369,15 @@ NTAPI Soft386SetStack(PSOFT386_STATE State, USHORT Segment, ULONG Offset); +VOID +NTAPI +Soft386SetSegment +( + PSOFT386_STATE State, + SOFT386_SEG_REGS Segment, + USHORT Selector +); + #endif // _SOFT386_H_ /* EOF */ Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Wed Oct 9 21:48:52 2013 @@ -306,5 +306,14 @@ State->GeneralRegs[SOFT386_REG_ESP].Long = Offset; } +VOID +NTAPI +Soft386SetSegment(PSOFT386_STATE State, + SOFT386_SEG_REGS Segment, + USHORT Selector) +{ + /* Call the internal function */ + Soft386LoadSegment(State, Segment, Selector); +} /* 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] Wed Oct 9 21:48:52 2013 @@ -521,16 +521,23 @@ VOID EmulatorSetRegister(ULONG Register, ULONG Value) { #ifndef NEW_EMULATOR - if (Register < EMULATOR_REG_CS) + if (Register < EMULATOR_REG_ES) { EmulatorContext.state->general_reg[Register].val = Value; } else { - EmulatorContext.state->segment_reg[Register - EMULATOR_REG_ES].val = (WORD)Value; - } -#else - // TODO: NOT IMPLEMENTED + EmulatorContext.state->segment_reg[Register - EMULATOR_REG_ES].val = (USHORT)Value; + } +#else + if (Register < EMULATOR_REG_ES) + { + EmulatorContext.GeneralRegs[Register].Long = Value; + } + else + { + Soft386SetSegment(&EmulatorContext, Register - EMULATOR_REG_ES, (USHORT)Value); + } #endif } @@ -596,7 +603,7 @@ } #else /* Dump the state for debugging purposes */ - Soft386DumpState(&EmulatorContext); + // Soft386DumpState(&EmulatorContext); /* Execute the next instruction */ Soft386StepInto(&EmulatorContext);

11 years, 2 months

[jimtabor] 60590: - Fix the remaining wine class tests. Left with more questions.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 9 20:25:25 2013 New Revision: 60590 URL: http://svn.reactos.org/svn/reactos?rev=60590&view=rev Log: - Fix the remaining wine class tests. Left with more questions. Modified: trunk/reactos/win32ss/user/ntuser/class.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Wed Oct 9 20:25:25 2013 @@ -999,10 +999,16 @@ Class->hModule = lpwcx->hInstance; Class->hIcon = lpwcx->hIcon; Class->hIconSm = lpwcx->hIconSm; - Class->hIconSmIntern = lpwcx->hIcon && !lpwcx->hIconSm ? - co_IntCopyImage( lpwcx->hIcon, IMAGE_ICON, + //// Sure W2k3 does not do this..... wine test inconclusive. + if (lpwcx->hIcon && !lpwcx->hIconSm) + { + Class->hIconSmIntern = co_IntCopyImage( lpwcx->hIcon, IMAGE_ICON, UserGetSystemMetrics( SM_CXSMICON ), - UserGetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; + UserGetSystemMetrics( SM_CYSMICON ), 0 ); + ERR("IntCreateClass hIconSmIntern %p\n",Class->hIconSmIntern); + Class->CSF_flags |= CSF_CACHEDSMICON; + } + //// Class->hCursor = lpwcx->hCursor; Class->hbrBackground = lpwcx->hbrBackground; @@ -1865,33 +1871,26 @@ /* FIXME: Get handle from pointer to ICON object */ Ret = (ULONG_PTR)Class->hIconSm; if (Class->hIconSm == (HANDLE)NewLong) break; -/* if (Ret && !NewLong) - { - hIconSmIntern = Class->hIconSmIntern = Class->hIcon ? co_IntCopyImage( Class->hIcon, IMAGE_ICON, - UserGetSystemMetrics( SM_CXSMICON ), - UserGetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; - Class->CSF_flags |= CSF_CACHEDSMICON; - } - else if (!Ret && NewLong && Class->hIconSmIntern) - { - IntClassDestroyIcon(Class->hIconSmIntern); + if (Class->CSF_flags & CSF_CACHEDSMICON) + { + if (Class->hIconSmIntern) + { + IntClassDestroyIcon(Class->hIconSmIntern); + Class->hIconSmIntern = NULL; + } Class->CSF_flags &= ~CSF_CACHEDSMICON; - Class->hIconSmIntern = NULL; - } -*/ - if (Class->CSF_flags & CSF_CACHEDSMICON) - { - if (Class->hIconSmIntern) IntClassDestroyIcon(Class->hIconSmIntern); - Class->CSF_flags &= ~CSF_CACHEDSMICON; - Class->hIconSmIntern = NULL; - Ret = 0; } if (Class->hIcon && !Class->hIconSmIntern) { hIconSmIntern = Class->hIconSmIntern = co_IntCopyImage( Class->hIcon, IMAGE_ICON, UserGetSystemMetrics( SM_CXSMICON ), UserGetSystemMetrics( SM_CYSMICON ), 0 ); + if (hIconSmIntern) Class->CSF_flags |= CSF_CACHEDSMICON; + //// FIXME: Very hacky here but it passes the tests.... + //// We should not kill a users handle!!! + if (Class->hIconSm) IntClassDestroyIcon(Class->hIconSm); // Fixes 1013 + Ret = 0; // Fixes 1009 } Class->hIconSm = (HANDLE)NewLong;

11 years, 2 months

[aandrejevic] 60589: [SOFT386] Fix the carry flag in the SAR instruction.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Oct 9 19:49:41 2013 New Revision: 60589 URL: http://svn.reactos.org/svn/reactos?rev=60589&view=rev Log: [SOFT386] Fix the carry flag in the SAR instruction. 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] Wed Oct 9 19:49:41 2013 @@ -273,7 +273,7 @@ if (Value & HighestBit) Result |= ((1 << Count) - 1) << (Bits - Count); /* Update CF and OF */ - State->Flags.Cf = Value & 1; + State->Flags.Cf = (Value & (1 << (Count - 1))) ? TRUE : FALSE; if (Count == 1) State->Flags.Of = FALSE; break;

11 years, 2 months

[aandrejevic] 60588: [SOFT386] Don't single-step on a prefix. Single-step should execute one whole instruction.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Oct 9 19:11:42 2013 New Revision: 60588 URL: http://svn.reactos.org/svn/reactos?rev=60588&view=rev Log: [SOFT386] Don't single-step on a prefix. Single-step should execute one whole instruction. Modified: branches/ntvdm/lib/soft386/soft386.c Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Wed Oct 9 19:11:42 2013 @@ -77,13 +77,19 @@ /* A non-prefix opcode has been executed, reset the prefix flags */ State->PrefixFlags = 0; } + else + { + /* This is a prefix, go to the next instruction immediately */ + continue; + } /* Increment the time stamp counter */ State->TimeStampCounter++; } while ((Command == SOFT386_CONTINUE) || (Command == SOFT386_STEP_OVER && ProcedureCallCount > 0) - || (Command == SOFT386_STEP_OUT && ProcedureCallCount >= 0)); + || (Command == SOFT386_STEP_OUT && ProcedureCallCount >= 0) + || (Soft386OpcodeHandlers[Opcode] == Soft386OpcodePrefix)); } /* PUBLIC FUNCTIONS ***********************************************************/

11 years, 2 months

[jimtabor] 60587: [Win32ss] - Fix class icon tests. Still two more to go, investigating.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 9 01:11:44 2013 New Revision: 60587 URL: http://svn.reactos.org/svn/reactos?rev=60587&view=rev Log: [Win32ss] - Fix class icon tests. Still two more to go, investigating. Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/callback.h trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/windows/class.c trunk/reactos/win32ss/user/user32/windows/cursoricon.c trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Wed Oct 9 01:11:44 2013 @@ -11,7 +11,8 @@ #define USER32_CALLBACK_CLIENTTHREADSTARTUP (7) #define USER32_CALLBACK_CLIENTLOADLIBRARY (8) #define USER32_CALLBACK_GETCHARSETINFO (9) -#define USER32_CALLBACK_MAXIMUM (9) +#define USER32_CALLBACK_COPYIMAGE (10) +#define USER32_CALLBACK_MAXIMUM (10) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -81,6 +82,15 @@ WCHAR MenuName[1]; } LOADMENU_CALLBACK_ARGUMENTS, *PLOADMENU_CALLBACK_ARGUMENTS; +typedef struct _COPYIMAGE_CALLBACK_ARGUMENTS +{ + HANDLE hImage; + UINT uType; + int cxDesired; + int cyDesired; + UINT fuFlags; +} COPYIMAGE_CALLBACK_ARGUMENTS, *PCOPYIMAGE_CALLBACK_ARGUMENTS; + typedef struct _CLIENT_LOAD_LIBRARY_ARGUMENTS { UNICODE_STRING strLibraryName; @@ -95,6 +105,8 @@ CHARSETINFO Cs; } GET_CHARSET_INFO, *PGET_CHARSET_INFO; +NTSTATUS WINAPI +User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallWindowProcFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Oct 9 01:11:44 2013 @@ -476,6 +476,9 @@ HANDLE hIconSm; /* FIXME - Use pointer! */ //PCURSOR spicnSm; + //// ReactOS dosn't suppot cache icons. + HICON hIconSmIntern; /* Internal small icon, derived from hIcon */ + //// UINT Unicode : 1; // !CSF_ANSIPROC UINT Global : 1; // CS_GLOBALCLASS or CSF_SERVERSIDEPROC UINT MenuNameIsString : 1; Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Wed Oct 9 01:11:44 2013 @@ -881,6 +881,59 @@ return Status; } + +HANDLE FASTCALL +co_IntCopyImage(HANDLE hnd, UINT type, INT desiredx, INT desiredy, UINT flags) +{ + HANDLE Handle; + NTSTATUS Status; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + PCOPYIMAGE_CALLBACK_ARGUMENTS Common; + + ArgumentLength = ResultLength = 0; + Argument = ResultPointer = NULL; + + ArgumentLength = sizeof(COPYIMAGE_CALLBACK_ARGUMENTS); + + Argument = IntCbAllocateMemory(ArgumentLength); + if (NULL == Argument) + { + ERR("CopyImage callback failed: out of memory\n"); + return 0; + } + Common = (PCOPYIMAGE_CALLBACK_ARGUMENTS) Argument; + + Common->hImage = hnd; + Common->uType = type; + Common->cxDesired = desiredx; + Common->cyDesired = desiredy; + Common->fuFlags = flags; + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_COPYIMAGE, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + + UserEnterCo(); + + Handle = *(HANDLE*)ResultPointer; + + IntCbFreeMemory(Argument); + + if (!NT_SUCCESS(Status)) + { + ERR("CopyImage callback failed!\n"); + return 0; + } + + return Handle; +} + BOOL APIENTRY co_IntGetCharsetInfo(LCID Locale, PCHARSETINFO pCs) Modified: trunk/reactos/win32ss/user/ntuser/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] Wed Oct 9 01:11:44 2013 @@ -67,3 +67,5 @@ BOOL APIENTRY co_IntGetCharsetInfo(LCID Locale, PCHARSETINFO pCs); + +HANDLE FASTCALL co_IntCopyImage(HANDLE,UINT,INT,INT,UINT); Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Wed Oct 9 01:11:44 2013 @@ -997,9 +997,13 @@ Class->cbclsExtra = lpwcx->cbClsExtra; Class->cbwndExtra = lpwcx->cbWndExtra; Class->hModule = lpwcx->hInstance; - Class->hIcon = lpwcx->hIcon; /* FIXME */ - Class->hIconSm = lpwcx->hIconSm; /* FIXME */ - Class->hCursor = lpwcx->hCursor; /* FIXME */ + Class->hIcon = lpwcx->hIcon; + Class->hIconSm = lpwcx->hIconSm; + Class->hIconSmIntern = lpwcx->hIcon && !lpwcx->hIconSm ? + co_IntCopyImage( lpwcx->hIcon, IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; + Class->hCursor = lpwcx->hCursor; Class->hbrBackground = lpwcx->hbrBackground; /* Make a copy of the string */ @@ -1711,6 +1715,30 @@ return Ret; } +//// Do this for now in anticipation of new cursor icon code. +BOOLEAN FASTCALL IntDestroyCurIconObject(PCURICON_OBJECT, PPROCESSINFO); + +BOOL FASTCALL +IntClassDestroyIcon(HANDLE hCurIcon) +{ + PCURICON_OBJECT CurIcon; + BOOL Ret; + + if (!(CurIcon = UserGetCurIconObject(hCurIcon))) + { + + ERR("hCurIcon was not found!\n"); + return FALSE; + } + Ret = IntDestroyCurIconObject(CurIcon, PsGetCurrentProcessWin32Process()); + /* Note: IntDestroyCurIconObject will remove our reference for us! */ + if (!Ret) + { + ERR("hCurIcon was not Destroyed!\n"); + } + return Ret; +} + ULONG_PTR UserSetClassLongPtr(IN PCLS Class, IN INT Index, @@ -1718,6 +1746,7 @@ IN BOOL Ansi) { ULONG_PTR Ret = 0; + HANDLE hIconSmIntern = NULL; /* NOTE: For GCLP_MENUNAME and GCW_ATOM this function may raise an exception! */ @@ -1806,6 +1835,20 @@ case GCLP_HICON: /* FIXME: Get handle from pointer to ICON object */ Ret = (ULONG_PTR)Class->hIcon; + if (Class->hIcon == (HANDLE)NewLong) break; + if (Ret && Class->hIconSmIntern) + { + IntClassDestroyIcon(Class->hIconSmIntern); + Class->CSF_flags &= ~CSF_CACHEDSMICON; + Class->hIconSmIntern = NULL; + } + if (NewLong && !Class->hIconSm) + { + hIconSmIntern = Class->hIconSmIntern = co_IntCopyImage( (HICON)NewLong, IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), 0 ); + Class->CSF_flags |= CSF_CACHEDSMICON; + } Class->hIcon = (HANDLE)NewLong; /* Update the clones */ @@ -1813,6 +1856,7 @@ while (Class != NULL) { Class->hIcon = (HANDLE)NewLong; + Class->hIconSmIntern = hIconSmIntern; Class = Class->pclsNext; } break; @@ -1820,6 +1864,35 @@ case GCLP_HICONSM: /* FIXME: Get handle from pointer to ICON object */ Ret = (ULONG_PTR)Class->hIconSm; + if (Class->hIconSm == (HANDLE)NewLong) break; +/* if (Ret && !NewLong) + { + hIconSmIntern = Class->hIconSmIntern = Class->hIcon ? co_IntCopyImage( Class->hIcon, IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; + Class->CSF_flags |= CSF_CACHEDSMICON; + } + else if (!Ret && NewLong && Class->hIconSmIntern) + { + IntClassDestroyIcon(Class->hIconSmIntern); + Class->CSF_flags &= ~CSF_CACHEDSMICON; + Class->hIconSmIntern = NULL; + } +*/ + if (Class->CSF_flags & CSF_CACHEDSMICON) + { + if (Class->hIconSmIntern) IntClassDestroyIcon(Class->hIconSmIntern); + Class->CSF_flags &= ~CSF_CACHEDSMICON; + Class->hIconSmIntern = NULL; + Ret = 0; + } + if (Class->hIcon && !Class->hIconSmIntern) + { + hIconSmIntern = Class->hIconSmIntern = co_IntCopyImage( Class->hIcon, IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), 0 ); + if (hIconSmIntern) Class->CSF_flags |= CSF_CACHEDSMICON; + } Class->hIconSm = (HANDLE)NewLong; /* Update the clones */ @@ -1827,6 +1900,7 @@ while (Class != NULL) { Class->hIconSm = (HANDLE)NewLong; + Class->hIconSmIntern = hIconSmIntern; Class = Class->pclsNext; } break; @@ -1952,7 +2026,8 @@ /* FIXME: Return the string? Okay! This is performed in User32! */ //lpwcx->lpszClassName = (LPCWSTR)((ULONG_PTR)Class->atomClassName); - lpwcx->hIconSm = Class->hIconSm; /* FIXME: Get handle from pointer */ + /* FIXME: Get handle from pointer */ + lpwcx->hIconSm = Class->hIconSm ? Class->hIconSm : Class->hIconSmIntern; return TRUE; } Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Wed Oct 9 01:11:44 2013 @@ -206,6 +206,7 @@ User32CallClientThreadSetupFromKernel, User32CallClientLoadLibraryFromKernel, User32CallGetCharsetInfo, + User32CallCopyImageFromKernel, }; /* Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Wed Oct 9 01:11:44 2013 @@ -562,7 +562,7 @@ case GCLP_HICONSM: /* FIXME - get handle from pointer to ICON object */ - Ret = (ULONG_PTR)Class->hIconSm; + Ret = (ULONG_PTR)(Class->hIconSm ? Class->hIconSm : Class->hIconSmIntern); break; case GCLP_WNDPROC: @@ -639,7 +639,7 @@ case GCLP_HICONSM: /* FIXME - get handle from pointer to ICON object */ - Ret = (ULONG_PTR)Class->hIconSm; + Ret = (ULONG_PTR)(Class->hIconSm ? Class->hIconSm : Class->hIconSmIntern); break; case GCLP_WNDPROC: Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Wed Oct 9 01:11:44 2013 @@ -2190,3 +2190,20 @@ return TRUE; } + +NTSTATUS WINAPI +User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + PCOPYIMAGE_CALLBACK_ARGUMENTS Common; + HANDLE Result; + Common = (PCOPYIMAGE_CALLBACK_ARGUMENTS) Arguments; + + Result = CopyImage(Common->hImage, + Common->uType, + Common->cxDesired, + Common->cyDesired, + Common->fuFlags); + + return ZwCallbackReturn(&Result, sizeof(HANDLE), STATUS_SUCCESS); +} + Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Wed Oct 9 01:11:44 2013 @@ -1442,6 +1442,23 @@ return hicon; } +NTSTATUS WINAPI +User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + PCOPYIMAGE_CALLBACK_ARGUMENTS Common; + HANDLE Result; + Common = (PCOPYIMAGE_CALLBACK_ARGUMENTS) Arguments; + + Result = CopyImage(Common->hImage, + Common->uType, + Common->cxDesired, + Common->cyDesired, + Common->fuFlags); + + return ZwCallbackReturn(&Result, sizeof(HANDLE), STATUS_SUCCESS); +} + + /************* PUBLIC FUNCTIONS *******************/ HANDLE WINAPI CopyImage(

11 years, 2 months

[aandrejevic] 60586: [SOFT386] Fix more prefix handling code. Implement the XLAT instruction.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Oct 9 00:36:37 2013 New Revision: 60586 URL: http://svn.reactos.org/svn/reactos?rev=60586&view=rev Log: [SOFT386] Fix more prefix handling code. Implement the XLAT instruction. 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] Wed Oct 9 00:36:37 2013 @@ -549,8 +549,7 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodePushReg) { - if ((State->PrefixFlags != SOFT386_PREFIX_OPSIZE) - && (State->PrefixFlags != 0)) + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -569,12 +568,13 @@ ULONG Value; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_SS].Size; - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -3880,12 +3880,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x60); - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -3928,12 +3929,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x61); - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -5437,10 +5439,34 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + UCHAR Value; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + /* Read a byte from DS:[(E)BX + AL] */ + if (!Soft386ReadMemory(State, + SOFT386_REG_DS, + AddressSize ? State->GeneralRegs[SOFT386_REG_EBX].Long + : State->GeneralRegs[SOFT386_REG_EBX].LowWord + + State->GeneralRegs[SOFT386_REG_EAX].LowByte, + FALSE, + &Value, + sizeof(UCHAR))) + { + /* Exception occurred */ + return FALSE; + } + + /* Set AL to the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Value; + + /* Return success */ + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeLoop)

11 years, 2 months

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

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Oct 8 23:03:56 2013 New Revision: 60585 URL: http://svn.reactos.org/svn/reactos?rev=60585&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] Tue Oct 8 23:03:56 2013 @@ -1152,12 +1152,13 @@ /* Make sure this is the right instruction */ ASSERT((Opcode & 0xF8) == 0xB8); - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD);

11 years, 2 months

[aandrejevic] 60584: [SOFT386] Fix a bug in the CMP instruction. Implement the SBB instruction.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Oct 8 22:27:48 2013 New Revision: 60584 URL: http://svn.reactos.org/svn/reactos?rev=60584&view=rev Log: [SOFT386] Fix a bug in the CMP instruction. Implement the SBB instruction. 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] Tue Oct 8 22:27:48 2013 @@ -3085,34 +3085,294 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbByteModrm) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + UCHAR FirstValue, SecondValue, Result; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + INT Carry = State->Flags.Cf ? 1 : 0; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x18); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is the instruction that writes to R/M */ + if (!(Opcode & SOFT386_OPCODE_WRITE_REG)) + { + /* Swap the order */ + FirstValue ^= SecondValue; + SecondValue ^= FirstValue; + FirstValue ^= SecondValue; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue - Carry; + + /* Update the flags */ + State->Flags.Cf = FirstValue < (SecondValue + 1); + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) != (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + 1) & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); } SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbModrm) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + INT Carry = State->Flags.Cf ? 1 : 0; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x19); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is the instruction that writes to R/M */ + if (!(Opcode & SOFT386_OPCODE_WRITE_REG)) + { + /* Swap the order */ + FirstValue ^= SecondValue; + SecondValue ^= FirstValue; + FirstValue ^= SecondValue; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue - Carry; + + /* Update the flags */ + State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) != (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + 1) & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is the instruction that writes to R/M */ + if (!(Opcode & SOFT386_OPCODE_WRITE_REG)) + { + /* Swap the order */ + FirstValue ^= SecondValue; + SecondValue ^= FirstValue; + FirstValue ^= SecondValue; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue - Carry; + + /* Update the flags */ + State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) != (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + 1) & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } } SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbAl) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + UCHAR FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + UCHAR SecondValue, Result; + INT Carry = State->Flags.Cf ? 1 : 0; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x1C); + + if (State->PrefixFlags) + { + /* This opcode doesn't take any prefixes */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (!Soft386FetchByte(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue - Carry; + + /* Update the flags */ + State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) != (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + 1) & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Result; + + return TRUE; + } SOFT386_OPCODE_HANDLER(Soft386OpcodeSbbEax) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + INT Carry = State->Flags.Cf ? 1 : 0; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x1D); + + 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; + } + + if (Size) + { + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue, Result; + + if (!Soft386FetchDword(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue - Carry; + + /* Update the flags */ + State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) != (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + Carry) & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result; + } + else + { + USHORT FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + USHORT SecondValue, Result; + + if (!Soft386FetchWord(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue - SecondValue - Carry; + + /* Update the flags */ + State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) != (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + Carry) & 0x0F); + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + } + + return TRUE; + } SOFT386_OPCODE_HANDLER(Soft386OpcodePushDs) @@ -3387,7 +3647,6 @@ return TRUE; } } - } SOFT386_OPCODE_HANDLER(Soft386OpcodeCmpSubAl) @@ -3506,8 +3765,12 @@ State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; State->Flags.Pf = Soft386CalculateParity(Result); - /* Write back the result */ - State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + /* Check if this is not a CMP */ + if (!(Opcode & 0x10)) + { + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + } } return TRUE;

11 years, 2 months

[fireball] 60583: Branches cleanup. Start from deleting c++-bringup (empty branch, unneeded as C++ compiles in trunk now) and vs_jc (as suggested by its author).

by fireball＠svn.reactos.org

Author: fireball Date: Tue Oct 8 22:11:06 2013 New Revision: 60583 URL: http://svn.reactos.org/svn/reactos?rev=60583&view=rev Log: Branches cleanup. Start from deleting c++-bringup (empty branch, unneeded as C++ compiles in trunk now) and vs_jc (as suggested by its author). Removed: branches/c++-bringup/ branches/vs_jc/

11 years, 2 months

[aandrejevic] 60582: [SOFT386] Implement opcode group 0xF7.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Oct 7 20:38:01 2013 New Revision: 60582 URL: http://svn.reactos.org/svn/reactos?rev=60582&view=rev Log: [SOFT386] Implement opcode group 0xF7. 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] Mon Oct 7 20:38:01 2013 @@ -1070,7 +1070,7 @@ USHORT Result = (USHORT)Value * (USHORT)State->GeneralRegs[SOFT386_REG_EAX].LowByte; /* Update the flags */ - State->Flags.Cf = State->Flags.Of = (Result & 0xFF00) ? TRUE : FALSE; + State->Flags.Cf = State->Flags.Of = HIBYTE(Result) ? TRUE : FALSE; /* Write back the result */ State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; @@ -1084,7 +1084,8 @@ SHORT Result = (SHORT)Value * (SHORT)State->GeneralRegs[SOFT386_REG_EAX].LowByte; /* Update the flags */ - State->Flags.Cf = State->Flags.Of = ((Result > 255) || (Result < 256)) ? TRUE : FALSE; + State->Flags.Cf = State->Flags.Of = + ((Result < -128) || (Result > 127)) ? TRUE : FALSE; /* Write back the result */ State->GeneralRegs[SOFT386_REG_EAX].LowWord = (USHORT)Result; @@ -1124,8 +1125,259 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupF7) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + ULONG Dummy, Value, SignFlag; + 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; + } + + /* Set the sign flag */ + if (OperandSize) SignFlag = SIGN_FLAG_LONG; + else SignFlag = SIGN_FLAG_WORD; + + /* Read the operand */ + if (OperandSize) + { + /* 32-bit */ + if (!Soft386ReadModrmDwordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + /* 16-bit */ + if (!Soft386ReadModrmWordOperands(State, &ModRegRm, (PUSHORT)&Dummy, (PUSHORT)&Value)) + { + /* Exception occurred */ + return FALSE; + } + } + + switch (ModRegRm.Register) + { + /* TEST */ + case 0: + case 1: + { + ULONG Immediate = 0, Result = 0; + + if (OperandSize) + { + /* Fetch the immediate dword */ + if (!Soft386FetchDword(State, &Immediate)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + /* Fetch the immediate word */ + if (!Soft386FetchWord(State, (PUSHORT)&Immediate)) + { + /* Exception occurred */ + return FALSE; + } + } + + /* Calculate the result */ + Result = Value & Immediate; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SignFlag) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + break; + } + + /* NOT */ + case 2: + { + /* Write back the result */ + if (OperandSize) + { + /* 32-bit */ + return Soft386WriteModrmDwordOperands(State, &ModRegRm, FALSE, ~Value); + } + else + { + /* 16-bit */ + return Soft386WriteModrmWordOperands(State, &ModRegRm, FALSE, LOWORD(~Value)); + } + } + + /* NEG */ + case 3: + { + /* Calculate the result */ + ULONG Result = -Value; + if (!OperandSize) Result &= 0xFFFF; + + /* Update the flags */ + State->Flags.Cf = (Value != 0) ? TRUE : FALSE; + State->Flags.Of = (Value & SignFlag) && (Result & SignFlag); + State->Flags.Af = ((Value & 0x0F) != 0) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SignFlag) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + if (OperandSize) + { + /* 32-bit */ + return Soft386WriteModrmDwordOperands(State, &ModRegRm, FALSE, Result); + } + else + { + /* 16-bit */ + return Soft386WriteModrmWordOperands(State, &ModRegRm, FALSE, LOWORD(Result)); + } + } + + /* MUL */ + case 4: + { + if (OperandSize) + { + ULONGLONG Result = (ULONGLONG)Value * (ULONGLONG)State->GeneralRegs[SOFT386_REG_EAX].Long; + + /* Update the flags */ + State->Flags.Cf = State->Flags.Of = + (Result & 0xFFFFFFFF00000000ULL) ? TRUE : FALSE; + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result & 0xFFFFFFFFULL; + State->GeneralRegs[SOFT386_REG_EDX].Long = Result >> 32; + } + else + { + ULONG Result = (ULONG)Value * (ULONG)State->GeneralRegs[SOFT386_REG_EAX].LowWord; + + /* Update the flags */ + State->Flags.Cf = State->Flags.Of = HIWORD(Result) ? TRUE : FALSE; + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = LOWORD(Result); + State->GeneralRegs[SOFT386_REG_EDX].LowWord = HIWORD(Result); + } + + break; + } + + /* IMUL */ + case 5: + { + if (OperandSize) + { + LONGLONG Result = (LONGLONG)Value * (LONGLONG)State->GeneralRegs[SOFT386_REG_EAX].Long; + + /* Update the flags */ + State->Flags.Cf = State->Flags.Of = + ((Result < -2147483648LL) || (Result > 2147483647LL)) ? TRUE : FALSE; + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result & 0xFFFFFFFFULL; + State->GeneralRegs[SOFT386_REG_EDX].Long = Result >> 32; + } + else + { + LONG Result = (LONG)Value * (LONG)State->GeneralRegs[SOFT386_REG_EAX].LowWord; + + /* Update the flags */ + State->Flags.Cf = State->Flags.Of = + ((Result < -32768) || (Result > 32767)) ? TRUE : FALSE; + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = LOWORD(Result); + State->GeneralRegs[SOFT386_REG_EDX].LowWord = HIWORD(Result); + } + + break; + } + + /* DIV */ + case 6: + { + if (OperandSize) + { + ULONGLONG Dividend = (ULONGLONG)State->GeneralRegs[SOFT386_REG_EAX].Long + | ((ULONGLONG)State->GeneralRegs[SOFT386_REG_EDX].Long << 32); + ULONG Quotient = Dividend / Value; + ULONG Remainder = Dividend % Value; + + /* Write back the results */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Quotient; + State->GeneralRegs[SOFT386_REG_EDX].Long = Remainder; + } + else + { + ULONG Dividend = (ULONG)State->GeneralRegs[SOFT386_REG_EAX].LowWord + | ((ULONG)State->GeneralRegs[SOFT386_REG_EDX].LowWord << 16); + USHORT Quotient = Dividend / Value; + USHORT Remainder = Dividend % Value; + + /* Write back the results */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Quotient; + State->GeneralRegs[SOFT386_REG_EDX].LowWord = Remainder; + } + + break; + } + + /* IDIV */ + case 7: + { + if (OperandSize) + { + LONGLONG Dividend = (LONGLONG)State->GeneralRegs[SOFT386_REG_EAX].Long + | ((LONGLONG)State->GeneralRegs[SOFT386_REG_EDX].Long << 32); + LONG Quotient = Dividend / (LONG)Value; + LONG Remainder = Dividend % (LONG)Value; + + /* Write back the results */ + State->GeneralRegs[SOFT386_REG_EAX].Long = (ULONG)Quotient; + State->GeneralRegs[SOFT386_REG_EDX].Long = (ULONG)Remainder; + } + else + { + LONG Dividend = (LONG)State->GeneralRegs[SOFT386_REG_EAX].LowWord + | ((LONG)State->GeneralRegs[SOFT386_REG_EDX].LowWord << 16); + SHORT Quotient = Dividend / (SHORT)Value; + SHORT Remainder = Dividend % (SHORT)Value; + + /* Write back the results */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = (USHORT)Quotient; + State->GeneralRegs[SOFT386_REG_EDX].LowWord = (USHORT)Remainder; + } + + break; + } + } + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupFE)

11 years, 2 months

← Newer
1
...
20
21
22
23
24
25
26
...
33
Older →

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 October 2013