Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 60199: [NETAPI32] - NetLocalGroupAdd: Delete the newly created alias if setting alias information fails. - NetUserGetGroups, NetUserGetInfo and NetUserGetLocalGroups: Return NERR_UserNotFou...
by ekohl＠svn.reactos.org 18 Sep '13

18 Sep '13

Author: ekohl Date: Wed Sep 18 18:02:36 2013 New Revision: 60199 URL: http://svn.reactos.org/svn/reactos?rev=60199&view=rev Log: [NETAPI32] - NetLocalGroupAdd: Delete the newly created alias if setting alias information fails. - NetUserGetGroups, NetUserGetInfo and NetUserGetLocalGroups: Return NERR_UserNotFound if no matching user was found. Modified: trunk/reactos/dll/win32/netapi32/local_group.c trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Wed Sep 18 18:02:36 2013 @@ -468,7 +468,12 @@ done: if (AliasHandle != NULL) - SamCloseHandle(AliasHandle); + { + if (ApiStatus != NERR_Success) + SamDeleteAlias(AliasHandle); + else + SamCloseHandle(AliasHandle); + } if (DomainHandle != NULL) SamCloseHandle(DomainHandle); Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Wed Sep 18 18:02:36 2013 @@ -2692,7 +2692,10 @@ if (!NT_SUCCESS(Status)) { ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); + if (Status == STATUS_NONE_MAPPED) + ApiStatus = NERR_UserNotFound; + else + ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -2846,7 +2849,10 @@ if (!NT_SUCCESS(Status)) { ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); + if (Status == STATUS_NONE_MAPPED) + ApiStatus = NERR_UserNotFound; + else + ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -3029,7 +3035,10 @@ if (!NT_SUCCESS(Status)) { ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); + if (Status == STATUS_NONE_MAPPED) + ApiStatus = NERR_UserNotFound; + else + ApiStatus = NetpNtStatusToApiStatus(Status); goto done; }

1 0

[khornicek] 60198: [RAPPS] Mind the null terminator. Spotted by dmex. ROSAPPS-237 #resolve #comment Fixed in r60198. Thank you.
by khornicek＠svn.reactos.org 18 Sep '13

18 Sep '13

Author: khornicek Date: Wed Sep 18 16:36:16 2013 New Revision: 60198 URL: http://svn.reactos.org/svn/reactos?rev=60198&view=rev Log: [RAPPS] Mind the null terminator. Spotted by dmex. ROSAPPS-237 #resolve #comment Fixed in r60198. Thank you. Modified: trunk/reactos/base/applications/rapps/richedit.c Modified: trunk/reactos/base/applications/rapps/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ri… ============================================================================== --- trunk/reactos/base/applications/rapps/richedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/richedit.c [iso-8859-1] Wed Sep 18 16:36:16 2013 @@ -25,7 +25,7 @@ pLink = (PWSTR) HeapAlloc(GetProcessHeap(), 0, (max(Link->chrg.cpMin, Link->chrg.cpMax) - - min(Link->chrg.cpMin, Link->chrg.cpMax))*sizeof(WCHAR)); + min(Link->chrg.cpMin, Link->chrg.cpMax) + 1) * sizeof(WCHAR)); if (!pLink) { /* TODO: Error message */

1 0

[jgardou] 60197: [OPENGL32_NEW] - Implement reading from the frontbuffer.
by jgardou＠svn.reactos.org 17 Sep '13

17 Sep '13

Author: jgardou Date: Tue Sep 17 23:24:13 2013 New Revision: 60197 URL: http://svn.reactos.org/svn/reactos?rev=60197&view=rev Log: [OPENGL32_NEW] - Implement reading from the frontbuffer. Modified: trunk/reactos/dll/opengl/opengl32_new/swimpl.c Modified: trunk/reactos/dll/opengl/opengl32_new/swimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/sw… ============================================================================== --- trunk/reactos/dll/opengl/opengl32_new/swimpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32_new/swimpl.c [iso-8859-1] Tue Sep 17 23:24:13 2013 @@ -12,6 +12,8 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(opengl32); + +#define WIDTH_BYTES_ALIGN32(cx, bpp) ((((cx) * (bpp) + 31) & ~31) >> 3) /* OSMesa stuff */ static HMODULE hMesaDll = NULL; @@ -28,26 +30,45 @@ OSMesaContext mesa_ctx; HHOOK hook; struct sw_framebuffer* framebuffer; + GLenum readmode; }; #define SW_FB_DOUBLEBUFFERED 0x1 #define SW_FB_DIBSECTION 0x2 #define SW_FB_FREE_BITS 0x4 +#define SW_FB_DIRTY_BITS 0x8 +#define SW_FB_DIRTY_SIZE 0x10 +#define SW_FB_DIRTY (SW_FB_DIRTY_BITS | SW_FB_DIRTY_SIZE) + struct sw_framebuffer { INT sw_format; UINT format_index; - void* bits; + union + { + void* backbuffer; + void* bits; + }; + void* frontbuffer; DWORD flags; BITMAPINFO bmi; }; -/* For our special SB glFinish implementation */ +/* + * Functions that we shadow to compensate with the impossibility + * to use double buffered format in osmesa + */ static void (GLAPIENTRY * pFinish)(void); - -/* Single buffered API table */ +static void (GLAPIENTRY * pReadBuffer)(GLenum); +static void (GLAPIENTRY * pGetBooleanv)(GLenum pname, GLboolean* params); +static void (GLAPIENTRY * pGetFloatv)(GLenum pname, GLfloat* params); +static void (GLAPIENTRY * pGetDoublev)(GLenum pname, GLdouble* params); +static void (GLAPIENTRY * pGetIntegerv)(GLenum pname, GLint* params); +static void (GLAPIENTRY * pReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); + +/* API table for single buffered mode */ static GLCLTPROCTABLE sw_table_sb; -/* Double buffered API table */ +/* API table for double buffered mode */ static GLCLTPROCTABLE sw_table_db; static const struct @@ -77,12 +98,12 @@ { OSMESA_RGB_565, 16, 5, 0, 6, 5, 5, 11, 0, 0, 16, 16, 8 }, }; -/* glFinish for single-buffered pixel formats */ +/* Single buffered format specifics */ static void GLAPIENTRY sw_sb_Finish(void) { struct wgl_dc_data* dc_data = IntGetCurrentDcData(); struct sw_framebuffer* fb; - HDC hdc; + HDC hdc = IntGetCurrentDC(); /* Call osmesa */ pFinish(); @@ -91,13 +112,9 @@ fb = dc_data->sw_data; assert(fb != NULL); + /* osmesa directly updated the bits of the DIB section */ if(fb->flags & SW_FB_DIBSECTION) return; - - if(dc_data->flags & WGL_DC_OBJ_DC) - hdc = GetDC(dc_data->owner.hwnd); - else - hdc = dc_data->owner.hdc; /* Upload the data to the device */ SetDIBitsToDevice(hdc, @@ -112,11 +129,178 @@ fb->bits, &fb->bmi, DIB_RGB_COLORS); - - if(dc_data->flags & WGL_DC_OBJ_DC) - ReleaseDC(dc_data->owner.hwnd, hdc); -} - +} + +/* Double buffered format specifics */ +static void sw_db_update_frontbuffer(struct sw_framebuffer* fb, HDC hdc) +{ + unsigned int widthbytes = WIDTH_BYTES_ALIGN32(fb->bmi.bmiHeader.biWidth, + pixel_formats[fb->format_index].color_bits); + size_t buffer_size = widthbytes*fb->bmi.bmiHeader.biHeight; + if(fb->flags & SW_FB_DIRTY_SIZE) + { + if(fb->frontbuffer) + fb->frontbuffer = HeapReAlloc(GetProcessHeap(), 0, fb->frontbuffer, buffer_size); + else + fb->frontbuffer = HeapAlloc(GetProcessHeap(), 0, buffer_size); + fb->flags ^= SW_FB_DIRTY_SIZE; + } + + if(fb->flags & SW_FB_DIRTY_BITS) + { + /* On windows, there is SetDIBitsToDevice, but not FROM device... */ + HBITMAP hbmp; + HDC hmemDC = CreateCompatibleDC(hdc); + void* DIBits; + hbmp = CreateDIBSection(hdc, + &fb->bmi, + DIB_RGB_COLORS, + &DIBits, + NULL, 0); + hbmp = SelectObject(hmemDC, hbmp); + BitBlt(hdc, + 0, + 0, + fb->bmi.bmiHeader.biWidth, + fb->bmi.bmiHeader.biHeight, + hmemDC, + 0, + 0, + SRCCOPY); + /* Copy the bits */ + CopyMemory(fb->frontbuffer, DIBits, buffer_size); + /* Clean up */ + hbmp = SelectObject(hmemDC, hbmp); + DeleteDC(hmemDC); + DeleteObject(hbmp); + /* We're clean */ + fb->flags ^= SW_FB_DIRTY_BITS; + } +} + +static void GLAPIENTRY sw_db_ReadBuffer(GLenum mode) +{ + struct sw_context* ctx = (struct sw_context*)IntGetCurrentDHGLRC(); + + /* All good */ + if(ctx->readmode == mode) + return; + + /* We don't support stereoscopic formats */ + if(mode == GL_FRONT) + mode = GL_FRONT_LEFT; + + if(mode == GL_BACK) + mode = GL_BACK_LEFT; + + /* Validate the asked mode */ + if((mode != GL_FRONT_LEFT) || (mode != GL_BACK_LEFT)) + { + ERR("Incompatble mode passed: %lx.\n", mode); + return; + } + + /* Save it */ + ctx->readmode = mode; +} + +static void GLAPIENTRY sw_db_GetBooleanv(GLenum pname, GLboolean* params) +{ + struct sw_context* ctx = (struct sw_context*)IntGetCurrentDHGLRC(); + switch(pname) + { + case GL_READ_BUFFER: + /* Well, it's never 0, but eh, the spec you know */ + *params = (ctx->readmode != 0); + return; + default: + pGetBooleanv(pname, params); + return; + } +} + +static void GLAPIENTRY sw_db_GetDoublev(GLenum pname, GLdouble* params) +{ + struct sw_context* ctx = (struct sw_context*)IntGetCurrentDHGLRC(); + switch(pname) + { + case GL_READ_BUFFER: + *params = (GLdouble)ctx->readmode; + return; + default: + pGetDoublev(pname, params); + return; + } +} + +static void GLAPIENTRY sw_db_GetFloatv(GLenum pname, GLfloat* params) +{ + struct sw_context* ctx = (struct sw_context*)IntGetCurrentDHGLRC(); + switch(pname) + { + case GL_READ_BUFFER: + *params = (GLfloat)ctx->readmode; + return; + default: + pGetFloatv(pname, params); + return; + } +} + +static void GLAPIENTRY sw_db_GetIntegerv(GLenum pname, GLint* params) +{ + struct sw_context* ctx = (struct sw_context*)IntGetCurrentDHGLRC(); + switch(pname) + { + case GL_READ_BUFFER: + *params = ctx->readmode; + return; + default: + pGetIntegerv(pname, params); + return; + } +} + +static void GLAPIENTRY sw_db_ReadPixels( + GLint x, + GLint y, + GLsizei width, + GLsizei height, + GLenum format, + GLenum type, + GLvoid *pixels +) +{ + struct sw_context* ctx = (struct sw_context*)IntGetCurrentDHGLRC(); + struct wgl_dc_data* dc_data = IntGetCurrentDcData(); + struct sw_framebuffer* fb = dc_data->sw_data; + + /* Quick path */ + if(ctx->readmode == GL_BACK_LEFT) + { + pReadPixels(x, y, width, height, format, type, pixels); + return; + } + + assert(ctx->readmode == GL_FRONT_LEFT); + + /* Update frontbuffer */ + if(fb->flags & SW_FB_DIRTY) + sw_db_update_frontbuffer(fb, IntGetCurrentDC()); + + /* Finish wahtever is going on on backbuffer */ + pFinish(); + /* Tell osmesa we changed the buffer */ + pOSMesaMakeCurrent(ctx->mesa_ctx, fb->frontbuffer, GL_UNSIGNED_BYTE, width, height); + + /* Go ahead */ + pReadPixels(x, y, width, height, format, type, pixels); + + /* Go back to backbuffer operation */ + pOSMesaMakeCurrent(ctx->mesa_ctx, fb->backbuffer, GL_UNSIGNED_BYTE, width, height); +} + +/* WGL <-> OSMesa functions */ static UINT index_from_format(struct wgl_dc_data* dc_data, INT format, BOOL* doubleBuffered) { UINT index, nb_win_compat = 0, start_win_compat = 0; @@ -230,7 +414,7 @@ { struct sw_framebuffer* fb; BOOL doubleBuffered; - /* NOTE: we let the wgl implementation tracking the pixel format for us */ + if(hMesaDll != NULL) goto osmesa_loaded; @@ -280,9 +464,27 @@ /* For completeness */ sw_table_db.cEntries = sw_table_sb.cEntries = OPENGL_VERSION_110_ENTRIES; - /* We are not really single buffered. */ - pFinish = sw_table_sb.glDispatchTable.Finish; - sw_table_sb.glDispatchTable.Finish = sw_sb_Finish; + /* We are not really single/double buffered. */ +#define SWAP_SB_FUNC(x) do \ +{ \ + p##x = sw_table_sb.glDispatchTable.x; \ + sw_table_sb.glDispatchTable.x = sw_sb_##x; \ +} while(0) + SWAP_SB_FUNC(Finish); +#undef SWAP_SB_FUNC +#define SWAP_DB_FUNC(x) do \ +{ \ + p##x = sw_table_db.glDispatchTable.x; \ + sw_table_db.glDispatchTable.x = sw_db_##x; \ +} while(0) + SWAP_DB_FUNC(ReadBuffer); + SWAP_DB_FUNC(ReadPixels); + SWAP_DB_FUNC(GetBooleanv); + SWAP_DB_FUNC(GetIntegerv); + SWAP_DB_FUNC(GetFloatv); + SWAP_DB_FUNC(GetDoublev); +#undef SWAP_DB_FUNC + /* OpenGL spec: flush == all pending commands are sent to the server, * and the client will receive the data in finished time. * We will call this finish in our case */ @@ -320,7 +522,9 @@ HeapFree( GetProcessHeap(), 0, context ); return NULL; } + /* Set defaults */ context->hook = NULL; + context->readmode = GL_BACK_LEFT; return (DHGLRC)context; } @@ -352,7 +556,6 @@ } } -#define WIDTH_BYTES_ALIGN32(cx, bpp) ((((cx) * (bpp) + 31) & ~31) >> 3) static LRESULT CALLBACK sw_call_window_proc( @@ -396,6 +599,9 @@ height = client_rect.bottom - client_rect.top; /* Do not reallocate for minimized windows */ if(width <= 0 || height <= 0) + goto end; + /* Do not bother with unchanged size */ + if(width == fb->bmi.bmiHeader.biWidth && height == fb->bmi.bmiHeader.biHeight) goto end; /* Resize the buffer accordingly */ widthBytes = WIDTH_BYTES_ALIGN32(width, pixel_formats[fb->format_index].color_bits); @@ -407,6 +613,8 @@ /* Re-enable osmesa */ pOSMesaMakeCurrent(ctx->mesa_ctx, fb->bits, GL_UNSIGNED_BYTE, width, height); pOSMesaPixelStore(OSMESA_ROW_LENGTH, widthBytes * 8 / pixel_formats[fb->format_index].color_bits); + /* Mark dirty bit acordingly */ + fb->flags |= SW_FB_DIRTY_SIZE; } } @@ -481,6 +689,7 @@ if(bits) { + assert(!(fb->flags & SW_FB_DOUBLEBUFFERED)); if(fb->flags & SW_FB_FREE_BITS) { fb->flags ^= SW_FB_FREE_BITS; @@ -489,14 +698,14 @@ fb->flags |= SW_FB_DIBSECTION; fb->bits = bits; } - else + else if((width != fb->bmi.bmiHeader.biWidth) || (height != fb->bmi.bmiHeader.biHeight)) { widthBytes = WIDTH_BYTES_ALIGN32(width, pixel_formats[fb->format_index].color_bits); if(fb->flags & SW_FB_FREE_BITS) fb->bits = HeapReAlloc(GetProcessHeap(), 0, fb->bits, widthBytes * height); else fb->bits = HeapAlloc(GetProcessHeap(), 0, widthBytes * height); - fb->flags |= SW_FB_FREE_BITS; + fb->flags |= (SW_FB_FREE_BITS | SW_FB_DIRTY_SIZE); fb->flags &= ~SW_FB_DIBSECTION; } @@ -572,6 +781,9 @@ /* Finish before swapping */ pFinish(); + /* We are now dirty */ + fb->flags |= SW_FB_DIRTY_BITS; + return (SetDIBitsToDevice(hdc, 0, 0,

1 0

[hbelusca] 60196: [SOFT386] Use SOFT386_EXCEPTIONS instead of INT for the ExceptionCode parameter in Soft386ExceptionWithErrorCode and Soft386Exception.
by hbelusca＠svn.reactos.org 17 Sep '13

17 Sep '13

Author: hbelusca Date: Tue Sep 17 23:17:50 2013 New Revision: 60196 URL: http://svn.reactos.org/svn/reactos?rev=60196&view=rev Log: [SOFT386] Use SOFT386_EXCEPTIONS instead of INT for the ExceptionCode parameter in Soft386ExceptionWithErrorCode and Soft386Exception. Modified: branches/ntvdm/lib/soft386/common.c branches/ntvdm/lib/soft386/common.h branches/ntvdm/lib/soft386/common.inl Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Tue Sep 17 23:17:50 2013 @@ -20,8 +20,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static -inline +static inline ULONG Soft386GetPageTableEntry(PSOFT386_STATE State, ULONG VirtualAddress) @@ -434,7 +433,7 @@ VOID FASTCALL Soft386ExceptionWithErrorCode(PSOFT386_STATE State, - INT ExceptionCode, + SOFT386_EXCEPTIONS ExceptionCode, ULONG ErrorCode) { SOFT386_IDT_ENTRY IdtEntry; Modified: branches/ntvdm/lib/soft386/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.h [iso-8859-1] Tue Sep 17 23:17:50 2013 @@ -119,7 +119,7 @@ Soft386ExceptionWithErrorCode ( PSOFT386_STATE State, - INT ExceptionCode, + SOFT386_EXCEPTIONS ExceptionCode, ULONG ErrorCode ); Modified: branches/ntvdm/lib/soft386/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.inl?re… ============================================================================== --- branches/ntvdm/lib/soft386/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.inl [iso-8859-1] Tue Sep 17 23:17:50 2013 @@ -11,7 +11,7 @@ FORCEINLINE VOID Soft386Exception(PSOFT386_STATE State, - INT ExceptionCode) + SOFT386_EXCEPTIONS ExceptionCode) { /* Call the internal function */ Soft386ExceptionWithErrorCode(State, ExceptionCode, 0);

1 0

[aandrejevic] 60195: [SOFT386] Fix the ARPL instruction. Use "inline" instead of FORCEINLINE for static functions.
by aandrejevic＠svn.reactos.org 17 Sep '13

17 Sep '13

Author: aandrejevic Date: Tue Sep 17 23:12:25 2013 New Revision: 60195 URL: http://svn.reactos.org/svn/reactos?rev=60195&view=rev Log: [SOFT386] Fix the ARPL instruction. Use "inline" instead of FORCEINLINE for static functions. Modified: branches/ntvdm/lib/soft386/common.c branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Tue Sep 17 23:12:25 2013 @@ -20,7 +20,8 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static /* FORCEINLINE */ +static +inline ULONG Soft386GetPageTableEntry(PSOFT386_STATE State, ULONG VirtualAddress) 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 Sep 17 23:12:25 2013 @@ -3686,16 +3686,31 @@ { USHORT FirstValue, SecondValue; SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; if (!(State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) - || State->PrefixFlags) - { - /* No prefixes allowed, protected mode only */ - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; + || State->Flags.Vm + || (State->PrefixFlags & SOFT386_PREFIX_LOCK)) + { + /* Cannot be used in real mode or with a LOCK prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + 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; + } + + /* Read the operands */ if (!Soft386ReadModrmWordOperands(State, &ModRegRm, &FirstValue,

1 0

[hbelusca] 60194: Fix a compilation error.
by hbelusca＠svn.reactos.org 17 Sep '13

17 Sep '13

Author: hbelusca Date: Tue Sep 17 23:10:26 2013 New Revision: 60194 URL: http://svn.reactos.org/svn/reactos?rev=60194&view=rev Log: Fix a compilation error. Modified: branches/ntvdm/lib/soft386/common.c Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Tue Sep 17 23:10:26 2013 @@ -20,7 +20,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static FORCEINLINE +static /* FORCEINLINE */ ULONG Soft386GetPageTableEntry(PSOFT386_STATE State, ULONG VirtualAddress)

1 0

[hbelusca] 60193: [SOFT386] - Put inlined functions in a .inl file, which gets included by the corresponding header file (i.e. fix MSVC builds). - Use enums types instead of "only" INTs...
by hbelusca＠svn.reactos.org 17 Sep '13

17 Sep '13

Author: hbelusca Date: Tue Sep 17 23:02:22 2013 New Revision: 60193 URL: http://svn.reactos.org/svn/reactos?rev=60193&view=rev Log: [SOFT386] - Put inlined functions in a .inl file, which gets included by the corresponding header file (i.e. fix MSVC builds). - Use enums types instead of "only" INTs... Added: branches/ntvdm/lib/soft386/common.inl (with props) Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/common.c branches/ntvdm/lib/soft386/common.h branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/soft386.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] Tue Sep 17 23:02:22 2013 @@ -44,7 +44,7 @@ struct _SOFT386_STATE; typedef struct _SOFT386_STATE SOFT386_STATE, *PSOFT386_STATE; -enum _SOFT386_GEN_REGS +typedef enum _SOFT386_GEN_REGS { SOFT386_REG_EAX, SOFT386_REG_ECX, @@ -54,9 +54,9 @@ SOFT386_REG_EBP, SOFT386_REG_ESI, SOFT386_REG_EDI -}; - -enum _SOFT386_SEG_REGS +} SOFT386_GEN_REGS, *PSOFT386_GEN_REGS; + +typedef enum _SOFT386_SEG_REGS { SOFT386_REG_ES, SOFT386_REG_CS, @@ -64,9 +64,9 @@ SOFT386_REG_DS, SOFT386_REG_FS, SOFT386_REG_GS -}; - -enum _SOFT386_CTRL_REGS +} SOFT386_SEG_REGS, *PSOFT386_SEG_REGS; + +typedef enum _SOFT386_CTRL_REGS { SOFT386_REG_CR0, SOFT386_REG_CR1, @@ -76,9 +76,9 @@ SOFT386_REG_CR5, SOFT386_REG_CR6, SOFT386_REG_CR7 -}; - -enum _SOFT386_DBG_REGS +} SOFT386_CTRL_REGS, *PSOFT386_CTRL_REGS; + +typedef enum _SOFT386_DBG_REGS { SOFT386_REG_DR0, SOFT386_REG_DR1, @@ -88,9 +88,9 @@ SOFT386_REG_DR5, SOFT386_REG_DR6, SOFT386_REG_DR7 -}; - -enum _SOFT386_EXCEPTIONS +} SOFT386_DBG_REGS, *PSOFT386_DBG_REGS; + +typedef enum _SOFT386_EXCEPTIONS { SOFT386_EXCEPTION_DE = 0x00, SOFT386_EXCEPTION_DB = 0x01, @@ -108,7 +108,7 @@ SOFT386_EXCEPTION_MF = 0x10, SOFT386_EXCEPTION_AC = 0x11, SOFT386_EXCEPTION_MC = 0x12 -}; +} SOFT386_EXCEPTIONS, *PSOFT386_EXCEPTIONS; typedef BOOLEAN @@ -303,7 +303,7 @@ ULONG DebugRegisters[SOFT386_NUM_DBG_REGS]; ULONG ExceptionCount; ULONG PrefixFlags; - INT SegmentOverride; + SOFT386_SEG_REGS SegmentOverride; BOOLEAN HardwareInt; }; Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Tue Sep 17 23:02:22 2013 @@ -12,24 +12,15 @@ // #define _INC_WINDOWS #include <windef.h> +// #define NDEBUG +#include <debug.h> + #include <soft386.h> #include "common.h" -// #define NDEBUG -#include <debug.h> - /* PRIVATE FUNCTIONS **********************************************************/ -static -inline -INT -Soft386GetCurrentPrivLevel(PSOFT386_STATE State) -{ - return GET_SEGMENT_RPL(State->SegmentRegs[SOFT386_REG_CS].Selector); -} - -static -inline +static FORCEINLINE ULONG Soft386GetPageTableEntry(PSOFT386_STATE State, ULONG VirtualAddress) @@ -42,10 +33,9 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -inline BOOLEAN Soft386ReadMemory(PSOFT386_STATE State, - INT SegmentReg, + SOFT386_SEG_REGS SegmentReg, ULONG Offset, BOOLEAN InstFetch, PVOID Buffer, @@ -184,10 +174,9 @@ return TRUE; } -inline BOOLEAN Soft386WriteMemory(PSOFT386_STATE State, - INT SegmentReg, + SOFT386_SEG_REGS SegmentReg, ULONG Offset, PVOID Buffer, ULONG Size) @@ -321,334 +310,6 @@ return TRUE; } -inline -BOOLEAN -Soft386StackPush(PSOFT386_STATE State, ULONG Value) -{ - BOOLEAN Size = State->SegmentRegs[SOFT386_REG_SS].Size; - - /* The OPSIZE prefix toggles the size */ - if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) Size = !Size; - - if (Size) - { - /* 32-bit size */ - - /* Check if ESP is between 1 and 3 */ - if (State->GeneralRegs[SOFT386_REG_ESP].Long >= 1 - && State->GeneralRegs[SOFT386_REG_ESP].Long <= 3) - { - Soft386Exception(State, SOFT386_EXCEPTION_SS); - return FALSE; - } - - /* Subtract ESP by 4 */ - State->GeneralRegs[SOFT386_REG_ESP].Long -= 4; - - /* Store the value in SS:ESP */ - return Soft386WriteMemory(State, - SOFT386_REG_SS, - State->GeneralRegs[SOFT386_REG_ESP].Long, - &Value, - sizeof(ULONG)); - } - else - { - /* 16-bit size */ - USHORT ShortValue = LOWORD(Value); - - /* Check if SP is 1 */ - if (State->GeneralRegs[SOFT386_REG_ESP].Long == 1) - { - Soft386Exception(State, SOFT386_EXCEPTION_SS); - return FALSE; - } - - /* Subtract SP by 2 */ - State->GeneralRegs[SOFT386_REG_ESP].LowWord -= 2; - - /* Store the value in SS:SP */ - return Soft386WriteMemory(State, - SOFT386_REG_SS, - State->GeneralRegs[SOFT386_REG_ESP].LowWord, - &ShortValue, - sizeof(USHORT)); - } -} - -inline -BOOLEAN -Soft386StackPop(PSOFT386_STATE State, PULONG Value) -{ - ULONG LongValue; - USHORT ShortValue; - BOOLEAN Size = State->SegmentRegs[SOFT386_REG_SS].Size; - - /* The OPSIZE prefix toggles the size */ - if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) Size = !Size; - - if (Size) - { - /* 32-bit size */ - - /* Check if ESP is 0xFFFFFFFF */ - if (State->GeneralRegs[SOFT386_REG_ESP].Long == 0xFFFFFFFF) - { - Soft386Exception(State, SOFT386_EXCEPTION_SS); - return FALSE; - } - - /* Read the value from SS:ESP */ - if (!Soft386ReadMemory(State, - SOFT386_REG_SS, - State->GeneralRegs[SOFT386_REG_ESP].Long, - FALSE, - &LongValue, - sizeof(LongValue))) - { - /* An exception occurred */ - return FALSE; - } - - /* Increment ESP by 4 */ - State->GeneralRegs[SOFT386_REG_ESP].Long += 4; - - /* Store the value in the result */ - *Value = LongValue; - } - else - { - /* 16-bit size */ - - /* Check if SP is 0xFFFF */ - if (State->GeneralRegs[SOFT386_REG_ESP].LowWord == 0xFFFF) - { - Soft386Exception(State, SOFT386_EXCEPTION_SS); - return FALSE; - } - - /* Read the value from SS:SP */ - if (!Soft386ReadMemory(State, - SOFT386_REG_SS, - State->GeneralRegs[SOFT386_REG_ESP].LowWord, - FALSE, - &ShortValue, - sizeof(ShortValue))) - { - /* An exception occurred */ - return FALSE; - } - - /* Increment SP by 2 */ - State->GeneralRegs[SOFT386_REG_ESP].Long += 2; - - /* Store the value in the result */ - *Value = ShortValue; - } - - return TRUE; -} - -inline -BOOLEAN -Soft386LoadSegment(PSOFT386_STATE State, INT Segment, USHORT Selector) -{ - PSOFT386_SEG_REG CachedDescriptor; - SOFT386_GDT_ENTRY GdtEntry; - - ASSERT(Segment < SOFT386_NUM_SEG_REGS); - - /* Get the cached descriptor */ - CachedDescriptor = &State->SegmentRegs[Segment]; - - /* Check for protected mode */ - if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) - { - /* Make sure the GDT contains the entry */ - if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) - { - Soft386Exception(State, SOFT386_EXCEPTION_GP); - return FALSE; - } - - /* 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)); - } - - /* Check if we are loading SS */ - if (Segment == SOFT386_REG_SS) - { - if (GET_SEGMENT_INDEX(Selector) == 0) - { - Soft386Exception(State, SOFT386_EXCEPTION_GP); - return FALSE; - } - - if (GdtEntry.Executable || !GdtEntry.ReadWrite) - { - Soft386Exception(State, SOFT386_EXCEPTION_GP); - return FALSE; - } - - if ((GET_SEGMENT_RPL(Selector) != Soft386GetCurrentPrivLevel(State)) - || (GET_SEGMENT_RPL(Selector) != GdtEntry.Dpl)) - { - Soft386Exception(State, SOFT386_EXCEPTION_GP); - return FALSE; - } - - if (!GdtEntry.Present) - { - Soft386Exception(State, SOFT386_EXCEPTION_SS); - return FALSE; - } - } - else - { - if ((GET_SEGMENT_RPL(Selector) > GdtEntry.Dpl) - && (Soft386GetCurrentPrivLevel(State) > GdtEntry.Dpl)) - { - Soft386Exception(State, SOFT386_EXCEPTION_GP); - return FALSE; - } - - if (!GdtEntry.Present) - { - Soft386Exception(State, SOFT386_EXCEPTION_NP); - return FALSE; - } - } - - /* Update the cache entry */ - CachedDescriptor->Selector = Selector; - CachedDescriptor->Base = GdtEntry.Base | (GdtEntry.BaseHigh << 24); - CachedDescriptor->Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); - CachedDescriptor->Accessed = GdtEntry.Accessed; - CachedDescriptor->ReadWrite = GdtEntry.ReadWrite; - CachedDescriptor->DirConf = GdtEntry.DirConf; - CachedDescriptor->Executable = GdtEntry.Executable; - CachedDescriptor->SystemType = GdtEntry.SystemType; - CachedDescriptor->Dpl = GdtEntry.Dpl; - CachedDescriptor->Present = GdtEntry.Present; - CachedDescriptor->Size = GdtEntry.Size; - - /* Check for page granularity */ - if (GdtEntry.Granularity) CachedDescriptor->Limit <<= 12; - } - else - { - /* Update the selector and base */ - CachedDescriptor->Selector = Selector; - CachedDescriptor->Base = Selector << 4; - } - - return TRUE; -} - -inline -BOOLEAN -Soft386FetchByte(PSOFT386_STATE State, PUCHAR Data) -{ - PSOFT386_SEG_REG CachedDescriptor; - - /* Get the cached descriptor of CS */ - CachedDescriptor = &State->SegmentRegs[SOFT386_REG_CS]; - - /* Read from memory */ - if (!Soft386ReadMemory(State, - SOFT386_REG_CS, - (CachedDescriptor->Size) ? State->InstPtr.Long - : State->InstPtr.LowWord, - TRUE, - Data, - sizeof(UCHAR))) - { - /* Exception occurred during instruction fetch */ - return FALSE; - } - - /* Advance the instruction pointer */ - if (CachedDescriptor->Size) State->InstPtr.Long++; - else State->InstPtr.LowWord++; - - return TRUE; -} - -inline -BOOLEAN -Soft386FetchWord(PSOFT386_STATE State, PUSHORT Data) -{ - PSOFT386_SEG_REG CachedDescriptor; - - /* Get the cached descriptor of CS */ - CachedDescriptor = &State->SegmentRegs[SOFT386_REG_CS]; - - /* Read from memory */ - // FIXME: Fix byte order on big-endian machines - if (!Soft386ReadMemory(State, - SOFT386_REG_CS, - (CachedDescriptor->Size) ? State->InstPtr.Long - : State->InstPtr.LowWord, - TRUE, - Data, - sizeof(USHORT))) - { - /* Exception occurred during instruction fetch */ - return FALSE; - } - - /* Advance the instruction pointer */ - if (CachedDescriptor->Size) State->InstPtr.Long += sizeof(USHORT); - else State->InstPtr.LowWord += sizeof(USHORT); - - return TRUE; -} - -inline -BOOLEAN -Soft386FetchDword(PSOFT386_STATE State, PULONG Data) -{ - PSOFT386_SEG_REG CachedDescriptor; - - /* Get the cached descriptor of CS */ - CachedDescriptor = &State->SegmentRegs[SOFT386_REG_CS]; - - /* Read from memory */ - // FIXME: Fix byte order on big-endian machines - if (!Soft386ReadMemory(State, - SOFT386_REG_CS, - (CachedDescriptor->Size) ? State->InstPtr.Long - : State->InstPtr.LowWord, - TRUE, - Data, - sizeof(ULONG))) - { - /* Exception occurred during instruction fetch */ - return FALSE; - } - - /* Advance the instruction pointer */ - if (CachedDescriptor->Size) State->InstPtr.Long += sizeof(ULONG); - else State->InstPtr.LowWord += sizeof(ULONG); - - return TRUE; -} - -inline BOOLEAN Soft386InterruptInternal(PSOFT386_STATE State, USHORT SegmentSelector, @@ -769,77 +430,11 @@ return TRUE; } -inline -BOOLEAN -Soft386GetIntVector(PSOFT386_STATE State, - UCHAR Number, - PSOFT386_IDT_ENTRY IdtEntry) -{ - ULONG FarPointer; - - /* Check for protected mode */ - if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) - { - /* 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)); - } - } - 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(IdtEntry, - (PVOID)(State->Idtr.Address - + Number * sizeof(FarPointer)), - sizeof(FarPointer)); - } - - /* Fill a fake IDT entry */ - IdtEntry->Offset = LOWORD(FarPointer); - IdtEntry->Selector = HIWORD(FarPointer); - IdtEntry->Zero = 0; - IdtEntry->Type = SOFT386_IDT_INT_GATE; - IdtEntry->Storage = FALSE; - IdtEntry->Dpl = 0; - IdtEntry->Present = TRUE; - IdtEntry->OffsetHigh = 0; - } - - /* - * Once paging support is implemented this function - * will not always return true - */ - return TRUE; -} - VOID FASTCALL -Soft386ExceptionWithErrorCode(PSOFT386_STATE State, INT ExceptionCode, ULONG ErrorCode) +Soft386ExceptionWithErrorCode(PSOFT386_STATE State, + INT ExceptionCode, + ULONG ErrorCode) { SOFT386_IDT_ENTRY IdtEntry; @@ -890,545 +485,4 @@ } } -inline -VOID -Soft386Exception(PSOFT386_STATE State, INT ExceptionCode) -{ - /* Call the internal function */ - Soft386ExceptionWithErrorCode(State, ExceptionCode, 0); -} - -inline -BOOLEAN -Soft386CalculateParity(UCHAR Number) -{ - Number ^= Number >> 1; - Number ^= Number >> 2; - Number ^= Number >> 4; - return !(Number & 1); -} - -inline -BOOLEAN -Soft386ParseModRegRm(PSOFT386_STATE State, - BOOLEAN AddressSize, - PSOFT386_MOD_REG_RM ModRegRm) -{ - UCHAR ModRmByte, Mode, RegMem; - - /* Fetch the MOD REG R/M byte */ - if (!Soft386FetchByte(State, &ModRmByte)) - { - /* Exception occurred */ - return FALSE; - } - - /* Unpack the mode and R/M */ - Mode = ModRmByte >> 6; - RegMem = ModRmByte & 0x07; - - /* Set the register operand */ - ModRegRm->Register = (ModRmByte >> 3) & 0x07; - - /* Check the mode */ - if ((ModRmByte >> 6) == 3) - { - /* The second operand is also a register */ - ModRegRm->Memory = FALSE; - ModRegRm->SecondRegister = RegMem; - - /* Done parsing */ - return TRUE; - } - - /* The second operand is memory */ - ModRegRm->Memory = TRUE; - - if (AddressSize) - { - if (RegMem == SOFT386_REG_ESP) - { - UCHAR SibByte; - ULONG Scale, Index, Base; - - /* Fetch the SIB byte */ - if (!Soft386FetchByte(State, &SibByte)) - { - /* Exception occurred */ - return FALSE; - } - - /* Unpack the scale, index and base */ - Scale = 1 << (SibByte >> 6); - Index = (SibByte >> 3) & 0x07; - if (Index != SOFT386_REG_ESP) Index = State->GeneralRegs[Index].Long; - else Index = 0; - Base = State->GeneralRegs[SibByte & 0x07].Long; - - /* Calculate the address */ - ModRegRm->MemoryAddress = Base + Index * Scale; - } - else if (RegMem == SOFT386_REG_EBP) - { - if (Mode) ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBP].Long; - else ModRegRm->MemoryAddress = 0; - } - else - { - /* Get the base from the register */ - ModRegRm->MemoryAddress = State->GeneralRegs[RegMem].Long; - } - - /* Check if there is no segment override */ - if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) - { - /* Check if the default segment should be SS */ - if ((RegMem == SOFT386_REG_EBP) && Mode) - { - /* Add a SS: prefix */ - State->PrefixFlags |= SOFT386_PREFIX_SEG; - State->SegmentOverride = SOFT386_REG_SS; - } - } - - if (Mode == 1) - { - CHAR Offset; - - /* Fetch the byte */ - if (!Soft386FetchByte(State, (PUCHAR)&Offset)) - { - /* Exception occurred */ - return FALSE; - } - - /* Add the signed offset to the address */ - ModRegRm->MemoryAddress += (LONG)Offset; - } - else if ((Mode == 2) || ((Mode == 0) && (RegMem == SOFT386_REG_EBP))) - { - LONG Offset; - - /* Fetch the dword */ - if (!Soft386FetchDword(State, (PULONG)&Offset)) - { - /* Exception occurred */ - return FALSE; - } - - /* Add the signed offset to the address */ - ModRegRm->MemoryAddress += Offset; - } - } - else - { - /* Check the operand */ - switch (RegMem) - { - case 0: - case 2: - { - /* (SS:)[BX + SI] */ - ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBX].LowWord - + State->GeneralRegs[SOFT386_REG_ESI].LowWord; - - break; - } - - case 1: - case 3: - { - /* (SS:)[BX + DI] */ - ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBX].LowWord - + State->GeneralRegs[SOFT386_REG_EDI].LowWord; - - break; - } - - case 4: - { - /* [SI] */ - ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_ESI].LowWord; - - break; - } - - case 5: - { - /* [DI] */ - ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EDI].LowWord; - - break; - } - - case 6: - { - if (Mode) - { - /* [BP] */ - ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBP].LowWord; - } - else - { - /* [constant] (added later) */ - ModRegRm->MemoryAddress = 0; - } - - break; - } - - case 7: - { - /* [BX] */ - ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBX].LowWord; - - break; - } - } - - /* Check if there is no segment override */ - if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) - { - /* Check if the default segment should be SS */ - if ((RegMem == 2) || (RegMem == 3) || ((RegMem == 6) && Mode)) - { - /* Add a SS: prefix */ - State->PrefixFlags |= SOFT386_PREFIX_SEG; - State->SegmentOverride = SOFT386_REG_SS; - } - } - - if (Mode == 1) - { - CHAR Offset; - - /* Fetch the byte */ - if (!Soft386FetchByte(State, (PUCHAR)&Offset)) - { - /* Exception occurred */ - return FALSE; - } - - /* Add the signed offset to the address */ - ModRegRm->MemoryAddress += (LONG)Offset; - } - else if ((Mode == 2) || ((Mode == 0) && (RegMem == 6))) - { - SHORT Offset; - - /* Fetch the word */ - if (!Soft386FetchWord(State, (PUSHORT)&Offset)) - { - /* Exception occurred */ - return FALSE; - } - - /* Add the signed offset to the address */ - ModRegRm->MemoryAddress += (LONG)Offset; - } - } - - return TRUE; -} - -inline -BOOLEAN -Soft386ReadModrmByteOperands(PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - PUCHAR RegValue, - PUCHAR RmValue) -{ - INT Segment = SOFT386_REG_DS; - - /* Get the register value */ - if (ModRegRm->Register & 0x04) - { - /* AH, CH, DH, BH */ - *RegValue = State->GeneralRegs[ModRegRm->Register & 0x03].HighByte; - } - else - { - /* AL, CL, DL, BL */ - *RegValue = State->GeneralRegs[ModRegRm->Register & 0x03].LowByte; - } - - if (!ModRegRm->Memory) - { - /* Get the second register value */ - if (ModRegRm->SecondRegister & 0x04) - { - /* AH, CH, DH, BH */ - *RmValue = State->GeneralRegs[ModRegRm->SecondRegister & 0x03].HighByte; - } - else - { - /* AL, CL, DL, BL */ - *RmValue = State->GeneralRegs[ModRegRm->SecondRegister & 0x03].LowByte; - } - } - else - { - /* Check for the segment override */ - if (State->PrefixFlags & SOFT386_PREFIX_SEG) - { - /* Use the override segment instead */ - Segment = State->SegmentOverride; - } - - /* Read memory */ - if (!Soft386ReadMemory(State, - Segment, - ModRegRm->MemoryAddress, - FALSE, - RmValue, - sizeof(UCHAR))) - { - /* Exception occurred */ - return FALSE; - } - } - - return TRUE; -} - -inline -BOOLEAN -Soft386ReadModrmWordOperands(PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - PUSHORT RegValue, - PUSHORT RmValue) -{ - INT Segment = SOFT386_REG_DS; - - /* Get the register value */ - *RegValue = State->GeneralRegs[ModRegRm->Register].LowWord; - - if (!ModRegRm->Memory) - { - /* Get the second register value */ - *RmValue = State->GeneralRegs[ModRegRm->SecondRegister].LowWord; - } - else - { - /* Check for the segment override */ - if (State->PrefixFlags & SOFT386_PREFIX_SEG) - { - /* Use the override segment instead */ - Segment = State->SegmentOverride; - } - - /* Read memory */ - if (!Soft386ReadMemory(State, - Segment, - ModRegRm->MemoryAddress, - FALSE, - RmValue, - sizeof(USHORT))) - { - /* Exception occurred */ - return FALSE; - } - } - - return TRUE; -} - -inline -BOOLEAN -Soft386ReadModrmDwordOperands(PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - PULONG RegValue, - PULONG RmValue) -{ - INT Segment = SOFT386_REG_DS; - - /* Get the register value */ - *RegValue = State->GeneralRegs[ModRegRm->Register].Long; - - if (!ModRegRm->Memory) - { - /* Get the second register value */ - *RmValue = State->GeneralRegs[ModRegRm->SecondRegister].Long; - } - else - { - /* Check for the segment override */ - if (State->PrefixFlags & SOFT386_PREFIX_SEG) - { - /* Use the override segment instead */ - Segment = State->SegmentOverride; - } - - /* Read memory */ - if (!Soft386ReadMemory(State, - Segment, - ModRegRm->MemoryAddress, - FALSE, - RmValue, - sizeof(ULONG))) - { - /* Exception occurred */ - return FALSE; - } - } - - return TRUE; -} - -inline -BOOLEAN -Soft386WriteModrmByteOperands(PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - BOOLEAN WriteRegister, - UCHAR Value) -{ - INT Segment = SOFT386_REG_DS; - - if (WriteRegister) - { - /* Store the value in the register */ - if (ModRegRm->Register & 0x04) - { - /* AH, CH, DH, BH */ - State->GeneralRegs[ModRegRm->Register & 0x03].HighByte = Value; - } - else - { - /* AL, CL, DL, BL */ - State->GeneralRegs[ModRegRm->Register & 0x03].LowByte = Value; - } - } - else - { - if (!ModRegRm->Memory) - { - /* Store the value in the second register */ - if (ModRegRm->SecondRegister & 0x04) - { - /* AH, CH, DH, BH */ - State->GeneralRegs[ModRegRm->SecondRegister & 0x03].HighByte = Value; - } - else - { - /* AL, CL, DL, BL */ - State->GeneralRegs[ModRegRm->SecondRegister & 0x03].LowByte = Value; - } - } - else - { - /* Check for the segment override */ - if (State->PrefixFlags & SOFT386_PREFIX_SEG) - { - /* Use the override segment instead */ - Segment = State->SegmentOverride; - } - - /* Write memory */ - if (!Soft386WriteMemory(State, - Segment, - ModRegRm->MemoryAddress, - &Value, - sizeof(UCHAR))) - { - /* Exception occurred */ - return FALSE; - } - } - } - - return TRUE; -} - -inline -BOOLEAN -Soft386WriteModrmWordOperands(PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - BOOLEAN WriteRegister, - USHORT Value) -{ - INT Segment = SOFT386_REG_DS; - - if (WriteRegister) - { - /* Store the value in the register */ - State->GeneralRegs[ModRegRm->Register].LowWord = Value; - } - else - { - if (!ModRegRm->Memory) - { - /* Store the value in the second register */ - State->GeneralRegs[ModRegRm->SecondRegister].LowWord = Value; - } - else - { - /* Check for the segment override */ - if (State->PrefixFlags & SOFT386_PREFIX_SEG) - { - /* Use the override segment instead */ - Segment = State->SegmentOverride; - } - - /* Write memory */ - if (!Soft386WriteMemory(State, - Segment, - ModRegRm->MemoryAddress, - &Value, - sizeof(USHORT))) - { - /* Exception occurred */ - return FALSE; - } - } - } - - return TRUE; -} - -inline -BOOLEAN -Soft386WriteModrmDwordOperands(PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - BOOLEAN WriteRegister, - ULONG Value) -{ - INT Segment = SOFT386_REG_DS; - - if (WriteRegister) - { - /* Store the value in the register */ - State->GeneralRegs[ModRegRm->Register].Long = Value; - } - else - { - if (!ModRegRm->Memory) - { - /* Store the value in the second register */ - State->GeneralRegs[ModRegRm->SecondRegister].Long = Value; - } - else - { - /* Check for the segment override */ - if (State->PrefixFlags & SOFT386_PREFIX_SEG) - { - /* Use the override segment instead */ - Segment = State->SegmentOverride; - } - - /* Write memory */ - if (!Soft386WriteMemory(State, - Segment, - ModRegRm->MemoryAddress, - &Value, - sizeof(ULONG))) - { - /* Exception occurred */ - return FALSE; - } - } - } - - return TRUE; -} - /* EOF */ Modified: branches/ntvdm/lib/soft386/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.h [iso-8859-1] Tue Sep 17 23:02:22 2013 @@ -32,11 +32,11 @@ typedef struct _SOFT386_MOD_REG_RM { - INT Register; + SOFT386_GEN_REGS Register; BOOLEAN Memory; union { - INT SecondRegister; + SOFT386_GEN_REGS SecondRegister; ULONG MemoryAddress; }; } SOFT386_MOD_REG_RM, *PSOFT386_MOD_REG_RM; @@ -84,79 +84,27 @@ /* FUNCTIONS ******************************************************************/ -inline BOOLEAN Soft386ReadMemory ( PSOFT386_STATE State, - INT SegmentReg, + SOFT386_SEG_REGS SegmentReg, ULONG Offset, BOOLEAN InstFetch, PVOID Buffer, ULONG Size ); -inline BOOLEAN Soft386WriteMemory ( PSOFT386_STATE State, - INT SegmentReg, + SOFT386_SEG_REGS SegmentReg, ULONG Offset, PVOID Buffer, ULONG Size ); -inline -BOOLEAN -Soft386StackPush -( - PSOFT386_STATE State, - ULONG Value -); - -inline -BOOLEAN -Soft386StackPop -( - PSOFT386_STATE State, - PULONG Value -); - -inline -BOOLEAN -Soft386LoadSegment -( - PSOFT386_STATE State, - INT Segment, - USHORT Selector -); - -inline -BOOLEAN -Soft386FetchByte -( - PSOFT386_STATE State, - PUCHAR Data -); - -inline -BOOLEAN -Soft386FetchWord -( - PSOFT386_STATE State, - PUSHORT Data -); - -inline -BOOLEAN -Soft386FetchDword -( - PSOFT386_STATE State, - PULONG Data -); - -inline BOOLEAN Soft386InterruptInternal ( @@ -164,15 +112,6 @@ USHORT SegmentSelector, ULONG Offset, BOOLEAN InterruptGate -); - -inline -BOOLEAN -Soft386GetIntVector -( - PSOFT386_STATE State, - UCHAR Number, - PSOFT386_IDT_ENTRY IdtEntry ); VOID @@ -184,89 +123,16 @@ ULONG ErrorCode ); -inline -VOID -Soft386Exception -( - PSOFT386_STATE State, - INT ExceptionCode -); +/* INLINED FUNCTIONS **********************************************************/ -inline -BOOLEAN -Soft386CalculateParity -( - UCHAR Number -); +/* static */ FORCEINLINE +INT +Soft386GetCurrentPrivLevel(PSOFT386_STATE State) +{ + return GET_SEGMENT_RPL(State->SegmentRegs[SOFT386_REG_CS].Selector); +} -inline -BOOLEAN -Soft386ParseModRegRm -( - PSOFT386_STATE State, - BOOLEAN AddressSize, - PSOFT386_MOD_REG_RM ModRegRm -); - -inline -BOOLEAN -Soft386ReadModrmByteOperands -( - PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - PUCHAR RegValue, - PUCHAR RmValue -); - -inline -BOOLEAN -Soft386ReadModrmWordOperands -( - PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - PUSHORT RegValue, - PUSHORT RmValue -); - -inline -BOOLEAN -Soft386ReadModrmDwordOperands -( - PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - PULONG RegValue, - PULONG RmValue -); - -inline -BOOLEAN -Soft386WriteModrmByteOperands -( - PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - BOOLEAN WriteRegister, - UCHAR Value -); - -inline -BOOLEAN -Soft386WriteModrmWordOperands -( - PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - BOOLEAN WriteRegister, - USHORT Value -); - -inline -BOOLEAN -Soft386WriteModrmDwordOperands -( - PSOFT386_STATE State, - PSOFT386_MOD_REG_RM ModRegRm, - BOOLEAN WriteRegister, - ULONG Value -); +#include "common.inl" #endif // _COMMON_H_ Added: branches/ntvdm/lib/soft386/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.inl?re… ============================================================================== --- branches/ntvdm/lib/soft386/common.inl (added) +++ branches/ntvdm/lib/soft386/common.inl [iso-8859-1] Tue Sep 17 23:02:22 2013 @@ -0,0 +1,955 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: 386/486 CPU Emulation Library + * FILE: common.inl + * PURPOSE: Common functions used internally by Soft386 (inlined funtions). + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* PUBLIC FUNCTIONS ***********************************************************/ + +FORCEINLINE +VOID +Soft386Exception(PSOFT386_STATE State, + INT ExceptionCode) +{ + /* Call the internal function */ + Soft386ExceptionWithErrorCode(State, ExceptionCode, 0); +} + +FORCEINLINE +BOOLEAN +Soft386StackPush(PSOFT386_STATE State, + ULONG Value) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_SS].Size; + + /* The OPSIZE prefix toggles the size */ + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) Size = !Size; + + if (Size) + { + /* 32-bit size */ + + /* Check if ESP is between 1 and 3 */ + if (State->GeneralRegs[SOFT386_REG_ESP].Long >= 1 + && State->GeneralRegs[SOFT386_REG_ESP].Long <= 3) + { + Soft386Exception(State, SOFT386_EXCEPTION_SS); + return FALSE; + } + + /* Subtract ESP by 4 */ + State->GeneralRegs[SOFT386_REG_ESP].Long -= 4; + + /* Store the value in SS:ESP */ + return Soft386WriteMemory(State, + SOFT386_REG_SS, + State->GeneralRegs[SOFT386_REG_ESP].Long, + &Value, + sizeof(ULONG)); + } + else + { + /* 16-bit size */ + USHORT ShortValue = LOWORD(Value); + + /* Check if SP is 1 */ + if (State->GeneralRegs[SOFT386_REG_ESP].Long == 1) + { + Soft386Exception(State, SOFT386_EXCEPTION_SS); + return FALSE; + } + + /* Subtract SP by 2 */ + State->GeneralRegs[SOFT386_REG_ESP].LowWord -= 2; + + /* Store the value in SS:SP */ + return Soft386WriteMemory(State, + SOFT386_REG_SS, + State->GeneralRegs[SOFT386_REG_ESP].LowWord, + &ShortValue, + sizeof(USHORT)); + } +} + +FORCEINLINE +BOOLEAN +Soft386StackPop(PSOFT386_STATE State, + PULONG Value) +{ + ULONG LongValue; + USHORT ShortValue; + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_SS].Size; + + /* The OPSIZE prefix toggles the size */ + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) Size = !Size; + + if (Size) + { + /* 32-bit size */ + + /* Check if ESP is 0xFFFFFFFF */ + if (State->GeneralRegs[SOFT386_REG_ESP].Long == 0xFFFFFFFF) + { + Soft386Exception(State, SOFT386_EXCEPTION_SS); + return FALSE; + } + + /* Read the value from SS:ESP */ + if (!Soft386ReadMemory(State, + SOFT386_REG_SS, + State->GeneralRegs[SOFT386_REG_ESP].Long, + FALSE, + &LongValue, + sizeof(LongValue))) + { + /* An exception occurred */ + return FALSE; + } + + /* Increment ESP by 4 */ + State->GeneralRegs[SOFT386_REG_ESP].Long += 4; + + /* Store the value in the result */ + *Value = LongValue; + } + else + { + /* 16-bit size */ + + /* Check if SP is 0xFFFF */ + if (State->GeneralRegs[SOFT386_REG_ESP].LowWord == 0xFFFF) + { + Soft386Exception(State, SOFT386_EXCEPTION_SS); + return FALSE; + } + + /* Read the value from SS:SP */ + if (!Soft386ReadMemory(State, + SOFT386_REG_SS, + State->GeneralRegs[SOFT386_REG_ESP].LowWord, + FALSE, + &ShortValue, + sizeof(ShortValue))) + { + /* An exception occurred */ + return FALSE; + } + + /* Increment SP by 2 */ + State->GeneralRegs[SOFT386_REG_ESP].Long += 2; + + /* Store the value in the result */ + *Value = ShortValue; + } + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386LoadSegment(PSOFT386_STATE State, + INT Segment, + USHORT Selector) +{ + PSOFT386_SEG_REG CachedDescriptor; + SOFT386_GDT_ENTRY GdtEntry; + + ASSERT(Segment < SOFT386_NUM_SEG_REGS); + + /* Get the cached descriptor */ + CachedDescriptor = &State->SegmentRegs[Segment]; + + /* Check for protected mode */ + if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + { + /* Make sure the GDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) + { + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + + /* 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)); + } + + /* Check if we are loading SS */ + if (Segment == SOFT386_REG_SS) + { + if (GET_SEGMENT_INDEX(Selector) == 0) + { + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + + if (GdtEntry.Executable || !GdtEntry.ReadWrite) + { + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + + if ((GET_SEGMENT_RPL(Selector) != Soft386GetCurrentPrivLevel(State)) + || (GET_SEGMENT_RPL(Selector) != GdtEntry.Dpl)) + { + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + + if (!GdtEntry.Present) + { + Soft386Exception(State, SOFT386_EXCEPTION_SS); + return FALSE; + } + } + else + { + if ((GET_SEGMENT_RPL(Selector) > GdtEntry.Dpl) + && (Soft386GetCurrentPrivLevel(State) > GdtEntry.Dpl)) + { + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + + if (!GdtEntry.Present) + { + Soft386Exception(State, SOFT386_EXCEPTION_NP); + return FALSE; + } + } + + /* Update the cache entry */ + CachedDescriptor->Selector = Selector; + CachedDescriptor->Base = GdtEntry.Base | (GdtEntry.BaseHigh << 24); + CachedDescriptor->Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); + CachedDescriptor->Accessed = GdtEntry.Accessed; + CachedDescriptor->ReadWrite = GdtEntry.ReadWrite; + CachedDescriptor->DirConf = GdtEntry.DirConf; + CachedDescriptor->Executable = GdtEntry.Executable; + CachedDescriptor->SystemType = GdtEntry.SystemType; + CachedDescriptor->Dpl = GdtEntry.Dpl; + CachedDescriptor->Present = GdtEntry.Present; + CachedDescriptor->Size = GdtEntry.Size; + + /* Check for page granularity */ + if (GdtEntry.Granularity) CachedDescriptor->Limit <<= 12; + } + else + { + /* Update the selector and base */ + CachedDescriptor->Selector = Selector; + CachedDescriptor->Base = Selector << 4; + } + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386FetchByte(PSOFT386_STATE State, + PUCHAR Data) +{ + PSOFT386_SEG_REG CachedDescriptor; + + /* Get the cached descriptor of CS */ + CachedDescriptor = &State->SegmentRegs[SOFT386_REG_CS]; + + /* Read from memory */ + if (!Soft386ReadMemory(State, + SOFT386_REG_CS, + (CachedDescriptor->Size) ? State->InstPtr.Long + : State->InstPtr.LowWord, + TRUE, + Data, + sizeof(UCHAR))) + { + /* Exception occurred during instruction fetch */ + return FALSE; + } + + /* Advance the instruction pointer */ + if (CachedDescriptor->Size) State->InstPtr.Long++; + else State->InstPtr.LowWord++; + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386FetchWord(PSOFT386_STATE State, + PUSHORT Data) +{ + PSOFT386_SEG_REG CachedDescriptor; + + /* Get the cached descriptor of CS */ + CachedDescriptor = &State->SegmentRegs[SOFT386_REG_CS]; + + /* Read from memory */ + // FIXME: Fix byte order on big-endian machines + if (!Soft386ReadMemory(State, + SOFT386_REG_CS, + (CachedDescriptor->Size) ? State->InstPtr.Long + : State->InstPtr.LowWord, + TRUE, + Data, + sizeof(USHORT))) + { + /* Exception occurred during instruction fetch */ + return FALSE; + } + + /* Advance the instruction pointer */ + if (CachedDescriptor->Size) State->InstPtr.Long += sizeof(USHORT); + else State->InstPtr.LowWord += sizeof(USHORT); + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386FetchDword(PSOFT386_STATE State, + PULONG Data) +{ + PSOFT386_SEG_REG CachedDescriptor; + + /* Get the cached descriptor of CS */ + CachedDescriptor = &State->SegmentRegs[SOFT386_REG_CS]; + + /* Read from memory */ + // FIXME: Fix byte order on big-endian machines + if (!Soft386ReadMemory(State, + SOFT386_REG_CS, + (CachedDescriptor->Size) ? State->InstPtr.Long + : State->InstPtr.LowWord, + TRUE, + Data, + sizeof(ULONG))) + { + /* Exception occurred during instruction fetch */ + return FALSE; + } + + /* Advance the instruction pointer */ + if (CachedDescriptor->Size) State->InstPtr.Long += sizeof(ULONG); + else State->InstPtr.LowWord += sizeof(ULONG); + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386GetIntVector(PSOFT386_STATE State, + UCHAR Number, + PSOFT386_IDT_ENTRY IdtEntry) +{ + ULONG FarPointer; + + /* Check for protected mode */ + if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + { + /* 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)); + } + } + 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(IdtEntry, + (PVOID)(State->Idtr.Address + + Number * sizeof(FarPointer)), + sizeof(FarPointer)); + } + + /* Fill a fake IDT entry */ + IdtEntry->Offset = LOWORD(FarPointer); + IdtEntry->Selector = HIWORD(FarPointer); + IdtEntry->Zero = 0; + IdtEntry->Type = SOFT386_IDT_INT_GATE; + IdtEntry->Storage = FALSE; + IdtEntry->Dpl = 0; + IdtEntry->Present = TRUE; + IdtEntry->OffsetHigh = 0; + } + + /* + * Once paging support is implemented this function + * will not always return true + */ + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386CalculateParity(UCHAR Number) +{ + Number ^= Number >> 1; + Number ^= Number >> 2; + Number ^= Number >> 4; + return !(Number & 1); +} + +FORCEINLINE +BOOLEAN +Soft386ParseModRegRm(PSOFT386_STATE State, + BOOLEAN AddressSize, + PSOFT386_MOD_REG_RM ModRegRm) +{ + UCHAR ModRmByte, Mode, RegMem; + + /* Fetch the MOD REG R/M byte */ + if (!Soft386FetchByte(State, &ModRmByte)) + { + /* Exception occurred */ + return FALSE; + } + + /* Unpack the mode and R/M */ + Mode = ModRmByte >> 6; + RegMem = ModRmByte & 0x07; + + /* Set the register operand */ + ModRegRm->Register = (ModRmByte >> 3) & 0x07; + + /* Check the mode */ + if ((ModRmByte >> 6) == 3) + { + /* The second operand is also a register */ + ModRegRm->Memory = FALSE; + ModRegRm->SecondRegister = RegMem; + + /* Done parsing */ + return TRUE; + } + + /* The second operand is memory */ + ModRegRm->Memory = TRUE; + + if (AddressSize) + { + if (RegMem == SOFT386_REG_ESP) + { + UCHAR SibByte; + ULONG Scale, Index, Base; + + /* Fetch the SIB byte */ + if (!Soft386FetchByte(State, &SibByte)) + { + /* Exception occurred */ + return FALSE; + } + + /* Unpack the scale, index and base */ + Scale = 1 << (SibByte >> 6); + Index = (SibByte >> 3) & 0x07; + if (Index != SOFT386_REG_ESP) Index = State->GeneralRegs[Index].Long; + else Index = 0; + Base = State->GeneralRegs[SibByte & 0x07].Long; + + /* Calculate the address */ + ModRegRm->MemoryAddress = Base + Index * Scale; + } + else if (RegMem == SOFT386_REG_EBP) + { + if (Mode) ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBP].Long; + else ModRegRm->MemoryAddress = 0; + } + else + { + /* Get the base from the register */ + ModRegRm->MemoryAddress = State->GeneralRegs[RegMem].Long; + } + + /* Check if there is no segment override */ + if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) + { + /* Check if the default segment should be SS */ + if ((RegMem == SOFT386_REG_EBP) && Mode) + { + /* Add a SS: prefix */ + State->PrefixFlags |= SOFT386_PREFIX_SEG; + State->SegmentOverride = SOFT386_REG_SS; + } + } + + if (Mode == 1) + { + CHAR Offset; + + /* Fetch the byte */ + if (!Soft386FetchByte(State, (PUCHAR)&Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Add the signed offset to the address */ + ModRegRm->MemoryAddress += (LONG)Offset; + } + else if ((Mode == 2) || ((Mode == 0) && (RegMem == SOFT386_REG_EBP))) + { + LONG Offset; + + /* Fetch the dword */ + if (!Soft386FetchDword(State, (PULONG)&Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Add the signed offset to the address */ + ModRegRm->MemoryAddress += Offset; + } + } + else + { + /* Check the operand */ + switch (RegMem) + { + case 0: + case 2: + { + /* (SS:)[BX + SI] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBX].LowWord + + State->GeneralRegs[SOFT386_REG_ESI].LowWord; + + break; + } + + case 1: + case 3: + { + /* (SS:)[BX + DI] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBX].LowWord + + State->GeneralRegs[SOFT386_REG_EDI].LowWord; + + break; + } + + case 4: + { + /* [SI] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_ESI].LowWord; + + break; + } + + case 5: + { + /* [DI] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EDI].LowWord; + + break; + } + + case 6: + { + if (Mode) + { + /* [BP] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBP].LowWord; + } + else + { + /* [constant] (added later) */ + ModRegRm->MemoryAddress = 0; + } + + break; + } + + case 7: + { + /* [BX] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBX].LowWord; + + break; + } + } + + /* Check if there is no segment override */ + if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) + { + /* Check if the default segment should be SS */ + if ((RegMem == 2) || (RegMem == 3) || ((RegMem == 6) && Mode)) + { + /* Add a SS: prefix */ + State->PrefixFlags |= SOFT386_PREFIX_SEG; + State->SegmentOverride = SOFT386_REG_SS; + } + } + + if (Mode == 1) + { + CHAR Offset; + + /* Fetch the byte */ + if (!Soft386FetchByte(State, (PUCHAR)&Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Add the signed offset to the address */ + ModRegRm->MemoryAddress += (LONG)Offset; + } + else if ((Mode == 2) || ((Mode == 0) && (RegMem == 6))) + { + SHORT Offset; + + /* Fetch the word */ + if (!Soft386FetchWord(State, (PUSHORT)&Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Add the signed offset to the address */ + ModRegRm->MemoryAddress += (LONG)Offset; + } + } + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386ReadModrmByteOperands(PSOFT386_STATE State, + PSOFT386_MOD_REG_RM ModRegRm, + PUCHAR RegValue, + PUCHAR RmValue) +{ + SOFT386_SEG_REGS Segment = SOFT386_REG_DS; + + /* Get the register value */ + if (ModRegRm->Register & 0x04) + { + /* AH, CH, DH, BH */ + *RegValue = State->GeneralRegs[ModRegRm->Register & 0x03].HighByte; + } + else + { + /* AL, CL, DL, BL */ + *RegValue = State->GeneralRegs[ModRegRm->Register & 0x03].LowByte; + } + + if (!ModRegRm->Memory) + { + /* Get the second register value */ + if (ModRegRm->SecondRegister & 0x04) + { + /* AH, CH, DH, BH */ + *RmValue = State->GeneralRegs[ModRegRm->SecondRegister & 0x03].HighByte; + } + else + { + /* AL, CL, DL, BL */ + *RmValue = State->GeneralRegs[ModRegRm->SecondRegister & 0x03].LowByte; + } + } + else + { + /* Check for the segment override */ + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Read memory */ + if (!Soft386ReadMemory(State, + Segment, + ModRegRm->MemoryAddress, + FALSE, + RmValue, + sizeof(UCHAR))) + { + /* Exception occurred */ + return FALSE; + } + } + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386ReadModrmWordOperands(PSOFT386_STATE State, + PSOFT386_MOD_REG_RM ModRegRm, + PUSHORT RegValue, + PUSHORT RmValue) +{ + SOFT386_SEG_REGS Segment = SOFT386_REG_DS; + + /* Get the register value */ + *RegValue = State->GeneralRegs[ModRegRm->Register].LowWord; + + if (!ModRegRm->Memory) + { + /* Get the second register value */ + *RmValue = State->GeneralRegs[ModRegRm->SecondRegister].LowWord; + } + else + { + /* Check for the segment override */ + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Read memory */ + if (!Soft386ReadMemory(State, + Segment, + ModRegRm->MemoryAddress, + FALSE, + RmValue, + sizeof(USHORT))) + { + /* Exception occurred */ + return FALSE; + } + } + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386ReadModrmDwordOperands(PSOFT386_STATE State, + PSOFT386_MOD_REG_RM ModRegRm, + PULONG RegValue, + PULONG RmValue) +{ + SOFT386_SEG_REGS Segment = SOFT386_REG_DS; + + /* Get the register value */ + *RegValue = State->GeneralRegs[ModRegRm->Register].Long; + + if (!ModRegRm->Memory) + { + /* Get the second register value */ + *RmValue = State->GeneralRegs[ModRegRm->SecondRegister].Long; + } + else + { + /* Check for the segment override */ + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Read memory */ + if (!Soft386ReadMemory(State, + Segment, + ModRegRm->MemoryAddress, + FALSE, + RmValue, + sizeof(ULONG))) + { + /* Exception occurred */ + return FALSE; + } + } + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386WriteModrmByteOperands(PSOFT386_STATE State, + PSOFT386_MOD_REG_RM ModRegRm, + BOOLEAN WriteRegister, + UCHAR Value) +{ + SOFT386_SEG_REGS Segment = SOFT386_REG_DS; + + if (WriteRegister) + { + /* Store the value in the register */ + if (ModRegRm->Register & 0x04) + { + /* AH, CH, DH, BH */ + State->GeneralRegs[ModRegRm->Register & 0x03].HighByte = Value; + } + else + { + /* AL, CL, DL, BL */ + State->GeneralRegs[ModRegRm->Register & 0x03].LowByte = Value; + } + } + else + { + if (!ModRegRm->Memory) + { + /* Store the value in the second register */ + if (ModRegRm->SecondRegister & 0x04) + { + /* AH, CH, DH, BH */ + State->GeneralRegs[ModRegRm->SecondRegister & 0x03].HighByte = Value; + } + else + { + /* AL, CL, DL, BL */ + State->GeneralRegs[ModRegRm->SecondRegister & 0x03].LowByte = Value; + } + } + else + { + /* Check for the segment override */ + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Write memory */ + if (!Soft386WriteMemory(State, + Segment, + ModRegRm->MemoryAddress, + &Value, + sizeof(UCHAR))) + { + /* Exception occurred */ + return FALSE; + } + } + } + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386WriteModrmWordOperands(PSOFT386_STATE State, + PSOFT386_MOD_REG_RM ModRegRm, + BOOLEAN WriteRegister, + USHORT Value) +{ + SOFT386_SEG_REGS Segment = SOFT386_REG_DS; + + if (WriteRegister) + { + /* Store the value in the register */ + State->GeneralRegs[ModRegRm->Register].LowWord = Value; + } + else + { + if (!ModRegRm->Memory) + { + /* Store the value in the second register */ + State->GeneralRegs[ModRegRm->SecondRegister].LowWord = Value; + } + else + { + /* Check for the segment override */ + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Write memory */ + if (!Soft386WriteMemory(State, + Segment, + ModRegRm->MemoryAddress, + &Value, + sizeof(USHORT))) + { + /* Exception occurred */ + return FALSE; + } + } + } + + return TRUE; +} + +FORCEINLINE +BOOLEAN +Soft386WriteModrmDwordOperands(PSOFT386_STATE State, + PSOFT386_MOD_REG_RM ModRegRm, + BOOLEAN WriteRegister, + ULONG Value) +{ + SOFT386_SEG_REGS Segment = SOFT386_REG_DS; + + if (WriteRegister) + { + /* Store the value in the register */ + State->GeneralRegs[ModRegRm->Register].Long = Value; + } + else + { + if (!ModRegRm->Memory) + { + /* Store the value in the second register */ + State->GeneralRegs[ModRegRm->SecondRegister].Long = Value; + } + else + { + /* Check for the segment override */ + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Write memory */ + if (!Soft386WriteMemory(State, + Segment, + ModRegRm->MemoryAddress, + &Value, + sizeof(ULONG))) + { + /* Exception occurred */ + return FALSE; + } + } + } + + return TRUE; +} + +/* EOF */ Propchange: branches/ntvdm/lib/soft386/common.inl ------------------------------------------------------------------------------ svn:eol-style = native 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 Sep 17 23:02:22 2013 @@ -12,12 +12,12 @@ // #define _INC_WINDOWS #include <windef.h> +// #define NDEBUG +#include <debug.h> + #include <soft386.h> #include "opcodes.h" #include "common.h" - -// #define NDEBUG -#include <debug.h> /* PUBLIC VARIABLES ***********************************************************/ 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] Tue Sep 17 23:02:22 2013 @@ -12,12 +12,12 @@ // #define _INC_WINDOWS #include <windef.h> +// #define NDEBUG +#include <debug.h> + #include <soft386.h> #include "common.h" #include "opcodes.h" - -// #define NDEBUG -#include <debug.h> /* DEFINES ********************************************************************/

1 0

[akhaldi] 60192: * Silence a debug print.
by akhaldi＠svn.reactos.org 17 Sep '13

17 Sep '13

Author: akhaldi Date: Tue Sep 17 22:49:56 2013 New Revision: 60192 URL: http://svn.reactos.org/svn/reactos?rev=60192&view=rev Log: * Silence a debug print. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Sep 17 22:49:56 2013 @@ -2873,7 +2873,7 @@ SxsWin32ExePath = PathBufferString; PathBuffer = PathBufferString.Buffer; PathBufferString.Buffer = NULL; - DPRINT1("SxS Path: %S\n", PathBuffer); + DPRINT("SxS Path: %S\n", PathBuffer); } /* Also set the .EXE path based on the path name */

1 0

[akhaldi] 60191: [RSYM] * Pad the coff string space. Brought to you by Arty.
by akhaldi＠svn.reactos.org 17 Sep '13

17 Sep '13

Author: akhaldi Date: Tue Sep 17 22:39:29 2013 New Revision: 60191 URL: http://svn.reactos.org/svn/reactos?rev=60191&view=rev Log: [RSYM] * Pad the coff string space. Brought to you by Arty. Modified: trunk/reactos/tools/rsym/rsym.c Modified: trunk/reactos/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.c?rev=6019… ============================================================================== --- trunk/reactos/tools/rsym/rsym.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.c [iso-8859-1] Tue Sep 17 22:39:29 2013 @@ -1163,6 +1163,8 @@ if (OutFileHeader->PointerToSymbolTable) { + int PaddingFrom = (OutFileHeader->PointerToSymbolTable + StringTableLength) % + OutOptHeader->FileAlignment; fseek(OutFile, OutFileHeader->PointerToSymbolTable, 0); /* COFF string section is preceeded by a length */ @@ -1172,6 +1174,15 @@ The string table length technically counts as part of the string table space itself. */ fwrite(StringTable + 4, 1, StringTableLength - 4, OutFile); + + if (PaddingFrom) + { + int PaddingSize = OutOptHeader->FileAlignment - PaddingFrom; + char *Padding = (char *)malloc(PaddingSize); + memset(Padding, 0, PaddingFrom); + fwrite(Padding, 1, PaddingSize, OutFile); + free(Padding); + } } if (PaddedRosSym)

1 0

[akhaldi] 60190: [CMAKE] * Add a proper way to enable/disable PSEH3.
by akhaldi＠svn.reactos.org 17 Sep '13

17 Sep '13

Author: akhaldi Date: Tue Sep 17 22:31:33 2013 New Revision: 60190 URL: http://svn.reactos.org/svn/reactos?rev=60190&view=rev Log: [CMAKE] * Add a proper way to enable/disable PSEH3. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/config.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/lib/pseh/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=60190&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue Sep 17 22:31:33 2013 @@ -127,10 +127,6 @@ if(_WINKD_) add_definitions(-D_WINKD_=1) - endif() - - if(USE_PSEH3) - add_definitions(-D_USE_PSEH3=1) endif() # Version Options Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=601… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Tue Sep 17 22:31:33 2013 @@ -71,15 +71,8 @@ "Whether to create a graphml dependency of dlls.") if(MSVC) - set(_PREFAST_ FALSE CACHE BOOL "Whether to enable PREFAST while compiling.") set(_VS_ANALYZE_ FALSE CACHE BOOL "Whether to enable static analysis while compiling.") - -else() - -set(USE_PSEH3 FALSE CACHE BOOL -"Whether to use the new PSEH3 library (requires GCC 4.5 and newer).") - endif() Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=60190&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Sep 17 22:31:33 2013 @@ -7,6 +7,14 @@ # PDB style debug info if(NOT DEFINED SEPARATE_DBG) set(SEPARATE_DBG FALSE) +endif() + +if(NOT DEFINED USE_PSEH3) + set(USE_PSEH3 0) +endif() + +if(USE_PSEH3) + add_definitions(-D_USE_PSEH3=1) endif() # Compiler Core Modified: trunk/reactos/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Tue Sep 17 22:31:33 2013 @@ -1,7 +1,7 @@ if(NOT MSVC) - if (USE_PSEH3) + if(USE_PSEH3) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/pseh) list(APPEND SOURCE i386/pseh3.c

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